msfl_visitors 1.2.1.dev0 → 1.2.1.dev1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43425b31d0774b6b7bfef7b7a47dd8914195729
-  data.tar.gz: b3fdf922ea429c522a77258ca40e5955d53373f3
+  metadata.gz: f37f5301f25a83e07f38aab1b3b82ee096d3ca1d
+  data.tar.gz: 609b068eff9ace33c8ef8f7c3b917f5392981143
 SHA512:
-  metadata.gz: cc796e4b08f79201048cf37715f50cba54abc9026ebbb96669a5c8f4b3e8ef93505a65e2f5e1790494d3775521a65bfdcb30092ba1c7d1fffec329855684a8e7
-  data.tar.gz: 142acb13b5679b278a9c2487ecace20e8917d3673a715b9ecbfa91ee1ea5ab71f131a49a2237851cdb50855e28b1ee8aa1468a831b548736eeb0700b02ffaa09
+  metadata.gz: d0d858070bcd4a52e6f9ab10513b60d19e9df46a92d880b42db0231a08cad0aef29c4015b8a752f5bc863785eb346a2c9d50654874ef87a086675bbf3053caf3
+  data.tar.gz: 5a86c87c0942efce43ca92c1822d02ff3a34bcd1776b49b04bc8f86d4b37a5deef56625ef29244ea4c279794b3ccb0d222429154c3ebf6099db134bd0583e22a

data/lib/msfl_visitors/visitor.rb

@@ -101,7 +101,7 @@ module MSFLVisitors
           when  Nodes::Match
             if node.right.is_a? Nodes::Set
               escaped_str = node.right.contents.map { |right_child| MSFLVisitors::Nodes::Regex.new(right_child.value.to_s).accept(visitor).inspect[3..-4] }.join('|')
-              "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} " + escaped_regex_helper(escaped_str).inspect
+              "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} " + %r[.*#{escaped_str}.*].inspect
             else
               "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} " + MSFLVisitors::Nodes::Regex.new(node.right.value.to_s).accept(visitor).inspect
             end

data/msfl_visitors.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl_visitors'
-  s.version     = '1.2.1.dev0'
+  s.version     = '1.2.1.dev1'
   s.date        = '2015-06-19'
   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

@@ -280,12 +280,12 @@ describe MSFLVisitors::Visitor do
 
       context "when the right hand side is a Value node that requires escaping" do
 
-        let(:right) { MSFLVisitors::Nodes::Word.new 'this (needs) to be* escaped' }
+        let(:right) { MSFLVisitors::Nodes::Word.new 'this (ne&eds) to be* escaped' }
 
         context "when using the TermFilter visitor" do
 
-          it "results in: 'left =~ /.*this\ \(needs\)\ to\ be\*\ escaped.*/'" do
-            expect(result).to eq %(lhs =~ ) + /.*this\ \(needs\)\ to\ be\*\ escaped.*/.inspect
+          it "results in: 'left =~ /.*this\ \(ne\&eds\)\ to\ be\*\ escaped.*/'" do
+            expect(result).to eq %(lhs =~ ) + /.*this\ \(ne\&eds\)\ to\ be\*\ escaped.*/.inspect
           end
         end
 
@@ -306,6 +306,15 @@ describe MSFLVisitors::Visitor do
           it "results in: 'left =~ /.*foo|bar|baz.*/'" do
             expect(result).to eq %(lhs =~ ) + /.*foo|bar|baz.*/.inspect
           end
+
+          context "when one of the members of the Set requires escaping" do
+
+            let(:foo_node) { MSFLVisitors::Nodes::Word.new "please&*escape me" }
+
+            it "escapes special characters" do
+              expect(result).to eq %(lhs =~ ) + /.*please\&\*escape\ me|bar|baz.*/.inspect
+            end
+          end
         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.2.1.dev0
+  version: 1.2.1.dev1
 platform: ruby
 authors:
 - Courtland Caldwell