rc_rails 2.1.0 → 2.1.1

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 2.1.1
+
+  * Stop modifying resource_specification_map in place [Joel Chippendale]
+  * Handle instance_methods containing Symbols in Ruby >= 1.9 [Lewis Marshall]
+  * Fix failing specs since 2.1.0 [Ian White]
+  * Add travis ci [Ian White]
+  
+  
 = 2.1.0
 
   * Gemify resources_controller and friends (thanks Josh Goebel)

data/Gemfile

@@ -1,5 +1,3 @@
 source :rubygems
 
-gemspec
-
-gem 'pry'
+gemspec

data/Gemfile.lock.development

@@ -1,60 +1,54 @@
 PATH
   remote: .
   specs:
-    rc_rails (2.1.0)
+    rc_rails (2.1.1)
       rails (>= 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.0)
-    coderay (1.0.5)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
-    json (1.6.5)
+    json (1.7.1)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.7.1)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
+    mime-types (1.18)
+    multi_json (1.3.4)
     polyglot (0.3.3)
-    pry (0.9.8.4)
-      coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -62,17 +56,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -80,37 +74,35 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    rspec-rails (2.10.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
-    slop (2.4.4)
-    sprockets (2.1.2)
+      rspec (~> 2.10.0)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  pry
   rc_rails!
   rspec (>= 2.8.0)
   rspec-rails (>= 2.8.0)

data/README.rdoc

@@ -1,5 +1,7 @@
 = resources_controller
 
+{<img src="https://secure.travis-ci.org/ianwhite/resources_controller.png?branch=master" alt="Build Status" />}[http://travis-ci.org/ianwhite/resources_controller]
+
 is a plugin to facilitate inheritance and DRYness in your resources controllers.  It introduces some abstraction to help
 you override the default RESTful funtionality in a clean and simple manner.
 
@@ -25,32 +27,24 @@ Add this to your Gemfile
 
 use the rails2 branch: http://github.com/ianwhite/resources_controller/tree/rails2
 
-== Run the specs
-
-To get set up for development, do the following:
-
-  git clone git://github.com/ianwhite/resources_controller
-  cd resources_controller
-  cp Gemfile.lock.development Gemfile.lock
-  bundle
-  rake spec:generate
-  rake spec
-
 == How to contribute
 
 If you have found a bug, or have a new feature, then spec'd code is great.
 
-To get set up and run the tests
+To get set up for development, do the following:
 
   git clone git://github.com/ianwhite/resources_controller
   cd resources_controller
+  cp Gemfile.lock.development Gemfile.lock
   bundle
-  rake spec:all
+  rake spec
+  rake spec:rspec_generated_specs
 
 == Contributors
 
 The following people have made contributions to resources_controller.  Please let me know if I've missed you out.
 
+* Lewis Marshall
 * Josh Goebel
 * Andrew Bloomgarden
 * Chris Hapgood

data/lib/resources_controller.rb

@@ -489,7 +489,7 @@ module ResourcesController
   # See Specification#new for details of how to call this
   def map_enclosing_resource(name, options = {}, &block)
     spec = Specification.new(name, options, &block)
-    resource_specification_map[spec.segment] = spec
+    self.resource_specification_map = resource_specification_map.merge spec.segment => spec
   end
   
   # this will be deprecated soon as it's badly named - use map_enclosing_resource

data/lib/resources_controller/include_actions.rb

@@ -26,9 +26,10 @@ module ResourcesController
     
     def action_methods_to_remove(options = {})
       if options[:only]
-        instance_methods - Array(options[:only]).map(&:to_s)
+        # instance_methods contains Strings in < 1.9, and Symbols in >= 1.9
+        instance_methods.map(&:to_s) - Array(options[:only]).map(&:to_s)
       elsif options[:except]
-        Array(options[:except]).map(&:to_s) & instance_methods
+        Array(options[:except]).map(&:to_s) & instance_methods.map(&:to_s)
       else
         []
       end

data/lib/resources_controller/version.rb

@@ -1,3 +1,3 @@
 module ResourcesController
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/spec/app.rb

@@ -31,6 +31,7 @@ Rails.application.routes.draw do
   end
   
   resources :users do
+    resources :interests
     resources :posts, :controller => 'user_posts'
     resources :comments, :controller => 'user_comments'
     resources :addresses do

data/spec/app/database.yml

@@ -1,5 +1,4 @@
 test:
   adapter: sqlite3
-  database: tmp/test.sqlite3
-  pool: 5
-  timeout: 5000
+  database: ":memory:"
+  verbosity: quiet

data/spec/controllers/users_controller_spec.rb

@@ -156,7 +156,7 @@ end
 
 describe UsersController, "handling GET /users/new" do
   it "should be unknown action" do
-    lambda{ get :new }.should raise_error(ActionView::MissingTemplate)
+    lambda{ get :new }.should raise_error(::AbstractController::ActionNotFound)
   end
 end
 
@@ -194,7 +194,7 @@ end
 
 describe UsersController, "handling POST /users" do
   it "should be unknown action" do
-    lambda{ post :create }.should raise_error(ActionController::RoutingError)
+    lambda{ post :create }.should raise_error(::AbstractController::ActionNotFound)
   end
 end
 

data/spec/lib/resource_methods_spec.rb

@@ -52,27 +52,28 @@ module ResourceMethodsSpec
     describe "when an enclosing resource is added (a forum)" do
       before do
         @forum = Forum.create!
+        @forum.stub(:users).and_return(@users = double)
         @controller.send :add_enclosing_resource, @forum
       end
   
-      it "#find_resource(<id>) should call forum.users.find(<id>)" do
-        @forum.users.should_receive(:find).with("42")
-        @controller.send(:find_resource, "42")
+      it "#find_resource(<id>) should find the forum user" do
+        @users.should_receive(:find).with("42").and_return(user = double)
+        @controller.send(:find_resource, "42").should == user
       end
   
-      it "#find_resources should call forum.users.find(:all)" do
-        @forum.users.should_receive(:all)
-        @controller.send(:find_resources)
+      it "#find_resources should return the forum users" do
+        @users.should_receive(:all).and_return(users = double)
+        @controller.send(:find_resources).should == users
       end
 
       it "#new_resource({}) should call forum.users.build({})" do
-        @forum.users.should_receive(:build).with({})
-        @controller.send :new_resource, {}
+        @users.should_receive(:build).with({}).and_return(user = double)
+        @controller.send(:new_resource, {}).should == user
       end
 
-      it "#destroy_resource(<id>) should call forum.users.find(<id>) and forum.users.destroy(<id>)" do
-        @forum.users.should_receive(:find).with("42").and_return(user = mock)
-        @forum.users.should_receive(:destroy).with("42").and_return(useless_array = mock)
+      it "#destroy_resource(<id>) should call forum.users.find(<id>) and forum.users.destroy(<id>) and return the resource" do
+        @users.should_receive(:find).with("42").and_return(user = double)
+        @users.should_receive(:destroy).with("42")
         @controller.send(:destroy_resource, "42").should == user
       end
     end

data/spec/rspec_generator_task.rb

@@ -1,6 +1,6 @@
 namespace :spec do
   desc "Run rspec's generated specs against RC'd controllers"
-  task :generate => 'tmp/test_app' do
+  task :rspec_generated_specs => 'tmp/test_app' do
     require 'active_support/all'
 
     cd 'tmp/test_app' do
@@ -9,7 +9,8 @@ namespace :spec do
         migrate_up
         make_resources_controller :author
         puts "** Running generated controller specs"
-        sh "bundle exec rake spec:controllers"
+        sh "rake db:test:prepare"
+        sh "bundle exec rspec"
       ensure
         migrate_down
         cleanup_resource :author
@@ -28,21 +29,14 @@ namespace :spec do
     puts "Generating test app"
     mkdir_p "tmp"
     cd 'tmp' do
-      system "rails new test_app"
+      system "rails new test_app --skip-gemfile --skip-bundle --skip-git --skip-test-unit"
       
       cd 'test_app' do
         File.open('Gemfile', 'w+') do |file|
-          file << <<-EOD
-            source :rubygems
-            gem 'rails'
-            gem 'sqlite3'
-            gem 'rspec'
-            gem 'rspec-rails'
-            gem 'rc_rails', :git => "#{File.expand_path('../../../..', __FILE__)}"
-          EOD
+          file << %Q{gem 'rc_rails', :git => "#{File.expand_path('../../../..', __FILE__)}"}
         end
-        system "bundle install"
-        system "rails g rspec:install"
+        system "bundle install --quiet"
+        system "rails generate rspec:install"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rc_rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70213065794220 !ruby/object:Gem::Requirement
+  requirement: &70122018858180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70213065794220
+  version_requirements: *70122018858180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213065793660 !ruby/object:Gem::Requirement
+  requirement: &70122018856400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70213065793660
+  version_requirements: *70122018856400
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70213065793060 !ruby/object:Gem::Requirement
+  requirement: &70122018850400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70213065793060
+  version_requirements: *70122018850400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70213065792600 !ruby/object:Gem::Requirement
+  requirement: &70122018847920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213065792600
+  version_requirements: *70122018847920
 description: rc makes RESTful controllers fun
 email: ian.w.white@gmail.com
 executables: []
@@ -63,6 +63,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - Gemfile.lock.development
@@ -174,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1183401089440574337
+      hash: -2439169626615472327
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -183,11 +184,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1183401089440574337
+      hash: -2439169626615472327
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: resources_controller-2.1.0
+summary: resources_controller-2.1.1
 test_files: []