bound 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7019abbcba367ffde338074a378485042f539b0b
-  data.tar.gz: 41ec48902a59084d62cb5a6b7ee281b32dc29296
+  metadata.gz: 2b4fefc3a0104facef9758ab7c625956d2b7aa61
+  data.tar.gz: 6d9fd0b0f0751f68f9aab060d28f5784c441daa2
 SHA512:
-  metadata.gz: 10fccfaecf7a65a8b92de435b3d8865306eee571ba916f9dfbeb97a95dc7aca6dcf2e856ac885b74210ff26d944f2c3c28125db1d04d4f0d5c7a0465a872ec12
-  data.tar.gz: cbfc59f94eb61dbd59b70c15b119cf1635a159cdf6918d11cf891de114a4e97df161dd0e5f30a1830357cf2af74bb72aff44b358aabd86a19955fc397da51611
+  metadata.gz: 9a0d2d024a524b3d7f6072d293cf0a083315a72fc059630c0cd25a88a336f0423900c08511bd8108ea9a35c8c1009a298f11ab76c61ffbb4141685028e9a09e8
+  data.tar.gz: c97baed792361e20ee2a9673d7343d51905083e210e299caea362318c9ef71a73dec36ac5e296382dfa7e6ca2a12a640863e6e8fefcdfeb181e8d545d6301049

data/lib/bound.rb

@@ -33,24 +33,26 @@ class Bound
   class BoundValidator
     attr_accessor :attributes, :optional_attributes, :nested_array_attributes
 
-    def initialize(target, overwrite)
+    def initialize(bound, target, overwrite)
+      @bound = bound
       @target = target
       @overwrite = overwrite
     end
 
     def validate!
-      ensure_all_attributes_are_known!
+      ensure_all_given_attributes_are_known!
       attributes.each do |attribute|
         ensure_present! attribute
       end
       nested_array_attributes.each do |nested_array_attribute|
         ensure_array! nested_array_attribute
       end
+      ensure_all_attributes_are_callable!
     end
 
     private
 
-    def ensure_all_attributes_are_known!
+    def ensure_all_given_attributes_are_known!
       (overwritten_attrs + target_attrs).each do |attr|
         unless (attributes + optional_attributes).include? attr
           a = (attributes + optional_attributes).inspect
@@ -81,6 +83,16 @@ class Bound
       end
     end
 
+    def ensure_all_attributes_are_callable!
+      attributes.each do |attr|
+        @bound.send attr
+      end
+      optional_attributes.each do |attr|
+        @bound.send attr if set? attr
+      end
+    end
+
+
     def overwritten_attrs
       if @overwrite
         @overwrite.keys
@@ -114,6 +126,10 @@ class Bound
       @target &&
         @target.kind_of?(Hash)?@target[attr]:@target.send(attr)
     end
+
+    def set?(attr)
+      target_has?(attr) || overwritten?(attr)
+    end
   end
 
   class StaticBoundClass
@@ -185,7 +201,7 @@ class Bound
       end.join(',')
       code = <<-EOR
         def validate!
-          v = Bound::BoundValidator.new(@t, @o)
+          v = Bound::BoundValidator.new(self, @t, @o)
           v.attributes = [#{attributes}]
           v.optional_attributes = [#{optional_attributes}]
           v.nested_array_attributes = [#{nested_array_attributes}]

data/lib/bound/version.rb

@@ -1,3 +1,3 @@
 class Bound
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/spec/bound_spec.rb

@@ -15,6 +15,16 @@ describe Bound do
     end
   end
 
+  it 'does not cache the set attributes' do
+    user = User.new(hash)
+    hash[:name] = 'AAA'
+    assert_equal 'AAA', user.name
+
+    user = User.new(object)
+    object.name = 'AAA'
+    assert_equal 'AAA', user.name
+  end
+
   it 'fails if attribute is missing' do
     hash.delete :age
 
@@ -158,6 +168,16 @@ describe Bound do
         UserWithProfile.new(subject)
       end
     end
+
+    it 'fails if argument of optional nested bound is missing' do
+      hash[:profile].delete(:age)
+      [hash, object].each do |subject|
+        error = assert_raises ArgumentError do
+          UserWithProfile.new(subject)
+        end
+        assert_match(/missing/i, error.message)
+      end
+    end
   end
 
   describe 'no attributes' do
@@ -189,6 +209,26 @@ describe Bound do
         assert_equal hash[:company][:address][:street], user.company.address.street
       end
     end
+
+    it 'fails if nested attributes are missing' do
+      hash[:company].delete(:name)
+      [hash, object].each do |subject|
+        error = assert_raises ArgumentError do
+          user = EmployedUser.new(subject)
+        end
+        assert_match(/missing/i, error.message)
+      end
+    end
+
+    it 'does not cache values in the nested bound' do
+      user = EmployedUser.new(hash)
+      hash[:company][:name] = 'AAA'
+      assert_equal 'AAA', user.company.name
+
+      user = EmployedUser.new(object)
+      object.company.name = 'AAA'
+      assert_equal 'AAA', user.company.name
+    end
   end
 
   describe 'array of nested attribute' do
@@ -214,6 +254,26 @@ describe Bound do
       end
     end
 
+    it 'fails if nested bound is missing an attribute' do
+      hash[:posts][1].delete(:title)
+      [hash, object].each do |subject|
+        error = assert_raises ArgumentError do
+          BloggingUser.new(subject)
+        end
+        assert_match(/missing/i, error.message)
+      end
+    end
+
+    it 'does not cache values in the array' do
+      user = BloggingUser.new(hash)
+      hash[:posts][0][:title] = 'AAA'
+      assert_equal 'AAA', user.posts[0].title
+
+      user = BloggingUser.new(object)
+      object.posts[0].title = 'AAA'
+      assert_equal 'AAA', user.posts[0].title
+    end
+
     describe 'equality' do
       let(:user) { BloggingUser.new(hash) }
       it 'is given if the nested attributes are equal' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bound
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jakob Holderbaum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler