use 1.3.0 → 1.3.1

data/CHANGES

@@ -1,3 +1,8 @@
+== 1.3.1 - 31-Jul-2009
+* Fixed a bug where identical methods from different modules were being
+  inadvertently undefined.
+* Updated the main rdoc example and fixed a typo in the README synopsis.
+
 == 1.3.0 - 30-Jul-2009
 * Compatibility fixes for Ruby 1.9.x
 * Added structured_warnings as a dependency, and now emits a

data/README

@@ -16,21 +16,23 @@
    rake install_gem
 
 == Synopsis
+   require 'use'
+   
    module Foo
       def bar
-         "hello"
+         puts "hello"
       end
       def baz
-         "world"
+         puts "world"
       end
    end
 
    module Test
       def bar
-         "goodbye"
+         puts "goodbye"
       end
       def blah
-         "new york"
+         puts "new york"
       end
    end
 
@@ -42,12 +44,12 @@
    z = Zap.new
 
    z.bar  # => "hello"
+   z.blah # => "new york"
    z.baz  # => NoMethodError
-   z.blah # =>"new york"
    
    # Using the new keywords
    class MyKlass
-      use Foo :alias => {:bar => :test}
+      use Foo, :alias => {:bar => :test}
    end
    
    m = MyKlass.new

data/lib/use.rb

@@ -8,7 +8,7 @@ end
 
 class Class
    # The version of the 'use' library
-   USE_VERSION = '1.3.0'
+   USE_VERSION = '1.3.1'
 
    # Allows you to include mixins in a fine grained manner. Instead of
    # including all methods from a given module, you can can instead mixin
@@ -18,33 +18,33 @@ class Class
    # Examples:
    #
    #  # Defines a 'bar' and 'baz' method
-   #  module Foo
+   #  module Alpha
    #     def bar
-   #        "hello"
+   #        puts 'hello'
    #     end
    #     def baz
-   #       "world"
+   #       puts 'world'
    #     end
    #  end
    #
    #  # Defines a 'bar', 'blah', and 'zap' methods
-   #  module Test
+   #  module Beta
    #     def bar
-   #        "goodbye"
+   #        puts 'goodbye'
    #     end
    #     def blah
-   #        "new york"
+   #        puts 'new york'
    #     end
    #     def zap
-   #        "zap"
+   #        puts 'zap'
    #     end
    #  end
    #
-   #  # From the Foo module, only mixin the 'bar' method. From the Test
+   #  # From the Alpha module, only mixin the 'bar' method. From the Beta
    #  # module exclude the 'bar' and 'zap' methods.
    #  class Zap
-   #     use Foo, :bar
-   #     use Test, :exclude => [:bar, :zap]
+   #     use Alpha, :bar
+   #     use Beta, :exclude => [:bar, :zap]
    #  end
    #
    #  z = Zap.new
@@ -52,15 +52,15 @@ class Class
    #  z.bar  # => "hello"
    #  z.baz  # => NoMethodError - wasn't mixed in
    #  z.zap  # => NoMethodError - wasn't mixed in
-   #  z.blah # =>"new york"
+   #  z.blah # => "new york"
    #   
    #  # Alias a method on the fly
    #  class MyKlass
-   #     use Foo :alias => {:bar, :test}
+   #     use Alpha, :alias => {:bar, :test}
    #  end
    #   
    #  m = MyKlass.new
-   #  m.test # => "hello"
+   #  m.test # => 'hello'
    #  m.bar  # => NoMethodError - was aliased to 'test'
    #
    #  If no options follow the module name this method is identical
@@ -147,8 +147,9 @@ class Class
       # remove methods from classes that already exist unless specifically
       # included.
       unless included_methods.empty?
+         self_instance_methods = self.instance_methods.map{ |e| e.to_s }
          (local_instance_methods - included_methods).each{ |meth|
-            if superclass.instance_methods.include?(meth)
+            if self_instance_methods.include?(meth)
                if included_methods.include?(meth)
                   mod.module_eval{ undef_method(meth) rescue nil }
                else

data/test/sample_data.rb

@@ -42,6 +42,16 @@ module ModC
    end
 end
 
+module ModD
+   def meth_a
+      "ModD#meth_a"
+   end
+
+   def meth_b
+      "ModD#meth_b"
+   end
+end
+
 class ClassA
    use ModA, :meth_a
 end
@@ -64,3 +74,8 @@ class ClassD
       :alias   => {:meth_a => :meth_x, :meth_c => :meth_z},
       :exclude => :meth_b
 end
+
+class ClassE
+   use ModA, :meth_a
+   use ModD, :meth_b
+end

data/test/test_use.rb

@@ -15,6 +15,7 @@ class TC_Use < Test::Unit::TestCase
       @b = ClassB.new
       @c = ClassC.new
       @d = ClassD.new
+      @e = ClassE.new
    end
 
    # Convert symbols to strings for 1.9.x
@@ -24,7 +25,7 @@ class TC_Use < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.3.0', Class::USE_VERSION)
+      assert_equal('1.3.1', Class::USE_VERSION)
    end
 
    def test_mod_a_methods
@@ -39,6 +40,10 @@ class TC_Use < Test::Unit::TestCase
       assert_methods(['meth_x', 'meth_y', 'meth_z'], ModC.instance_methods.sort)
    end
 
+   def test_mod_d_methods
+      assert_methods(['meth_a', 'meth_b'], ModD.instance_methods.sort)
+   end
+
    def test_class_a_methods
       assert_respond_to(@a, :meth_a)
       assert_equal('ModA#meth_a', @a.meth_a)
@@ -93,10 +98,16 @@ class TC_Use < Test::Unit::TestCase
       assert_raise(NoMethodError){ @d.meth_c }
    end
 
+   def test_class_e_methods
+      assert_respond_to(@e, :meth_a)
+      assert_respond_to(@e, :meth_b)
+   end
+
    def teardown
       @a = nil
       @b = nil
       @c = nil
       @d = nil
+      @e = nil
    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: use
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -06:00
+date: 2009-07-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency