data_maps 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af2821ba45839fc317a21346c3cfad439ad99757
-  data.tar.gz: 606ba1f46ff79b1328ddd8d398b037f8ff9b2fee
+  metadata.gz: 5a16f9e0450a56553c020366bffdbed04c85531c
+  data.tar.gz: 15288d671c8908e573f9af7cefecc887c14c22b1
 SHA512:
-  metadata.gz: 3161cccfdd881fbd6cd6ada8cfe52c692d4df938aa7d6f771afc7fe913950b41145c314e8036a2bfbedd34dc01ec4cf642849440b4edeb83fd7ced331e43c74f
-  data.tar.gz: 3127ac3add6f6dc61b91276bddc8f20fb084d414a4a03920f37be42d0b98923b1d50c1931bc64c6bf6e26ee48bdcda5255270662e6c93ec64637fa0c219e0c78
+  metadata.gz: 32246884e5a56a4b30299ce6caf435598ba48d6b5a48778b2c2411307cef50cf590177ea98279706e880b8332f8c5138a25f6fca420f2ccd2ac1bbaa872cff2a
+  data.tar.gz: 6611c2fdfe9e0ec8740f24cf8b28657eed598ee27011c637129e187843ace3cbe18d04742b9cacc2f34bf56f4633fcf411816eda9771992a383615aca533dfbd

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+Gemfile.lock

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 cache: bundler
 rvm:
   - 2.1.3
+before_install: gem install bundler -v '~> 1.8'
 addons:
   code_climate:
     repo_token: 2111a70b2a7d70a9ec1c1d386e9dbd2f1bceec2cd16524393fcce14c280b571c

data/README.md

@@ -264,8 +264,8 @@ Apply one or many converters to the input data. Converters applied procedural.
 
 - **Converter: map**
   A simple value mapping. Maps are converted to a `HashWithIndifferentAccess`.
-  Works with flat values, hashes and arrays.
-  For arrays and hashes it returns nil if the value is not in the mapping. For flat values it returns the original data.
+  Works with scalar values, hashes and arrays.
+  For arrays and hashes it returns nil if the value is not in the mapping. For scalar values it returns the original data.
 
   ```ruby
   apply: :map,
@@ -348,4 +348,9 @@ Apply one or many converters to the input data. Converters applied procedural.
   option: { as: :importer } # passed value are available via option
   ```
 
+## ToDos:
+- DSL to describe mappings
+- Better error handling during the converter process
+
+
 Have fun using the `DataMaps` gem :)

data/data_maps.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.2'
 
-  spec.add_runtime_dependency 'activesupport', '~> 3.2', '>= 3.2.21'
+  spec.add_runtime_dependency 'activesupport', '>= 3.2.21'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/data_maps/dsl/mapping/conditions_dsl.rb

@@ -10,9 +10,22 @@ module DataMaps
           self.thens = {}
         end
 
+        def when(condition, option)
+          self.whens[condition] = option
+        end
+        alias_method :is, :when
+
+        def then(action, option)
+          self.thens[action] = option
+        end
+        alias_method :so, :then
+
         # Serialize DSL to an Hash
         def to_h
-          data = super
+          data = {
+            when: whens,
+            then: thens
+          }
           data.stringify_keys
         end
       end

data/lib/data_maps/dsl/mapping/field_dsl.rb

@@ -11,19 +11,20 @@ module DataMaps
           self.converter = []
         end
 
-        def add_condition(&block)
+        def condition(&block)
           dsl = DataMaps::Dsl::Mapping::ConditionsDsl.new
           dsl.configure(&block) if block_given?
           self.conditions << dsl.to_h
         end
 
-        def add_converter(converter, options = nil)
+        def convert(converter, options = nil)
           self.converter << { apply: converter, option: options }
         end
 
         # Serialize DSL to an Hash
         def to_h
           data = super
+          data[:convert] = data.delete(:converter)
           data.stringify_keys
         end
       end

data/lib/data_maps/version.rb

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

data/spec/data_maps/converter/affixes_spec.rb

@@ -42,7 +42,7 @@ describe DataMaps::Converter::Prefix do
       end
     end
 
-    describe 'for flat values' do
+    describe 'for scalar values' do
       it 'cast value to string' do
         data = double(Object)
 
@@ -101,7 +101,7 @@ describe DataMaps::Converter::Postfix do
       end
     end
 
