casting 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 817477d1f96444e97690553a806289ef4abfce2f
-  data.tar.gz: f50a67f05c760518b3e2b1b93e817db06c8a2adf
+  metadata.gz: 0cca3576453e1acf20799cd80afe5a2e9e4c39cc
+  data.tar.gz: f892e78276d01554fa159d893507c61fcb4dcf37
 SHA512:
-  metadata.gz: 19dd0a57a2a785282fd3eb7bdce9ab973c332b13530000f8419a3fbc6ee69476fddd585073bf72d9b16318c960cdfe9c7c04b496071323a734bd2874e4977a9e
-  data.tar.gz: 88f35215738b381bdac0893fd3e4946c435e8aed8b62876e454f2674b316f53c31b07a93a956d412cc36d93190b2d5fd7ae648885d7f20e9ab29d013f91a52b3
+  metadata.gz: 68f289b4009fd5330f856fda1ce71f190ab8317fbf0aa343b9b4244afc6bcdb613be34457c3b98ceb120b620e889511b285099d1006cd6f679be874a6a0a1251
+  data.tar.gz: 75e7c54b13bad49081fd15597adc4891f3ebfdb5c66b423b0278ecbfd8a3dd48ff22ab1fcc6a2b40b7dae19a29d5e31d1a5a3b1a0986f9250c67e2c3c52c3950

data/lib/casting/client.rb

@@ -10,7 +10,7 @@ module Casting
         Casting::Client.set_delegation_strategy(self, *which.reverse)
       end
 
-      unless base.instance_methods.include?('delegate')
+      unless base.method_defined?('delegate')
         add_delegate_method_to(base)
       end
     end

data/lib/casting/missing_method_client_class.rb

@@ -27,11 +27,7 @@ module Casting
 
       def method_class_delegate(meth)
         __class_delegates__.find{|attendant|
-          if Module === attendant
-            attendant.instance_methods
-          else
-            attendant.methods
-          end.include?(meth)
+          attendant.method_defined?(meth)
         }
       end
     end

data/lib/casting/prepared_delegation.rb

@@ -1,17 +1,3 @@
-# Some features are only available in versions of Ruby
-# where this method is true
-unless defined?(self.module_method_rebinding?)
-  def module_method_rebinding?
-    return @__module_method_rebinding__ if defined?(@__module_method_rebinding__)
-    sample_method = Enumerable.instance_method(:to_a)
-    @__module_method_rebinding__ = begin
-      !!sample_method.bind(Object.new)
-    rescue TypeError
-      false
-    end
-  end
-end
-
 module Casting
 
   class MissingAttendant < StandardError
@@ -36,11 +22,10 @@ module Casting
     end
 
     def to(object_or_module)
-      @attendant = method_carrier(object_or_module)
+      @attendant = object_or_module
       begin
         check_valid_type
       rescue TypeError
-        raise unless module_method_rebinding?
         @attendant = method_module || raise
       end
       self
@@ -69,19 +54,7 @@ module Casting
       begin
         !client.nil? && delegated_method.bind(client)
       rescue TypeError
-        raise TypeError.new("`to' argument must be a module or an instance of #{client.class}")
-      end
-    end
-
-    def method_carrier(object_or_module)
-      if Module === object_or_module
-        if module_method_rebinding?
-          object_or_module
-        else
-          client.clone.extend(object_or_module)
-        end
-      else
-        object_or_module
+        raise TypeError.new("`to' argument must be a module or an object with #{delegated_method_name} defined in a module")
       end
     end
 
@@ -93,7 +66,7 @@ module Casting
       if Module === attendant
         attendant.instance_method(delegated_method_name)
       else
-        attendant.method(delegated_method_name).unbind
+        attendant.method(delegated_method_name).owner.instance_method(delegated_method_name)
       end
     rescue NameError => e
       raise InvalidAttendant.new(e.message)

data/lib/casting/version.rb

@@ -1,3 +1,3 @@
 module Casting
-  VERSION = '0.6.9'
+  VERSION = '0.7.0'
 end

data/test/casting_19_test.rb

@@ -2,8 +2,6 @@ require 'test_helper'
 
 describe Casting, '.delegating' do
   it 'delegates missing methods to object delegates' do
-    skip 'extending objects not used in this version of Ruby' if test_rebinding_methods?
-
     client = test_person
     client.extend(Casting::Client)
     client.delegate_missing_methods
@@ -26,8 +24,6 @@ end
 describe Casting::Delegation do
 
   it 'calls a method defined on another object of the same type' do
-    skip 'extending objects not used in this version of Ruby' if test_rebinding_methods?
-
     client = test_person
     attendant = test_person
     attendant.extend(TestPerson::Greeter)
@@ -36,8 +32,6 @@ describe Casting::Delegation do
   end
 
   it 'passes arguments to a delegated method' do
-    skip 'extending objects not used in this version of Ruby' if test_rebinding_methods?
-
     client = test_person
     attendant = test_person
     attendant.extend(TestPerson::Verbose)
@@ -46,16 +40,12 @@ describe Casting::Delegation do
   end
 
   it 'delegates when given a module' do
