msfl 1.2.1.dev1 → 1.2.1.dev2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06a5c190ca1f28269f35a382637758327bb4d601
-  data.tar.gz: f0bfb4e6be47d3d69b6b4a568bf70247f30a9fcd
+  metadata.gz: ad99df360e8e32175605e12ccc3abf9fc47700fd
+  data.tar.gz: b06896540e73eb488a6ee6dc4abb723f50388923
 SHA512:
-  metadata.gz: f55554e68871ad1faf1421d380881229f3ef9092c4d2d37776cb1873e523291cf0915a9a0998b592820738433710f1c8f50fe7a34fa066b597a11575bbc8a6c0
-  data.tar.gz: b9c507c62f4dab0cd1312971b7bddc77632c94738e3b0428b36e79fd945d075274360c57bbd75087ca534f9321983ab870943a1b280fa2822173ea2481c5a3b9
+  metadata.gz: a1b504c5cb7780c17a59cccdbd5b519705bf97e96e707b30dde921015761933d5ffffe4b9c76bbee63d0429adaa3591a8085e62b9c5fefdd5b0f827bea1286e3
+  data.tar.gz: 4960d6ffad371bff60692c149f06284448b0cabc183f8e4e5824e08e2556f2321520ba92a6ff44e1aa3ea9d25b4c54ff6609b62dfe519d497c29b26724b11624

data/lib/msfl/converters/operator.rb

@@ -102,6 +102,7 @@ module MSFL
       #
       # @param obj [Object] the Hash that is an implicit and
       # @return [Hash] the resulting explicit hash
+      # @todo clean up the if elsif train
       def implicit_and_to_explicit_recursively(obj, parent_key = nil)
         if obj.is_a? Hash
           first_key = obj.keys.first
@@ -112,6 +113,9 @@ module MSFL
           elsif first_key == :partial
             result = { partial: { given: implicit_and_to_explicit_recursively(obj[:partial][:given]),
                                   filter: implicit_and_to_explicit_recursively(obj[:partial][:filter]) } }
+          elsif first_key == :foreign
+            result = { foreign: { dataset: implicit_and_to_explicit_recursively(obj[:foreign][:dataset]),
+                                  filter: implicit_and_to_explicit_recursively(obj[:foreign][:filter]) } }
           else
             # the first key is not an operator
             # if there is only one key just assign the result of calling this method recursively on the value to the result for the key

data/lib/msfl/validators/definitions/hash_key.rb

@@ -13,7 +13,7 @@ module MSFL
 
         # Operators still needing parsing: ellipsis2, tilda
         def hash_key_operators
-          binary_operators.concat(logical_operators).concat(partial_operators)
+          binary_operators.concat(logical_operators).concat(partial_operators).concat(foreign_operators)
         end
 
         def binary_operators
@@ -30,9 +30,6 @@ module MSFL
               :gt,          # >
               :gte,         # >=
               :neg,         # logical negation
-              :foreign,     # Defines a filter on a related item
-              :dataset,     # A foreign dataset
-              :filter,      # an explicit filter
           ]
         end
 
@@ -44,6 +41,14 @@ module MSFL
           ]
         end
 
+        def foreign_operators
+          [
+              :foreign,     # Defines a filter on a related item
+              :dataset,     # A foreign dataset
+              :filter,      # an explicit filter
+          ]
+        end
+
         def logical_operators
           [:and, :or]
         end

data/msfl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl'
-  s.version     = '1.2.1.dev1'
+  s.version     = '1.2.1.dev2'
   s.date        = '2015-05-20'
   s.summary     = "MSFL in Ruby"
   s.description = "Serializers, validators, and other tasty goodness for the Mattermark Semantic Filter Language in Ruby."

data/spec/msfl/converters/operator_spec.rb

@@ -574,16 +574,28 @@ describe MSFL::Converters::Operator do
     end
   end
 
-  describe "running conversions on a normal msfl filter containing a partial" do
+  context "when running conversions on a msfl filter containing a specific type of filter" do
+
+    let(:converter) { described_class.new }
 
     subject { converter.run_conversions msfl }
 
-    let(:converter) { described_class.new }
+    describe "running conversions on a normal msfl filter containing a partial" do
 
-    let(:msfl) { { partial: { given: { make: "Toyota" }, filter: { avg_age: 10 } } } }
+      let(:msfl) { { partial: { given: { make: "Toyota" }, filter: { avg_age: 10 } } } }
 
-    it "is unchanged" do
-      expect(subject).to eq msfl
+      it "is unchanged" do
+        expect(subject).to eq msfl
+      end
+    end
+
+    describe "running conversion on a normal msfl filter containing a foreign" do
+
+      let(:msfl) { { foreign: { dataset: :person, filter: { age: 10 } } } }
+
+      it "is unchanged" do
+        expect(subject).to eq msfl
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl
 version: !ruby/object:Gem::Version
-  version: 1.2.1.dev1
+  version: 1.2.1.dev2
 platform: ruby
 authors:
 - Courtland Caldwell