plain_old_model 0.1.3 → 0.1.4

data/lib/plain_old_model/attribute_assignment.rb

@@ -30,7 +30,8 @@ module PlainOldModel
       associations.each do |association|
         attr_name = association.attr_name
         if attributes.include?(attr_name)
-          value = association.create_value_from_attributes(attributes[attr_name])
+          merged_hash = merge_association_instance_variables_with_attributes(association, attr_name, attributes)
+          value = association.create_value_from_attributes(merged_hash)
           set_attribute(attr_name, value)
           attributes  = attributes.delete_if { |key, value| key.to_s == attr_name.to_s }
         end
@@ -86,6 +87,7 @@ module PlainOldModel
     end
 
     private
+
     def sanitize_attributes(attributes)
       sanitized_attributes = {}
       attributes.each do |k, v|
@@ -111,5 +113,38 @@ module PlainOldModel
         instance_variable_set("@#{attr_name}".to_sym, value)
       end
     end
+
+    def merge_association_instance_variables_with_attributes(association, attr_name, attributes)
+      association_instance = send(attr_name)
+      if association.class == HasOneAssociation
+        instance_hash = create_association_hash(association_instance,{})
+        merged_result = instance_hash.deep_merge(attributes[attr_name])
+      elsif association.class == HasManyAssociation
+        association_instance_array = []
+        if association_instance.nil?
+          merged_result = attributes[attr_name]
+        else
+          for i in 0..association_instance.length-1
+            instance_hash = create_association_hash(association_instance[i],{})
+            association_instance_array << instance_hash.deep_merge(attributes[attr_name][i])
+          end
+          merged_result = association_instance_array
+        end
+      end
+      merged_result
+    end
+
+    def create_association_hash(association_instance,association_instance_hash)
+      unless association_instance.nil?
+        association_instance.instance_variables.each do |var|
+          if association_instance.instance_variable_get(var).instance_variables.length > 0
+            association_instance_hash[var.to_s.delete("@").to_sym] = create_association_hash(association_instance.instance_variable_get(var),{})
+          else
+            association_instance_hash[var.to_s.delete("@").to_sym] = association_instance.instance_variable_get(var)
+          end
+        end
+      end
+      association_instance_hash
+    end
   end
 end

data/lib/plain_old_model/version.rb

@@ -1,3 +1,3 @@
 module PlainOldModel
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/base_spec.rb

@@ -11,7 +11,9 @@ describe PlainOldModel::Base do
     end
     it "should assign value to the attr_reader attributes/ read only attribute" do
       @address = Address.new
-      @address.assign_attributes({:fname => "first value", :lname => "second value", :read_test => 'This should be assigned'})
+      @address.fname = "first value"
+      @address.assign_attributes({:lname => "second value", :read_test => 'This should be assigned'})
+      @address.fname.should == "first value"
       @address.read_test.should == "This should be assigned"
     end
     it "should assign value to the attr_writer attributes" do
@@ -66,7 +68,41 @@ describe PlainOldModel::Base do
         @address = Address.new({:fname => "first value", :lname => "second value", :country => {:code => "In", :name => "India"}, :read_test => 'This should be assigned',:write_test => "this shd be available"})
         @address.read_test.should == "This should be assigned"
       end