-    skip 'extending objects not used in this version of Ruby' if test_rebinding_methods?
-
     client = test_person
     delegation = Casting::Delegation.new('greet', client).to(TestPerson::Greeter)
     assert_equal 'hello', delegation.call
   end
 
   it 'does not delegate when given a class' do
-    skip 'extending objects not used in this version of Ruby' if test_rebinding_methods?
-
     client = test_person
     assert_raises(TypeError){
       Casting::Delegation.new('class_defined', client).to(Unrelated)

data/test/casting_20_test.rb

@@ -3,8 +3,6 @@ require 'test_helper'
 describe Casting::Delegation do
 
   it 'finds the module defining a method and uses it to delegate' do
-    skip 'not able to bind module methods in this version of Ruby' unless test_rebinding_methods?
-
     client = test_person
     attendant = Unrelated.new
     delegation = Casting::Delegation.new('unrelated', client).to(attendant)
@@ -12,8 +10,6 @@ describe Casting::Delegation do
   end
 
   it 'does not delegate to methods defined in classes' do
-    skip 'not able to bind module methods in this version of Ruby' unless test_rebinding_methods?
-
     client = test_person
     attendant = Unrelated.new
     assert_raises(TypeError){

data/test/client_test.rb

@@ -65,4 +65,17 @@ describe Casting::Client do
       client.delegate('to_s', client)
     }
   end
+
+  it 'does not delegate singleton methods' do
+    client = test_person.extend(Casting::Client)
+    client.delegate_missing_methods
+    attendant = test_person
+
+    def attendant.hello
+      'hello'
+    end
+    assert_raises(TypeError){
+      client.delegate('hello', attendant)
+    }
+  end
 end

data/test/delegation_test.rb

@@ -8,9 +8,12 @@ describe Casting::Delegation do
 
   it 'raises an error when calling without an attendant object' do
     delegation = Casting::Delegation.new('some_method', Object.new)
-    assert_raises(Casting::MissingAttendant){
-      delegation.call
-    }
+      begin
+        delegation.call
+      rescue StandardError => e
+      end
+    assert_kind_of Casting::MissingAttendant, e
+    assert_equal "You must set your attendant object using `to'.", e.message
   end
 
   it 'raises an error when setting an invalid attendant type' do

data/test/missing_method_client_test.rb

@@ -77,6 +77,19 @@ describe Casting::MissingMethodClient, '#uncast' do
 
     assert_equal 'name from TestPerson', jim.uncast.name
   end
+
+  it "removes the specified number of delegates" do
+    jim = test_person.extend(Casting::Client, Casting::MissingMethodClient)
+    jim.cast_as(TestPerson::Greeter, TestPerson::Verbose)
+
+    assert_includes(jim.delegated_methods(true), :psst)
+    assert_includes(jim.delegated_methods(true), :verbose)
+
+    jim.uncast(2)
+
+    refute_includes(jim.delegated_methods(true), :psst)
+    refute_includes(jim.delegated_methods(true), :verbose)
+  end
 end
 
 describe Casting::MissingMethodClient, '#delegated_methods' do

data/test/null_module_test.rb

@@ -1,23 +1,21 @@
 require 'test_helper'
 
-if test_rebinding_methods?
-  describe Casting::Null do
-    it 'will answer to any method with nil' do
-      client = TestPerson.new
-      client.extend(Casting::Client)
-      attendant = Casting::Null
+describe Casting::Null do
+  it 'will answer to any method with nil' do
+    client = TestPerson.new
+    client.extend(Casting::Client)
+    attendant = Casting::Null
 
-      assert_nil client.delegate('greet', attendant)
-    end
+    assert_nil client.delegate('greet', attendant)
   end
+end
 
-  describe Casting::Blank do
-    it 'will answer to any method with an empty string' do
-      client = TestPerson.new
-      client.extend(Casting::Client)
-      attendant = Casting::Blank
+describe Casting::Blank do
+  it 'will answer to any method with an empty string' do
+    client = TestPerson.new
+    client.extend(Casting::Client)
+    attendant = Casting::Blank
 
-      assert_empty client.delegate('greet', attendant)
-    end
+    assert_empty client.delegate('greet', attendant)
   end
 end

data/test/super_test.rb

@@ -22,7 +22,6 @@ end
 
 describe Casting, 'modules using delegate_super' do
   it 'call the method from the next delegate with the same arguments' do
-    skip 'extending objects not used in this version of Ruby' unless test_rebinding_methods?
     client = TestPerson.new.extend(Casting::Client)
     client.delegate_missing_methods
     client.cast_as(AnyWay, ThisWay, ThatWay)

data/test/test_helper.rb

@@ -81,18 +81,3 @@ end
 def test_person
   TestPerson.new
 end
-
-
-
-# This is a different implementation of module_method_rebinding?
-# created in order to check that the behavior of the code is correct.
-#
-# This method is used in tests and module_method_rebinding? is used
-# in the library code.
-def test_rebinding_methods?
-  unbound = Enumerable.instance_method(:count)
-  unbound.bind(Object.new)
-  true
-rescue TypeError
-  false
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casting
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Jim Gay