close #4

Author: MarioRuiz

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,21 +226,37 @@ 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

spec/string/pattern/add_to_ruby_spec.rb

@@ -65,6 +65,25 @@
     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
+
   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

string_pattern.gemspec

@@ -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', '~> 2.5', '>= 2.5.0' #jal
+  s.add_runtime_dependency 'regexp_parser', '~> 2.5', '>= 2.5.0'
 end