bound 0.1.3 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2f7a861be5786e9c63288302cd956278041d4465
+  data.tar.gz: 76a7db28ebbac84fe9596a443e8dda2cdc2dc199
+SHA512:
+  metadata.gz: 0eaa78599c10b8719ce5b7953529015877b3b39fab5a2eb1c01f93500c0ddd5b5a92b1f02002e2236254eea9d47dbbdc8f8b1a5865fa4f6df26e87c9a8c637ff
+  data.tar.gz: 486ae7ca380ebb1247f40e4ffe06a5a45e229170b637069dd3d3c1f8f3a1cec7c50ca407762c46d4c9ced2baac67bb4177b67873929020c131fc9b57c41dbb23

data/lib/bound.rb

@@ -33,6 +33,8 @@ class Bound
 
   class BoundClass
     class Attribute
+      NotImplemented = Class.new(RuntimeError)
+
       attr_reader :name, :value
       attr_accessor :nested_class
 
@@ -59,7 +61,7 @@ class Bound
         if object.respond_to?(method)
           object.send method
         else
-          raise NoMethodError, "undefined method `#{method}' for #{object}"
+          raise NotImplemented, "undefined method `#{method}' for #{object}"
         end
       end
 
@@ -197,9 +199,11 @@ class Bound
       end
     end
 
-    def initialize(hash_or_object = {})
+    def initialize(*seeds)
       @attributes = {}
-      seed hash_or_object
+      seeds.reverse.each do |seed|
+        seed_with seed
+      end
       validate!
     end
 
@@ -220,12 +224,12 @@ class Bound
       get_attributes.map(&:name)
     end
 
-    private
-
     def get_attribute(attribute_name)
       attribute_class = self.class.attrs[attribute_name]
       nested_class = self.class.nested_attr_classes[attribute_name]
 
+      return nil if attribute_class.nil?
+
       attribute = @attributes[attribute_name]
 
       unless attribute
@@ -237,21 +241,23 @@ class Bound
       attribute
     end
 
+    private
+
     def validate!
       get_attributes.each do |attribute|
         raise ArgumentError.new("Missing attribute: #{attribute.name}") unless attribute.valid?
       end
     end
 
-    def seed(hash_or_object)
-      case hash_or_object
+    def seed_with(seed)
+      case seed
       when Hash
         seeder = HashSeeder.new(self)
       else
         seeder = ObjectSeeder.new(self)
       end
 
-      seeder.seed(hash_or_object)
+      seeder.seed(seed)
     end
   end
 
@@ -262,6 +268,9 @@ class Bound
 
     def seed(hash)
       hash.each do |key, value|
+        attribute = @receiver.get_attribute(key)
+        next if attribute && attribute.is_assigned?
+
         method = "#{key}="
         @receiver.send method, value
       end
@@ -275,19 +284,29 @@ class Bound
 
     def seed(object)
       @receiver.get_attributes.each do |attribute|
+        next if attribute.is_assigned?
+
         begin
           value = attribute.call_on(object)
-        rescue NoMethodError
-          value = nil
-          raise ArgumentError, "missing #{attribute.name}" if attribute.required?
+          assign_to_receiver attribute, value
+        rescue BoundClass::Attribute::NotImplemented
+          # no assignment if object hasn't desired method
+          # this prevents null-assignments
         end
+      end
+    end
 
-        method = "#{attribute.name}="
-        if @receiver.respond_to?(method)
-          @receiver.send method, value
-        else
-          raise NoMethodError, "undefined method `#{method}' for #{self}"
-        end
+    private
+    def assign_to_receiver(attribute, value)
+      method = "#{attribute.name}="
+      send_method @receiver, method, value
+    end
+
+    def send_method(receiver, method, *args)
+      if receiver.respond_to?(method)
+        receiver.send method, *args
+      else
+        raise NoMethodError, "undefined method `#{method}' for #{receiver}"
       end
     end
   end

data/lib/bound/version.rb

@@ -1,3 +1,3 @@
 class Bound
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/bound_spec.rb

@@ -266,5 +266,25 @@ describe Bound do
     end
   end
 
+  describe 'seeding with multiple seeds' do
+    FunnyUser = Bound.required(:joke, :nose_color)
+
+    let(:hash) { {:joke => 'Text', :nose_color => 'blue'} }
+
+    it 'overwrites attributes from first to last' do
+      overwriting_hash = {:nose_color => 'RED'}
+      overwriting_object = HashObject.new(overwriting_hash)
+
+      [hash, object].each do |subject|
+        [overwriting_hash, overwriting_object].each do |overwriting_subject|
+          user = FunnyUser.new(subject, overwriting_subject)
+
+          assertion_description = [subject, overwriting_subject].inspect
+          assert_equal 'RED', user.nose_color, assertion_description
+        end
+      end
+    end
+  end
+
 
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bound
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Jakob Holderbaum
@@ -15,7 +14,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,23 +28,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,17 +56,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -100,33 +91,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3582315724912543482
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3582315724912543482
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Implements a nice helper for fast boundary definitions
 test_files:
 - spec/bound_spec.rb