msfl_visitors 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78d429ddb4c1a32e2dbf1cdda725aca9debe57fa
-  data.tar.gz: c2e440ab6d0533077a6fb69ebe1c896b6b640b4d
+  metadata.gz: 6c117d655ed803271224e2a71689ab1196b7f9ab
+  data.tar.gz: ea8e723de7f14d3e445871ced6e5db2f661db459
 SHA512:
-  metadata.gz: 0716d9f199190a2a70e39a115b9dbb6cf0381a5784f94a9fecac4e0a3c7693b8027acc04875e34cd4b93569db9cb13a6c6574925d99a4afba792c3f45838d0b5
-  data.tar.gz: 653e1798ceedb81c272148888ef471552c0ea6097c58a0c328f4a1a599a3e8f41a298db950e08b2828c6f19696b696ee5e86b054110c7eb4239e6ef791e9bf6b
+  metadata.gz: aef4b3739fa0cfe4518b096f4c8fb7381db60e606afe80181c289795cb3f459b5adb4b9e801f2c8ae01f2f88f1b488d3271ffdfdae2dcbd1862fddff3c966508
+  data.tar.gz: 11e15b89492d83ff590bb957d75a500c88217d6be2b8e90e675287109f339850a2385f3b7e098cd95929b2b71584128cb7e6d0d61159ced00fdb2a2d0d28439c

data/lib/msfl_visitors/visitor.rb

@@ -120,8 +120,6 @@ module MSFLVisitors
       def visit(node)
         case node
           when Nodes::Partial
-            # { given: Hash[[node.left.accept(visitor), node.right.accept(visitor)]] }
-
             # build the aggregate criteria clause first
             # agg_criteria_clause = { clause: { agg_field_name: :portfolio_size, operator: :gt, test_value: 2 }, method_to_execute: :aggregations }
             agg_criteria_clause = { clause: node.right.accept(visitor), method_to_execute: :aggregations }
@@ -134,12 +132,8 @@ module MSFLVisitors
             # return the result of the visitation
             [agg_criteria_clause, given_clause]
 
-
-
           when Nodes::Equal
-            # { term: { node.left.accept(visitor) => node.right.accept(visitor) } }
             { agg_field_name: node.left.accept(visitor), operator: :eq, test_value: node.right.accept(visitor) }
-            # [{ clause:  }]
           when Nodes::Field
             node.value.to_sym
           when Nodes::Date, Nodes::Time
@@ -154,17 +148,14 @@ module MSFLVisitors
                 Nodes::LessThan,
                 Nodes::LessThanEqual
             { agg_field_name: node.left.accept(visitor), operator: RANGE_OPERATORS[node.class], test_value: node.right.accept(visitor) }
-            # { range: { node.left.accept(visitor) => { RANGE_OPERATORS[node.class] =>  node.right.accept(visitor) } } }
           when Nodes::Given
             [:filter, node.contents.first.accept(visitor)]
           when Nodes::ExplicitFilter
-            # [:filter, node.contents.map { |n| n.accept(visitor) }.reduce({}) { |hsh, x| hsh.merge!(x); hsh } ]
             node.contents.map { |n| n.accept(visitor) }.first
           when Nodes::NamedValue
-            # [:aggs, {node.name.accept(visitor).to_sym => Hash[[node.value.accept(visitor)]]}]
             node.value.accept(visitor)
           when Nodes::Containment
-            { terms: {node.left.accept(visitor).to_sym => node.right.accept(visitor)} }
+            { agg_field_name: node.left.accept(visitor).to_sym, operator: :in, test_value: node.right.accept(visitor) }
           when Nodes::Set
             node.contents.map { |n| n.accept(visitor) }
           when Nodes::Filter

data/msfl_visitors.gemspec

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

data/spec/visitors/chewy_term_filter_spec.rb

@@ -162,8 +162,9 @@ describe MSFLVisitors::Visitor do
 
         before { visitor.mode = :aggregations }
 
-        it "results in: { terms: { lhs: [\"item_one\", \"item_two\", \"item_three\"] } }" do
-          expect(subject).to eq({ terms: { lhs: ["item_one", "item_two", "item_three"] } })
+        it "results in: { agg_field_name: :lhs, operator: :in, test_value: [\"item_one\", \"item_two\", \"item_three\"] }" do
+
+          expect(subject).to eq({ agg_field_name: :lhs, operator: :in, test_value: ["item_one", "item_two", "item_three"] })
         end
       end
     end
@@ -536,9 +537,9 @@ describe MSFLVisitors::Visitor do
 
           before { visitor.mode = :aggregations }
 
-          it "returns: { and: [{ terms: { make: [\"Honda\",\"Chevy\",\"Volvo\"]} }, { agg_field_name: :value, operator: :gte, test_value: 1000 } }] }" do
+          it "returns: { and: [{ agg_field_name: :make, operator: :in, test_value: [\"Honda\", \"Chevy\", \"Volvo\"] }, { agg_field_name: :value, operator: :gte, test_value: 1000 } }] }" do
             expected = { and: [
-                { terms: { make: ["Honda", "Chevy", "Volvo"] } },
+                { agg_field_name: :make, operator: :in, test_value: ["Honda", "Chevy", "Volvo"] },
                 { agg_field_name: :value, operator: :gte, test_value: 1000}
             ]}
             expect(result).to eq expected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Courtland Caldwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msfl