msfl_visitors 1.1.0.dev3 → 1.1.0.dev4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ec3bfda1d028fdcd4c4fb02eaf3e6a26c792e4b
-  data.tar.gz: f1e1324598941df2d59dc3da9b80ef2f0a4e3710
+  metadata.gz: e7618102d9f99a0c0355ca268490a8f333726946
+  data.tar.gz: d53c6a5cafbb278a65a5be4d18342a9b90b492c5
 SHA512:
-  metadata.gz: 8f910b468fefd6e905119c76e9fd7e9939490b37789ba76f9d1cc5a32d42d30a565f44aa32c0c72e8cd149ac10e4b564972f66536d9a59ba95aeca592744d408
-  data.tar.gz: 9e621c0a5175d457c0dc0c63324ac229719442d01c9008a043ced18a41767c37597a5c14da68f710ed0cdf811c0820c07c17178a793b7820c2afc5a2ae67f0d3
+  metadata.gz: 69d662a60f191114662fa52b9cac362891d3e51f75405610fec3ebeb0be29a8bd47e8c8b4cdb34a18fa699203bcd115624479078f00e4102d3d639bf4e37b994
+  data.tar.gz: 8196994112628bf366eb554ffd291c95ce47a4b1bba99ec885eea7457a7717dfdc5a612a347b7a818fefa6e80380d7b746ea1833edd52a1613ef6ed29ec51c2f

data/lib/msfl_visitors/visitor.rb

@@ -73,7 +73,7 @@ module MSFLVisitors
           when  Nodes::Field
             node.value.to_s
           when Nodes::Regex
-            "/#{node.value}/"
+            "/#{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| right_child.value.to_s }.join('|')
-              "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} #{MSFLVisitors::Nodes::Regex.new(regex).accept(visitor)}"
+              regex = '/' + node.right.contents.map { |right_child| MSFLVisitors::Nodes::Regex.new(right_child.value.to_s).accept(visitor)[1..-2] }.join('|') + '/'
+              "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} #{regex}"
             else
               "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} #{MSFLVisitors::Nodes::Regex.new(node.right.value.to_s).accept(visitor)}"
             end
@@ -159,8 +159,9 @@ module MSFLVisitors
 
           when Nodes::Match
             if node.right.is_a? Nodes::Set
-              regex = node.right.contents.map { |right_child| right_child.value.to_s }.join('|')
-              { agg_field_name: node.left.accept(visitor), operator: :match, test_value: MSFLVisitors::Nodes::Regex.new(regex).accept(visitor) }
+              regex = node.right.contents.map { |right_child| MSFLVisitors::Nodes::Regex.new(right_child.value.to_s).accept(visitor) }.join('|')
+              # regex = node.right.contents.map { |right_child| right_child.value.to_s }.join('|')
+              { agg_field_name: node.left.accept(visitor), operator: :match, test_value: regex }
             else
               { agg_field_name: node.left.accept(visitor), operator: :match, test_value: MSFLVisitors::Nodes::Regex.new(node.right.value.to_s).accept(visitor) }
             end
@@ -175,7 +176,7 @@ module MSFLVisitors
                 Nodes::Dataset
             node.value
           when  Nodes::Regex
-            node.value.to_s
+            Regexp.escape(node.value.to_s)
 
           when  Nodes::GreaterThan,
                 Nodes::GreaterThanEqual,

data/msfl_visitors.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl_visitors'
-  s.version     = '1.1.0.dev3'
+  s.version     = '1.1.0.dev4'
   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

@@ -683,6 +683,46 @@ describe MSFLVisitors::Visitor do
           end
         end
       end
+
+      describe "a Regex node" do
+
+        let(:regex) { "content" }
+
+        let(:node) { MSFLVisitors::Nodes::Regex.new regex }
+
+        it "returns: \"/content/\"" do
+          expect(result).to eq "/#{regex}/"
+        end
+
+        context "when using the Aggregations visitor" do
+
+          before { visitor.mode = :aggregations }
+
+          it "returns: the elasticsearch regular expression formatted string \"content\"" do
+            expect(result).to eq "#{regex}"
+          end
+        end
+
+        context "when the regex contains characters that require escaping" do
+
+          let(:regex) { 'this / needs to % {be,escaped} *. ^[or] | \else' }
+
+          let(:node) { MSFLVisitors::Nodes::Regex.new regex }
+
+          it "returns: '/this\\ /\\ needs\\ to\\ %\\ \\{be,escaped\\}\\ \\*\\.\\ \\^\\[or\\]\\ \\|\\ \\\\else/'" do
+            expect(result).to eq "/this\\ /\\ needs\\ to\\ %\\ \\{be,escaped\\}\\ \\*\\.\\ \\^\\[or\\]\\ \\|\\ \\\\else/"
+          end
+
+          context "when using the Aggregations visitor" do
+
+            before { visitor.mode = :aggregations }
+
+            it "returns: 'this\\ /\\ needs\\ to\\ %\\ \\{be,escaped\\}\\ \\*\\.\\ \\^\\[or\\]\\ \\|\\ \\\\else'" do
+              expect(result).to eq "this\\ /\\ needs\\ to\\ %\\ \\{be,escaped\\}\\ \\*\\.\\ \\^\\[or\\]\\ \\|\\ \\\\else"
+            end
+          end
+        end
+      end
     end
 
     describe "range value nodes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 1.1.0.dev3
+  version: 1.1.0.dev4
 platform: ruby
 authors:
 - Courtland Caldwell