wrap 0.4.3 → 0.5.0

data/lib/wrap.rb

@@ -5,7 +5,7 @@
 ##
 #
   class << Wrap
-    Version = '0.4.3' unless defined?(Version)
+    Version = '0.5.0' unless defined?(Version)
 
     def version
       Version
@@ -16,31 +16,13 @@
         'map'        =>  [ 'map'         , ' >= 4.7.1'   ]
       }
     end
-
-    def libdir(*args, &block)
-      @libdir ||= File.expand_path(__FILE__).sub(/\.rb$/,'')
-      args.empty? ? @libdir : File.join(@libdir, *args)
-    ensure
-      if block
-        begin
-          $LOAD_PATH.unshift(@libdir)
-          block.call()
-        ensure
-          $LOAD_PATH.shift()
-        end
-      end
-    end
-
-    def load(*libs)
-      libs = libs.join(' ').scan(/[^\s+]+/)
-      Wrap.libdir{ libs.each{|lib| Kernel.load(lib) } }
-    end
   end
 
 ##
 #
   begin
     require 'rubygems'
+    Wrap.dependencies.each{|name, dependency| gem(*dependency)}
   rescue LoadError
     nil
   end
@@ -82,15 +64,8 @@
     end
 
     ClassMethods = proc do
-      def wrap(name, *args, &block)
-        define_method(name){} unless method_defined?(name)
-
-        wrap!(name)
-      end
-
       def method_added(name)
         return super if wrapping?
-
         begin
           super
         ensure
@@ -98,18 +73,43 @@
         end
       end
 
+      def include(other)
+        super
+      ensure
+        other.instance_methods.each do |name|
+          if wrapped?(name)
+            begin
+              remove_method(name)
+            rescue NameError
+              nil
+            end
+            rewrap!(name)
+          end
+        end
+      end
+
+      def wrap(name, *args, &block)
+        define_method(name){} unless method_defined?(name)
+        wrap!(name)
+      end
+
       def wrapped?(name)
         method_defined?("wrapped_#{ name }")
       end
 
       def wrap!(name)
+        name = name.to_s
+        method = instance_method(name)
+
         wrapping! name do
           name = name.to_s
           wrapped_name = "wrapped_#{ name }"
 
-          method = instance_method(name)
-
-          remove_method(wrapped_name) if method_defined?(wrapped_name)
+          begin
+            remove_method(wrapped_name)
+          rescue NameError
+            nil
+          end
 
           alias_method(wrapped_name, name)
 

data/test/wrap_test.rb

@@ -207,6 +207,40 @@ Testing Wrap do
     end
   end
 
+##
+#
+  testing 'that methods added via module inclusion preserve wrapping too' do
+    c =
+      assert do
+        wrapped_class do
+          define_method(:foo){ accum.push(:original); accum }
+
+          wrap :foo
+
+          before(:foo){ accum.push(:before) }
+          after(:foo){ accum.push(:after) }
+        end
+      end
+
+    assert do
+      o = c.new
+      o.foo()
+      assert o.accum === [:before, :original, :after]
+    end
+
+    m =
+      Module.new do
+        define_method(:foo){ accum.push(:mixin); accum }
+      end
+
+    c.send(:include, m)
+
+    assert do
+      o = c.new
+      o.foo()
+      assert o.accum === [:before, :mixin, :after]
+    end
+  end
 
 private
   def wrapped_class(&block)

data/wrap.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "wrap"
-  spec.version = "0.4.3"
+  spec.version = "0.5.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "wrap"
   spec.description = "description: wrap kicks the ass"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrap
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2011-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
-  requirement: &70328097412480 !ruby/object:Gem::Requirement
+  requirement: &70362008679240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 4.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70328097412480
+  version_requirements: *70362008679240
 description: ! 'description: wrap kicks the ass'
 email: ara.t.howard@gmail.com
 executables: []