msfl_visitors 1.1.0.dev5 → 1.1.0.dev6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95d9fae385a3b9762ddba024ef96817d7d71739c
-  data.tar.gz: 2a8d3d903e18961b9c0bd3e5cfb412a8bbd7bec9
+  metadata.gz: 32396eb4d354abc1354870d15fb22e2328aaa6a5
+  data.tar.gz: cf5865b6fcce2cb9e88cad25706d542439add95d
 SHA512:
-  metadata.gz: ed7c6a16d6f6731ef09dce3c8efe5b87b1fc7368abb6326064636de15a2d9a5d11ef8994bcc7ed6776abcd599b17159ea5dd3f3df7d3905fa5844c4c6d9fa94a
-  data.tar.gz: a3f06451b7983b88d5435088bd0a02afad2b07ce6a1e6a45c0c2cabba50d08b3dec99c739ef1f1ca583c2b33bc262f2355df63ac0499d6ef6450c7a4340fa8ba
+  metadata.gz: 5a6b76e2ea415343d350c8dce77a8422db02bf89370bc6df4787f498b723219589756d7018de2b8aa54755620772058d0d3cb86088d57fe07d973ba390987c7b
+  data.tar.gz: 901fbc5717a6ce8dfc72030a2864b0898b4e3ffbce0048f5c19f213a833b50acd8f8e5944c1a5d44e0ff81c8c82fbdc905d39124df5433f99dfe61abf963f9cd

data/lib/msfl_visitors/visitor.rb

@@ -73,7 +73,7 @@ module MSFLVisitors
           when  Nodes::Field
             node.value.to_s
           when Nodes::Regex
-            %(Regexp.new( "#{Regexp.escape(node.value)}" ))
+            %(Regexp.new( ".*#{Regexp.escape(node.value)}.*" ))
           when  Nodes::Word
             "\"#{node.value}\""
           when Nodes::Date, Nodes::Time
@@ -83,8 +83,8 @@ 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)[13..-4] }.join('|')
-              "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} Regexp.new( \"#{regex}\" )"
+              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}.*\" )"
             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.dev5'
+  s.version     = '1.1.0.dev6'
   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

@@ -202,8 +202,8 @@ describe MSFLVisitors::Visitor do
 
       context "when using the TermFilter visitor" do
 
-        it "results in: 'Regexp.new( \"foobar \")'" do
-          expect(result).to eq %(Regexp.new( "foobar" ))
+        it "results in: 'Regexp.new( \".*foobar.*\")'" do
+          expect(result).to eq %(Regexp.new( ".*foobar.*" ))
         end
       end
 
@@ -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( \".*rhs.*\" )'" do
+          expect(result).to eq %(lhs =~ Regexp.new( ".*rhs.*" ))
         end
       end
 
@@ -249,8 +249,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( \".*foo|bar|baz.*\" )'" do
+            expect(result).to eq %(lhs =~ Regexp.new( ".*foo|bar|baz.*" ))
           end
         end
 
@@ -690,8 +690,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( \".*content.*\" )'" do
+          expect(result).to eq %(Regexp.new( ".*#{regex}.*" ))
         end
 
         context "when using the Aggregations visitor" do
@@ -709,8 +709,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( \".*this\\ /\\ needs\\ to\\ %\\ \\{be,escaped\\}\\ \\*\\.\\ \\^\\[or\\]\\ \\|\\ \\\\else.*\" )'" do
+            expect(result).to eq "Regexp.new( \".*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.dev5
+  version: 1.1.0.dev6
 platform: ruby
 authors:
 - Courtland Caldwell