datamappify 0.51.0 → 0.51.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9765005a9b047c0dabab75eeb3da7997761c57d
-  data.tar.gz: c6747c591e913b7565a730ea7192703991aaf2b6
+  metadata.gz: e2eb31e15b5957467c3d496b2ddaf6f584d4b652
+  data.tar.gz: 7515f3c6935418a502e22213c75b7465a5faaf4e
 SHA512:
-  metadata.gz: 64566dfe4f603db5104657ca9416aef1d96f4b0327de25c0c9a36a68285b3dcf049efd2c39381f5f4f2ab7b781509c13f0c4ef27b02066e9b634e5cd23c56720
-  data.tar.gz: 0bc81a94c2c52c1b3da152d79f39405be5050e2242c526d628650591a4e741250f5d47136c93ef96a2a1f63f6c264200754ad603ea41954aafaffb2ce2f91cda
+  metadata.gz: 5f014a40766499d0f3e076d7ff82117a1e1bb5b5752741c917f14bcd5d5daceb1c5e080211f3bdd83cd8478425eb87d7ebee20582622fc0d23542f0150dcf91a
+  data.tar.gz: c13d2de1a9596ccfe8951a7d447e749529f4ab5539b2f33bed0499a12e000dca871e36a040401d2f405f96037d3c440d585326bfbb94db880154b35bea06a149

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## 0.51.1 [2013-06-17]
+
+- Fixed an issue with attribute name and validation conflicts.
+
 ## 0.51.0 [2013-06-17]
 
 - Enhanced `find` for searching specific attributes.

data/lib/datamappify/entity/composable.rb

@@ -23,9 +23,9 @@ module Datamappify
         #
         # @return (see #attributes_from)
         def setup_attributes(entity_class, options)
-          entity_class.attribute_set.dup.each do |attribute|
+          entity_class.attribute_set.each do |attribute|
             unless excluded_attributes(entity_class).include?(attribute.name)
-              self.attribute_set << tweak_attribute(attribute, options)
+              self.attribute_set << tweak_attribute(attribute.dup, options)
             end
           end
         end
@@ -57,13 +57,9 @@ module Datamappify
         # @return [void]
         def rename_validators(entity_class, prefix)
           entity_class._validators.each do |attribute_name, validators|
-            dup_validators = validators.dup
-
-            dup_validators.each do |validator|
-              rename_validator_attributes(validator, prefix)
+            self._validators[:"#{prefix}_#{attribute_name}"] = validators.map do |validator|
+              rename_validator_attributes(validator.dup, prefix)
             end
-
-            self._validators[:"#{prefix}_#{attribute_name}"] = dup_validators
           end
         end
 
@@ -74,6 +70,7 @@ module Datamappify
         # @return [void]
         def rename_validator_attributes(validator, prefix)
           validator.instance_variable_set :@attributes, validator.attributes.map { |name| :"#{prefix}_#{name}" }
+          validator
         end
 
         # @param entity_class [Entity]

data/lib/datamappify/version.rb

@@ -1,3 +1,3 @@
 module Datamappify
-  VERSION = '0.51.0'
+  VERSION = '0.51.1'
 end

data/spec/entity/composable_spec.rb

@@ -13,7 +13,12 @@ describe Datamappify::Entity do
       :software_osx_id     => 1,
       :software_windows_id => 2,
       :software_linux_id   => 3,
-      :software_vendor     => 'Lotus'
+      :software_vendor     => 'Lotus',
+      :game_os             => 'OS X',
+      :game_osx_id         => 1,
+      :game_windows_id     => 2,
+      :game_linux_id       => 3,
+      :game_vendor         => 'Lotus'
     })
   end
 
@@ -27,6 +32,11 @@ describe Datamappify::Entity do
   its(:software_windows_id) { should == 2 }
   its(:software_linux_id)   { should == 3 }
   its(:software_vendor)     { should == 'Lotus' }
+  its(:game_os)             { should == 'OS X' }
+  its(:game_osx_id)         { should == 1 }
+  its(:game_windows_id)     { should == 2 }
+  its(:game_linux_id)       { should == 3 }
+  its(:game_vendor)         { should == 'Lotus' }
 
   describe "validation" do
     context "valid" do

data/spec/support/entities/computer.rb

@@ -8,6 +8,7 @@ class Computer
 
   attributes_from ComputerHardware
   attributes_from ComputerSoftware, :prefix_with => :software
+  attributes_from ComputerSoftware, :prefix_with => :game
 
   validates :brand, :presence => true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datamappify
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.51.1
 platform: ruby
 authors:
 - Fred Wu