msfl 1.2.0.dev3 → 1.2.0.dev4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92776017e13b2f1677d282efee338f57475e0c6b
-  data.tar.gz: cf7f80e1c004e70bfa209cedfa9867a87277b52b
+  metadata.gz: 64f2f1391e2c2d84010f3f24dea6c05876914c0a
+  data.tar.gz: 043011b2811609dca0d3c64f77bf3bc38fc18736
 SHA512:
-  metadata.gz: 9cb498ae6117a7a53f7899f0bab6e56d2bf87c64dce04aa44d1675709729e9fded2785fff74d1b122c13754239fac4e9b121bd2c75a41be4bbe67969161da95c
-  data.tar.gz: e899946daebe34c207f9ce94dd9dd4f698e84f1a277d2b4c8701f50325e942a026c877b4cc2c2631056fe426789c0ca727b408e60c46d1c2afbb12c6de1f24f1
+  metadata.gz: a76a648c5915c1f12bffe6df8ccbc177a664414046df5690d5e1ed71325b825aa2914a8b9ebc836376818347ff8db797adb35a2bb694cdbf37147fbd39d84217
+  data.tar.gz: 60ba3c0cf3aedf8dea480b7eb79072a49002ec27a22143f2dbda12e66e1825be7bf29ce2374fe90b707c54a8566c536ac733684bbb9e2698127fb7f45ac4a992

data/README.md

@@ -41,7 +41,11 @@ MSFL is a context-free language. The context-free grammar is defined below.
 
     partial_expr    =   partial_op , colon , partial ;
 
-    foreign_expr    =   word , colon , filter ;
+    foreign_expr    =   foreign_op , colon , foreign_filter ;
+    
+    foreign_filter  =   lc , dataset_expr , comma , partial_filter , rc ;
+    
+    dataset_expr    =   dataset_op , colon , word ;
 
     partial         =   lc , given_expr , comma , partial_filter , rc ;
 
@@ -118,6 +122,10 @@ MSFL is a context-free language. The context-free grammar is defined below.
     and_op          =   dq , "and" , dq ;
 
     or_op           =   dq , "or" , dq ;
+    
+    foreign_op      =   dq , "foreign" , dq ;
+    
+    dataset_op      =   dq , "dataset" , dq ;
 
 
 

data/lib/msfl/datasets/base.rb

@@ -167,10 +167,6 @@ module MSFL
       def value_conforms?(value, field, errors = [])
         true
       end
-
-      def foreign?(field)
-
-      end
     end
   end
 end

data/msfl.gemspec

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

data/spec/msfl/parsers/json_spec.rb

@@ -38,10 +38,10 @@ describe "MSFL::Parsers::JSON" do
 
       # The test scenario here is if we are limiting the set of cars by person criteria (only cars owned by people over 25)
 
-      let(:test_json) { '{"person":{"age":{"gte":25}}}' }
+      let(:test_json) { '{"foreign":{"dataset":"person","filter":{"age":{"gte":25}}}}' }
 
       it "is an equivalent Ruby hash" do
-        expect(mut).to eq({ person: { age: { gte: 25 } } })
+        expect(mut).to eq({foreign: { dataset: "person", filter: { age: { gte: 25 } } } })
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl
 version: !ruby/object:Gem::Version
-  version: 1.2.0.dev3
+  version: 1.2.0.dev4
 platform: ruby
 authors:
 - Courtland Caldwell