merb-action-args 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,75 +1,66 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
-
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Merb plugin that provides support for ActionArgs"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-AUTHOR = "Yehuda Katz"
-EMAIL  = "ykatz@engineyard.com"
-
-GEM_NAME    = "merb-action-args"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-RELEASE_NAME = "REL #{GEM_VERSION}"
-
-require "extlib/tasks/release"
-
-spec = Gem::Specification.new do |s|
-  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 = PROJECT_SUMMARY
-  s.description = PROJECT_DESCRIPTION
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', "~> #{Merb::VERSION}")
-  s.add_dependency('ruby2ruby', '>= 1.1.9')
-  s.add_dependency('ParseTree', '>= 2.1.1')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-end
+require 'rubygems'
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+# Load this library's version information
+require File.expand_path('../lib/merb-action-args/version', __FILE__)
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::ActionArgs::VERSION
+
+    gemspec.name        = "merb-action-args"
+    gemspec.description = "Merb plugin that supports controller action arguments"
+    gemspec.summary     = "Merb plugin that provides support for named parameters in your controller actions"
+
+    gemspec.authors     = [ "Yehuda Katz" ]
+    gemspec.email       = "ykatz@engineyard.com"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core', "~> #{Merb::VERSION}"
+    gemspec.add_dependency 'ruby2ruby', '>= 1.1.9'
+    gemspec.add_dependency 'ParseTree', '>= 2.1.1'
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-desc "Run all examples (or a specific spec with TASK=xxxx)"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts  = ["-cfs"]
-  t.spec_files = begin
-    if ENV["TASK"] 
-      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
-    else
-      FileList['spec/**/*_spec.rb']
-    end
-  end
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-desc 'Default: run spec examples'
-task :default => 'spec'
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "test_gem #{Merb::ActionArgs::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

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

@@ -41,4 +41,4 @@ class Merb::AbstractController
     end
     __send__(action, *args)
   end
-end
+end

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

@@ -1,94 +1,9 @@
-unless RUBY_PLATFORM == "java"
-  require 'parse_tree'
-  require 'ruby2ruby'
-
-  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)
-        end
-        sexp = ParseTree.translate(klass, args.last) if klass
-      end
-      sexp = Unifier.new.process(sexp)
-      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)
-      end
-      nil
-    end
-
-    def arg_nodes
-      self[1..-1].inject([]) do |sum,item|
-        sum << [item] unless item.is_a?(Array)
-        sum
-      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
-    
-      # 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
-
-  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.
-    #
-    # ==== 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.full_const_get(klass), meth).get_args
-    end
-  end
-else
+if RUBY_PLATFORM == "java"
   require File.dirname(__FILE__) / "jruby_args"
+elsif RUBY_VERSION < "1.9"
+  require File.dirname(__FILE__) / "mri_args"
+else
+  require File.dirname(__FILE__) / "vm_args"
 end
 
 class UnboundMethod
@@ -97,4 +12,4 @@ end
 
 class Method
   include GetArgs
-end
+end

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

@@ -29,12 +29,12 @@ module GetArgs
 
     # required args
     if (args_node.args && args_node.args.size > 0)
-      required << args_node.args.child_nodes.map { |arg| [arg.name.to_s.intern] }
+      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|
+      optional = args_node.opt_args.child_nodes.map do |arg|
         name = arg.name.to_s.intern
         value_node = arg.value_node
         case value_node
@@ -51,17 +51,7 @@ module GetArgs
       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
+    args = required + optional
+    return [args, optional.map{|name,| name}]
   end
-end
+end

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

@@ -0,0 +1,88 @@
+require 'parse_tree'
+require 'ruby2ruby'
+
+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)
+      end
+      sexp = ParseTree.translate(klass, args.last) if klass
+    end
+    sexp = Unifier.new.process(sexp)
+    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)
+    end
+    nil
+  end
+
+  def arg_nodes
+    self[1..-1].inject([]) do |sum,item|
+      sum << [item] unless item.is_a?(Array)
+      sum
+    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
+    
+    # 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
+
+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.
+  #
+  # ==== 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.full_const_get(klass), meth).get_args
+  end
+end

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

@@ -0,0 +1,5 @@
+module Merb
+  module ActionArgs
+    VERSION = '1.1.0.pre'.freeze
+  end
+end

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

@@ -0,0 +1,27 @@
+begin
+  require "methopara"
+rescue
+  puts "Make sure you have methopara http://github.com/genki/methopara installed if you want to use action args on Ruby 1.9"
+end
+
+module GetArgs
+  def get_args
+    unless respond_to?(:parameters)
+      raise NotImplementedError, "Ruby #{RUBY_VERSION} doesn't support #{self.class}#parameters"
+    end
+
+    required = []
+    optional = []
+
+    parameters.each do |(type, name)|
+      if type == :opt
+        required << [name, nil]
+        optional << name
+      else
+        required << [name]
+      end
+    end
+
+    return [required, optional]
+  end
+end

data/spec/action_args_spec.rb

@@ -1,11 +1,23 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "ActionArgs" do
   
   it "should not accidently introduce any methods as controller actions" do
     Merb::Controller.callable_actions.should be_empty
   end
-  
+
+  it "should extract explicit one arg" do
+    ActionArgs.instance_method(:index).get_args.should == [[[:foo]], []]
+  end
+
+  it "should extract explicit multi args" do
+    ActionArgs.instance_method(:multi).get_args.should == [[[:foo], [:bar]], []]
+  end
+
+  it "should extract optional args" do
+    ActionArgs.instance_method(:with_default_nil).get_args.should == [[[:foo], [:bar, nil]], [:bar]]
+  end
+
 end
 
 describe Merb::AbstractController do
@@ -64,4 +76,4 @@ describe Merb::AbstractController do
       Merb::ControllerExceptions::BadRequest, /were missing bar/)          
   end
   
-end
+end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -1,10 +1,18 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
 require "rubygems"
-require "merb-core"
+
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'merb-core'
+
+# The lib under test
 require "merb-action-args"
-require File.dirname(__FILE__) / "controllers" / "action-args"
-require "spec"
+
+# Satisfies Autotest and anyone else not using the Rake tasks
+require 'spec'
+
+# Additional files required for specs
+require "controllers/action-args"
 
 Merb.start :environment => 'test'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-action-args
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2010-02-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
@@ -42,35 +42,49 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.1
     version: 
-description: Merb plugin that provides support for ActionArgs
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+description: Merb plugin that supports controller action arguments
 email: ykatz@engineyard.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
 - LICENSE
+- README
 - TODO
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
+- lib/merb-action-args.rb
 - 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
+- lib/merb-action-args/mri_args.rb
+- lib/merb-action-args/version.rb
+- lib/merb-action-args/vm_args.rb
 - spec/action_args_spec.rb
 - spec/controllers/action-args.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merbivore.com
+homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,16 +95,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: merb
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Merb plugin that provides support for ActionArgs
+summary: Merb plugin that provides support for named parameters in your controller actions
 test_files: []