msfl_visitors 1.1.0.dev7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527b56ff39a1ef27ee5c54953f2f018825519e22
-  data.tar.gz: 2d0b50e7a59b37091a252e38023238dba36aaac9
+  metadata.gz: 59b0a99aa0756f6df016c0a83b95f26f1d0dea11
+  data.tar.gz: 15b2059bbd5815cd7ee512acbaa06c48804c2270
 SHA512:
-  metadata.gz: 08254e255043304901bd24d758f847f737bf2b3aff4c9b278bf7cfccad41eb213f0d932b0b4ad9a7806baaf083bb03d1d634b8a47550f27432beb87cbc4042a2
-  data.tar.gz: 7f1e8de48af5eeff14d409a7ffc904e1eb117e0aa1cc4910620740bcd3fbbf74fca0b601ab69493a4a8070015667ea5b3921792855723d41bcbf2b8c1e794196
+  metadata.gz: fa4bede1856b58d2fb1ad36d9856c935a71a83f988f06a28c9cb3653dd2bb76dac4d45448c7bd71b995c3d8910434f3b2dee04fae1907f83ec301ac62d9a9d93
+  data.tar.gz: bf4b42e0892f2a006c9c3b7a42e9dfe9475f6f83c614ed2e068fa4787c6d2e60074232324db56ddb181c471ec0c9c8d988de32dc8a3f8ef7eec355fc33fff4fe

data/lib/msfl_visitors/visitor.rb

@@ -84,7 +84,7 @@ module MSFLVisitors
           when  Nodes::Match
             if node.right.is_a? Nodes::Set
               regex = node.right.contents.map { |right_child| MSFLVisitors::Nodes::Regex.new(right_child.value.to_s).accept(visitor)[15..-6] }.join('|')
-              "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} Regexp.new( \".*#{regex}.*\" )"
+              "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} Regexp.new( '.*' + #{regex[4..-5]} + '.*' )"
             else
               "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} #{MSFLVisitors::Nodes::Regex.new(node.right.value.to_s).accept(visitor)}"
             end

data/msfl_visitors.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl_visitors'
-  s.version     = '1.1.0.dev7'
+  s.version     = '1.1.0'
   s.date        = '2015-05-28'
   s.summary     = "Convert MSFL to other forms"
   s.description = "Visitor pattern approach to converting MSFL to other forms."

data/spec/msfl_visitors/visitors/chewy_term_filter_spec.rb

@@ -223,8 +223,8 @@ describe MSFLVisitors::Visitor do
 
       context "when using the TermFilter visitor" do
 
-        it "results in: 'left =~ Regexp.new( \".*rhs.*\" )'" do
-          expect(result).to eq %(lhs =~ Regexp.new( ".*rhs.*" ))
+        it "results in: 'left =~ Regexp.new( '.*' + Regexp.parse( \"rhs\" ) + '.*' )'" do
+          expect(result).to eq %(lhs =~ Regexp.new( '.*' + Regexp.escape( "rhs" ) + '.*' ))
         end
       end
 
@@ -243,8 +243,8 @@ describe MSFLVisitors::Visitor do
 
         context "when using the TermFilter visitor" do
 
-          it "results in: 'left =~ Regexp.new( \".*this\\ \\(needs\\)\\ to\\ be\\*\\ escaped.*\" )'" do
-            expect(result).to eq %(lhs =~ Regexp.new( ".*this\\ \\(needs\\)\\ to\\ be\\*\\ escaped.*" ))
+          it "results in: 'left =~ Regexp.new( '.*' + Regexp.escape( \"this (needs) to be* escaped\" ) + '.*' )'" do
+            expect(result).to eq %(lhs =~ Regexp.new( '.*' + Regexp.escape( "this (needs) to be* escaped" ) + '.*' ))
           end
         end
 
@@ -262,8 +262,8 @@ describe MSFLVisitors::Visitor do
 
         context "when using the TermFilter visitor" do
 
-          it "results in: 'left =~ Regexp.new( \".*foo|bar|baz.*\" )'" do
-            expect(result).to eq %(lhs =~ Regexp.new( ".*foo|bar|baz.*" ))
+          it "results in: 'left =~ Regexp.new( '.*' + Regexp.escape( \"foo\" ) + '|' + Regexp.escape( \"bar\" ) + '|' + Regexp.escape( \"baz\" ) + '.*' )'" do
+            expect(result).to eq %(lhs =~ Regexp.new( '.*' + Regexp.escape( "foo" ) + '|' + Regexp.escape( "bar" ) + '|' + Regexp.escape( "baz" ) + '.*' ))
           end
         end
 
@@ -703,8 +703,8 @@ describe MSFLVisitors::Visitor do
 
         let(:node) { MSFLVisitors::Nodes::Regex.new regex }
 
-        it "returns: 'Regexp.new( \".*content.*\" )'" do
-          expect(result).to eq %(Regexp.new( ".*#{regex}.*" ))
+        it "returns: 'Regexp.new( '.*' + Regexp.escape( \"content\" ) + '.*' )'" do
+          expect(result).to eq %(Regexp.new( '.*' + Regexp.escape( "#{regex}" ) + '.*' ))
         end
 
         context "when using the Aggregations visitor" do
@@ -722,8 +722,8 @@ describe MSFLVisitors::Visitor do
 
           let(:node) { MSFLVisitors::Nodes::Regex.new regex }
 
-          it "returns: 'Regexp.new( \".*this\\ /\\ needs\\ to\\ %\\ \\{be,escaped\\}\\ \\*\\.\\ \\^\\[or\\]\\ \\|\\ \\\\else.*\" )'" do
-            expect(result).to eq "Regexp.new( \".*this\\ /\\ needs\\ to\\ %\\ \\{be,escaped\\}\\ \\*\\.\\ \\^\\[or\\]\\ \\|\\ \\\\else.*\" )"
+          it "returns: 'Regexp.new( '.*' + Regexp.escape( \"this / needs to % {be,escaped} *. ^[or] | \\else\" ) + '.*' )'" do
+            expect(result).to eq %(Regexp.new( '.*' + Regexp.escape( "this / needs to % {be,escaped} *. ^[or] | \\else" ) + '.*' ))
           end
 
           context "when using the Aggregations visitor" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 1.1.0.dev7
+  version: 1.1.0
 platform: ruby
 authors:
 - Courtland Caldwell
@@ -172,9 +172,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2