+      it "should override assigned attributes" do
+        @address = Address.new({:fname => "first value", :lname => "second value", :country => {:code => "In", :name => "India"}, :read_test => 'This should be assigned',:write_test => "this shd be available"})
+        @address.assign_attributes({:fname => "replaced first value", :lname => "replaced second value", :country => {:code => "USA", :name => "United States"}})
+        @address.fname.should == "replaced first value"
+        @address.country.code.should == "USA"
+        @address.country.name.should == "United States"
+        @address.read_test.should == "This should be assigned"
+      end
+      it "should not override unassigned nested attributes" do
+        @address = Address.new({:fname => "first value", :lname => "second value", :country => {:code => "In", :name => "India"}, :read_test => 'This should be assigned',:write_test => "this shd be available"})
+        @address.assign_attributes({:fname => "replaced first value", :lname => "replaced second value"})
+        @address.fname.should == "replaced first value"
+        @address.country.code.should == "In"
+        @address.country.name.should == "India"
+        @address.read_test.should == "This should be assigned"
+      end
+      it "should not override unassigned nested attributes' values" do
+        @address = Address.new({:fname => "first value", :lname => "second value", :country => {:code => "In", :name => "India", :continent => {:name => "asia", :desc => {:this => "is a test", :actual_desc => "is another test"}}}, :read_test => 'This should be assigned',:write_test => "this shd be available"})
+        @address.assign_attributes({:fname => "replaced first value", :lname => "replaced second value", :country => {:name => "United States", :continent => {:desc => {:this => "is a replacement", :actual_desc => "is another replacement"}}}})
+        @address.fname.should == "replaced first value"
+        @address.country.code.should == "In"
+        @address.country.name.should == "United States"
+        @address.country.continent.name.should == "asia"
+        @address.read_test.should == "This should be assigned"
+      end
+      it "should create assigned nested attributes" do
+        @address = Address.new({:fname => "first value", :lname => "second value", :read_test => 'This should be assigned',:write_test => "this shd be available"})
+        @address.assign_attributes({:fname => "replaced first value", :lname => "replaced second value", :country => {:code => "In", :name => "India"} })
+        @address.fname.should == "replaced first value"
+        @address.country.code.should == "In"
+        @address.country.name.should == "India"
+        @address.read_test.should == "This should be assigned"
+      end
     end
+
     describe "has_many" do
       it "should create a new instance and assign attributes for each value in array" do
         @person = Person.new({ addresses: [{ fname: "first name 1", lname: "last name 1"}, { fname: "first name 2", lname: "last name 2"}]})
@@ -78,7 +114,6 @@ describe PlainOldModel::Base do
         @person.addresses[1].fname.should == "first name 2"
         @person.addresses[1].lname.should == "last name 2"
       end
-
       it "should not alter the params passed in" do
         passed_params = { addresses: [{ fname: "first name 1", lname: "last name 1"}, { fname: "first name 2", lname: "last name 2"}]}
         @person = Person.new(passed_params)
@@ -87,7 +122,6 @@ describe PlainOldModel::Base do
         @person.addresses.first.fname.should == "first name 1"
         passed_params.should == { addresses: [{ fname: "first name 1", lname: "last name 1"}, { fname: "first name 2", lname: "last name 2"}]}
       end
-
       it "should create each class via factory_method if one is specified" do
         @person = Person.new({ phones: [{ number: '423-5841'}, {number: '383-9139'}]})
         @person.phones.length.should == 2
@@ -95,11 +129,18 @@ describe PlainOldModel::Base do
         @person.phones[0].extension.should == 'set_via_factory'
         @person.phones[1].extension.should == 'set_via_factory'
       end
+      it "should not override unassigned nested attributes' values" do
+        @person = Person.new({ addresses: [{ fname: "first name 1", lname: "last name 1", :country => {:code => "In", :name => "India", :continent => {:name => "asia", :desc => {:this => "is a test", :actual_desc => "is another test"}}}}, { fname: "first name 2", lname: "last name 2"}]})
+        @person.assign_attributes({ addresses: [{ fname: "first name 1", :country => {:name => "United States", :continent => {:desc => {:this => "is a replacement", :actual_desc => "is another replacement"}}}}, { fname: "first name 2", lname: "last name 2"}]})
+        @person.addresses.first.lname.should == "last name 1"
+        @person.addresses.last.lname.should == "last name 2"
+        @person.addresses.first.country.name.should == "United States"
+        @person.addresses.first.country.continent.name.should == "asia"
+      end
     end
   end
 end
 
-
 class Person < PlainOldModel::Base
   attr_accessor :fname, :lname, :address
   has_many :addresses
@@ -122,7 +163,6 @@ class Address < PlainOldModel::Base
   attr_writer :write_test
 
   has_one :country
-
 end
 
 class Country < PlainOldModel::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plain_old_model
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3603961560709073915
+      hash: 3516179471459458128
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,10 +139,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3603961560709073915
+      hash: 3516179471459458128
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: This gem is created to cater the projects which do not require a backend/database,