msfl_visitors 0.3.0.dev8 → 0.3.0.dev9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2451ca5f2e764e7b6d1f2afddbba1309663713ff
-  data.tar.gz: 20f9c5f6bbbad4739051d8fcd9eac7347eac6cdc
+  metadata.gz: 25bf9ac107d3a11cf34fc2f6b968d08e5947070b
+  data.tar.gz: 4d055af609779f8f3d835032ef5c0115183d0129
 SHA512:
-  metadata.gz: 48617b447fa24532e232eb9ddfeb9ca362d63d4828f4b4f1b78542c9f6369ec81e57d6bed14d97b86a27f4e4e72d9a94940c0d4b69776ce5f4e344f28911480b
-  data.tar.gz: 1a34854010135959f64e505b5a099a8a2c76f0c821fe660cb5df233875463fa6a56459ed534028fa68bafb1d78080b05c89a0692055d55d16b248d18c8f7b9e1
+  metadata.gz: 87dd45f5d5f705e93d0fa8bde238ff5d33e9981f557bf808ff4486ce9f91cc1b6cf6c15ed2337f53ee1f611cf69a47539fd216be4df49733a738b4d13f8cc24b
+  data.tar.gz: b78adea265db2e39583223f802415468df7c48e909de379cea531b2ee0acf345097b8524081a3dc013bc1e29c08114e66f2475d6b0322d358417e23f267f3c6a

data/Gemfile

@@ -3,4 +3,4 @@ gem 'simplecov', :require => false, :group => :test           # MIT https://gith
 gem 'yard'                                                    # MIT https://github.com/lsegal/yard/blob/master/LICENSE + Ruby license for one file from the Ruby source lib/parser/ruby/legacy/ruby_lex.rb
 gem 'rspec'                                                   # MIT https://github.com/rspec/rspec/blob/master/License.txt
 gem 'byebug'
-gem 'msfl', "~> 1.2"
+gem 'msfl', "~> 1.2", ">=1.2.1"

data/Gemfile.lock

@@ -7,7 +7,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     json (1.8.2)
-    msfl (1.2.0)
+    msfl (1.2.1)
       json (~> 1.7)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
@@ -34,7 +34,7 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
-  msfl (~> 1.2)
+  msfl (~> 1.2, >= 1.2.1)
   rspec
   simplecov
   yard

data/README.md

@@ -37,7 +37,44 @@ dataset   = MSFL::Datasets::Car.new
 
 MSFLVisitors.get_chewy_clauses dataset, filter
 
