merb-action-args 0.9.2 → 0.9.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb-action-args"
 NAME = "merb-action-args"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Yehuda Katz"
 EMAIL = "ykatz@engineyard.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-haml/"
@@ -20,25 +20,28 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.2')
+  s.add_dependency('merb-core', '>= 0.9.3')
+  s.add_dependency('ruby2ruby', '>= 1.1.8')  
   s.require_path = 'lib'
   s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
+
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
+  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
 end
 
 namespace :jruby do
 
   desc "Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{SUDO} jruby -S gem install #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
   end
   
 end

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

@@ -12,7 +12,7 @@ class Merb::AbstractController
     def inherited(klass)
       klass.action_argument_list = Hash.new do |h,k| 
         h[k] = ParseTreeArray.translate(klass, k.to_sym).get_args
-      end      
+      end
       old_inherited(klass)
     end
   end

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

@@ -2,9 +2,18 @@ require 'ruby2ruby'
 
 class ParseTreeArray < Array #:nodoc:
   def self.translate(*args)
-    self.new(ParseTree.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
+    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)

data/spec/action_args_spec.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Merb::AbstractController do
+  
+  it "should be able to accept Action Arguments" do
+    dispatch_to(ActionArgs, :index, :foo => "bar").body.should == "bar"
+  end
+  
+  it "should be able to accept multiple Action Arguments" do
+    dispatch_to(ActionArgs, :multi, :foo => "bar", :bar => "baz").body.should == "bar baz"    
+  end
+  
+  it "should be able to handle defaults in Action Arguments" do
+    dispatch_to(ActionArgs, :defaults, :foo => "bar").body.should == "bar bar"
+  end
+  
+  it "should be able to handle out of order defaults" do
+    dispatch_to(ActionArgs, :defaults_mixed, :foo => "bar", :baz => "bar").body.should == "bar bar bar"    
+  end
+  
+  it "should throw a BadRequest if the arguments are not provided" do
+    lambda { dispatch_to(ActionArgs, :index) }.should raise_error(Merb::ControllerExceptions::BadRequest)
+  end
+  
+  it "should treat define_method actions as equal" do
+    dispatch_to(ActionArgs, :dynamic_define_method).body.should == "mos def"
+  end
+  
+  it "should be able to inherit actions for use with Action Arguments" do
+    dispatch_to(ActionArgs, :funky_inherited_method, :foo => "bar", :bar => "baz").body.should == "bar baz"
+  end
+  
+end

data/spec/controllers/action-args.rb

@@ -0,0 +1,35 @@
+module ExtraActions
+  def self.included(base)
+    base.show_action(:funky_inherited_method)
+  end
+  
+  def funky_inherited_method(foo, bar)
+    "#{foo} #{bar}"
+  end
+end
+
+
+class ActionArgs < Merb::Controller
+  include ExtraActions
+  
+  def index(foo)
+    foo
+  end
+  
+  def multi(foo, bar)
+    "#{foo} #{bar}"
+  end
+  
+  def defaults(foo, bar = "bar")
+    "#{foo} #{bar}"
+  end
+  
+  def defaults_mixed(foo, bar ="bar", baz = "baz")
+    "#{foo} #{bar} #{baz}"
+  end
+  
+  define_method :dynamic_define_method do
+    "mos def"
+  end
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+$TESTING=true
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require "rubygems"
+require "merb-core"
+require "merb-action-args"
+require File.dirname(__FILE__) / "controllers" / "action-args"
+require "spec"
+
+Merb.start :environment => 'test'
+
+Spec::Runner.configure do |config|
+  config.include Merb::Test::RequestHelper  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-action-args
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire: merb-action-args
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby2ruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.8
     version: 
 description: Merb plugin that provides support for ActionArgs
 email: ykatz@engineyard.com
@@ -40,6 +49,10 @@ files:
 - lib/merb-action-args/abstract_controller.rb
 - lib/merb-action-args/get_args.rb
 - lib/merb-action-args.rb
+- spec/action_args_spec.rb
+- spec/controllers
+- spec/controllers/action-args.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://merb-plugins.rubyforge.org/merb-haml/
 post_install_message: