method-args 0.0.5 → 0.1.0

data/Gemfile.lock

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

data/lib/method_args.rb

@@ -1,207 +1,52 @@
+require 'set'
 require 'ruby2ruby'
 require 'ruby_parser'
 require 'sexp_processor'
 
-module MethodMixin
-  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
-    @args.owning_method = self
-    @args
-  end
-end
-
-Method.send(:include, MethodMixin)
-UnboundMethod.send(:include, MethodMixin)
-
+require 'method_args/method_mixins'
+require 'method_args/args'
+require 'method_args/processor'
+require 'method_args/version'
+require 'method_args/method_registry'
 module MethodArgs
 
-  class ArgList < Array
-    class Arg
-      
-      attr_accessor :arg_list
-      attr_reader :name, :type
-      
-      def initialize(name, type, default = nil)
-        @name, @type, @default = name, type, default
-      end
-
-      def required?
-        @type == :required
-      end
-
-      def optional?
-        @type == :optional
-      end
-
-      def splat?
-        @type == :splat
-      end
-
-      def default_value(receiver = nil)
-        return nil if @default.nil?
-        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
+  ClassMethodRegistry = Hash.new{|h, k| h[k] = MethodRegistry.new}
+  FileRegistry = Set.new
 
-    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
-    alias_method :required_count, :required_size
+  def self.load(file, require_file = true)
+    require file if require_file
+    register file
+  end
 
-    def names
-      map(&:name)
-    end
+  def self.args_for_method(method)
+    k = class_key(method.owner)
+    ClassMethodRegistry[k][method.name.to_sym] if ClassMethodRegistry.key?(k)
+  end
 
-    def types
-      map(&:type)
+  def self.register(file)
+    file = expand_path(file)
+    unless FileRegistry.include?(file)
+      FileRegistry << file
+      parse(file).each { |cls, methods| ClassMethodRegistry[cls].add_methods!(methods) }
     end
   end
 
-  def self.load(file, require_file = true)
-    file = File.expand_path(file)
-    require file if require_file
+  def self.parse(file, require_file = true)
     parser = RubyParser.new
-    sexp = parser.process(File.read(File.exist?(file) ? file : "#{file}.rb"))
+    sexp = parser.process(File.read(expand_path(file)))
     method_args = Processor.new
     method_args.process(sexp)
+    method_args.methods
   end
 
-  class Processor < SexpProcessor
-
-    attr_reader :method_maps
-
-    def initialize
-      @method_maps = Hash.new{|h,k| h[k] = {}}
-      @current_class = []
-      super()
-    end
-
-    def process_module(exp)
-      exp.shift
-      @current_class << exp.first.to_sym
-      process(exp)
-      @current_class.pop
-      exp.clear
-      exp
-    end
-
-    def process_class(exp)
-      exp.shift
-      current_class_size = @current_class.size
-      case exp.first
-      when Symbol
-        @current_class << exp.first.to_sym
-        process(exp)
-      else
-        if exp.first.first == :colon2
-          exp.first.shift
-          class_exp = exp.shift
-          class_exp[0, class_exp.size - 1].each do |const|
-            @current_class << const.last
-          end
-          @current_class << class_exp.last
-        else
-          raise
-        end
-        exp.shift
-        process(exp.first)
-      end
-      @current_class.slice!(current_class_size, @current_class.size)
-      exp.clear
-      exp
-    end
-
-    def process_defn(exp)
-      exp.shift
-      @current_method = exp.shift
-      @ruby2ruby = Ruby2Ruby.new
-      process_args(exp.shift)
-      scope = exp.shift
-      exp
-    end
-
-    def process_args(exp)
-      exp.shift
-      arg_list = ArgList.new(current_class)
-      while !exp.empty?
-        t = exp.shift
-        case t
-        when Symbol
-          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
-          when :block
-            lasgn = t.shift
-            lasgn.shift
-            name = lasgn.shift
-            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
-      end
-      @method_maps[current_classname][@current_method] = arg_list
-      add_methods
-    end
-
-    def add_methods
-      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
-          
-          class << self
-            alias_method :__instance_method__, :instance_method unless method_defined?(:__instance_method__)
-          end
-
-          def self.instance_arg_list(method_name)
-            method = __instance_method__(method_name)
-            if method.owner == self
-              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)
-            else
-              raise \"\#{method.owner} has not been loaded with method_args\"
-            end
-          end
-
-        HERE_DOC
-      end
-    end
-
-    def current_classname
-      @current_class.map{|c| c.to_s}.join('::')
-    end
+  def self.class_key(cls)
+    nesting = cls.class_eval("Module.nesting")
+    nesting.pop
+    nesting.join('::')
+  end
 
-    def current_class
-      @current_class.inject(Module) {|c, m| c.const_get(m)}
-    end
+  def self.expand_path(file)
+    file = File.expand_path(file)
+    File.exist?(file) ? file : "#{file}.rb"
   end
 end

data/lib/method_args/args.rb

@@ -0,0 +1,66 @@
+module MethodArgs
+  class Args < Array
+    class Arg
+    
+      attr_accessor :arg_list
+      attr_reader :name, :type
+    
+      def initialize(name, type, default = nil)
+        @name, @type, @default = name, type, default
+      end
+
+      def required?
+        @type == :required
+      end
+
+      def optional?
+        @type == :optional
+      end
+
+      def splat?
+        @type == :splat
+      end
+
+      def default?
+        !@default.nil?
+      end
+
+      def default_value(receiver = nil)
+        return nil if @default.nil?
+        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 #{arg_list.cls.name}." unless receiver.is_a?(arg_list.cls)
+        receiver.instance_eval(@default)
+      end
+    end
+
+    attr_accessor :owning_method
+
+    def initialize(cls)
+      @cls = cls
+    end
+
+    def cls
+      @cls.inject(Module) {|c, m| c.const_get(m)}
+    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
+    alias_method :required_count, :required_size
+
+    def names
+      map(&:name)
+    end
+
+    def types
+      map(&:type)
+    end
+  end
+end

