string_pattern 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c451e4295f5c62ea8b7c8113815a0c7a2b5c70a739826fdf651a7fb99a75be48
-  data.tar.gz: 2445e4958a2bf96b70e0ce99f4df31ab02a61183a496289a1b20b3360e2fecaf
+  metadata.gz: 7b9ea7310d3fb561b37d8b0753360ddd5742188a2f71b68560a121d716d65083
+  data.tar.gz: a0504e61ff66a749d7c0b0fcc36ad629474d793abd78bc0456bdd6a9ddeae7f7
 SHA512:
-  metadata.gz: 650a16f6a2cda5c762f2f685b4fe515848135a6c4995ba08504ec80435696d4e1ab6289adaf4aae839ca0d77978338d2603411a7330fe2db0f2bede587554cfd
-  data.tar.gz: 996deb9300188c286dc0a051f744262367f928192e5c30fcd981f7f964283463f2dc606c4876163378397b767ed235f51bc749bac55e801866810aa19318da91
+  metadata.gz: 3ade8ead8f7434fb1893f62e44523245fb52776a24ffc9f9f548a16f790ec035f2411d223203886571decd7c7455b6f56cf41a7e62c491910762c210754e11f7
+  data.tar.gz: bbb68322396f6017f6f6f1b6190b1e14cc0a3cea804efa66f6527f892be032fe5cebc321e39ea399e0af9f69ee6f5e4ef1c7a9241ac97541cf6d4aac3191c658

data/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.

data/lib/string/pattern/add_to_ruby.rb

@@ -90,11 +90,14 @@ class Regexp
     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 @@ class Regexp
               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 @@ class Regexp
         pats = ""
       end
       fixed_text = false
-
       case token
       when :open
         set = true
@@ -158,7 +160,13 @@ class Regexp
           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 @@ class Regexp
             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 @@ class Regexp
           end
         end
       when :range
+        pats.chop! if options.include?('i')
         range = pats[-1]
         pats.chop!
       when :digit
@@ -212,28 +226,44 @@ class Regexp
             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

data/lib/string/pattern/generate.rb

@@ -568,6 +568,16 @@ class StringPattern
           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}"

data/lib/string_pattern.rb

@@ -25,9 +25,13 @@ require_relative "string/pattern/validate"
 #             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 StringPattern
   @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 @@ class StringPattern
     @cache = Hash.new()
     @national_chars = par
   end
+
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: string_pattern
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Mario Ruiz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 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.
@@ -68,7 +68,7 @@ homepage: https://github.com/MarioRuiz/string_pattern
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,8 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 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.