msfl_visitors 1.1.0.dev0 → 1.1.0.dev1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23a08894d57a37827597d64aeda4d6ed4061f4f
-  data.tar.gz: dd4b02c9a63274565773b97de1c781ebc1798913
+  metadata.gz: ae62acf6b12fb294d8010a5edfb6a931e8a1d117
+  data.tar.gz: f442b027daf2a25c48743d9b3b427d779fc4e921
 SHA512:
-  metadata.gz: a4d8f3d100e707424d88a403530e90c60b444d76c36407301831e39b8805aac4822eb8f23c371a9a1af3b9c1c6ba23e968ef6860ecb2344745a6e0225678aa9f
-  data.tar.gz: 02e5f8a832ad4c141229ea285a536554d3d6af6b5b9f8fcdccc37374cbac77fc78d8a6d3cf305d824c63f40d23e5db6af1ff293ff203cae3cc97261c9d032f40
+  metadata.gz: 0e93bd8a1a9d1071f4a9bb280fbc5b9293c7b5c4912130bdf8d1f58dc9b6895f597a50f9e346ba5c2824fcef0516fd1b26c065e47b38792979cbfb195ef26f65
+  data.tar.gz: c3e2d39332b9f1fefd8536121e682b09865014837cf38d0638fe6397c4f77540b7b50755fbb24edc89d84477e5100ef6bd40f3308bcd0140b9b2c7712de9162a

data/lib/msfl_visitors/nodes/match.rb

@@ -0,0 +1,10 @@
+require_relative 'comparison'
+module MSFLVisitors
+  module Nodes
+    class Match < Comparison
+      def accept(visitor)
+        visitor.visit self
+      end
+    end
+  end
+end

data/lib/msfl_visitors/nodes/regex.rb

@@ -0,0 +1,7 @@
+require_relative 'value'
+module MSFLVisitors
+  module Nodes
+    class Regex < Value
+    end
+  end
+end

data/lib/msfl_visitors/nodes.rb

@@ -19,10 +19,12 @@ require_relative 'nodes/greater_than'
 require_relative 'nodes/greater_than_equal'
 require_relative 'nodes/less_than'
 require_relative 'nodes/less_than_equal'
+require_relative 'nodes/match'
 require_relative 'nodes/named_value'
 require_relative 'nodes/number'
 require_relative 'nodes/partial'
 require_relative 'nodes/range_value'
+require_relative 'nodes/regex'
 require_relative 'nodes/set'
 require_relative 'nodes/time'
 require_relative 'nodes/value'

data/lib/msfl_visitors/visitor.rb

@@ -54,18 +54,29 @@ module MSFLVisitors
           Nodes::Equal                  => '==',
           Nodes::LessThan               => '<',
           Nodes::LessThanEqual          => '<=',
+          Nodes::Match                  => '=~',
       }
 
       def visit(node)
         case node
           when  Nodes::Field
             node.value.to_s
+          when Nodes::Regex
+            "/#{node.value}/"
           when  Nodes::Word
             "\"#{node.value}\""
           when Nodes::Date, Nodes::Time
             "\"#{node.value.iso8601}\""
           when  Nodes::Number, Nodes::Boolean
             node.value
+
+          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)}"
+            else
+              "#{node.left.accept(visitor)} #{BINARY_OPERATORS[node.class]} #{MSFLVisitors::Nodes::Regex.new(node.right.value.to_s).accept(visitor)}"
+            end
           when  Nodes::Containment,
                 Nodes::GreaterThan,
                 Nodes::GreaterThanEqual,
@@ -134,6 +145,15 @@ module MSFLVisitors
 
           when Nodes::Equal
             { agg_field_name: node.left.accept(visitor), operator: :eq, test_value: node.right.accept(visitor) }
+
+          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) }
+            else
+              { agg_field_name: node.left.accept(visitor), operator: :match, test_value: MSFLVisitors::Nodes::Regex.new(node.right.value.to_s).accept(visitor) }
+            end
+
           when Nodes::Field
             node.value.to_sym
           when Nodes::Date, Nodes::Time
