Merge pull request #8 from MarioRuiz/v2.3.0

V2.3.0

Author: MarioRuiz

.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 2.4
-  - 2.5
-  - 2.6
+  - 2.7
+  - 3.0
   - ruby-head
 branches:
   except:

README.md

@@ -428,6 +428,17 @@ StringPattern.optimistic = true
 #>SAAERfixedtext988
 ```
 
+#### block_list
+
+To specify which words will be avoided from the results
+
+```ruby
+StringPattern.block_list = ['example', 'wrong', 'ugly']
+StringPattern.block_list_enabled = true
+"2-20:Tn".gen #>AAñ34Ef99éNOP
+```
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/marioruiz/string_pattern.

lib/string/pattern/add_to_ruby.rb

@@ -90,11 +90,14 @@ def to_sp
     pats = ""
     patg = [] # for (aa|bb|cc) group
     set = false
+    set_negate = false
+    options = []
     capture = false
 
     range = ""
     fixed_text = false
-    last_char = (regexp.to_s.gsub("?-mix:", "").length) - 2
+    options = regexp.to_s.scan(/\A\(\?([mix]*)\-[mix]*:/).join.split('')
+    last_char = (regexp.to_s.gsub(/\A\(\?[mix]*\-[mix]*:/, "").length) - 2
     Regexp::Scanner.scan regexp do |type, token, text, ts, te|
       if type == :escape
         if token == :dot
@@ -126,9 +129,9 @@ def to_sp
               pata[-1] += pats.chop
             else
               if pats.size == 2
-                pata << pats.chop #jal
+                pata << pats.chop
               else
-                pata << "1:[#{pats}" #jal
+                pata << "1:[#{pats}"
               end
               if last_char == te and type == :literal and token == :literal
                 pata << text
@@ -147,7 +150,6 @@ def to_sp
         pats = ""
       end
       fixed_text = false
-
       case token
       when :open
         set = true
@@ -158,7 +160,13 @@ def to_sp
           if pats[-1] == "["
             pats.chop!
           else
-            pats += "]"
+            if set_negate
+              pats+="%]*"
+              set_negate = false
+            else
+              pats += "]"
+            end    
+
           end
         elsif type == :group
           capture = false
@@ -169,6 +177,11 @@ def to_sp
             pats = ""
           end
         end
+      when :negate
+        if set and pats[-1] == '['
+          pats+="%"
+          set_negate = true
+        end
       when :capture
         capture = true if type == :group
       when :alternation
@@ -182,6 +195,7 @@ def to_sp
           end
         end
       when :range
+        pats.chop! if options.include?('i')
         range = pats[-1]
         pats.chop!
       when :digit
@@ -212,28 +226,44 @@ def to_sp
             pats = text[-1]
           else
             pats += text
+            pats += text.upcase if options.include?('i')
           end
         else
           range = range + "-" + text
           if range == "a-z"
-            pats = "x" + pats
+            if options.include?('i')
+              pats = "L" + pats
+            else
+              pats = "x" + pats
+            end
           elsif range == "A-Z"
-            pats = "X" + pats
+            if options.include?('i')
+              pats = "L" + pats
+            else
+              pats = "X" + pats
+            end
           elsif range == "0-9"
             pats = "n" + pats
           else
-            pats += if set
-                      (range[0]..range[2]).to_a.join
-                    else
-                      "[" + (range[0]..range[2]).to_a.join + "]"
-                    end
+            if set
+              pats += (range[0]..range[2]).to_a.join
+              if options.include?('i')
+                pats += (range[0]..range[2]).to_a.join.upcase
+              end
+            else
+              trange = (range[0]..range[2]).to_a.join
+              if options.include?('i')
+                trange += trange.upcase
+              end
+              pats += "[" + trange + "]"
+            end
           end
           range = ""
         end
         pats = "[" + pats + "]" unless set
       when :interval
         size = text.sub(",", "-").sub("{", "").sub("}", "")
-        size.chop! if size[-1] == "-"
+        size+=(default_infinite+size.chop.to_i).to_s if size[-1] == "-"
         pats = size + ":" + pats
         if !patg.empty?
           patg << pats

lib/string/pattern/generate.rb

@@ -568,6 +568,16 @@ def StringPattern.generate(pattern, expected_errors: [], **synonyms)
           good_result = true
         end
       end
+      if @block_list_enabled
+        if @block_list.is_a?(Array)
+          @block_list.each do |bl|
+            if string.match?(/#{bl}/i)
+              good_result = false
+              break
+            end
+          end
+        end
+      end
     end until good_result or tries > 10000
     unless good_result
       puts "Not possible to generate the string on StringPattern.generate: #{pattern.inspect}, expected_errors: #{expected_errors.inspect}"

lib/string_pattern.rb

@@ -25,9 +25,13 @@
 #             In case using regular expressions the maximum when using * or + for repetitions
 # word_separator: (String, default: '_')
 #             When generating words using symbol types 'w' or 'p' the character to separate the english or spanish words.
+# block_list: (Array, default: empty)
+#             Array of words to be avoided from resultant strings.
+# block_list_enabled: (TrueFalse, default: false)
+#             If true block_list will be take in consideration
 class StringPattern
   class << self
-    attr_accessor :national_chars, :optimistic, :dont_repeat, :cache, :cache_values, :default_infinite, :word_separator
+    attr_accessor :national_chars, :optimistic, :dont_repeat, :cache, :cache_values, :default_infinite, :word_separator, :block_list, :block_list_enabled
   end
   @national_chars = (("a".."z").to_a + ("A".."Z").to_a).join
   @optimistic = true
@@ -36,6 +40,8 @@ class << self
   @dont_repeat = false
   @default_infinite = 10
   @word_separator = "_"
+  @block_list_enabled = false
+  @block_list = []
   NUMBER_SET = ("0".."9").to_a
   SPECIAL_SET = [" ", "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "-", "_", "+", "=", "{", "}", "[", "]", "'", ";", ":", "?", ">", "<", "`", "|", "/", '"']
   ALPHA_SET_LOWER = ("a".."z").to_a
@@ -56,4 +62,5 @@ def self.national_chars=(par)
     @cache = Hash.new()
     @national_chars = par
   end
+
 end

spec/string/pattern/add_to_ruby_spec.rb

@@ -65,6 +65,37 @@
     it "responds to to_sp" do
       expect(/\d{2}/.to_sp).to eq "2:n"
     end
+    it "/[^abc]+/i.to_sp" do
+      expect(/[^abc]+/i.to_sp).to eq "1-10:[%aAbBcC%]*"
+    end
+    it "/[abc]+/i.to_sp" do 
+      expect(/[abc]+/i.to_sp).to eq "1-10:[aAbBcC]"
+    end
+    it "/[a-z]+/i.to_sp" do
+      expect(/[a-z]+/i.to_sp).to eq "1-10:L"
+    end
+    it "/[a-z]+/.to_sp" do
+      expect(/[a-z]+/.to_sp).to eq "1-10:x"
+    end
+    it "/[m-z]+/i.to_sp" do
+      expect(/[m-z]+/i.to_sp).to eq '1-10:[mnopqrstuvwxyzMNOPQRSTUVWXYZ]'
+    end
+    it '/[m-z]+\d+\w+[ab]+/i.to_sp' do
+      expect(/[m-z]+\d+\w+[ab]+/i.to_sp).to eq ["1-10:[mnopqrstuvwxyzMNOPQRSTUVWXYZ]", "1-10:n", "1-10:Ln_", "1-10:[aAbB]"]
+    end
+    it '/a{3,}/.to_sp' do
+      expect(/a{3,}/.to_sp).to eq '3-13:[a]'
+    end
+    it '/a{3,8}/.to_sp' do
+      expect(/a{3,8}/.to_sp).to eq '3-8:[a]'
+    end
+    it '/a{3}/.to_sp' do
+      expect(/a{3}/.to_sp).to eq '3:[a]'
+    end
+    it '/a{15,}/.to_sp' do
+      expect(/a{15,}/.to_sp).to eq '15-25:[a]'
+    end
+
   end
 
   describe "from Kernel" do

spec/string/pattern/generate_spec.rb

@@ -371,8 +371,7 @@
       regexp = /[abc]/
       expect(regexp.gen.match?(regexp)).to eq true
     end
-    #todo: this is failing, it is generating a string of a b or c
-    xit 'accepts [^abc]' do
+    it 'accepts [^abc]' do
       regexp = /[^abc]/
       expect(regexp.gen.match?(regexp)).to eq true
     end
@@ -465,8 +464,7 @@
       regexp = /a{3}/
       expect(regexp.gen.match?(regexp)).to eq true
     end
-    #todo: 3 or more is returning now always 3
-    xit 'accepts a{3,}' do
+    it 'accepts a{3,}' do
       regexp = /a{3}/
       expect(regexp.gen.match?(regexp)).to eq true
     end
@@ -479,6 +477,26 @@
       expect(regexp.gen.match?(regexp)).to eq true
     end
 
+    describe "block_list" do
+      before(:all) do
+        StringPattern.block_list = []
+        StringPattern.block_list_enabled = false
+      end
+
+      after(:each) do
+        StringPattern.block_list = []
+        StringPattern.block_list_enabled = false
+      end
+
+      it "doesn't return any of block list" do
+        StringPattern.block_list_enabled = true
+        StringPattern.block_list = ('a'..'x').to_a
+        5.times do 
+          expect("2:L".gen).to match(/^[yz]{2}$/i)
+        end
+      end
+    end
+
 
   end
 end

string_pattern.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'string_pattern'
-  s.version     = '2.2.3'
+  s.version     = '2.3.0'
   s.summary     = "Generate easily random strings following a simple pattern or regular expression. '10-20:Xn/x/'.generate #>qBstvc6JN8ra. Also generate words in English or Spanish. Perfect to be used in test data factories."
   s.description = "Easily generate strings supplying a very simple pattern. '10-20:Xn/x/'.generate #>qBstvc6JN8ra. Generate random strings using a regular expression (Regexp): /[a-z0-9]{2,5}\w+/.gen . Also generate words in English or Spanish. Perfect to be used in test data factories. Also, validate if a text fulfills a specific pattern or even generate a string following a pattern and returning the wrong length, value... for testing your applications."
   s.authors     = ["Mario Ruiz"]
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["LICENSE","README.md"]
   s.homepage    = 'https://github.com/MarioRuiz/string_pattern'
   s.license       = 'MIT'
-  s.add_runtime_dependency 'regexp_parser', '~> 1.3', '>= 1.3.0'
+  s.add_runtime_dependency 'regexp_parser', '~> 2.5', '>= 2.5.0'
 end