msfl 0.0.1.pre.rc2 → 0.0.1.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daafbe97f5c20cfcd8c01f85f037d2ce541f79ea
-  data.tar.gz: 5dc889069b814f410425cd899a195affb0d5033e
+  metadata.gz: b6c56cf3880a84eafff98a45f46931bf957e2f09
+  data.tar.gz: 23afd30b810244488d9307059faad6ddfae6ba48
 SHA512:
-  metadata.gz: 82a657a00b0dfa31b645d4a23bf587768510dd03dbeaa659543e11570af810688e29dad84475c4632ef1dc0c7f9f1b2c3115af9f6579f764b9d99be54268c8e5
-  data.tar.gz: be3361401722d576c5a9cb66dd1f4c4883f1d9abdf9328fe52f7dce1966deb09ffe7b16cebe4d21496847b23cf9642465c3f018196da031439c4726c1c63258d
+  metadata.gz: c3ac65b1be870a46fa7495c3510fb78290b93b9ff28ec49fe5fdd5860bd1c8a51a625df4ec067e0f30da9a93f90b3a6ae7e11bef6ef0b1aededbf53015e23771
+  data.tar.gz: a2c081a4776ab4f93eddeca6c219c4238c3cb3f0e60c383ce560172fd1ba556a4590b7eaed030f05831ca7b45561034190be91bebabb6b358acd8749c3827471

data/lib/msfl/parsers/json.rb

@@ -8,7 +8,9 @@ module MSFL
       # @param json [String] the string to parse
       # @return [Object] the Ruby encoded MSFL, which may be a Hash, MSFL::Types::Set, or any number of scalar types
       def self.parse(json)
-        obj = ::JSON.parse(json)
+        json_to_parse = json
+        json_to_parse = '{}' if json_to_parse.nil? || json_to_parse == "" || json_to_parse == "null"
+        obj = ::JSON.parse(json_to_parse)
         obj = arrays_to_sets obj
         obj
       end

data/lib/msfl/sinatra.rb

@@ -14,7 +14,7 @@ module MSFL
       # @return [Object] the Ruby-ified MSFL filter
       def parse_filter_from(params)
         filter = params[:filter]
-        MSFL::Parsers::JSON.parse filter.to_json unless filter.nil?
+        MSFL::Parsers::JSON.parse filter.to_json
       end
 
       # Extracts the dataset name from the Sinatra params. It then returns a new instance of the specified

data/msfl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl'
-  s.version     = '0.0.1-rc2'
+  s.version     = '0.0.1-rc3'
   s.date        = '2015-03-05'
   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

@@ -9,6 +9,17 @@ describe "MSFL::Parsers::JSON" do
 
     let(:test_json) { '{"total_funding": 5000000}' }
 
+    context "when parsing an empty json string" do
+
+      let(:test_json) { '' }
+
+      let(:expected) { MSFL::Parsers::JSON.parse '{}' }
+
+      it "is parsed as an empty json hash" do
+        expect(mut).to eq expected
+      end
+    end
+
     context "when parsing a json hash" do
 
       it "is an equivalent Ruby Hash" do

data/spec/msfl/shared_examples.rb

@@ -2,6 +2,24 @@ shared_examples_for "an invocation of MSFL::Sinatra.validate" do
 
   let(:params) { { dataset: dataset, filter: filter } }
 
+  context "when params[:filter] is nil" do
+
+    let(:filter) { nil }
+
+    let(:dataset) { nil }
+
+    it { is_expected.to be true }
+  end
+
+  context "when params[:filter] is an empty hash" do
+
+    let(:filter) { {} }
+
+    let(:dataset) { nil }
+
+    it { is_expected.to be true }
+  end
+
   context "when params[:dataset] is :movies" do
 
     let(:dataset) { :movies }

data/spec/msfl/sinatra/helpers_spec.rb

@@ -69,13 +69,6 @@ describe "MSFL::Sinatra::Helpers" do
         end
       end
 
-      context "when params[:filter] is nil" do
-
-        it "raises an ArgumentError" do
-          expect { mut }.to raise_error ArgumentError
-        end
-      end
-
       context "when params[:dataset] is a valid Dataset" do
 
         let(:dataset) { :cars }

data/spec/msfl/validators/semantic_spec.rb

@@ -40,6 +40,23 @@ describe "MSFL::Validators::Semantic" do
 
   end
 
+  describe "#validate" do
+
+    subject(:mut) { test_instance.validate hash, errors, options }
+
+    let(:test_instance) { MSFL::Validators::Semantic.new }
+
+    let(:hash) { {} }
+
+    let(:errors) { [] }
+
+    let(:options) { {} }
+
+    context "when the filter is empty" do
+      it { is_expected.to be true }
+    end
+  end
+
   describe "#validate_set" do
 
     subject(:mut) { test_instance.validate_set set, errors, options }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.rc2
+  version: 0.0.1.pre.rc3
 platform: ruby
 authors:
 - Courtland Caldwell