merb-action-args 0.9.3 → 0.9.4

data/Rakefile

@@ -1,29 +1,44 @@
 require 'rubygems'
 require 'rake/gempackagetask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
+
+##############################################################################
+# Package && release
+##############################################################################
+RUBY_FORGE_PROJECT  = "merb"
+PROJECT_URL         = "http://merbivore.com"
+PROJECT_SUMMARY     = "Merb plugin that provides support for ActionArgs"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY
 
-PLUGIN = "merb-action-args"
-NAME = "merb-action-args"
-VERSION = "0.9.3"
 AUTHOR = "Yehuda Katz"
-EMAIL = "ykatz@engineyard.com"
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-haml/"
-SUMMARY = "Merb plugin that provides support for ActionArgs"
+EMAIL  = "ykatz@engineyard.com"
+
+GEM_NAME    = "merb-action-args"
+PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.4") + PKG_BUILD
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+require "extlib/tasks/release"
+
 
 spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
+  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.name = GEM_NAME
+  s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
+  s.summary = PROJECT_SUMMARY
+  s.description = PROJECT_DESCRIPTION
   s.author = AUTHOR
   s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.3')
-  s.add_dependency('ruby2ruby', '>= 1.1.8')  
+  s.homepage = PROJECT_URL
+  s.add_dependency('merb-core', '>= 0.9.4')
+  s.add_dependency('ruby2ruby', '>= 1.1.9')
+  s.add_dependency('ParseTree', '>= 2.2')
   s.require_path = 'lib'
-  s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
@@ -31,17 +46,14 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
-
+desc "Install the gem"
 task :install => [:package] do
-  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
+  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_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 #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
   end
-  
 end

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

@@ -1,7 +1,7 @@
 class Merb::AbstractController
   
   class << self
-    attr_accessor :action_argument_list    
+    attr_accessor :action_argument_list
     alias_method :old_inherited, :inherited
 
     # Stores the argument lists for all methods for this class.
@@ -25,10 +25,11 @@ class Merb::AbstractController
   # ==== Raises
   # BadRequest:: The params hash doesn't have a required parameter.
   def _call_action(action)
-    args = self.class.action_argument_list[action].map do |arg, default|
+    arguments, defaults = self.class.action_argument_list[action]
+    args = arguments.map do |arg, default|
       arg = arg
       p = params.key?(arg.to_sym)
-      raise BadRequest unless p || default
+      raise BadRequest unless p || (defaults && defaults.include?(arg))
       p ? params[arg.to_sym] : default
     end
     __send__(action, *args)

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

@@ -1,6 +1,7 @@
+require 'parse_tree'
 require 'ruby2ruby'
 
-class ParseTreeArray < Array #:nodoc:
+class ParseTreeArray < Array
   def self.translate(*args)
     sexp = ParseTree.translate(*args)
     # ParseTree.translate returns [nil] if called on an inherited method, so walk
@@ -35,20 +36,19 @@ class ParseTreeArray < Array #:nodoc:
       # method defined with def keyword
       args = arg_node.arg_nodes
       default_node = arg_node.deep_array_node(:block)
-      return args unless default_node
+      return [args, []] unless default_node
     else
       # assuming method defined with Module#define_method
-      return []
+      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(RubyToRuby.new.process(asgn[2]))
     end
-    args
+    [args, (default_node[1..-1].map { |asgn| asgn[1] })]
   end
 
 end
@@ -84,10 +84,10 @@ module GetArgs
   end
 end
 
-class UnboundMethod #:nodoc:
+class UnboundMethod
   include GetArgs
 end
 
-class Method  #:nodoc:
+class Method
   include GetArgs
 end

data/spec/action_args_spec.rb

@@ -30,4 +30,8 @@ describe Merb::AbstractController do
     dispatch_to(ActionArgs, :funky_inherited_method, :foo => "bar", :bar => "baz").body.should == "bar baz"
   end
   
+  it "should be able to handle nil defaults" do
+    dispatch_to(ActionArgs, :with_default_nil, :foo => "bar").body.should == "bar "
+  end
+  
 end

data/spec/controllers/action-args.rb

@@ -32,4 +32,8 @@ class ActionArgs < Merb::Controller
     "mos def"
   end
   
+  def with_default_nil(foo, bar = nil)
+    "#{foo} #{bar}"
+  end
+  
 end

metadata

@@ -1,34 +1,46 @@
 --- !ruby/object:Gem::Specification 
 name: merb-action-args
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Yehuda Katz
-autorequire: merb-action-args
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.8
+        version: 1.1.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ParseTree
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.2"
     version: 
 description: Merb plugin that provides support for ActionArgs
 email: ykatz@engineyard.com
@@ -54,7 +66,7 @@ files:
 - spec/controllers/action-args.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merb-plugins.rubyforge.org/merb-haml/
+homepage: http://merbivore.com
 post_install_message: 
 rdoc_options: []
 
@@ -74,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: merb
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Merb plugin that provides support for ActionArgs