method-args 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    method-args (0.0.3)
+    method-args (0.0.4)
       ruby2ruby (~> 1.2.4)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0.4)

data/README.markdown

@@ -19,7 +19,12 @@ Pretend you have a file `your_ruby_file.rb`:
       end
     end
 
-To look at the arguments to something, do the following.
+To look at the arguments to something and you're in Ruby 1.9 (please see https://twitter.com/igrigorik/status/19461463110320128), just require it normally:
+
+    require 'your_ruby_file'
+    MyClass.instance_method(:something).args
+
+Otherwise, do the following:
     
     MethodArgs.load('your_ruby_file') # <-- this also requires the file
     MyClass.instance_method(:something).args

data/lib/method_args.rb

@@ -3,7 +3,13 @@ require 'ruby_parser'
 require 'sexp_processor'
 
 module MethodMixin
-  attr_reader :args
+  def args(trying_load = false)
+    if !trying_load && respond_to?(:source_location) && !owner.const_defined?(:ArgList, false)
+      file, line = source_location
+      MethodArgs.load(file, false)
+    end
+    self.args = owner.const_get(:ArgList)[name.to_sym]
+  end
 
   def args=(a)
     @args = a.clone
@@ -75,9 +81,9 @@ module MethodArgs
     end
   end
 
-  def self.load(file)
+  def self.load(file, require_file = true)
     file = File.expand_path(file)
-    require file
+    require file if require_file
     parser = RubyParser.new
     sexp = parser.process(File.read(File.exist?(file) ? file : "#{file}.rb"))
     method_args = Processor.new
@@ -166,25 +172,14 @@ module MethodArgs
     end
 
     def add_methods
-      unless current_class.method(:const_defined?).arity == 2 ? current_class.const_defined?(:ArgList, false) : current_class.const_defined?(:ArgList)
+      unless current_class.method(:const_defined?).arity == -1 ? 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
           
-          def method(name)
-            m = __method__(name)
-            m.args = self.class.instance_arg_list(name)
-            m
-          end
-
           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)
@@ -192,10 +187,6 @@ module MethodArgs
               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)
-            #   source, line = method.source_location
-            #   MethodArgs.load(source)
-            #   method.owner.instance_arg_list(method_name)
             else
               raise \"\#{method.owner} has not been loaded with method_args\"
             end

data/lib/method_args/version.rb

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

data/test/fixtures/4.rb

@@ -0,0 +1,4 @@
+class Autoloaded
+  def some_method
+  end
+end

data/test/test_autoload.rb

@@ -0,0 +1,11 @@
+if Method.instance_method(:source_location)
+  class TestAutoload < MiniTest::Unit::TestCase
+    def setup
+      require ~'fixtures/4'
+    end
+
+    def test_arg_counts
+      assert_equal 0, Autoloaded.instance_method(:some_method).args.count
+    end
+  end
+end rescue nil

data/test/test_bound_method.rb

@@ -12,4 +12,11 @@ class TestBoundMethod < MiniTest::Unit::TestCase
     assert_equal 'more happy times', two.method(:default_args_with_dependant_value).args.last.default_value
   end
 
+  def test_binding_method
+    method = One.instance_method(:default_args_with_dependant_value)
+    one = One.new
+    one.two_method = 'happy times'
+    assert_equal 'happy times',      method.bind(one).args.last.default_value
+  end
+
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: method-args
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -08:00
+date: 2011-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 0
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 2
@@ -57,7 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 3
         - 0
@@ -73,7 +69,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
@@ -89,7 +84,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -105,7 +99,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -119,7 +112,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -133,7 +125,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -160,7 +151,9 @@ files:
 - test/fixtures/1.rb
 - test/fixtures/2.rb
 - test/fixtures/3.rb
+- test/fixtures/4.rb
 - test/helper.rb
+- test/test_autoload.rb
 - test/test_block.rb
 - test/test_bound_method.rb
 - test/test_simple.rb
@@ -179,7 +172,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -188,7 +180,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -203,7 +194,9 @@ test_files:
 - test/fixtures/1.rb
 - test/fixtures/2.rb
 - test/fixtures/3.rb
+- test/fixtures/4.rb
 - test/helper.rb
+- test/test_autoload.rb
 - test/test_block.rb
 - test/test_bound_method.rb
 - test/test_simple.rb