virtus-mapper 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7288399b225e10cc42af3e3d87819599fa0fc316
-  data.tar.gz: c144d2802d44463ba5a78289710d684451061ad8
+  metadata.gz: 610232c9390a9e5738942dc54b1e50464e7661bc
+  data.tar.gz: 646327cae53a1c6d56de6cf93f3a9b4d2f260868
 SHA512:
-  metadata.gz: 822a971aef5430f3ef77ac9e4b96ab20ca00bb2bd45d32f93a9aa30fdf72ed337e83cd19adbcbc4cd3030d7a7379e2069d41650e55b4f6e66b3ff4a9da67983a
-  data.tar.gz: ba404f7672c39c8e624d14a4cd7b35fdd7428daed03680e61be4c907e07ee355d77fa11f2b6538156fad6d5ccac92bc394ed6eae1efd8332ea5b33a4b1f1e0eb
+  metadata.gz: c1e216c9effb6ae800aeaaf3d159b9fd544f4ad541099a364c6ce7b83a717d60e93fed0da94ba474fdff1a3c298ef2988195e163a2d7cddc9d355fc6241de6d4
+  data.tar.gz: c5c37ed1bf79d24afa50bc7e21193f99f50eb1025dd5df42da6b2cb48649eae7b1835d9b472c391b17d024cb97cc9ba7ffeb38913264e3ca1b886809fec09b8c

data/lib/virtus/mapper.rb

@@ -41,10 +41,7 @@ module Virtus
     end
 
     def attributes_to_map_by_symbol(attrs)
-      attributes_to_map.select do |att|
-        !from(att).respond_to?(:call) &&
-        !attrs.has_key?(att.name)
-      end
+      attributes_to_map - attributes_to_map_by_call
     end
 
     def attributes_to_map_by_call

data/lib/virtus/mapper/version.rb

@@ -1,5 +1,5 @@
 module Virtus
   module Mapper
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/spec/virtus/mapper_spec.rb

@@ -6,7 +6,7 @@ module Virtus
 
     before do
       module Examples
-        class Person
+        class PersonMapper
           include Virtus.model
           include Virtus::Mapper
 
@@ -19,7 +19,7 @@ module Virtus
                     from: lambda { |atts| atts[:address][:street] rescue '' }
         end
 
-        module Employment
+        module EmploymentMapper
           include Virtus.module
           include Virtus::Mapper
 
@@ -28,14 +28,14 @@ module Virtus
           attribute :salary, Integer
         end
 
-        module Traits
+        module TraitsMapper
           include Virtus.module
           include Virtus::Mapper
 
           attribute :eye_color, String, from: :eyecolor
         end
 
-        class Dog
+        class DogMapper
           include Virtus.model
           include Virtus::Mapper
 
@@ -57,7 +57,7 @@ module Virtus
     let(:employment_attrs) {
       { salary: 100,  business: 'RentPath', position: 'Programmer' }
     }
-    let(:person) { Examples::Person.new(person_attrs) }
+    let(:person) { Examples::PersonMapper.new(person_attrs) }
 
     describe 'attribute with from option as symbol' do
       it 'translates key' do
@@ -68,22 +68,34 @@ module Virtus
         expect { person.surname }.to raise_error(NoMethodError)
       end
 
-      describe 'with attribute name as key' do
-        it 'does not raise error' do
-          expect { Examples::Person.new({id: 1}) }.not_to raise_error
+      describe 'required attribute with name key, missing from key' do
+        it 'raises error' do
+          expect { Examples::PersonMapper.new({id: 1}) }.to raise_error
         end
+      end
+
+      describe 'attribute with name key, missing from key' do
+        it 'returns nil from reader method' do
+          data = { person_id: 1, last_name: 'Smith' }
+          person = Examples::PersonMapper.new(data)
+          expect(person.last_name).to be_nil
+        end
+      end
 
-        it 'returns expected value' do
-          expect(Examples::Person.new({id: 1}).id).to eq(1)
+      describe 'when name and from keys exist in initialized attributes' do
+        it 'prefers from data to name data' do
+          data = person_attrs.merge({ last_name: 'Smith' })
+          person = Examples::PersonMapper.new(data)
+          expect(person.last_name).to eq('Doe')
         end
       end
     end
 
     describe 'attribute with from option as callable object' do
       it 'calls the object and passes the attributes hash' do
-        callable = Examples::Person.attribute_set[:address].options[:from]
+        callable = Examples::PersonMapper.attribute_set[:address].options[:from]
         expect(callable).to receive(:call) { person_attrs }
-        Examples::Person.new(person_attrs)
+        Examples::PersonMapper.new(person_attrs)
       end
 
       it 'sets attribute to result of call' do
@@ -98,7 +110,7 @@ module Virtus
     end
 
     it 'maps attributes with indifferent access' do
-      person = Examples::Person.new({ person_id: 1,
+      person = Examples::PersonMapper.new({ person_id: 1,
                                       first_name: first_name,
                                       'surname' => last_name })
       expect(person.last_name).to eq('Doe')
@@ -106,22 +118,22 @@ module Virtus
 
     describe 'given no arguments to constructor' do
       it 'does not raise error' do
-        expect { Examples::Dog.new }.not_to raise_error
+        expect { Examples::DogMapper.new }.not_to raise_error
       end
 
       it 'respects defaults' do
-        expect(Examples::Dog.new.name).to eq('Spot')
+        expect(Examples::DogMapper.new.name).to eq('Spot')
       end
     end
 
     describe 'given nil values' do
       it 'respects nil values' do
-        expect(Examples::Dog.new(name: nil).name).to be_nil
+        expect(Examples::DogMapper.new(name: nil).name).to be_nil
       end
     end
 
     describe '#mapped_attributes' do
-      let(:person) { Examples::Person.new(person_attrs.merge({ unused: true })) }
+      let(:person) { Examples::PersonMapper.new(person_attrs.merge({ unused: true })) }
 
       it 'preserves unused attributes' do
         expect(person.mapped_attributes[:unused]).to be true
@@ -135,11 +147,11 @@ module Virtus
     describe '#extend_with' do
       describe 'for single extended module' do
         let(:person) {
-          Examples::Person.new(person_attrs.merge(employment_attrs))
+          Examples::PersonMapper.new(person_attrs.merge(employment_attrs))
         }
 
         before do
-          person.extend_with(Examples::Employment)
+          person.extend_with(Examples::EmploymentMapper)
         end
 
         it 'updates unmapped attribute values for extended modules' do
@@ -166,14 +178,14 @@ module Virtus
 
       describe 'for multiple extended modules' do
         let(:person) {
-          Examples::Person.new(
+          Examples::PersonMapper.new(
             person_attrs.merge(employment_attrs.merge({ eyecolor: 'green' }))
           )
         }
 
         before do
-          person.extend_with(Examples::Employment)
-          person.extend_with(Examples::Traits)
+          person.extend_with(Examples::EmploymentMapper)
+          person.extend_with(Examples::TraitsMapper)
         end
 
         it 'updates mapped attributes for last module extended' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virtus-mapper
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - RentPath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus