unextendable 0.1.1 → 0.1.3

data/CHANGELOG.rdoc

@@ -1,5 +1,18 @@
 = Unextendable CHANGELOG
 
+== Version 0.1.3 (May 2, 2011)
+
+* Always returning boolean when calling object.meta_class?
+* Corrected the arguments definition of instance.respond_to? (being able to pass include_private)
+
+== Version 0.1.2 (May 2, 2011)
+
+* Improved object_instance.unextend
+* Created a single point of definition for determination to whether or not unextend a certain module
+* Added object.meta_class? (aliased with singleton_class?)
+* Fixed error raised when trying to wrap a non-existing object instance method
+* Corrected respond_to? and raising NoMethodError when calling an unextended module method which wasn't defined in the object instance itself
+
 == Version 0.1.1 (May 1, 2011)
 
 * Being able to pass a block to 'unextend' and only unextending a module when the block passes

data/README.textile

@@ -100,19 +100,25 @@ After that, you can do the following:
   c.salutation #=> "Mr. X"
   c.extend U
   c.salutation #=> "Mr. U"
+  c.unextend U
+  c.salutation #=> "Mr. X"
   c.unextend
   c.salutation #=> "Mr. C"
   c.extend A
   c.salutation #=> "Mr. A"
   c.extend X
   c.salutation #=> "Mr. X"
+  c.unextend do |mod|
+    mod == U
+  end
+  c.salutation #=> "Mr. X"
   c.unextend
   c.salutation #=> "Mr. A" (because module A is NOT unextendable)
 </pre>
 
 h2. Last remarks
 
-Please check out "https://github.com/archan937/unextendable/blob/master/test/object_instance_test.rb":https://github.com/archan937/unextendable/blob/master/test/object_instance_test.rb for most of the tests.
+Please check out "https://github.com/archan937/unextendable/blob/master/test/object_instance_test.rb":https://github.com/archan937/unextendable/blob/master/test/object_instance_test.rb for most of the tests available. You can run the unit tests with @rake@ within the terminal.
 
 Also, the Unextendable repo is provided with @script/console@ which you can run for testing purposes. The module and class definitions are already defined when starting up and the object instance <code>@c</code> of the class @C@ is also defined.
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/unextendable/object.rb

@@ -8,6 +8,11 @@ class Object
   end
   alias :singleton_class :meta_class
 
+  def meta_class?
+    !!(meta_class rescue false)
+  end
+  alias :singleton_class? :meta_class?
+
   meta_class do
     def extended_modules
       @extended_modules ||= []
@@ -29,17 +34,29 @@ class Object
   def unextend(*modules, &block)
     if modules.empty?
       meta_class.extended_modules.delete_if do |mod|
-        mod.unextendable? if !block_given? || block.call(mod)
+        unextend? mod, &block
       end
     else
       modules.each do |mod|
-        meta_class.extended_modules.delete mod if !block_given? || block.call(mod)
+        meta_class.extended_modules.delete mod if unextend? mod, &block
       end
     end
   end
 
+  def respond_to?(symbol, include_private = false)
+    if meta_class? && meta_class.extended_modules.any?{|mod| mod.unextendable?}
+      meta_class.extended_modules.detect{|x| x.instance_methods.include? symbol.to_s} || meta_class.method_procs[symbol.to_s].class == Proc
+    else
+      !(meta_class? && meta_class.method_procs.key?(symbol.to_s) && meta_class.method_procs[symbol.to_s].nil?) && super
+    end
+  end
+
 private
 
+  def unextend?(mod, &block)
+    mod.unextendable? && (!block_given? || !!block.call(mod))
+  end
+
   def wrap_unextendable_module(mod)
     return unless (mod.class == Module) && mod.unextendable?
 
@@ -51,7 +68,7 @@ private
   def wrap_unextendable_method(name)
     return if meta_class.method_procs.key? name
 
-    meta_class.method_procs[name] = method(name).to_proc
+    meta_class.method_procs[name] = respond_to?(name) ? method(name).to_proc : nil
 
     instance_eval <<-CODE
       def #{name}(*args, &block)
@@ -66,7 +83,11 @@ private
   end
 
   def call_unextendable_method(method_name, *args, &block)
-    method_for(method_name).call(*args, &block)
+    if method = method_for(method_name)
+      method.call(*args, &block)
+    else
+      raise NoMethodError, "undefined method `#{method_name}' for #{self.inspect}"
+    end
   end
 
   def method_for(method_name)
@@ -75,7 +96,9 @@ private
   end
 
   def proc_for(method_name)
-    meta_class.method_procs[method_name.to_s] || method(method_name.to_s)
+    meta_class.method_procs.key?(method_name.to_s) ?
+      meta_class.method_procs[method_name.to_s] :
+      method(method_name.to_s)
   end
 
 end

data/lib/unextendable/version.rb

@@ -1,7 +1,7 @@
 module Unextendable
   MAJOR = 0
   MINOR = 1
-  TINY  = 1
+  TINY  = 3
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/object_instance_test.rb

@@ -77,6 +77,9 @@ class ObjectInstanceTest < Test::Unit::TestCase
             def name
               "U"
             end
+            def foo
+              "bar"
+            end
           end
         end
 
@@ -86,10 +89,16 @@ class ObjectInstanceTest < Test::Unit::TestCase
         end
 
         should "call wrap_unextendable_method" do
-          @c.expects(:wrap_unextendable_method)
+          @c.expects(:wrap_unextendable_method).twice
           @c.extend U
         end
 
+        should "add nil value as method proc when not responding to module method name" do
+          @c.extend U
+          assert_equal 1, @c.meta_class.method_procs.select{|k, v| v.nil?}.size
+          assert_equal 1, @c.meta_class.method_procs.select{|k, v| v.class == Proc}.size
+        end
+
         should "add the module to extended_modules" do
           assert @c.meta_class.extended_modules.empty?
           @c.extend U
@@ -99,7 +108,7 @@ class ObjectInstanceTest < Test::Unit::TestCase
         should "add method proc to method_procs" do
           assert @c.meta_class.send(:method_procs).empty?
           @c.extend U
-          assert_equal 1, @c.meta_class.send(:method_procs).size
+          assert_equal 2, @c.meta_class.send(:method_procs).size
         end
 
         context "when calling an unextendable method" do
@@ -176,16 +185,32 @@ class ObjectInstanceTest < Test::Unit::TestCase
               @c.title = "Dr."
               assert_equal "Dr. C", @c.salutation
 
+              assert !@c.respond_to?(:foo)
+              assert_raise NoMethodError do
+                @c.foo
+              end
+
               @c.extend U
               assert_equal "Dr. U", @c.salutation
               @c.title = "Sir"
               assert_equal "Sir U", @c.salutation
 
+              assert @c.respond_to?(:foo)
+              assert_nothing_raised NoMethodError do
+                @c.foo
+              end
+              assert_equal "bar", @c.foo
+
               @c.unextend U
               assert_equal "Sir C", @c.salutation
               @c.title = ""
               assert_equal "C", @c.salutation
 
+              assert !@c.respond_to?(:foo)
+              assert_raise NoMethodError do
+                @c.foo
+              end
+
               @c.extend U
               assert_equal "U", @c.salutation
               @c.title = "Ms."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unextendable
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 +02:00
-default_executable: 
+date: 2011-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -73,7 +72,6 @@ files:
 - test/object_instance_test.rb
 - test/test_helper.rb
 - unextendable.gemspec
-has_rdoc: true
 homepage: https://github.com/archan937/unextendable
 licenses: []
 
@@ -103,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: unextendable
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A small gem making unextending extended module methods within object instances possible