method-args 0.0.1 → 0.0.2

data/README.markdown

@@ -22,19 +22,19 @@ Pretend you have a file `your_ruby_file.rb`:
 To look at the arguments to something, do the following.
     
     MethodArgs.load('your_ruby_file') # <-- this also requires the file
-    MyClass.arg_list(:something)
+    MyClass.instance_method(:something).args
     
 This will return an `ArgList` object. You can then look at the names & types.
 
-    MyClass.arg_list(:something).names
+    MyClass.instance_method(:something).args.names
     # => [:one, :two, :three]
 
-    MyClass.arg_list(:something).types
+    MyClass.instance_method(:something).args.types
     # => [:required, :optional, :splat]
     
 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.
 
     obj = MyClass.new
-    MyClass.arg_list(:something).last.default_value(obj)
+    MyClass.instance_method(:something).args.last.default_value(obj)
     # => 'hello'

data/lib/method_args.rb

@@ -2,6 +2,14 @@ require 'ruby2ruby'
 require 'ruby_parser'
 require 'sexp_processor'
 
+class Method
+  attr_accessor :args
+end
+
+class UnboundMethod
+  attr_accessor :args
+end
+
 module MethodArgs
 
   class ArgList < Array
@@ -151,11 +159,28 @@ module MethodArgs
     def add_methods
       unless current_class.const_defined?(:ArgList)
         current_class.send(:const_set, :ArgList, @method_maps[current_classname])
-        current_class.module_eval "
-          def self.arg_list(method_name)
-            ArgList[method_name]
+        current_class.module_eval(<<-HERE_DOC, __FILE__, __LINE__)
+          class << self
+            alias_method :__instance_method__, :instance_method unless method_defined?(:__instance_method__)
           end
-        "
+          def self.instance_method(name)
+            m = __instance_method__(name)
+            m.args = instance_arg_list(name)
+            m
+          end
+
+          def self.instance_arg_list(method_name)
+            method = __instance_method__(method_name)
+            if method.owner == self
+              ArgList[method_name]
+            elsif method.owner.respond_to?(:instance_arg_list)
+              method.owner.instance_arg_list(method_name)
+            else
+              raise \"\#{method.owner} has not been loaded with method_args\"
+            end
+          end
+
+        HERE_DOC
       end
     end
 

data/lib/method_args/version.rb

@@ -1,3 +1,3 @@
 module MethodArgs
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/method_args.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = "Get back more detailed information about the arguments for a method"
   s.description = "Get back more detailed information about the arguments for a method"
 
-  s.rubyforge_project = "method_args2"
+  s.rubyforge_project = "method_args"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/fixtures/2.rb

@@ -0,0 +1,15 @@
+class Two
+  def one(hi, there)
+  end
+end
+
+module TwoModule
+  def mod(from, mod)
+  end
+end
+
+class TwoSubclass < Two
+  include TwoModule
+  def two(one, more)
+  end
+end

data/test/test_simple.rb

@@ -0,0 +1,37 @@
+class TestSimple < MiniTest::Unit::TestCase
+  def setup
+    MethodArgs.load(~'fixtures/1')
+  end
+
+  def test_arg_counts
+    assert_equal 0, One.instance_method(:no_args).args.count
+    assert_equal 1, One.instance_method(:one_args).args.count
+    assert_equal 2, One.instance_method(:two_args).args.count
+    assert_equal 3, One.instance_method(:splat_args).args.count
+    assert_equal 2, One.instance_method(:splat_args).args.required_count
+    assert_equal 2, One.instance_method(:default_args).args.count
+    assert_equal 1, One.instance_method(:default_args).args.required_count
+    assert_equal 2, One.instance_method(:default_args_with_dependant_value).args.count
+    assert_equal 1, One.instance_method(:default_args_with_dependant_value).args.required_count
+  end
+
+  def test_arg_types
+    assert_equal [],                              One.instance_method(:no_args).args.types
+    assert_equal [:required],                     One.instance_method(:one_args).args.types
+    assert_equal [:required, :required],          One.instance_method(:two_args).args.types
+    assert_equal [:required, :required, :splat],  One.instance_method(:splat_args).args.types
+    assert_equal [:required, :optional],          One.instance_method(:default_args).args.types
+    assert_equal [:required, :optional],          One.instance_method(:default_args_with_dependant_value).args.types
+  end
+
+  def test_arg_method
+    assert_equal One.instance_method(:no_args), One.instance_arg_list(:no_args).to_method
+  end
+
+  def test_default_args
+    one = One.new
+    one.two_method = 'happy times'
+    assert_equal 'happy times', One.instance_method(:default_args_with_dependant_value).args.last.default_value(one)
+  end
+
+end

data/test/test_subclass.rb

@@ -0,0 +1,17 @@
+class TestSubclass < MiniTest::Unit::TestCase
+  def setup
+    MethodArgs.load(~'fixtures/2')
+  end
+
+  def test_normal_visibility
+    assert_equal [:one, :more], TwoSubclass.instance_method(:two).args.names
+  end
+
+  def test_superclass_visibility
+    assert_equal [:hi, :there], TwoSubclass.instance_method(:one).args.names
+  end
+
+  def test_module_visibility
+    assert_equal [:from, :mod], TwoSubclass.instance_method(:mod).args.names
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: method-args
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Joshua Hull
@@ -158,8 +158,10 @@ files:
 - lib/method_args/version.rb
 - method_args.gemspec
 - test/fixtures/1.rb
+- test/fixtures/2.rb
 - test/helper.rb
-- test/test_method_args.rb
+- test/test_simple.rb
+- test/test_subclass.rb
 has_rdoc: true
 homepage: https://github.com/joshbuddy/method_args
 licenses: []
@@ -189,12 +191,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: method_args2
+rubyforge_project: method_args
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Get back more detailed information about the arguments for a method
 test_files: 
 - test/fixtures/1.rb
+- test/fixtures/2.rb
 - test/helper.rb
-- test/test_method_args.rb
+- test/test_simple.rb
+- test/test_subclass.rb

data/test/test_method_args.rb

@@ -1,37 +0,0 @@
-class TestMethodArgs < MiniTest::Unit::TestCase
-  def setup
-    MethodArgs.load(~'fixtures/1')
-  end
-
-  def test_arg_counts
-    assert_equal 0, One.arg_list(:no_args).count
-    assert_equal 1, One.arg_list(:one_args).count
-    assert_equal 2, One.arg_list(:two_args).count
-    assert_equal 3, One.arg_list(:splat_args).count
-    assert_equal 2, One.arg_list(:splat_args).required_count
-    assert_equal 2, One.arg_list(:default_args).count
-    assert_equal 1, One.arg_list(:default_args).required_count
-    assert_equal 2, One.arg_list(:default_args_with_dependant_value).count
-    assert_equal 1, One.arg_list(:default_args_with_dependant_value).required_count
-  end
-
-  def test_arg_types
-    assert_equal [],                              One.arg_list(:no_args).types
-    assert_equal [:required],                     One.arg_list(:one_args).types
-    assert_equal [:required, :required],          One.arg_list(:two_args).types
-    assert_equal [:required, :required, :splat], One.arg_list(:splat_args).types
-    assert_equal [:required, :optional],          One.arg_list(:default_args).types
-    assert_equal [:required, :optional],          One.arg_list(:default_args_with_dependant_value).types
-  end
-
-  def test_arg_method
-    assert_equal One.instance_method(:no_args), One.arg_list(:no_args).to_method
-  end
-
-  def test_default_args
-    one = One.new
-    one.two_method = 'happy times'
-    assert_equal 'happy times', One.arg_list(:default_args_with_dependant_value).last.default_value(one)
-  end
-
-end