@@ -143,6 +163,9 @@ module MSFLVisitors
                 Nodes::Boolean,
                 Nodes::Dataset
             node.value
+          when  Nodes::Regex
+            node.value.to_s
+
           when  Nodes::GreaterThan,
                 Nodes::GreaterThanEqual,
                 Nodes::LessThan,

data/msfl_visitors.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl_visitors'
-  s.version     = '1.1.0.dev0'
+  s.version     = '1.1.0.dev1'
   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/visitors/chewy_term_filter_spec.rb

@@ -196,6 +196,75 @@ describe MSFLVisitors::Visitor do
       end
     end
 
+    describe "a Regex node" do
+
+      let(:node) { MSFLVisitors::Nodes::Regex.new "foobar" }
+
+      context "when using the TermFilter visitor" do
+
+        it "results in: '/foobar/'" do
+          expect(result).to eq "/foobar/"
+        end
+      end
+
+      context "when using the Aggregations visitor" do
+
+        before { visitor.mode = :aggregations }
+
+        it "results in: 'foobar'" do
+          expect(result).to eq "foobar"
+        end
+      end
+    end
+
+    describe "a Match node" do
+
+      let(:node) { MSFLVisitors::Nodes::Match.new left, right }
+
+      context "when using the TermFilter visitor" do
+
+        it "results in: 'left =~ /right/'" do
+          expect(result).to eq "lhs =~ /rhs/"
+        end
+      end
+
+      context "when using the Aggregations visitor" do
+
+        before { visitor.mode = :aggregations }
+
+        it "results in: { agg_field_name: :lhs, operator: :match, test_value: \"rhs\" }" do
+          expect(result).to eq({agg_field_name: :lhs, operator: :match, test_value: "rhs"})
+        end
+      end
+
+      context "when the right hand side is a Set node containing Value nodes" do
+
+        let(:right) { MSFLVisitors::Nodes::Set.new [foo_node, bar_node, baz_node] }
+
+        let(:foo_node) { MSFLVisitors::Nodes::Word.new "foo" }
+
+        let(:bar_node) { MSFLVisitors::Nodes::Word.new "bar" }
+
+        let(:baz_node) { MSFLVisitors::Nodes::Word.new "baz" }
+
+        context "when using the TermFilter visitor" do
+
+          it "results in: 'left =~ /foo|bar|baz/'" do
+            expect(result).to eq "lhs =~ /foo|bar|baz/"
+          end
+        end
+
+        context "when using the Aggregations visitor" do
+
+          before { visitor.mode = :aggregations }
+
+          it "results in: { agg_field_name: :lhs, operator: :match, test_value: \"foo|bar|baz\" }" do
+            expect(result).to eq({agg_field_name: :lhs, operator: :match, test_value: "foo|bar|baz"})
+          end
+        end
+      end
+    end
+
     describe "an Equal node" do
 
       let(:node) { MSFLVisitors::Nodes::Equal.new left, right }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 1.1.0.dev0
+  version: 1.1.0.dev1
 platform: ruby
 authors:
 - Courtland Caldwell
@@ -135,10 +135,12 @@ files:
 - lib/msfl_visitors/nodes/iterator.rb
 - lib/msfl_visitors/nodes/less_than.rb
 - lib/msfl_visitors/nodes/less_than_equal.rb
+- lib/msfl_visitors/nodes/match.rb
 - lib/msfl_visitors/nodes/named_value.rb
 - lib/msfl_visitors/nodes/number.rb
 - lib/msfl_visitors/nodes/partial.rb
 - lib/msfl_visitors/nodes/range_value.rb
+- lib/msfl_visitors/nodes/regex.rb
 - lib/msfl_visitors/nodes/set.rb
 - lib/msfl_visitors/nodes/time.rb
 - lib/msfl_visitors/nodes/value.rb