virtus-mapper 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d6d28f150fb62eacfa306509f4dcdd028c11aaf
-  data.tar.gz: 0be0b2f44a38c3d9e300fa5be1c1f43864723418
+  metadata.gz: 1668de6a4647f8f728f267188e4d4709a6f539bb
+  data.tar.gz: 68dc9ee28a36a7d481158b8a3d66c0a84a5e75fe
 SHA512:
-  metadata.gz: ee0175a90dd63624ea349ee0605bc7b43bd501b37deb76bba392660106b370f42ab26c7ef0a00564e0593e834cc427ef2277fac662d1ce32636b1cac36d01918
-  data.tar.gz: 0497d8cdf327cfffdbba9f65cca6a12c3b12718751f8ca2747cddadd4e84caef7eb9f0ef568460c0beb13542685ebc1391cfa3a8f15b6ee02bf1dcb96839afc6
+  metadata.gz: cf729a2b109bafa2598e55384f2c64e9d8ed064f86f8077f384e421e1be5be91fd9c0aae56c7bf9f10f1a86c087fd1c4dc2ce572719e9d67a1aa59f634f81254
+  data.tar.gz: 501be5a33044479639d4c5ed74fc883129370e215eadb23597ae4bc00e622df9ae7b396c3d5bc631cb3c00fbf4303b4286fb1f1a7d7e87e0c3af2057ee309391

data/lib/virtus/mapper/version.rb

@@ -1,5 +1,5 @@
 module Virtus
   module Mapper
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/lib/virtus/mapper.rb

@@ -7,13 +7,23 @@ HWIA = ActiveSupport::HashWithIndifferentAccess
 module Virtus
   module Mapper
 
+    attr_reader :mapped_attributes
+
     def initialize(attrs={})
-      super(map_attributes!(HWIA.new(attrs)))
+      @mapped_attributes = HWIA.new(attrs)
+      super(prepare_attributes_for_assignment!(@mapped_attributes))
+    end
+
+    def extend_with(mod)
+      attr_set = attribute_set
+      self.extend(mod) # Virtus modifies attribute_set
+      set_attr_values(attribute_set.collect(&:name))
+      update_attribute_set(attr_set)
     end
 
     private
 
-    def map_attributes!(attrs)
+    def prepare_attributes_for_assignment!(attrs)
       attrs.tap do |h|
         attributes_to_map_by_symbol(attrs).each do |att|
           h[att.name] = h.delete(from(att))
@@ -42,5 +52,21 @@ module Virtus
     def from(attribute)
       attribute.options[:from]
     end
+
+    def update_attribute_set(attr_set)
+      attr_set.merge(attribute_set)
+      self.attribute_set = attr_set
+    end
+
+    def attribute_set=(attr_set)
+      instance_variable_set(:@attribute_set, attr_set)
+    end
+
+    def set_attr_values(names)
+      attrs = prepare_attributes_for_assignment!(mapped_attributes)
+      names.each do |name|
+        self.send("#{name}=", attrs[name])
+      end
+    end
   end
 end

data/scratchpad.md

@@ -0,0 +1,9 @@
+Scratchpad
+==========
+
+- [ ] Is raw attributes the correct name. We do change them when they are
+  mapped, so raw is probably not correct. mapped_attributes
+
+- [ ] #update_attributes
+
+- [ ] Remove attrs arg from private methods, use raw_attributes

data/spec/virtus/mapper_spec.rb

@@ -19,11 +19,27 @@ module Virtus
                     from: lambda { |atts| atts[:address][:street] rescue '' }
         end
 
-        class Narwhal
+        module Employment
+          include Virtus.module
+          include Virtus::Mapper
+
+          attribute :company, String, from: :business
+          attribute :job_title, String, from: :position
+          attribute :salary, Integer
+        end
+
+        module Traits
+          include Virtus.module
+          include Virtus::Mapper
+
+          attribute :eye_color, String, from: :eyecolor
+        end
+
+        class Dog
           include Virtus.model
           include Virtus::Mapper
 
-          attribute :name, String, from: :narwhalmom
+          attribute :name, String, from: :shelter
         end
       end
     end
@@ -32,21 +48,24 @@ module Virtus
     let(:first_name) { 'John' }
     let(:last_name) { 'Doe' }
     let(:address) { '1122 Something Avenue' }
