soulless 0.5.0.rc4 → 0.5.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73404dc7c4d37dd5d37a9e9da0b1cbcf4ab270d7
-  data.tar.gz: 3f96ef0fb6469f40839715f5e47694e1ea2a6f0d
+  metadata.gz: 55f2a96f9a0f18a43db7ff06832033aa57bdb84d
+  data.tar.gz: b5dd5bae30504bfb5c17aff8b9745a0142985923
 SHA512:
-  metadata.gz: dd7cb188a6bd2073b7800be185d4dfff1fb8a80d906ee8efb6e26aefe2cf9e34a252e7834f1f9cab353297b4f5f69fd1a401aa62a064b243d3f8cd480791f7cc
-  data.tar.gz: 326844e42ebe27522d559ceac30e75357ed362f2cd15395f3632e5ca6dcd7fd6157cc65a7d11f4aad6a668618b17c887d37f4e93163916d765c2f3e5ef842ad5
+  metadata.gz: be0ba0bb958e7049229b0bdd6d0c583e7d2784b9f767ac7e6ff9f3499231c88f8cc25a172d1bdc39d1af968d89ad5b534e9577fe2c83b5862d3804d5626e8e9e
+  data.tar.gz: 9fb3d78389ba6974ad8ff60e6096cfc3efd660eb37f6bb023c8def6d72decbebe5f7bd9f8e013f8889b36052b3031283103026c0fdf7dd3a927d7ec1767e2e88

data/README.md

@@ -331,7 +331,7 @@ form.errors.messages # => { name: ["can't be blank"] }
 
 ```additional_attributes``` - Used to specify attributes that cannot automatically be added to the form model. These are generally attributes that have been specified using ```attr_accessor```. Accepts a string, symbol or an array of strings and symbols for multiple attributes.
 
-```validate_attribute_on``` - By default any validation that specifies an ```:on``` option will not be inherited. This option will allow you to inherit a validator that uses the ```:on``` with a specific value. Example usage: ```validate_password_on: :create`. Accepts a string or symbol. This option will accept any value that the Rails ```:on``` validator option can accept.
+```validate_attribute_on``` - By default any validation that specifies an ```:on``` option will not be inherited. This option will allow you to inherit a validator that uses the ```:on``` with a specific value. Example usage: ```validate_password_on: :create```. Accepts a string or symbol. This option will accept any value that the Rails ```:on``` validator option can accept.
 
 ### I18n
 
@@ -344,8 +344,9 @@ en:
     errors:
       models:
         person:
-          name:
-            blank: "there's nothing here"
+          attributes:
+            name:
+              blank: "there's nothing here"
 ```
 
 For attributes defined as ```has_one``` and ```has_many``` associations use the enclosing class as the locale key's namespace.
@@ -356,8 +357,9 @@ en:
     errors:
       models:
         person/spouse:
-          name:
-            blank: "there's nothing here"
+          attributes:
+            name:
+              blank: "there's nothing here"
 ```
 
 ## Contributing

data/lib/soulless/model.rb

@@ -33,9 +33,13 @@ module Soulless
             false
           end
         end
+        
+        def assign_attributes(attributes)
+          deep_update(self, attributes)
+        end
     
         def update_attributes(attributes)
-          deep_update(self, attributes)
+          assign_attributes(attributes)
           save
         end
     

data/lib/soulless/version.rb

@@ -1,3 +1,3 @@
 module Soulless
-  VERSION = "0.5.0.rc4"
+  VERSION = "0.5.0.rc5"
 end

data/spec/soulless_spec.rb

@@ -27,26 +27,29 @@ describe Soulless do
     @dummy_class.saved.should be_false
   end
   
-  it '#update_attributes should update multiple attributes and then save' do
-    @dummy_class.update_attributes(name: 'Yaw', email: 'yokoono@thebeatles.com')
-    @dummy_class.name.should == 'Yaw'
-    @dummy_class.email.should == 'yokoono@thebeatles.com'
-    @dummy_class.saved?.should be_true
+  it '#update_attributes should not save' do
+    @dummy_class.assign_attributes(name: 'Yaw', email: 'yokoono@thebeatles.com')
+    @dummy_class.saved?.should be_false
   end
   
-  it '#update_attributes should merge new values' do
+  it '#assign_attributes should merge new values' do
     @dummy_class.email = 'yokoono@thebeatles.com'
-    @dummy_class.update_attributes(name: 'Yaw')
+    @dummy_class.assign_attributes(name: 'Yaw')
     @dummy_class.name.should == 'Yaw'
     @dummy_class.email.should == 'yokoono@thebeatles.com'
   end
   
-  it '#update_attributes should deep merge new values' do
+  it '#assign_attributes should deep merge new values' do
     @dummy_class = DummyAssociation.new(spouse: { name: 'Megan' })
-    @dummy_class.update_attributes(spouse: { name: 'Mary Jane Watson' })
+    @dummy_class.assign_attributes(spouse: { name: 'Mary Jane Watson' })
     @dummy_class.spouse.name.should == 'Mary Jane Watson'
   end
   
+  it '#update_attributes should save' do
+    @dummy_class.update_attributes(name: 'Yaw', email: 'yokoono@thebeatles.com')
+    @dummy_class.saved?.should be_true
+  end
+  
   it '#persisted? should be false' do
     @dummy_class.persisted?.should be_false
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soulless
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc4
+  version: 0.5.0.rc5
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport