msfl_visitors 0.3.0.dev6 → 0.3.0.dev7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf62249c0dac5ff2ae2537406f87989007141dbd
-  data.tar.gz: c98ec078a520735c4b64cefec4e04f6939f981fc
+  metadata.gz: 81c17ec053d98d942d10f13579e2030a42ee7fcf
+  data.tar.gz: 16a5e7658c183b6ed1c01df9b9f4e7ef21bd0870
 SHA512:
-  metadata.gz: 6a2607260acd278637f603c69a7f1c520126da9dd6ad0e777b5670a3ee54c2d9de77109bf55f650be7cf987516fc1cd0bb75af1a0338225da240cb1cd1222a0f
-  data.tar.gz: 6cf9d405e4bf47acf71cac765d04590734b9c266bc679c25a62b6f4ca73dbe57101c5379aca338a607cf4e119cf932b6b047037aa1b734ea8ba20668450d04e7
+  metadata.gz: 75f3704f5245b9fa94d557c7a3125b118674f10553790700c6fdf84dc2581b112c904c0726e73a6be8215f76b27695be9fb60a390a2e26a618293f31d948c53c
+  data.tar.gz: a698aef66b54a979f08026693176e1a857a6a5723904b280868f5143633cfa71fafdac8abd0ecc4bb4ed22603a3e5610904c0eef331308e059d0a480bfd02102

data/lib/msfl_visitors/visitor.rb

@@ -159,7 +159,7 @@ module MSFLVisitors
             [: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) }
+            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)
@@ -177,7 +177,7 @@ module MSFLVisitors
             { and: node.set.accept(visitor) }
 
           when Nodes::Foreign
-            { foreign: Hash[[[:type, node.left.accept(visitor)], [:filter, *node.right.accept(visitor)]]] }
+            { foreign: Hash[[[:type, node.left.accept(visitor)], [:filter, node.right.accept(visitor)]]] }
 
           else
             fail ArgumentError, "AGGREGATIONS cannot visit: #{node.class.name}"

data/msfl_visitors.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl_visitors'
-  s.version     = '0.3.0.dev6'
+  s.version     = '0.3.0.dev7'
   s.date        = '2015-05-20'
   s.summary     = "Convert MSFL to other forms"
   s.description = "Visitor pattern approach to converting MSFL to other forms."

data/spec/msfl_visitors_spec.rb

@@ -30,8 +30,8 @@ describe MSFLVisitors do
 
       context "when the filter is { make: \"Toyota\" }" do
 
-        it 'returns: [{:clause=>"make == \"Toyota\""}]' do
-          expect(subject).to eq [{:clause=>"make == \"Toyota\""}]
+        it 'returns: [{ clause: "make == \"Toyota\"" }]' do
+          expect(subject).to eq [{ clause: "make == \"Toyota\"" }]
         end
       end
 
@@ -39,17 +39,24 @@ describe MSFLVisitors do
 
         let(:msfl) { { partial: { given: { make: "Toyota" }, filter: { avg_age: 10 } } } }
 
-        it "returns: [{:clause=>[{:agg_field_name=>:avg_age, :operator=>:eq, :test_value=>10}], :method_to_execute=>:aggregations}, {:clause=>\"make == \"Toyota\"\"}]" do
+        it "returns: [
+            {
+                clause: {
+                    agg_field_name: :avg_age,
+                    operator: :eq,
+                    test_value: 10
+                },
+                method_to_execute: :aggregations
+            }, {clause: \"make == \"Toyota\"\"}
+        ]" do
 
           expect(subject).to eq [
             {
-                clause: [
-                    {
-                        agg_field_name: :avg_age,
-                        operator: :eq,
-                        test_value: 10
-                    }
-                ],
+                clause: {
+                    agg_field_name: :avg_age,
+                    operator: :eq,
+                    test_value: 10
+                },
                 method_to_execute: :aggregations
             }, {clause: "make == \"Toyota\""}
           ]

data/spec/visitors/chewy_term_filter_spec.rb

@@ -43,8 +43,6 @@ describe MSFLVisitors::Visitor do
 
     end
 
-    # chewy looks like
-    # Index::Type.filter { match_all }.aggregations({toyotas: {terms: {make: 'Toyota'}, aggregations: { filter: { range: { avg_age: { gt: 10 }}} }}})
     describe "a Partial node" do
 
       let(:node)                    { MSFLVisitors::Nodes::Partial.new given_node, named_value }
@@ -72,7 +70,7 @@ describe MSFLVisitors::Visitor do
       subject { visitor.visit_tree node }
 
       let(:expected) do
-        [{ clause: [{ agg_field_name: :age, operator: :gt, test_value: 10 }], method_to_execute: :aggregations },
+        [{ clause: { agg_field_name: :age, operator: :gt, test_value: 10 }, method_to_execute: :aggregations },
          { clause: "make == \"Toyota\"" }]
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 0.3.0.dev6
+  version: 0.3.0.dev7
 platform: ruby
 authors:
 - Courtland Caldwell