merb-action-args 0.9.12 → 0.9.13

data/Rakefile

@@ -1,9 +1,4 @@
-require 'rubygems'
-require "merb-core"
-require 'rake/gempackagetask'
-require "extlib"
-require File.join(File.dirname(__FILE__), '../merb-core/lib/merb-core/tasks/merb_rake_helper')
-require "spec/rake/spectask"
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
 
 ##############################################################################
 # Package && release

data/lib/merb-action-args/abstract_controller.rb

@@ -10,8 +10,12 @@ class Merb::AbstractController
     # klass<Class>::
     #   The controller that is being inherited from Merb::AbstractController.
     def inherited(klass)
-      klass.action_argument_list = Hash.new do |h,k| 
-        h[k] = ParseTreeArray.translate(klass, k.to_sym).get_args
+      klass.action_argument_list = Hash.new do |h,k|
+        args = klass.instance_method(k).get_args
+        arguments = args[0]
+        defaults = []
+        arguments.each {|a| defaults << a[0] if a.size == 2} if arguments
+        h[k] = [arguments || [], defaults]
       end
       old_inherited(klass)
     end
@@ -26,6 +30,7 @@ class Merb::AbstractController
   # BadRequest:: The params hash doesn't have a required parameter.
   def _call_action(action)
     arguments, defaults = self.class.action_argument_list[action]
+    
     args = arguments.map do |arg, default|
       arg = arg
       p = params.key?(arg.to_sym)

data/lib/merb-action-args/get_args.rb

@@ -1,89 +1,93 @@
-require 'parse_tree'
-require 'ruby2ruby'
+unless RUBY_PLATFORM == "java"
+  require 'parse_tree'
+  require 'ruby2ruby'
 
-class ParseTreeArray < Array
-  R2R = Object.const_defined?(:Ruby2Ruby) ? Ruby2Ruby : RubyToRuby
+  class ParseTreeArray < Array
+    R2R = Object.const_defined?(:Ruby2Ruby) ? Ruby2Ruby : RubyToRuby
   
-  def self.translate(*args)
-    sexp = ParseTree.translate(*args)
-    # ParseTree.translate returns [nil] if called on an inherited method, so walk
-    # up the inheritance chain to find the class that the method was defined in
-    unless sexp.first
-      klass = args.first.ancestors.detect do |klass| 
-        klass.public_instance_methods(false).include?(args.last.to_s)
+    def self.translate(*args)
+      sexp = ParseTree.translate(*args)
+      # ParseTree.translate returns [nil] if called on an inherited method, so walk
+      # up the inheritance chain to find the class that the method was defined in
+      unless sexp.first
+        klass = args.first.ancestors.detect do |klass| 
+          klass.public_instance_methods(false).include?(args.last.to_s)
+        end
+        sexp = ParseTree.translate(klass, args.last) if klass
       end
-      sexp = ParseTree.translate(klass, args.last) if klass
+      self.new(sexp)
     end
-    self.new(sexp)
-  end
   
-  def deep_array_node(type = nil)
-    each do |node|
-      return ParseTreeArray.new(node) if node.is_a?(Array) && (!type || node[0] == type)
-      next unless node.is_a?(Array)
-      return ParseTreeArray.new(node).deep_array_node(type)
+    def deep_array_node(type = nil)
+      each do |node|
+        return ParseTreeArray.new(node) if node.is_a?(Array) && (!type || node[0] == type)
+        next unless node.is_a?(Array)
+        return ParseTreeArray.new(node).deep_array_node(type)
+      end
+      nil
     end
-    nil
-  end
 
-  def arg_nodes
-    self[1..-1].inject([]) do |sum,item|
-      sum << [item] unless item.is_a?(Array)
-      sum
+    def arg_nodes
+      self[1..-1].inject([]) do |sum,item|
+        sum << [item] unless item.is_a?(Array)
+        sum
+      end
     end
-  end
   
-  def get_args
-    if arg_node = deep_array_node(:args)
-      # method defined with def keyword
-      args = arg_node.arg_nodes
-      default_node = arg_node.deep_array_node(:block)
-      return [args, []] unless default_node
-    else
-      # assuming method defined with Module#define_method
-      return [[],[]]
-    end
+    def get_args
+      if arg_node = deep_array_node(:args)
+        # method defined with def keyword
+        args = arg_node.arg_nodes
+        default_node = arg_node.deep_array_node(:block)
+        return [args, []] unless default_node
+      else
+        # assuming method defined with Module#define_method
+        return [[],[]]
+      end
     
-    # if it was defined with def, and we found the default_node,
-    # that should bring us back to regularly scheduled programming..
-    lasgns = default_node[1..-1]
-    lasgns.each do |asgn|
-      args.assoc(asgn[1]) << eval(R2R.new.process(asgn[2]))
+      # if it was defined with def, and we found the default_node,
+      # that should bring us back to regularly scheduled programming..
+      lasgns = default_node[1..-1]
+      lasgns.each do |asgn|
+        args.assoc(asgn[1]) << eval(R2R.new.process(asgn[2]))
+      end
+      [args, (default_node[1..-1].map { |asgn| asgn[1] })]
     end
-    [args, (default_node[1..-1].map { |asgn| asgn[1] })]
-  end
 
-end
+  end
 
