msfl_visitors 0.3.0.dev5 → 0.3.0.dev6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 179b3ba53392e68b27a017eb798bf8f0035af481
-  data.tar.gz: 2e2360d9f0103674394969e4a73553d572cc5618
+  metadata.gz: bf62249c0dac5ff2ae2537406f87989007141dbd
+  data.tar.gz: c98ec078a520735c4b64cefec4e04f6939f981fc
 SHA512:
-  metadata.gz: 9dd78a8a9b6cad36b44c93d887f1cb765dc3783756c95231c9b4833c725542e6549ba44a2f4c1d5b6fe2c2e85a18cba2fb9a5baa206cbd64096e09f138a11b95
-  data.tar.gz: 947ba05154658c97cebac6b5c9fd686d8a0ac2437ba17e402d493a5eca714e910efa4a269d9ce9907ed18cac100d441b067cd4309544172151f7db24ec04d65e
+  metadata.gz: 6a2607260acd278637f603c69a7f1c520126da9dd6ad0e777b5670a3ee54c2d9de77109bf55f650be7cf987516fc1cd0bb75af1a0338225da240cb1cd1222a0f
+  data.tar.gz: 6cf9d405e4bf47acf71cac765d04590734b9c266bc679c25a62b6f4ca73dbe57101c5379aca338a607cf4e119cf932b6b047037aa1b734ea8ba20668450d04e7

data/lib/msfl_visitors/visitor.rb

@@ -15,7 +15,7 @@ module MSFLVisitors
       case node
         when Nodes::Partial
           in_aggregation_mode do
-            clauses << { clause: get_visitor.visit(node), method_to_execute: :aggregations }
+            clauses.concat get_visitor.visit(node)
             ""
           end
         else
@@ -120,10 +120,25 @@ module MSFLVisitors
       def visit(node)
         case node
           when Nodes::Partial
-            { given: Hash[[node.left.accept(visitor), node.right.accept(visitor)]] }
+            # { 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 }
+            # switch to the term filter mode
+            visitor.mode = :term
+            given_clause = { clause: node.left.accept(visitor) }
+
+            # switch back to the aggregations mode
+            visitor.mode = :aggregations
+            # return the result of the visitation
+            [agg_criteria_clause, given_clause]
+
+
 
           when Nodes::Equal
-            { term: { node.left.accept(visitor) => node.right.accept(visitor) } }
+            # { 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
@@ -138,13 +153,16 @@ module MSFLVisitors
                 Nodes::GreaterThanEqual,
                 Nodes::LessThan,
                 Nodes::LessThanEqual
-            { range: { node.left.accept(visitor) => { RANGE_OPERATORS[node.class] =>  node.right.accept(visitor) } } }
+            { 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 } ]
+            # [:filter, node.contents.map { |n| n.accept(visitor) }.reduce({}) { |hsh, x| hsh.merge!(x); hsh } ]
+            node.contents.map { |n| n.accept(visitor) }
           when Nodes::NamedValue
-            [:aggs, {node.name.accept(visitor).to_sym => Hash[[node.value.accept(visitor)]]}]
+            # [: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)} }
           when Nodes::Set
@@ -159,7 +177,7 @@ module MSFLVisitors
             { and: node.set.accept(visitor) }
 
           when Nodes::Foreign
-            { has_child: Hash[[[:type, node.left.accept(visitor)], 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,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl_visitors'
-  s.version     = '0.3.0.dev5'
-  s.date        = '2015-05-15'
+  s.version     = '0.3.0.dev6'
+  s.date        = '2015-05-20'
   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_spec.rb

@@ -39,19 +39,19 @@ describe MSFLVisitors do
 
         let(:msfl) { { partial: { given: { make: "Toyota" }, filter: { avg_age: 10 } } } }
 
-        it "returns: [{:clause=>{partial: {terms: {make: \"Toyota\"}, aggs: { filter: { range: { avg_age: { gt: 10 }}} }}}}]" 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: {
-                    given: {
-                        filter: { term: { make: "Toyota"} },
-                        aggs: {
-                            partial: {
-                                filter: {
-                                    term: { avg_age: 10 }
-                                }}}}},
+                clause: [
+                    {
+                        agg_field_name: :avg_age,
+                        operator: :eq,
+                        test_value: 10
+                    }
+                ],
                 method_to_execute: :aggregations
-            }
+            }, {clause: "make == \"Toyota\""}
           ]
         end
       end

data/spec/visitors/chewy_term_filter_spec.rb

@@ -72,21 +72,8 @@ describe MSFLVisitors::Visitor do
       subject { visitor.visit_tree node }
 
       let(:expected) do
-        [{
-             clause: {
-                 given: {
-                     filter: {
-                         term: { make: "Toyota" }
-                     },
-                     aggs: {
-                         partial: {
-                             filter: { range: { age: { gt: 10 }}}
-                         }
-                     }
-                 }
-             },
-             method_to_execute: :aggregations
-         }]
+        [{ clause: [{ agg_field_name: :age, operator: :gt, test_value: 10 }], method_to_execute: :aggregations },
+         { clause: "make == \"Toyota\"" }]
       end
 
       it "results in the appropriate aggregation clause" do
@@ -115,9 +102,9 @@ describe MSFLVisitors::Visitor do
           let(:given_value_node)        { MSFLVisitors::Nodes::Word.new "Toyota" }
 
 
-      it "results in: [:filter, { term: { make: \"Toyota\" } }]" do
+      it "results in: [:filter, { agg_field_name: :make, operator: :eq, test_value: \"Toyota\" }]" do
         visitor.mode = :aggregations
-        expect(subject).to eq([:filter, { term: { make: "Toyota" } }])
+        expect(subject).to eq([:filter, { agg_field_name: :make, operator: :eq, test_value: "Toyota" }])
       end
     end
 
@@ -146,8 +133,8 @@ describe MSFLVisitors::Visitor do
 
         before { visitor.mode = :aggregations }
 
-        it "results in: { has_child: { type: \"person\", filter: { term: { age: 25 } } } }" do
-          expect(subject).to eq({ has_child: { type: "person", filter: { term: { age: 25 } } } })
+        it "results in: { foreign: { type: \"person\", filter: { agg_field_name: :age, operator: :eq, test_value: 25 } } }" do
+          expect(subject).to eq({ foreign: { type: "person", filter: { agg_field_name: :age, operator: :eq, test_value: 25 } } })
         end
       end
     end
@@ -225,8 +212,8 @@ describe MSFLVisitors::Visitor do
 
         before { visitor.mode = :aggregations }
 
-        it "results in: { term: { lhs: \"rhs\" } }" do
-          expect(result).to eq({ term: { lhs: "rhs" } })
+        it "results in: { agg_field_name: :lhs, operator: :eq, test_value: \"rhs\" }" do
+          expect(result).to eq({ agg_field_name: :lhs, operator: :eq, test_value: "rhs" })
         end
       end
     end
@@ -248,8 +235,8 @@ describe MSFLVisitors::Visitor do
 
         before { visitor.mode = :aggregations }
 
-        it "results in: { range: { lhs: { gt: 1000 } } }" do
-          expect(result).to eq({ range: { lhs: { gt: 1000 } } })
+        it "results in: { agg_field_name: :lhs, operator: :gt, test_value: 1000 }" do
+          expect(result).to eq({ agg_field_name: :lhs, operator: :gt, test_value: 1000 })
         end
       end
     end
@@ -271,8 +258,8 @@ describe MSFLVisitors::Visitor do
 
         before { visitor.mode = :aggregations }
 
-        it "results in: { range: { lhs: { gte: 10.52 } } }" do
-          expect(result).to eq({ range: { lhs: { gte: 10.52 } } })
+        it "results in: { agg_field_name: :lhs, operator: :gte, test_value: 10.52 }" do
+          expect(result).to eq({ agg_field_name: :lhs, operator: :gte, test_value: 10.52 })
         end
       end
     end
@@ -294,8 +281,8 @@ describe MSFLVisitors::Visitor do
 
         before { visitor.mode = :aggregations }
 
-        it "returns: { range: { lhs: { lt: 133.7 } } }" do
-          expect(result).to eq({ range: { lhs: { lt: 133.7 } } })
+        it "returns: { agg_field_name: :lhs, operator: :lt, test_value: 133.7 }" do
+          expect(result).to eq({ agg_field_name: :lhs, operator: :lt, test_value: 133.7 })
         end
       end
     end
@@ -317,8 +304,8 @@ describe MSFLVisitors::Visitor do
 
         before { visitor.mode = :aggregations }
 
-        it "returns: { range: { lhs: { lte: \"#{Date.today}\" } } }" do
-          expect(result).to eq({ range: { lhs: { lte: "#{Date.today}" } } })
+        it "returns: { agg_field_name: :lhs, operator: :lte, test_value: \"#{Date.today}\"}" do
+          expect(result).to eq({ agg_field_name: :lhs, operator: :lte, test_value: "#{Date.today}"})
         end
       end
     end
@@ -346,8 +333,8 @@ describe MSFLVisitors::Visitor do
 
         before { visitor.mode = :aggregations }
 
-        it "returns: { range: { value: { gte: 1000 } } }" do
-          expect(result).to eq({ range: { value: { gte: 1000 } } })
+        it "returns: { agg_field_name: :value, operator: :gte, test_value: 1000 }" do
+          expect(result).to eq({ agg_field_name: :value, operator: :gte, test_value: 1000 })
         end
       end
 
@@ -376,8 +363,12 @@ describe MSFLVisitors::Visitor do
 
           before { visitor.mode = :aggregations }
 
-          it "returns: { and: [{ term: { make: \"Chevy\" } },{ range: { value: { gte: 1000 } } }] }" do
-            expect(result).to eq({ and: [{ term: { make: "Chevy" } },{ range: { value: { gte: 1000 } } }] })
+          it "returns: {
+              and: [{ agg_field_name: :make, operator: :eq, test_value: \"Chevy\" },
+                    { agg_field_name: :value, operator: :gte, test_value: 1000 }]}" do
+            expect(result).to eq({
+              and: [{ agg_field_name: :make, operator: :eq, test_value: "Chevy" },
+                    { agg_field_name: :value, operator: :gte, test_value: 1000 }]})
           end
         end
       end
@@ -441,8 +432,8 @@ describe MSFLVisitors::Visitor do
 
           before { visitor.mode = :aggregations }
 
-          it "returns: { and: [{ term: { first_field: \"first_word\" }] }" do
-            expect(result).to eq({ and: [{ term: { first_field: "first_word" } }] })
+          it "returns: { and: [{ agg_field_name: :first_field, operator: :eq, test_value: \"first_word\" }]}" do
+            expect(result).to eq({ and: [{ agg_field_name: :first_field, operator: :eq, test_value: "first_word" }]})
           end
         end
       end
@@ -462,8 +453,14 @@ describe MSFLVisitors::Visitor do
 
           before { visitor.mode = :aggregations }
 
-          it "returns: { and: [{ term: { first_field: \"first_word\" } },{ term: { second_field: \"second_word\" } }] }" do
-            expect(result).to eq({ and: [{ term: { first_field: "first_word" }}, { term: { second_field: "second_word" } }] })
+          it "returns: {
+              and: [{ agg_field_name: :first_field, operator: :eq, test_value: \"first_word\" },
+                    { agg_field_name: :second_field, operator: :eq, test_value: \"second_word\" }
+              ]}" do
+            expect(result).to eq({
+              and: [{ agg_field_name: :first_field, operator: :eq, test_value: "first_word" },
+                    { agg_field_name: :second_field, operator: :eq, test_value: "second_word" }
+              ]})
           end
         end
       end
@@ -483,8 +480,16 @@ describe MSFLVisitors::Visitor do
 
           before { visitor.mode = :aggregations }
 
-          it "returns: { and: [{ term: { first_field: \"first_word\" } },{ term: { second_field: \"second_word\" } },{ term: { third_field: \"third_word\" } }] }" do
-            expect(result).to eq({ and: [{ term: { first_field: "first_word" } },{ term: { second_field: "second_word" } },{ term: { third_field: "third_word" } }] })
+          it "returns: {
+              and: [{ agg_field_name: :first_field, operator: :eq, test_value: \"first_word\" },
+                    { agg_field_name: :second_field, operator: :eq, test_value: \"second_word\"},
+                    {agg_field_name: :third_field, operator: :eq, test_value: \"third_word\"}
+              ]}" do
+            expect(result).to eq({
+              and: [{ agg_field_name: :first_field, operator: :eq, test_value: "first_word" },
+                    { agg_field_name: :second_field, operator: :eq, test_value: "second_word"},
+                    {agg_field_name: :third_field, operator: :eq, test_value: "third_word"}
+              ]})
           end
         end
       end
@@ -533,8 +538,11 @@ describe MSFLVisitors::Visitor do
 
           before { visitor.mode = :aggregations }
 
-          it "returns: { and: [{ terms: { make: [\"Honda\",\"Chevy\",\"Volvo\"]} }, { range: { value: { gte: 1000 } } }] }" do
-            expected = { and: [{ terms: { make: ["Honda", "Chevy", "Volvo"]} }, { range: { value: { gte: 1000 } } }] }
+          it "returns: { and: [{ terms: { make: [\"Honda\",\"Chevy\",\"Volvo\"]} }, { agg_field_name: :value, operator: :gte, test_value: 1000 } }] }" do
+            expected = { and: [
+                { terms: { make: ["Honda", "Chevy", "Volvo"] } },
+                { agg_field_name: :value, operator: :gte, test_value: 1000}
+            ]}
             expect(result).to eq expected
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 0.3.0.dev5
+  version: 0.3.0.dev6
 platform: ruby
 authors:
 - Courtland Caldwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msfl