bound 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40eb13fe1d57fd0d42c0d0fc5c91348173071cb2
-  data.tar.gz: 61658fd50d9bf0dd3790b75bca0588e80863ca4f
+  metadata.gz: cc2a2abb3f5f3cec8ad904ad037dfbbbf77d3b7d
+  data.tar.gz: c1d7bc7dc181231fa857fd2ac0749bea48fb6488
 SHA512:
-  metadata.gz: 86f3b026b006ff92b6652cd3e37df15206bcb304150c4d9c3c0fee70809b02a65fce814f67dc92f40e4df87ef93e351b182420e38d968e8c8cac27e8fbe8b9c5
-  data.tar.gz: ebc0035cc9f636a9af6f798a3cb70ab0420834f73b8212b2f42d74b640217a6ebb5385b7e3e98830c42f6cbe0282757f2839e55a44d0c55b4d0167437177afd7
+  metadata.gz: 66cea5184ddda962bbb0ae8b2cc19e23075f1f01e03991e6b5b37819362d2b24dca324a62f218b36b45a55eb1493c93a73c3424d119780d66bc3f896856fc928
+  data.tar.gz: d9c232a68c91b193165ae4d8980e535b574560bb03435da1326a360bd305a2de7339b3a67b2b3cf60f894a740ca4b4472815f0699357a34a74c611a6ea0b7cd5

data/lib/bound.rb

@@ -1,4 +1,5 @@
 require "bound/version"
+require "bound/caller"
 
 class Bound
   def self.new(*args)
@@ -23,8 +24,6 @@ class Bound
 
   class BoundClass
     class Attribute
-      NotImplemented = Class.new(RuntimeError)
-
       attr_reader :name, :value
       attr_accessor :nested_class
 
@@ -47,12 +46,7 @@ class Bound
       end
 
       def call_on(object)
-        method = @name
-        if object.respond_to?(method)
-          object.send method
-        else
-          raise NotImplemented, "undefined method `#{method}' for #{object}"
-        end
+        Caller.call(object, @name)
       end
 
       def valid?
@@ -155,20 +149,22 @@ class Bound
           raise ArgumentError.new("Invalid list of attributes: #{attributes.inspect}")
         end
 
+        attribute_class = if is_optional
+                            Attribute
+                          else
+                            RequiredAttribute
+                          end
+
         attributes.each do |attribute|
-          if is_optional
-            self.attrs[attribute] = Attribute
-          else
-            self.attrs[attribute] = RequiredAttribute
-          end
+          self.attrs[attribute] = attribute_class
         end
 
         define_attribute_accessors attributes
 
         if nested_attributes.any?
           set_attributes flag, nested_attributes.keys
-          nested_attributes.each do |attribute_name, attribute_class|
-            self.nested_attr_classes[attribute_name] = attribute_class
+          nested_attributes.each do |attribute_name, nested_class|
+            self.nested_attr_classes[attribute_name] = nested_class
           end
         end
       end
@@ -195,15 +191,14 @@ class Bound
       end
     end
 
-    def initialize(*seeds)
+    def initialize(seed = nil, overwrite = nil)
       @attributes = {}
-      seeds.reverse.each do |seed|
-        seed_with seed
-      end
+      raise('Overwrite with object') if overwrite && !overwrite.kind_of?(Hash)
+      seed_with overwrite if overwrite
+      seed_with seed if seed
       validate!
     end
 
-
     def method_missing(meth, *args, &blk)
       attribute = meth.to_s.gsub(/=$/, '')
       raise ArgumentError.new("Unknown attribute: #{self.class}##{attribute}")
@@ -225,27 +220,24 @@ class Bound
     end
 
     def get_attribute(attribute_name)
-      attribute_class = self.class.attrs[attribute_name]
-      nested_class = self.class.nested_attr_classes[attribute_name]
+      return @attributes[attribute_name] if @attributes.has_key? attribute_name
 
+      attribute_class = self.class.attrs[attribute_name]
       return nil if attribute_class.nil?
 
-      attribute = @attributes[attribute_name]
+      nested_class = self.class.nested_attr_classes[attribute_name]
 
-      unless attribute
-        @attributes[attribute_name] = attribute_class.new(attribute_name)
-        attribute = @attributes[attribute_name]
-        attribute.nested_class = nested_class if nested_class
-      end
+      attribute = attribute_class.new(attribute_name)
+      attribute.nested_class = nested_class
 
-      attribute
+      @attributes[attribute_name] = attribute
     end
 
     def ==(other)
       return false unless other
 
       get_attributes.all? do |attribute|
-        attribute.value == other.public_send(attribute.name)
+        attribute.value == Caller.call(other, attribute.name)
       end
     end
 
@@ -297,9 +289,7 @@ class Bound
         begin
           value = attribute.call_on(object)
           assign_to_receiver attribute, value
-        rescue BoundClass::Attribute::NotImplemented
-          # no assignment if object hasn't desired method
-          # this prevents null-assignments
+        rescue NoMethodError
         end
       end
     end
@@ -307,15 +297,8 @@ class Bound
     private
     def assign_to_receiver(attribute, value)
       method = "#{attribute.name}="
-      send_method @receiver, method, value
+      @receiver.send(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
 end

data/lib/bound/caller.rb

@@ -0,0 +1,23 @@
+class Bound
+  class PublicSendCaller
+    def self.call(object, method, *args)
+      object.public_send(method, *args)
+    end
+  end
+
+  class ManualCaller
+    def self.call(object, method, *args)
+      if object.respond_to?(method)
+        object.send method, *args
+      else
+        raise NoMethodError, "undefined method `#{method}' for #{object}"
+      end
+    end
+  end
+
+  if Object.respond_to? :public_send
+    Caller = PublicSendCaller
+  else
+    Caller = ManualCaller
+  end
+end

data/lib/bound/version.rb

@@ -1,3 +1,3 @@
 class Bound
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/bound_spec.rb

@@ -351,15 +351,12 @@ describe Bound do
 
     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)
+        user = FunnyUser.new(subject, overwriting_hash)
 
-          assertion_description = [subject, overwriting_subject].inspect
-          assert_equal 'RED', user.nose_color, assertion_description
-        end
+        assertion_description = [subject, overwriting_hash].inspect
+        assert_equal 'RED', user.nose_color, assertion_description
       end
     end
   end

data/spec/caller_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Bound::Caller do
+
+  it 'calls the given method with args' do
+    assert_equal [22], Bound::Caller.call([], :push, 22)
+  end
+
+  it 'raises if method was not found' do
+    assert_raises NoMethodError do
+      Bound::Caller.call(22, :foobar)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bound
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jakob Holderbaum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,8 +84,10 @@ files:
 - benchmark.rb
 - bound.gemspec
 - lib/bound.rb
+- lib/bound/caller.rb
 - lib/bound/version.rb
 - spec/bound_spec.rb
+- spec/caller_spec.rb
 - spec/hash_object_spec.rb
 - spec/spec_helper.rb
 - spec/support/hash_object.rb
@@ -115,6 +117,7 @@ specification_version: 4
 summary: Implements a nice helper for fast boundary definitions
 test_files:
 - spec/bound_spec.rb
+- spec/caller_spec.rb
 - spec/hash_object_spec.rb
 - spec/spec_helper.rb
 - spec/support/hash_object.rb