-# Used in mapping controller arguments to the params hash.
-# NOTE: You must have the 'ruby2ruby' gem installed for this to work.
-#
-# ==== Examples
-#   # In PostsController
-#   def show(id)  #=> id is the same as params[:id]
-module GetArgs
-  
-  # ==== Returns
-  # Array:: Method arguments and their default values.
+  # Used in mapping controller arguments to the params hash.
+  # NOTE: You must have the 'ruby2ruby' gem installed for this to work.
   #
   # ==== Examples
-  #   class Example
-  #     def hello(one,two="two",three)
-  #     end
-  #
-  #     def goodbye
-  #     end
-  #   end
-  #
-  #   Example.instance_method(:hello).get_args
-  #     #=> [[:one], [:two, "two"], [:three, "three"]]
-  #   Example.instance_method(:goodbye).get_args  #=> nil
-  def get_args
-    klass, meth = self.to_s.split(/ /).to_a[1][0..-2].split("#")
-    # Remove stupidity for #<Method: Class(Object)#foo>
-    klass = $` if klass =~ /\(/
-    ParseTreeArray.translate(Object.const_get(klass), meth).get_args
+  #   # In PostsController
+  #   def show(id)  #=> id is the same as params[:id]
+  module GetArgs
+  
+    # ==== Returns
+    # Array:: Method arguments and their default values.
+    #
+    # ==== Examples
+    #   class Example
+    #     def hello(one,two="two",three)
+    #     end
+    #
+    #     def goodbye
+    #     end
+    #   end
+    #
+    #   Example.instance_method(:hello).get_args
+    #     #=> [[:one], [:two, "two"], [:three, "three"]]
+    #   Example.instance_method(:goodbye).get_args  #=> nil
+    def get_args
+      klass, meth = self.to_s.split(/ /).to_a[1][0..-2].split("#")
+      # Remove stupidity for #<Method: Class(Object)#foo>
+      klass = $` if klass =~ /\(/
+      ParseTreeArray.translate(Object.const_get(klass), meth).get_args
+    end
   end
+else
+  require File.dirname(__FILE__) / "jruby_args"
 end
 
 class UnboundMethod

data/lib/merb-action-args/jruby_args.rb

@@ -0,0 +1,67 @@
+require 'java'
+require 'jruby'
+
+module GetArgs
+  Methods = org.jruby.internal.runtime.methods
+
+  def get_args
+    real_method = JRuby.reference(self)
+
+    # hack to expose a protected field; could be improved in 1.1.5
+    method_field = org.jruby.RubyMethod.java_class.declared_field(:method)
+
+    method_field.accessible = true
+  
+    dyn_method = method_field.value(real_method)
+
+    case dyn_method
+    when Methods.MethodArgs
+      return build_args(dyn_method.args_node)
+    else
+      raise "Can't get args from method: #{self}"
+    end
+  end
+
+  def build_args(args_node)
+    args = []
+    required = []
+    optional = []
+
+    # required args
+    if (args_node.args && args_node.args.size > 0)
+      required << args_node.args.child_nodes.map { |arg| [arg.name.to_s.intern] }
+    end
+  
+    # optional args
+    if (args_node.opt_args && args_node.opt_args.size > 0)
+      optional << args_node.opt_args.child_nodes.map do |arg|
+        name = arg.name.to_s.intern
+        value_node = arg.value_node
+        case value_node
+        when org.jruby.ast::FixnumNode
+          value = value_node.value
+        when org.jruby.ast::SymbolNode
+          value = value_node.get_symbol(JRuby.runtime)
+        when org.jruby.ast::StrNode
+          value = value_node.value
+        else
+          value = nil
+        end
+        [name, value]
+      end
+    end
+
+    first_args = required.first
+    optional.first.each {|arg| first_args << arg} if optional.first
+        
+    args = [first_args]
+    
+    rest = args_node.rest_arg_node
+    args << (rest ? rest.name.to_s.intern : nil)
+  
+    block = args_node.block_arg_node
+    args << (block ? block.name.to_s.intern : nil)
+
+    args
+  end
+end

data/spec/action_args_spec.rb

@@ -10,6 +10,10 @@ end
 
 describe Merb::AbstractController do
   
+  it "should be able to handle no arguments" do
+    dispatch_to(ActionArgs, :nada).body.should == "NADA"
+  end
+  
   it "should be able to accept Action Arguments" do
     dispatch_to(ActionArgs, :index, :foo => "bar").body.should == "bar"
   end

data/spec/controllers/action-args.rb

@@ -11,6 +11,10 @@ end
 
 class ActionArgs < Merb::Controller
   include ExtraActions
+
+  def nada
+    "NADA"
+  end
   
   def index(foo)
     foo
@@ -31,7 +35,7 @@ class ActionArgs < Merb::Controller
   define_method :dynamic_define_method do
     "mos def"
   end
-  
+    
   def with_default_nil(foo, bar = nil)
     "#{foo} #{bar}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-action-args
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-29 00:00:00 -07:00
+date: 2008-11-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: 0.9.13
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
@@ -60,6 +60,7 @@ files:
 - lib/merb-action-args
 - lib/merb-action-args/abstract_controller.rb
 - lib/merb-action-args/get_args.rb
+- lib/merb-action-args/jruby_args.rb
 - lib/merb-action-args.rb
 - spec/action_args_spec.rb
 - spec/controllers
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Merb plugin that provides support for ActionArgs