wrap 1.1.0 → 1.2.0

data/lib/wrap.rb

@@ -5,7 +5,7 @@
 ##
 #
   class << Wrap
-    Version = '1.1.0' unless defined?(Version)
+    Version = '1.2.0' unless defined?(Version)
 
     def version
       Version
@@ -41,26 +41,37 @@
       other.send(:class_eval, &InstanceMethods)
     end
 
-    def Wrap.code_for(name)
-      <<-__
-        def #{ name }(*args, &block)
-          if running_callbacks?(#{ name.inspect })
-            return wrapped_#{ name }(*args, &block)
-          end
+    def Wrap.code_for(name, arity)
+      if arity <= 0
+        argv = "*argv"
+        argv_array = "argv"
+      else
+        argv = Array.new(arity){|i| "arg#{ i }"}.join(', ')
+        argv_array = argv
+      end
 
-          running_callbacks(#{ name.inspect }) do
-            catch(:halt) do
-              return false unless run_callbacks(:before, #{ name.inspect }, args)
+      code =
+        <<-__
+          def #{ name }(#{ argv }, &block)
+            args = #{ argv_array }
+             
+            if running_callbacks?(#{ name.inspect })
+              return wrapped_#{ name }(*args, &block)
+            end
 
-              begin
-                result = wrapped_#{ name }(*args, &block)
-              ensure
-                run_callbacks(:after, #{ name.inspect }, [result]) unless $!
+            running_callbacks(#{ name.inspect }) do
+              catch(:halt) do
+                return false unless run_callbacks(:before, #{ name.inspect }, args)
+
+                begin
+                  result = wrapped_#{ name }(*args, &block)
+                ensure
+                  run_callbacks(:after, #{ name.inspect }, [result]) unless $!
+                end
               end
             end
           end
-        end
-      __
+        __
     end
 
     ClassMethods = proc do
@@ -130,7 +141,7 @@
 
           alias_method(wrapped_name, name)
 
-          module_eval(Wrap.code_for(name))
+          module_eval(Wrap.code_for(name, method.arity))
         end
       end
 

data/test/wrap_test.rb

@@ -327,6 +327,24 @@ Testing Wrap do
     end
   end
 
+##
+#
+  testing 'that wrapping preserves method arity' do
+    assert do
+      wrapped_class do
+        def foo(x, y) [x, y] end
+
+        assert{ instance_method(:foo).arity == 2 }
+        assert{ new.foo(4, 2) == [4, 2] }
+
+        wrap :foo
+
+        assert{ instance_method(:foo).arity == 2 }
+        assert{ new.foo(4, 2) == [4, 2] }
+      end
+    end
+  end
+
 private
   def wrapped_class(&block)
     tc = self

data/wrap.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "wrap"
-  spec.version = "1.1.0"
+  spec.version = "1.2.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: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
-  requirement: &70155276120700 !ruby/object:Gem::Requirement
+  requirement: &70251455330920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 4.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70155276120700
+  version_requirements: *70251455330920
 description: ! 'description: wrap kicks the ass'
 email: ara.t.howard@gmail.com
 executables: []