-=> [{:clause=>{partial: {terms: {make: 'Toyota'}, aggregations: { filter: { range: { avg_age: { gt: 10 }}} }}}}]
+=> [{:clause=>{:agg_field_name=>:avg_age, :operator=>:eq, :test_value=>10}, :method_to_execute=>:aggregations}, {:clause=>"make == \"Toyota\""}]
+
+```
+
+## An example of a Foreign
+
+```ruby
+require 'msfl'
+# Load one of the test datasets
+require 'msfl/datasets/car'
+require 'msfl_visitors'
+
+filter    = { foreign: { dataset: 'person', filter: { gender: 'female' } } }
+
+dataset   = MSFL::Datasets::Car.new
+
+MSFLVisitors.get_chewy_clauses dataset, filter
+
+=> [{:clause=>"has_child( :person ).filter { gender == \"female\" }"}]
+
+```
+
+## An example in which a Foreign is nested in the Given of a Partial
+```ruby
+require 'msfl'
+# Load one of the test datasets
+require 'msfl/datasets/car'
+require 'msfl_visitors'
+# Given the set of cars where the person that is the owner is male, filter the set to only include those cars that
+# were manufactured in 2010
+filter    = { partial: { given: { foreign: { dataset: 'person', filter: { gender: 'male' } } }, filter: { year: '2010' } } }
+
+dataset   = MSFL::Datasets::Car.new
+
+MSFLVisitors.get_chewy_clauses dataset, filter
+
+=> [{:clause=>{:agg_field_name=>:year, :operator=>:eq, :test_value=>"2010"}, :method_to_execute=>:aggregations}, 
+    {:clause=>"has_child( :person ).filter { gender == \"male\" }"}]
 
 ```
 

data/lib/msfl_visitors/parsers/msfl_parser.rb

@@ -90,7 +90,7 @@ module MSFLVisitors
               # Explicit Filter
               # ex { foreign: { dataset: "person", filter: { age: 25 } } }
               # ex { partial: { given: { make: "Toyota" }, filter: { avg_age: 10 } } }
-              args = value.map { |k,v| hash_dispatch(k,v) }
+              args = value.map { |k,v| hash_dispatch(k,v) } # !!! THE CURRENT PROBLEM IS HERE!! need to test / update for a foreign in a partial's given
             else
               # fall back to a Filter Node
               args = [lhs, parse(value)] if lhs

data/msfl_visitors.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl_visitors'
-  s.version     = '0.3.0.dev8'
+  s.version     = '0.3.0.dev9'
   s.date        = '2015-05-20'
   s.summary     = "Convert MSFL to other forms"
   s.description = "Visitor pattern approach to converting MSFL to other forms."
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.homepage    =
       'https://github.com/Referly/msfl_visitors'
-  s.add_runtime_dependency "msfl", "~> 1.2"
+  s.add_runtime_dependency "msfl", "~> 1.2", ">=1.2.1"
   s.add_development_dependency "rake", "~> 10.3"
   s.add_development_dependency "simplecov", "~> 0.10"
   s.add_development_dependency "yard", "~> 0.8"

data/spec/msfl_visitors_spec.rb

@@ -62,6 +62,41 @@ describe MSFLVisitors do
           ]
         end
       end
+
+      context "when the filter is { foreign: { dataset: 'person', filter: { gender: 'female' } } }" do
+
+        let(:msfl) { { foreign: { dataset: 'person', filter: { gender: 'female' } } } }
+
+        it "returns: [{:clause=>\"has_child( :person ).filter { gender == \"female\" }\"}]" do
+          expect(subject).to eq [{ clause: "has_child( :person ).filter { gender == \"female\" }" }]
+        end
+      end
+
+      context "when the filter is { partial: { given: { foreign: { dataset: 'person', filter: { gender: 'male' } } }, filter: { year: '2010' } } }" do
+
+        let(:msfl) { { partial: { given: { foreign: { dataset: 'person', filter: { gender: 'male' } } }, filter: { year: '2010' } } } }
+
+        it "returns [
+            {
+              clause: {
+                agg_field_name: :year,
+                operator: :eq,
+                test_value: \"2010\"
+              },
+              method_to_execute: :aggregations
+            }, {clause: \"has_child( :person ).filter { gender == \"male\" }\"}]" do
+
+          expect(subject).to eq [
+            {
+                clause: {
+                    agg_field_name: :year,
+                    operator: :eq,
+                    test_value: "2010"
+              },
+              method_to_execute: :aggregations
+            }, {clause: "has_child( :person ).filter { gender == \"male\" }"}]
+        end
+      end
     end
   end
 end

data/spec/parsers/msfl_parser_spec.rb

@@ -146,8 +146,9 @@ describe MSFLVisitors::Parsers::MSFLParser do
 
         describe "parsing a partial" do
 
-          let(:filter) { { partial: { given: { make: "Toyota" }, filter: { avg_age: 10 } } } }
+          let(:filter) { { partial: { given: given_filter, filter: { avg_age: 10 } } } }
 
+          let(:given_filter) { { make: "Toyota" } }
 
 
           let(:partial_node)        { MSFLVisitors::Nodes::Partial.new given_node, named_value }
@@ -174,6 +175,29 @@ describe MSFLVisitors::Parsers::MSFLParser do
           it "is the expected Partial node" do
             expect(subject).to eq expected_node.call(partial_node)
           end
+
+          context "when the partial's given clause is a foreign" do
+
+            let(:given_filter) { { foreign: { dataset: "person", filter: { gender: 'male' } } } }
+
+            let(:given_node) { MSFLVisitors::Nodes::Given.new [foreign_node] }
+
+            let(:foreign_node) { MSFLVisitors::Nodes::Foreign.new dataset_node, given_explicit_filter_node }
+
+            let(:dataset_node) { MSFLVisitors::Nodes::Dataset.new "person" }
+
+            let(:given_explicit_filter_node) { MSFLVisitors::Nodes::ExplicitFilter.new [given_exp_fil_equal_node] }
+
+            let(:given_exp_fil_equal_node) { MSFLVisitors::Nodes::Equal.new given_exp_fil_field_node, given_exp_fil_value_node }
+
+            let(:given_exp_fil_field_node) { MSFLVisitors::Nodes::Field.new :gender }
+
+            let(:given_exp_fil_value_node) { MSFLVisitors::Nodes::Word.new 'male' }
+
+            it "is the expected Partial node with a Foreign node under the Given node" do
+              expect(subject).to eq expected_node.call(partial_node)
+            end
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 0.3.0.dev8
+  version: 0.3.0.dev9
 platform: ruby
 authors:
 - Courtland Caldwell
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement