method-args 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    method_args (0.0.1)
+    method-args (0.0.3)
       ruby2ruby (~> 1.2.4)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0.4)
@@ -26,7 +26,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   callsite (~> 0.0.4)
-  method_args!
+  method-args!
   minitest
   phocus
   rake

data/README.markdown

@@ -15,7 +15,7 @@ Pretend you have a file `your_ruby_file.rb`:
         @default_value = 'hello'
       end
 
-      def something(one, two = 'two', three = @default_value)
+      def something(one, two = 'two', three = @default_value, *more, &block)
       end
     end
 
@@ -27,10 +27,10 @@ To look at the arguments to something, do the following.
 This will return an `ArgList` object. You can then look at the names & types.
 
     MyClass.instance_method(:something).args.names
-    # => [:one, :two, :three]
+    # => [:one, :two, :three, :more, :block]
 
     MyClass.instance_method(:something).args.types
-    # => [:required, :optional, :splat]
+    # => [:required, :optional, :optional, :splat, :block]
     
 If you want to get the value of a default argument, you'll need a context in which to evaluate it, namely,
 an instance of the class from which the method derives.

data/Rakefile

@@ -3,6 +3,7 @@ require 'bundler'
 
 desc "Run tests"
 task :test do
+  $: << '.'
   $: << 'lib'
   require 'method_args'
   require 'test/helper'

data/lib/method_args.rb

@@ -145,10 +145,10 @@ module MethodArgs
         t = exp.shift
         case t
         when Symbol
-          arg_list << if t.to_s[0] == ?*
-            ArgList::Arg.new(t.to_s[1, t.to_s.size].to_sym, :splat)
-          else
-            ArgList::Arg.new(t, :required)
+          arg_list << case t.to_s[0]
+          when ?* then ArgList::Arg.new(t.to_s[1, t.to_s.size].to_sym, :splat)
+          when ?& then ArgList::Arg.new(t.to_s[1, t.to_s.size].to_sym, :block)
+          else         ArgList::Arg.new(t, :required)
           end
         when Sexp
           case t.shift
@@ -166,7 +166,7 @@ module MethodArgs
     end
 
     def add_methods
-      unless current_class.const_defined?(:ArgList)
+      unless current_class.method(:const_defined?).arity == 2 ? current_class.const_defined?(:ArgList, false) : current_class.const_defined?(:ArgList)
         current_class.send(:const_set, :ArgList, @method_maps[current_classname])
         current_class.module_eval(<<-HERE_DOC, __FILE__, __LINE__)
           alias_method :__method__, :method
@@ -189,7 +189,7 @@ module MethodArgs
           def self.instance_arg_list(method_name)
             method = __instance_method__(method_name)
             if method.owner == self
-              ArgList[method_name]
+              ArgList[method_name] or raise('i don\\'t know this method ' + method_name.inspect)
             elsif method.owner.respond_to?(:instance_arg_list)
               method.owner.instance_arg_list(method_name)
             # elsif method.respond_to?(:source_location)

data/lib/method_args/version.rb

@@ -1,3 +1,3 @@
 module MethodArgs
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/fixtures/3.rb

@@ -0,0 +1,4 @@
+class MyClass
+  def block(arg, arg2 = 1, *splat, &blk)
+  end
+end

data/test/test_block.rb

@@ -0,0 +1,9 @@
+class TestBlock < MiniTest::Unit::TestCase
+  def setup
+    MethodArgs.load(~'fixtures/3')
+  end
+
+  def test_block
+    assert_equal [:required, :optional, :splat, :block], MyClass.instance_method(:block).args.types
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: method-args
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -08:00
+date: 2011-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,7 +159,9 @@ files:
 - method_args.gemspec
 - test/fixtures/1.rb
 - test/fixtures/2.rb
+- test/fixtures/3.rb
 - test/helper.rb
+- test/test_block.rb
 - test/test_bound_method.rb
 - test/test_simple.rb
 - test/test_subclass.rb
@@ -200,7 +202,9 @@ summary: Get back more detailed information about the arguments for a method
 test_files: 
 - test/fixtures/1.rb
 - test/fixtures/2.rb
+- test/fixtures/3.rb
 - test/helper.rb
+- test/test_block.rb
 - test/test_bound_method.rb
 - test/test_simple.rb
 - test/test_subclass.rb