method-args 0.0.2 → 0.0.3

data/README.markdown

@@ -36,5 +36,5 @@ If you want to get the value of a default argument, you'll need a context in whi
 an instance of the class from which the method derives.
 
     obj = MyClass.new
-    MyClass.instance_method(:something).args.last.default_value(obj)
+    obj.method(:something).args.last.default_value
     # => 'hello'

data/lib/method_args.rb

@@ -2,26 +2,29 @@ require 'ruby2ruby'
 require 'ruby_parser'
 require 'sexp_processor'
 
-class Method
-  attr_accessor :args
-end
+module MethodMixin
+  attr_reader :args
 
-class UnboundMethod
-  attr_accessor :args
+  def args=(a)
+    @args = a.clone
+    @args.owning_method = self
+    @args
+  end
 end
 
+Method.send(:include, MethodMixin)
+UnboundMethod.send(:include, MethodMixin)
+
 module MethodArgs
 
   class ArgList < Array
     class Arg
       
+      attr_accessor :arg_list
       attr_reader :name, :type
       
-      def initialize(cls, arg)
-        @cls = cls
-        @name = arg[0]
-        @type = arg[1]
-        @default = arg[2]
+      def initialize(name, type, default = nil)
+        @name, @type, @default = name, type, default
       end
 
       def required?
@@ -36,13 +39,28 @@ module MethodArgs
         @type == :splat
       end
 
-      def default_value(inst)
+      def default_value(receiver = nil)
         return nil if @default.nil?
-        raise "You must evaluate defaults in the context of a matching class. #{inst.class.name} is not a #{@cls.name}." unless inst.is_a?(@cls)
-        inst.instance_eval(@default)
+        receiver ||= arg_list.owning_method.receiver if arg_list.owning_method.respond_to?(:receiver)
+        raise "You must specify a receiver for the defaul value" if receiver.nil?
+        raise "You must evaluate defaults in the context of a matching class. #{receiver.class.name} is not a #{@cls.name}." unless receiver.is_a?(arg_list.cls)
+        receiver.instance_eval(@default)
       end
     end
-    
+
+    attr_accessor :owning_method
+    attr_reader :cls
+
+    def initialize(cls)
+      @cls = cls
+    end
+
+    def clone
+      o = super
+      o.each {|arg| arg.arg_list = o}
+      o
+    end
+
     def required_size
       inject(0) {|count, arg| count += arg.required? ? 1 : 0}
     end
@@ -55,17 +73,8 @@ module MethodArgs
     def types
       map(&:type)
     end
-
-    def initialize(cls, method)
-      @cls, @method = cls, method
-    end
-
-    def to_method
-      @cls.instance_method(@method)
-    end
   end
 
-
   def self.load(file)
     file = File.expand_path(file)
     require file
@@ -131,15 +140,15 @@ module MethodArgs
 
     def process_args(exp)
       exp.shift
-      arg_list = ArgList.new(current_class, @current_method)
+      arg_list = ArgList.new(current_class)
       while !exp.empty?
         t = exp.shift
         case t
         when Symbol
           arg_list << if t.to_s[0] == ?*
-            ArgList::Arg.new(current_class, [t.to_s[1, t.to_s.size].to_sym, :splat])
+            ArgList::Arg.new(t.to_s[1, t.to_s.size].to_sym, :splat)
           else
-            ArgList::Arg.new(current_class, [t, :required])
+            ArgList::Arg.new(t, :required)
           end
         when Sexp
           case t.shift
@@ -147,7 +156,7 @@ module MethodArgs
             lasgn = t.shift
             lasgn.shift
             name = lasgn.shift
-            new_arg = ArgList::Arg.new(current_class, [name, :optional, @ruby2ruby.process(lasgn.last)])
+            new_arg = ArgList::Arg.new(name, :optional, @ruby2ruby.process(lasgn.last))
             arg_list.each_with_index{|arg, idx| arg_list[idx] = new_arg if arg.name == name}
           end
         end
@@ -160,6 +169,14 @@ module MethodArgs
       unless 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
@@ -175,6 +192,10 @@ module MethodArgs
               ArgList[method_name]
             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.2'
+  VERSION = '0.0.3'
 end

data/test/test_bound_method.rb

@@ -0,0 +1,15 @@
+class TestBoundMethod < MiniTest::Unit::TestCase
+  def setup
+    MethodArgs.load(~'fixtures/1')
+  end
+
+  def test_default_args
+    one = One.new
+    one.two_method = 'happy times'
+    two = One.new
+    two.two_method = 'more happy times'
+    assert_equal 'happy times',      one.method(:default_args_with_dependant_value).args.last.default_value
+    assert_equal 'more happy times', two.method(:default_args_with_dependant_value).args.last.default_value
+  end
+
+end

data/test/test_simple.rb

@@ -24,10 +24,6 @@ class TestSimple < MiniTest::Unit::TestCase
     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'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: method-args
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 -08:00
+date: 2011-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,6 +160,7 @@ files:
 - test/fixtures/1.rb
 - test/fixtures/2.rb
 - test/helper.rb
+- test/test_bound_method.rb
 - test/test_simple.rb
 - test/test_subclass.rb
 has_rdoc: true
@@ -200,5 +201,6 @@ test_files:
 - test/fixtures/1.rb
 - test/fixtures/2.rb
 - test/helper.rb
+- test/test_bound_method.rb
 - test/test_simple.rb
 - test/test_subclass.rb