-    describe 'for flat values' do
+    describe 'for scalar values' do
       it 'cast value to string' do
         data = double(Object)
 

data/spec/data_maps/converter/map_spec.rb

@@ -32,7 +32,7 @@ describe DataMaps::Converter::Map do
       end
     end
 
-    describe 'for flat values' do
+    describe 'for scalar values' do
       it 'converts the value' do
         expect(subject.execute('a')).to eq 'x'
       end

data/spec/data_maps/dsl/mapping/conditions_dsl_spec.rb

@@ -12,4 +12,22 @@ describe DataMaps::Dsl::Mapping::ConditionsDsl do
       expect(subject.thens).to eq({})
     end
   end
+
+  describe '#when' do
+    it 'adds a when with correct options to the whens hash' do
+      expect{ subject.when(:regex, /[0-9]/) }.to change{ subject.whens.length }.from(0).to(1)
+
+      expect(subject.whens.key?(:regex)).to be_truthy
+      expect(subject.whens[:regex]).to eq /[0-9]/
+    end
+  end
+
+  describe '#then' do
+    it 'adds a then with correct options to the thens hash' do
+      expect{ subject.then(:filter, true) }.to change{ subject.thens.length }.from(0).to(1)
+
+      expect(subject.thens.key?(:filter)).to be_truthy
+      expect(subject.thens[:filter]).to be_truthy
+    end
+  end
 end

data/spec/data_maps/dsl/mapping/field_dsl_spec.rb

@@ -17,24 +17,24 @@ describe DataMaps::Dsl::Mapping::FieldMappingDsl do
     end
   end
 
-  describe '#add_condition' do
+  describe '#condition' do
     it 'creates a new ConditionsDsl object' do
       dsl = DataMaps::Dsl::Mapping::ConditionsDsl.new
 
       expect(DataMaps::Dsl::Mapping::ConditionsDsl).to receive(:new).with(no_args).and_return(dsl)
-      subject.add_condition
+      subject.condition
     end
 
     it 'calls configure with given block' do
       expect do |block|
-        subject.add_condition(&block)
+        subject.condition(&block)
       end.to yield_control
     end
   end
 
-  describe '#add_converter' do
+  describe '#convert' do
     it 'adds the defined converter to converter hash' do
-      expect{ subject.add_converter(:ruby, :downcase) }.to change{ subject.converter.count }.from(0).to(1)
+      expect{ subject.convert(:ruby, :downcase) }.to change{ subject.converter.count }.from(0).to(1)
       expect(subject.converter.first).to eq({ apply: :ruby, option: :downcase })
     end
   end

data/spec/data_maps/dsl/mapping_dsl_spec.rb

@@ -34,4 +34,34 @@ describe DataMaps::Dsl::Mapping do
       expect(subject.mapping_hash.key?('myfield')).to be_truthy
     end
   end
+
+  describe 'full integration' do
+    it 'generates correct mapping hash' do
+      mapping = DataMaps::Mapping.new.configure do
+        field :myfield, from: :source_field do
+          condition do
+            is :empty, true
+            so :filter, true
+          end
+
+          convert :ruby, [:join, ',']
+        end
+      end
+
+      expect(mapping.mapping_hash).not_to be_empty
+      expect(mapping.mapping_hash).to eq(
+        {
+          'myfield' => {
+            'from' => :source_field,
+            'conditions' => [
+              { 'when' => { 'empty' => true }, 'then' => { 'filter' => true } }
+            ],
+            'convert' => [
+              { 'apply' => :ruby, 'option' => [:join, ','] }
+            ]
+          }
+        }
+      )
+    end
+  end
 end

metadata

@@ -1,22 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: data_maps
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Axel Wahlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.21
@@ -24,9 +21,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.21
@@ -111,7 +105,6 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    data_maps (0.3.4)
-      activesupport (~> 3.2, >= 3.2.21)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    codeclimate-test-reporter (0.4.7)
-      simplecov (>= 0.7.1, < 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    i18n (0.7.0)
-    multi_json (1.10.1)
-    rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.1)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    simplecov (0.9.2)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.8)
-  codeclimate-test-reporter (~> 0.4.7)
-  data_maps!
-  rake (~> 10.0)
-  rspec (~> 3.2)
-  simplecov (~> 0.9.2)