-    let(:attrs) {
+    let(:person_attrs) {
       { person_id: person_id,
         first_name: first_name,
         surname: last_name,
         address: { 'street' => address } }
     }
-    let(:mapper) { Examples::Person.new(attrs) }
+    let(:employment_attrs) {
+      { salary: 100,  business: 'RentPath', position: 'Programmer' }
+    }
+    let(:person) { Examples::Person.new(person_attrs) }
 
     describe 'attribute with from option as symbol' do
       it 'translates key' do
-        expect(mapper.last_name).to eq(last_name)
+        expect(person.last_name).to eq(last_name)
       end
 
       it 'does not create method from original key' do
-        expect { mapper.surname }.to raise_error(NoMethodError)
+        expect { person.surname }.to raise_error(NoMethodError)
       end
 
       describe 'with attribute name as key' do
@@ -63,34 +82,114 @@ module Virtus
     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]
-        expect(callable).to receive(:call) { attrs }
-        Examples::Person.new(attrs)
+        expect(callable).to receive(:call) { person_attrs }
+        Examples::Person.new(person_attrs)
       end
 
       it 'sets attribute to result of call' do
-        expect(mapper.address).to eq(address)
+        expect(person.address).to eq(address)
       end
     end
 
 
     describe 'attribute without from option' do
       it 'behaves as usual' do
-        expect(mapper.first_name).to eq(first_name)
+        expect(person.first_name).to eq(first_name)
       end
     end
 
     it 'maps attributes with indifferent access' do
-      mapper = Examples::Person.new({ person_id: 1,
+      person = Examples::Person.new({ person_id: 1,
                                       first_name: first_name,
                                       'surname' => last_name })
-      expect(mapper.last_name).to eq('Doe')
+      expect(person.last_name).to eq('Doe')
     end
 
     describe 'given no arguments to constructor' do
       it 'does not raise error' do
-        expect {
-          Examples::Narwhal.new
-        }.not_to raise_error
+        expect { Examples::Dog.new }.not_to raise_error
+      end
+    end
+
+    # describe '#mapped_attributes' do
+    #   let(:person) { Examples::Person.new(person_attrs.merge({ unused: true })) }
+
+    #   it 'preserves unused attributes' do
+    #     expect(person.mapped_attributes[:unused]).to be true
+    #   end
+
+    #   it 'does not create instance methods for unused attributes' do
+    #     expect { person.unused }.to raise_error(NoMethodError)
+    #   end
+    # end
+
+    describe '#extend_with' do
+      describe 'for single extended module' do
+        let(:person) {
+          Examples::Person.new(person_attrs.merge(employment_attrs))
+        }
+
+        before do
+          person.extend_with(Examples::Employment)
+        end
+
+        it 'updates unmapped attribute values for extended modules' do
+          expect(person.salary).to eq(100)
+        end
+
+        it 'updates mapped attribute values for extended modules' do
+          expect(person.job_title).to eq('Programmer')
+        end
+
+        it 'adds module attributes to attribute_set' do
+          attr_names = person.instance_eval { attribute_set }.collect(&:name)
+          [:id,
+           :first_name,
+           :last_name,
+           :address,
+           :company,
+           :job_title,
+           :salary].each do |attr_name|
+             expect(attr_names).to include(attr_name)
+           end
+        end
+      end
+
+      describe 'for multiple extended modules' do
+        let(:person) {
+          Examples::Person.new(
+            person_attrs.merge(employment_attrs.merge({ eyecolor: 'green' }))
+          )
+        }
+
+        before do
+          person.extend_with(Examples::Employment)
+          person.extend_with(Examples::Traits)
+        end
+
+        it 'updates mapped attributes for last module extended' do
+          expect(person.eye_color).to eq('green')
+        end
+
+        it 'updates mapped attributes for first module extended' do
+          expect(person.salary).to eq(100)
+          expect(person.company).to eq('RentPath')
+          expect(person.job_title).to eq('Programmer')
+        end
+
+        it 'adds module attributes to attribute_set' do
+          attr_names = person.instance_eval { attribute_set }.collect(&:name)
+          [:id,
+           :first_name,
+           :last_name,
+           :address,
+           :company,
+           :job_title,
+           :salary,
+           :eye_color].each do |attr_name|
+             expect(attr_names).to include(attr_name)
+           end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virtus-mapper
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - RentPath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -109,6 +109,7 @@ files:
 - Rakefile
 - lib/virtus/mapper.rb
 - lib/virtus/mapper/version.rb
+- scratchpad.md
 - spec/spec_helper.rb
 - spec/virtus/mapper_spec.rb
 - virtus-mapper.gemspec