data_maps 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e98ad1206ae2fd432192dcc293147aa0a5f0bd3e
-  data.tar.gz: 012bf7a5109b391cc1ba5ae3159cb1a1ec10e648
+  metadata.gz: af2821ba45839fc317a21346c3cfad439ad99757
+  data.tar.gz: 606ba1f46ff79b1328ddd8d398b037f8ff9b2fee
 SHA512:
-  metadata.gz: 772a63b8e3436f1da7cc212e6e2d4418144df4d0a7bfc4aca0bc6938adec0c94d8af120df21743ee47f8fa59d316b3f7e44b4ac7bdef836f3725f26286719b9a
-  data.tar.gz: 070be2c85255749782e8b9796b29556376051ff6485bb889dcf4dafecd07a16f87b28a97d4835922f1ab6b24b243136c9d63ac1aaf2d86787f1bce9b88ffe60a
+  metadata.gz: 3161cccfdd881fbd6cd6ada8cfe52c692d4df938aa7d6f771afc7fe913950b41145c314e8036a2bfbedd34dc01ec4cf642849440b4edeb83fd7ced331e43c74f
+  data.tar.gz: 3127ac3add6f6dc61b91276bddc8f20fb084d414a4a03920f37be42d0b98923b1d50c1931bc64c6bf6e26ee48bdcda5255270662e6c93ec64637fa0c219e0c78

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    data_maps (0.3.3)
+    data_maps (0.3.4)
       activesupport (~> 3.2, >= 3.2.21)
 
 GEM

data/lib/data_maps/statement.rb

@@ -47,7 +47,7 @@ module DataMaps
       data = _fetch_from_data(data)
 
       data = execute_conditions(data)
-      data = execute_converter(data)
+      data = execute_converter(data) unless data.is_a? DataMaps::FilteredValue
 
       [to, data]
     end
@@ -58,7 +58,11 @@ module DataMaps
     # @return [mixed] mutated data
     def execute_conditions(data)
       conditions.reduce(data) do |data, condition|
-        condition.execute(data)
+        if data.is_a? DataMaps::FilteredValue
+          data
+        else
+          condition.execute(data)
+        end
       end
     end
 

data/lib/data_maps/version.rb

@@ -1,3 +1,3 @@
 module DataMaps
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/data_maps/statement_spec.rb

@@ -82,6 +82,17 @@ describe DataMaps::Statement do
 
       expect(statement.execute(data)).to eq ['to', 'some double mutated value']
     end
+
+    it 'doesn\'t call execute_converter if condition returns a FilteredValue' do
+      statement = DataMaps::Statement.new('from', 'to', [], [])
+      data = { 'from' => 'some value' }
+      filtered_value = DataMaps::FilteredValue.new('some value')
+
+      expect(statement).to receive(:execute_conditions).with('some value').and_return(filtered_value)
+      expect(statement).not_to receive(:execute_converter)
+
+      expect(statement.execute(data)).to eq ['to', filtered_value]
+    end
   end
 
   describe '#execute_conditions' do
@@ -93,6 +104,16 @@ describe DataMaps::Statement do
 
       expect(statement.execute_conditions('some value')).to eq 'some mutated value'
     end
+
+    it 'doesn\'t execute the next converter if the first one returns a filtered value' do
+      statement = DataMaps::Statement.new('from', 'to', [DataMaps::Condition.new([], []), DataMaps::Condition.new([], [])], [])
+      filtered_value = DataMaps::FilteredValue.new('some value')
+
+      expect(statement.conditions[0]).to receive(:execute).with('some value').and_return(filtered_value)
+      expect(statement.conditions[1]).not_to receive(:execute)
+
+      expect(statement.execute_conditions('some value')).to eq filtered_value
+    end
   end
 
   describe '#execute_converter' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_maps
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Axel Wahlen