unextendable 0.1.6 → 0.1.7

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Unextendable CHANGELOG
 
+== Version 0.1.7 (August 15, 2012)
+
+* Support (un-)extending private / protected methods. Thanks Stephan Kaag (@stephankaag) for contributing
+
 == Version 0.1.6 (January 9, 2012)
 
 * Being able to tackle 'BlankObject instances' when extending:

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/unextendable/module.rb

@@ -1,5 +1,11 @@
 class Module
 
+  def my_methods(include_private = true)
+    public_instance_methods.tap do |methods|
+      return methods + private_instance_methods + protected_instance_methods if include_private
+    end
+  end
+
   def unextendable
     @unextendable = true
   end

data/lib/unextendable/object.rb

@@ -43,7 +43,7 @@ private
   def wrap_unextendable_module(mod)
     return unless (mod.class == Module) && mod.unextendable?
 
-    mod.instance_methods.each do |method_name|
+    mod.my_methods.each do |method_name|
       wrap_unextendable_method method_name
     end
 
@@ -51,12 +51,12 @@ private
 
     instance_eval <<-CODE
       def respond_to?(symbol, include_private = false)
-        meta_class.extended_modules.any?{|x| x.instance_methods.collect(&:to_s).include? symbol.to_s} ||
+        meta_class.extended_modules.any?{|x| x.my_methods(include_private).collect(&:to_s).include? symbol.to_s} ||
         begin
           if meta_class.method_procs.has_key? symbol.to_s
             meta_class.method_procs[symbol.to_s].class == Proc
           else
-            self.class.instance_methods.collect(&:to_s).include? symbol.to_s
+            self.class.my_methods(include_private).collect(&:to_s).include? symbol.to_s
           end
         end
       end
@@ -68,7 +68,7 @@ private
   def wrap_unextendable_method(method_name)
     return if meta_class.method_procs.key? method_name.to_s
 
-    meta_class.method_procs[method_name.to_s] = respond_to?(method_name) ? method(method_name.to_s).to_proc : nil
+    meta_class.method_procs[method_name.to_s] = respond_to?(method_name, true) ? method(method_name.to_s).to_proc : nil
 
     instance_eval <<-CODE
       def #{method_name}(*args, &block)
@@ -91,7 +91,7 @@ private
   end
 
   def method_for(method_name)
-    mod = meta_class.extended_modules.detect{|x| x.instance_methods.collect(&:to_s).include? method_name.to_s}
+    mod = meta_class.extended_modules.detect{|x| x.my_methods.collect(&:to_s).include? method_name.to_s}
     mod ? mod.instance_method(method_name).bind(self) : proc_for(method_name)
   end
 

data/lib/unextendable/version.rb

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

data/test/object_test.rb

@@ -17,6 +17,10 @@ class ObjectTest < Test::Unit::TestCase
         def name
           "C"
         end
+      private
+        def id
+          "C"
+        end
       end
       @c = C.new
       @c.title = "Mr."
@@ -72,6 +76,14 @@ class ObjectTest < Test::Unit::TestCase
 
       context "which are unextendable" do
         setup do
+          module B
+            unextendable
+          public
+            def id
+              "B"
+            end
+          end
+
           module U
             unextendable
             def name
@@ -80,6 +92,10 @@ class ObjectTest < Test::Unit::TestCase
             def foo
               "bar"
             end
+          private
+            def id
+              "U"
+            end
           end
         end
 
@@ -95,14 +111,14 @@ class ObjectTest < Test::Unit::TestCase
         end
 
         should "call wrap_unextendable_method" do
-          @c.expects(:wrap_unextendable_method).twice
+          @c.expects(:wrap_unextendable_method).times(3)
           @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
+          assert_equal 2, @c.meta_class.method_procs.select{|k, v| v.class == Proc}.size
         end
 
         should "add the module to extended_modules" do
@@ -114,7 +130,7 @@ class ObjectTest < Test::Unit::TestCase
         should "add method proc to method_procs" do
           assert @c.meta_class.send(:method_procs).empty?
           @c.extend U
-          assert_equal 2, @c.meta_class.send(:method_procs).size
+          assert_equal 3, @c.meta_class.send(:method_procs).size
         end
 
         context "when calling an unextendable method" do
@@ -151,11 +167,24 @@ class ObjectTest < Test::Unit::TestCase
 
         context "when unextending the module afterwards" do
           should "remove the module from extended_modules" do
+            exception = assert_raises(NoMethodError) do
+              @c.id
+            end
+            assert_equal "private method `id' called for", exception.message[0..29]
+            assert_equal "C", @c.send(:id)
+
             @c.extend U
             assert @c.meta_class.extended_modules.include?(U)
+            assert_equal "private method `id' called for", exception.message[0..29]
+            assert_equal "U", @c.send(:id)
+
+            @c.extend B
+            assert_equal "B", @c.send(:id)
 
-            @c.unextend U
+            @c.unextend
             assert !@c.meta_class.extended_modules.include?(U)
+            assert_equal "private method `id' called for", exception.message[0..29]
+            assert_equal "C", @c.send(:id)
           end
 
           should "remove the module but when passed a block only when it passes" do

metadata

@@ -1,52 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: unextendable
-version: !ruby/object:Gem::Version
-  version: 0.1.6
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.1.7
 platform: ruby
-authors:
+authors: 
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &2152388140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152388140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &2152384460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152384460
-description: ! 'Unextendable originated from the thought of being able to implement
-  the State pattern within object instances using modules. In other words: I wanted
-  object instances to behave dependent on their state using modules. I really want
-  to use modules because they are commonly used to define a set of methods which you
-  can extend within an object instance. Unfortunately, you cannot just unexclude a
-  module. So after searching the web for solutions, I came across Mixology, evil-ruby
-  and StatePattern. But they slightly did not fit the picture. So after doing some
-  research, I came up with Unextendable.'
-email:
+  version_requirements: *id002
+description: "Unextendable originated from the thought of being able to implement the State pattern within object instances using modules. In other words: I wanted object instances to behave dependent on their state using modules. I really want to use modules because they are commonly used to define a set of methods which you can extend within an object instance. Unfortunately, you cannot just unexclude a module. So after searching the web for solutions, I came across Mixology, evil-ruby and StatePattern. But they slightly did not fit the picture. So after doing some research, I came up with Unextendable."
+email: 
 - paul.engel@holder.nl
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG.rdoc
 - Gemfile
@@ -68,31 +65,34 @@ files:
 - unextendable.gemspec
 homepage: https://github.com/archan937/unextendable
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: unextendable
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: A small gem making unextending extended module methods within object instances
-  possible
-test_files:
+summary: A small gem making unextending extended module methods within object instances possible
+test_files: 
 - test/blank_object_test.rb
 - test/module_test.rb
 - test/object_test.rb
 - test/test_helper.rb
+has_rdoc: