merb-action-args 0.9.7 → 0.9.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 YOUR NAME
+Copyright (c) 2008 Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rake/gempackagetask'
 require "extlib"
 require 'merb-core/tasks/merb_rake_helper'
+require "spec/rake/spectask"
 
 ##############################################################################
 # Package && release
@@ -16,13 +17,12 @@ 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.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 
-RELEASE_NAME    = "REL #{GEM_VERSION}"
+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
@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.7')
+  s.add_dependency('merb-core', '>= 0.9.8')
   s.add_dependency('ruby2ruby', '>= 1.1.9')
   s.add_dependency('ParseTree', '>= 2.2')
   s.require_path = 'lib'
@@ -47,13 +47,33 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
+end
+
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
 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
+end
+
+desc 'Default: run spec examples'
+task :default => 'spec'

data/spec/action_args_spec.rb

@@ -1,5 +1,13 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
+describe "ActionArgs" do
+  
+  it "should not accidently introduce any methods as controller actions" do
+    Merb::Controller.callable_actions.should be_empty
+  end
+  
+end
+
 describe Merb::AbstractController do
   
   it "should be able to accept Action Arguments" do

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-$TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require "rubygems"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-action-args
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +03:00
+date: 2008-10-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby