wrap 1.3.0 → 1.4.0

data/lib/wrap.rb

@@ -5,7 +5,7 @@
 ##
 #
   class << Wrap
-    Wrap::Version = '1.3.0' unless defined?(Wrap::Version)
+    Wrap::Version = '1.4.0' unless defined?(Wrap::Version)
 
     def version
       Wrap::Version
@@ -41,19 +41,40 @@
       other.send(:class_eval, &InstanceMethods)
     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
+    def Wrap.code_for(method)
+      name = method.name.to_s
+      arity = method.arity
+
+      case
+        when arity == 0
+          signature = <<-__.strip
+            def #{ name }(&block)
+              args = []
+          __
+
+        when arity < 0
+          argv = Array.new(arity.abs - 1){|i| "arg#{ i }"}
+          argv.push('*args')
+          argv = argv.join(', ')
+
+          signature = <<-__.strip
+            def #{ name }(#{ argv }, &block)
+              args = [#{ argv }]
+          __
+
+        when arity > 0
+          argv = Array.new(arity){|i| "arg#{ i }"}
+          argv = argv.join(', ')
+
+          signature = <<-__.strip
+            def #{ name }(#{ argv }, &block)
+              args = [#{ argv }]
+          __
       end
 
       code =
         <<-__
-          def #{ name }(#{ argv }, &block)
-            args = #{ argv_array }
+          #{ signature.strip }
              
             if running_callbacks?(#{ name.inspect })
               return wrapped_#{ name }(*args, &block)
@@ -128,6 +149,7 @@
       def wrap!(name)
         name = name.to_s
         method = instance_method(name)
+        arity = method.arity
 
         wrapping! name do
           name = name.to_s
@@ -141,7 +163,7 @@
 
           alias_method(wrapped_name, name)
 
-          module_eval(Wrap.code_for(name, method.arity))
+          module_eval(Wrap.code_for(method))
         end
       end
 

data/test/wrap_test.rb

@@ -329,7 +329,7 @@ Testing Wrap do
 
 ##
 #
-  testing 'that wrapping preserves method arity' do
+  testing 'that wrapping preserves method arity like a boss' do
     assert do
       wrapped_class do
         def foo(x, y) [x, y] end
@@ -341,6 +341,18 @@ Testing Wrap do
 
         assert{ instance_method(:foo).arity == 2 }
         assert{ new.foo(4, 2) == [4, 2] }
+
+        def foo() end
+        assert{ instance_method(:foo).arity == 0 }
+
+        def foo(x) end
+        assert{ instance_method(:foo).arity == 1 }
+
+        def foo(*x) end
+        assert{ instance_method(:foo).arity == -1 }
+
+        def foo(x, *y) end
+        assert{ instance_method(:foo).arity == -2 }
       end
     end
   end

data/wrap.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "wrap"
-  spec.version = "1.3.0"
+  spec.version = "1.4.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.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
-  requirement: &70321392671840 !ruby/object:Gem::Requirement
+  requirement: &70355214698460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 4.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70321392671840
+  version_requirements: *70355214698460
 description: ! 'description: wrap kicks the ass'
 email: ara.t.howard@gmail.com
 executables: []