data/lib/method_args/method_mixins.rb

@@ -0,0 +1,11 @@
+module MethodMixin
+  def args
+    MethodArgs.register(source_location[0]) if respond_to?(:source_location)
+    args = MethodArgs.args_for_method(self).clone
+    args.owning_method = self
+    args
+  end
+end
+
+Method.send(:include, MethodMixin)
+UnboundMethod.send(:include, MethodMixin)

data/lib/method_args/method_registry.rb

@@ -0,0 +1,19 @@
+module MethodArgs
+  class MethodRegistry < Hash
+    attr_reader :method_names
+
+    def initialize
+      super
+      @method_names = []
+    end
+
+    def add_methods!(methods)
+      methods.each do |(method_name, args)|
+        unless key?(method_name)
+          self[method_name] = args
+          method_names << method_name
+        end
+      end
+    end
+  end
+end

data/lib/method_args/processor.rb

@@ -0,0 +1,86 @@
+module MethodArgs
+  class Processor < SexpProcessor
+
+    attr_reader :methods
+
+    def initialize
+      @methods = Hash.new{|h,k| h[k] = []}
+      @current_class = []
+      super()
+    end
+
+    def process_module(exp)
+      exp.shift
+      @current_class << exp.first.to_sym
+      process(exp)
+      @current_class.pop
+      exp.clear
+      exp
+    end
+
+    def process_class(exp)
+      exp.shift
+      current_class_size = @current_class.size
+      case exp.first
+      when Symbol
+        @current_class << exp.first.to_sym
+        process(exp)
+      else
+        if exp.first.first == :colon2
+          exp.first.shift
+          class_exp = exp.shift
+          class_exp[0, class_exp.size - 1].each do |const|
+            @current_class << const.last
+          end
+          @current_class << class_exp.last
+        else
+          raise
+        end
+        exp.shift
+        process(exp.first)
+      end
+      @current_class.slice!(current_class_size, @current_class.size)
+      exp.clear
+      exp
+    end
+
+    def process_defn(exp)
+      exp.shift
+      @current_method = exp.shift
+      @ruby2ruby = Ruby2Ruby.new
+      process_args(exp.shift)
+      exp.shift
+      exp
+    end
+
+    def process_args(exp)
+      exp.shift
+      arg_list = Args.new(@current_class.clone)
+      while !exp.empty?
+        t = exp.shift
+        case t
+        when Symbol
+          arg_list << case t.to_s[0]
+          when ?* then Args::Arg.new(t.to_s[1, t.to_s.size].to_sym, :splat)
+          when ?& then Args::Arg.new(t.to_s[1, t.to_s.size].to_sym, :block)
+          else         Args::Arg.new(t, :required)
+          end
+        when Sexp
+          case t.shift
+          when :block
+            lasgn = t.shift
+            lasgn.shift
+            name = lasgn.shift
+            new_arg = Args::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
+      end
+      @methods[current_classname] << [@current_method, arg_list]
+    end
+
+    def current_classname
+      @current_class.map{|c| c.to_s}.join('::')
+    end
+  end
+end

data/lib/method_args/version.rb

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

data/test/fixtures/5.rb

@@ -0,0 +1,17 @@
+class Top
+  def one
+  end
+  
+  class Middle
+    def two
+    end
+
+    def one(two)
+    end
+    
+    class End
+      def two(three)
+      end
+    end
+  end
+end

data/test/test_nested.rb

@@ -0,0 +1,12 @@
+class TestNested < MiniTest::Unit::TestCase
+  def setup
+    MethodArgs.load(~'fixtures/5')
+  end
+
+  def test_nested
+    assert_equal 0, Top.instance_method(:one).args.count
+    assert_equal 1, Top::Middle.instance_method(:one).args.count
+    assert_equal 0, Top::Middle.instance_method(:two).args.count
+    assert_equal 1, Top::Middle::End.instance_method(:two).args.count
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: method-args
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 5
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Joshua Hull
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
@@ -39,6 +41,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 2
@@ -54,6 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 3
         - 0
@@ -69,6 +73,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 0
@@ -84,6 +89,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -99,6 +105,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -112,6 +119,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -125,6 +133,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -146,16 +155,22 @@ files:
 - README.markdown
 - Rakefile
 - lib/method_args.rb
+- lib/method_args/args.rb
+- lib/method_args/method_mixins.rb
+- lib/method_args/method_registry.rb
+- lib/method_args/processor.rb
 - lib/method_args/version.rb
 - method_args.gemspec
 - test/fixtures/1.rb
 - test/fixtures/2.rb
 - test/fixtures/3.rb
 - test/fixtures/4.rb
+- test/fixtures/5.rb
 - test/helper.rb
 - test/test_autoload.rb
 - test/test_block.rb
 - test/test_bound_method.rb
+- test/test_nested.rb
 - test/test_simple.rb
 - test/test_subclass.rb
 has_rdoc: true
@@ -172,6 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -180,6 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -195,9 +212,11 @@ test_files:
 - test/fixtures/2.rb
 - test/fixtures/3.rb
 - test/fixtures/4.rb
+- test/fixtures/5.rb
 - test/helper.rb
 - test/test_autoload.rb
 - test/test_block.rb
 - test/test_bound_method.rb
+- test/test_nested.rb
 - test/test_simple.rb
 - test/test_subclass.rb