msfl 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dabe6bd0c5afed3d7dd3b5a684397066966a9dd
-  data.tar.gz: a4a87bc6566ac6a61cb316b7406580a0f022059b
+  metadata.gz: 177a30d02e7d96f90d3a86fd31804f7dcfacae54
+  data.tar.gz: 5e6ddff54fcc8f8380e51967a81b6a8b48931ec8
 SHA512:
-  metadata.gz: 8d1efc78665649567fead825ddc15e982241e29a4dcef21a975062dc913a26ea877eb2a29d8bb02fe7844800d3f7606961c936bf674775847582c33a5de75d19
-  data.tar.gz: 06f45d034877d6201d457c9dd89404fd207ae5501498414881c5b171a47bebc15a567d46831a7095fc62ccaa0d13775cfb706bd956235e54650edf93130f5ef0
+  metadata.gz: 69c76fe997453a7ad780a7ebeb6f91558777075b5f2085c6aa2c2b0a4282d10c91eec1e18fa7267c0c058ddb9eeb6f129b446352bacaf55565aa60ea4e46af76
+  data.tar.gz: 1329571a071f77f574acd92223f79d7fad3dfbf94a63a4d88eca1acc782a354a336ae20120f73a8dc68b92a54721aa4529d180e9e0ce51d63583e9fb9083d79a

data/lib/msfl/converters/operator.rb

@@ -37,15 +37,21 @@ module MSFL
 
       # { year: { start: 2001, end: 2005 } }
       #  => { year: { between: { start: 2001, end: 2015 } } }
-      def implicit_between_to_explicit_recursively(obj)
-        if obj.is_a? Hash
+      def implicit_between_to_explicit_recursively(obj, parent_key = nil)
+        if parent_key == :between
+          # The immediately ancestor key is :between, so don't do anything special with :start and :end
+          result = Hash.new
+          obj.each do |k, v|
+            result[k] = implicit_between_to_explicit_recursively(v)
+          end
+        elsif obj.is_a? Hash
           # if the hash has two keys :start and :end, nest it inside a between and recurse on the values
           if obj.has_key?(:start) && obj.has_key?(:end)
             result = { between: { start: implicit_between_to_explicit_recursively(obj[:start]), end: implicit_between_to_explicit_recursively(obj[:end]) } }
           else
             result = Hash.new
             obj.each do |k, v|
-              result[k] = implicit_between_to_explicit_recursively(v)
+              result[k] = implicit_between_to_explicit_recursively(v, k)
             end
           end
         elsif obj.is_a? Types::Set

data/msfl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl'
-  s.version     = '1.1.4'
+  s.version     = '1.1.5'
   s.date        = '2015-04-01'
   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

@@ -77,6 +77,46 @@ describe "MSFL::Converters::Operator" do
 
         subject
       end
+
+      context "when the object to be converted is { investor_id: { between: { start: 10, end: 50 } } }" do
+
+        let(:test_instance) { MSFL::Converters::Operator.new }
+
+        let(:obj) { { investor_id: { between: { start: 10, end: 50 } } } }
+
+        let(:expected) do
+          { and: MSFL::Types::Set.new([
+                                          { investor_id: { gte: 10 } },
+                                          { investor_id: { lte: 50 } }
+                                      ])}
+        end
+
+        let(:conversions_to_run) { nil }
+
+        it "is the the ANDed gte / lte equivalent expression" do
+          expect(subject).to eq expected
+        end
+      end
+
+      context "when the object to be converted is { investor_id: { start: 10, end: 50 } }" do
+
+        let(:test_instance) { MSFL::Converters::Operator.new }
+
+        let(:obj) { { investor_id: { start: 10, end: 50 } } }
+
+        let(:expected) do
+          { and: MSFL::Types::Set.new([
+                                          { investor_id: { gte: 10 } },
+                                          { investor_id: { lte: 50 } }
+                                      ])}
+        end
+
+        let(:conversions_to_run) { nil }
+
+        it "is the the ANDed gte / lte equivalent expression" do
+          expect(subject).to eq expected
+        end
+      end
     end
 
 
@@ -201,6 +241,17 @@ describe "MSFL::Converters::Operator" do
           expect(subject).to eq expected
         end
       end
+
+      context "when there is an explicit BETWEEN" do
+
+        let(:arg) { { investor_id: { between: { start: 10, end: 50 } } } }
+
+        let(:expected) { arg }
+
+        it "is unchanged" do
+          expect(subject).to eq expected
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Courtland Caldwell