msfl_visitors 1.1.0 → 1.2.0.dev0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b0a99aa0756f6df016c0a83b95f26f1d0dea11
-  data.tar.gz: 15b2059bbd5815cd7ee512acbaa06c48804c2270
+  metadata.gz: 9ed725ea60387117e7b2f79638500afce496ddbc
+  data.tar.gz: befef21647b2c75d696cc327d0282ffdabb348f9
 SHA512:
-  metadata.gz: fa4bede1856b58d2fb1ad36d9856c935a71a83f988f06a28c9cb3653dd2bb76dac4d45448c7bd71b995c3d8910434f3b2dee04fae1907f83ec301ac62d9a9d93
-  data.tar.gz: bf4b42e0892f2a006c9c3b7a42e9dfe9475f6f83c614ed2e068fa4787c6d2e60074232324db56ddb181c471ec0c9c8d988de32dc8a3f8ef7eec355fc33fff4fe
+  metadata.gz: 9a620c25080b6167fb821d53dd2f04ce0c394447f731cf295ef7d8e70d930bef8b76507a9c3ea451779597a1c5578210018dd5bad5cbb0963a5834870b8ae0d9
+  data.tar.gz: 3c94d3c259b9668be22c9a937452703a67f75cfaeca3b0804df6421549caa9deb9d1e1a6815e3f78922bcaec02595a00e8bdc8c38a3c1cb236d0955a6813cfe1

data/lib/msfl_visitors/nodes/query_string.rb

@@ -0,0 +1,7 @@
+require_relative 'comparison'
+module MSFLVisitors
+  module Nodes
+    class QueryString < Comparison
+    end
+  end
+end

data/lib/msfl_visitors/nodes.rb

@@ -23,6 +23,7 @@ require_relative 'nodes/match'
 require_relative 'nodes/named_value'
 require_relative 'nodes/number'
 require_relative 'nodes/partial'
+require_relative 'nodes/query_string'
 require_relative 'nodes/range_value'
 require_relative 'nodes/regex'
 require_relative 'nodes/set'

data/lib/msfl_visitors/visitor.rb

@@ -81,6 +81,9 @@ module MSFLVisitors
           when  Nodes::Number, Nodes::Boolean
             node.value
 
+          when  Nodes::QueryString
+            %(q(query_string:{default_field:"#{node.left.accept(visitor)}", query:#{node.right.accept(visitor)}}))
+
           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('|')
@@ -137,6 +140,8 @@ module MSFLVisitors
           Nodes::GreaterThanEqual       => :gte,
           Nodes::LessThan               => :lt,
           Nodes::LessThanEqual          => :lte,
+          Nodes::Equal                  => :eq,
+          Nodes::QueryString            => :query_string,
       }
 
       def visit(node)
@@ -154,9 +159,6 @@ module MSFLVisitors
             # return the result of the visitation
             [agg_criteria_clause, given_clause]
 
-          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| MSFLVisitors::Nodes::Regex.new(right_child.value.to_s).accept(visitor) }.join('|')
@@ -181,7 +183,9 @@ module MSFLVisitors
           when  Nodes::GreaterThan,
                 Nodes::GreaterThanEqual,
                 Nodes::LessThan,
-                Nodes::LessThanEqual
+                Nodes::LessThanEqual,
+                Nodes::Equal,
+                Nodes::QueryString
             { agg_field_name: node.left.accept(visitor), operator: RANGE_OPERATORS[node.class], test_value: node.right.accept(visitor) }
           when Nodes::Given
             [:filter, node.contents.first.accept(visitor)]
@@ -234,7 +238,10 @@ module MSFLVisitors
 
           when Nodes::Equal
             { term: { node.left.accept(visitor) => node.right.accept(visitor) } }
-          # [{ clause:  }]
+
+          when Nodes::QueryString
+            { query: { query_string: { default_field: node.left.accept(visitor).to_s, query: node.right.accept(visitor).to_s }}}
+
           when Nodes::Field
             node.value.to_sym
           when Nodes::Date, Nodes::Time

data/msfl_visitors.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl_visitors'
-  s.version     = '1.1.0'
-  s.date        = '2015-05-28'
+  s.version     = '1.2.0.dev0'
+  s.date        = '2015-06-19'
   s.summary     = "Convert MSFL to other forms"
   s.description = "Visitor pattern approach to converting MSFL to other forms."
   s.authors     = ["Courtland Caldwell"]

data/spec/msfl_visitors/visitors/chewy_term_filter_spec.rb

@@ -391,6 +391,29 @@ describe MSFLVisitors::Visitor do
       end
     end
 
+    describe "a QueryString node" do
+
+      let(:node) { MSFLVisitors::Nodes::QueryString.new left, right }
+
+      let(:right) { MSFLVisitors::Nodes::Word.new "applesauce" }
+
+      context "when using the TermFilter visitor" do
+
+        it %(returns: 'q(query_string:{default_field:"lhs", query:"applesauce"})') do
+          expect(result).to eq %(q(query_string:{default_field:"lhs", query:"applesauce"}))
+        end
+      end
+
+      context "when using the Aggregations visitor" do
+
+        before { visitor.mode = :aggregations }
+
+        it %(returns: { agg_field_name: :lhs, operator: :query_string, test_value:"applesauce") do
+          expect(result).to eq({agg_field_name: :lhs, operator: :query_string, test_value: "applesauce"})
+        end
+      end
+    end
+
     describe "a Filter node" do
 
       let(:node) { MSFLVisitors::Nodes::Filter.new filtered_nodes }

data/spec/msfl_visitors/visitors/es_term_filter_spec.rb

@@ -201,6 +201,17 @@ describe MSFLVisitors::Visitor do
         end
       end
 
+      describe "a QueryString node" do
+
+        let(:node) { MSFLVisitors::Nodes::QueryString.new left, right }
+
+        let(:right) { MSFLVisitors::Nodes::Word.new "happy" }
+
+        it %(returns: { query: { query_string: { default_field: "lhs", query: "happy" } } }) do
+          expect(result).to eq({ query: { query_string: { default_field: "lhs", query: "happy" } } })
+        end
+      end
+
       describe "a Filter node" do
 
         let(:node) { MSFLVisitors::Nodes::Filter.new filtered_nodes }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.dev0
 platform: ruby
 authors:
 - Courtland Caldwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msfl
@@ -139,6 +139,7 @@ files:
 - lib/msfl_visitors/nodes/named_value.rb
 - lib/msfl_visitors/nodes/number.rb
 - lib/msfl_visitors/nodes/partial.rb
+- lib/msfl_visitors/nodes/query_string.rb
 - lib/msfl_visitors/nodes/range_value.rb
 - lib/msfl_visitors/nodes/regex.rb
 - lib/msfl_visitors/nodes/set.rb
@@ -172,9 +173,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2