rom-mapper 0.3.0.beta1 → 0.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e261943dc4114a157a1f142045a0f5ee033dd5c5
-  data.tar.gz: 06c40a576ebf206f9719c161f332f43a5dbf075c
+  metadata.gz: 8445a0b1754d08c53cd69fb5e4d5ebc1101b81b1
+  data.tar.gz: 48e8e7ff9b54220e4e1680e9675db6e56a385639
 SHA512:
-  metadata.gz: 5f3dd818d7f91c3c73828bd8ed93354e41183bd86d3a3a30c1f8a26bad02994a37ed86c22befc4fa473d11b788595805a015d41792226ba12947fd6af71a984f
-  data.tar.gz: d53d9d99ad4be33c2faf1eca94eff0cf05bd75966e2cf6267afda48c605d7551772f141d3cb1c0b4f370d9a6bf3d9344838b456f9abde81cd303f3774d994115
+  metadata.gz: fb63e1a42a59f4feee6d5457d729c52616f7c7ba4818da90bb904553d01b75920165bdb7923e1d7b77766a19945c8e221eb080c4cfa32b59aa5574c6879d403e
+  data.tar.gz: aca717bcb4b6d16c29b55a61ae5630581fd5f5f057ab4c6261e1dcf92d1c6730f1d5c121a73e4e0a8a98f23e78f2abb993c4870b38664edc59d0e0cdd5c2002d

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# v0.3.0 to-be-released
+
+### Added
+
+* Allow `attribute`'s `:from` option to take an array of other attribute names (hmadison)
+
+### Changed
+
+* Coercer blocks are now executed in the context of the mapper object (AMHOL)
+
+### Fixed
+
+* `model` will skip excluded attributes (chastell)
+
+[Compare v0.2.0..HEAD](https://github.com/rom-rb/rom-mapper/compare/v0.2.0...HEAD)
+
 # v0.2.0 2015-08-10
 
 Import code from rom 0.8.1

data/lib/rom/header.rb

@@ -19,6 +19,9 @@ module ROM
     # @api private
     attr_reader :reject_keys
 
+    # @api private
+    attr_reader :copy_keys
+
     # @api private
     attr_reader :attributes
 
@@ -62,6 +65,7 @@ module ROM
     def initialize(attributes, options = {})
       @options = options
       @model = options[:model]
+      @copy_keys = options.fetch(:copy_keys, false)
       @reject_keys = options.fetch(:reject_keys, false)
 
       @attributes = attributes

data/lib/rom/mapper.rb

@@ -8,7 +8,7 @@ module ROM
     include DSL
     include Dry::Equalizer(:transformers, :header)
 
-    defines :relation, :register_as, :symbolize_keys,
+    defines :relation, :register_as, :symbolize_keys, :copy_keys,
       :prefix, :prefix_separator, :inherit_header, :reject_keys
 
     inherit_header true

data/lib/rom/mapper/attribute_dsl.rb

@@ -14,7 +14,7 @@ module ROM
     class AttributeDSL
       include ModelDSL
 
-      attr_reader :attributes, :options, :symbolize_keys, :reject_keys, :steps
+      attr_reader :attributes, :options, :copy_keys, :symbolize_keys, :reject_keys, :steps
 
       # @param [Array] attributes accumulator array
       # @param [Hash] options
@@ -23,6 +23,7 @@ module ROM
       def initialize(attributes, options)
         @attributes = attributes
         @options = options
+        @copy_keys = options.fetch(:copy_keys)
         @symbolize_keys = options.fetch(:symbolize_keys)
         @prefix = options.fetch(:prefix)
         @prefix_separator = options.fetch(:prefix_separator)
@@ -344,7 +345,7 @@ module ROM
       #
       # @api private
       def header
-        Header.coerce(attributes, model: model, reject_keys: reject_keys)
+        Header.coerce(attributes, copy_keys: copy_keys, model: model, reject_keys: reject_keys)
       end
 
       private

data/lib/rom/mapper/dsl.rb

@@ -78,7 +78,8 @@ module ROM
         #
         # @api private
         def options
-          { prefix: prefix,
+          { copy_keys: copy_keys,
+            prefix: prefix,
             prefix_separator: prefix_separator,
             symbolize_keys: symbolize_keys,
             reject_keys: reject_keys }

data/lib/rom/mapper/version.rb

@@ -1,5 +1,5 @@
 module ROM
   class Mapper
-    VERSION = '0.3.0.beta1'.freeze
+    VERSION = '0.3.0.rc1'.freeze
   end
 end

data/lib/rom/processor/transproc.rb

@@ -353,9 +353,10 @@ module ROM
       # @api private
       def initialize_row_proc
         @row_proc = compose { |ops|
+          alias_handler = header.copy_keys ? :copy_keys : :rename_keys
           process_header_keys(ops)
 
-          ops << t(:rename_keys, mapping) if header.aliased?
+          ops << t(alias_handler, mapping) if header.aliased?
           ops << header.map { |attr| visit(attr) }
           ops << t(:constructor_inject, model) if model
         }

data/spec/integration/mapper_spec.rb

@@ -17,7 +17,7 @@ describe ROM::Mapper do
       let(:mapper_body) do
         proc do
           attribute(:key) { |key| [prefix, key].join('_') }
-        
+
           def prefix
             'foo'
           end
@@ -28,6 +28,21 @@ describe ROM::Mapper do
         is_expected.to match_array(results)
       end
     end
+
+    context 'when copying aliased keys to multiple attributes' do
+      let(:tuples) { [{ key: 'bar' }] }
+      let(:results) { [{ key: 'bar', key2: 'bar', key3: 'bar' }] }
+      let(:mapper_body) do
+        proc do
+          copy_keys true
+          attribute([:key2, :key3], from: :key)
+        end
+      end
+
+      it 'creates attributes by copying keys rather than renaming' do
+        is_expected.to match_array(results)
+      end
+    end
   end
 
   describe '.embedded' do
@@ -39,7 +54,7 @@ describe ROM::Mapper do
           embedded :items, type: :hash do
             attribute(:key) { |key| [prefix, key].join('_') }
           end
-        
+
           def prefix
             'foo'
           end
@@ -61,7 +76,7 @@ describe ROM::Mapper do
           wrap :items do
             attribute(:key) { |key| [prefix, key].join('_') }
           end
-        
+
           def prefix
             'foo'
           end
@@ -83,7 +98,7 @@ describe ROM::Mapper do
           unwrap :items do
             attribute(:key) { |key| [prefix, key].join('_') }
           end
-        
+
           def prefix
             'foo'
           end

data/spec/unit/rom/mapper/dsl_spec.rb

@@ -71,11 +71,23 @@ describe ROM::Mapper do
     end
   end
 
+  describe 'copy_keys' do
+    let(:attributes) { [[:name, type: :string]] }
+    let(:options) { { copy_keys: true } }
+
+    it 'sets copy_keys for the header' do
+      mapper.copy_keys true
+      mapper.attribute :name, type: :string
+
+      expect(header).to eql(expected_header)
+    end
+  end
+
   describe 'reject_keys' do
     let(:attributes) { [[:name, type: :string]] }
     let(:options) { { reject_keys: true } }
 
-    it 'sets rejected_keys for the header' do
+    it 'sets reject_keys for the header' do
       mapper.reject_keys true
       mapper.attribute :name, type: :string
 

data/spec/unit/rom/processor/transproc_spec.rb

@@ -68,21 +68,39 @@ describe ROM::Processor::Transproc do
     end
   end
 
+  context 'copying keys' do
+    let(:options) do
+      { copy_keys: true }
+    end
+
+    let(:attributes) do
+      [['b', from: 'a'], ['c', from: 'b']]
+    end
+
+    let(:relation) do
+      [{ 'a' => 'copy' }]
+    end
+
+    it 'copies without removing the original' do
+      expect(transproc[relation]).to eql([{ 'a' => 'copy', 'b' => 'copy', 'c' => 'copy' }])
+    end
+  end
+
   describe 'key from exsisting keys' do
     let(:attributes) do
-      coercer = ->(a,b) { b + a }
-      [[:c, {from: [:a, :b], coercer: coercer} ]]
+      coercer = ->(a, b) { b + a }
+      [[:c, { from: [:a, :b], coercer: coercer }]]
     end
 
     let(:relation) do
       [
-        {a: 'works', b: 'this'}
+        { a: 'works', b: 'this' }
       ]
     end
 
-    let (:expected_result) do
+    let(:expected_result) do
       [
-        {c: 'thisworks'}
+        { c: 'thisworks' }
       ]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-mapper
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta1
+  version: 0.3.0.rc1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-equalizer