inherited_resources 1.1.0 → 1.1.2

data/README.rdoc

@@ -12,15 +12,15 @@ http://akitaonrails.com/2009/09/01/screencast-real-thin-restful-controllers-with
 
 == Rails 3
 
-Inherited Resources master branch is now supports Rails 3 and is backward incompatible.
+Inherited Resources master branch is now supports Rails 3 and is NOT backward compatible.
 
 You can install it as:
 
-  sudo gem install inherited_resources --version=1.1.pre
+  sudo gem install inherited_resources --version=1.1.1
 
 If you want to use the Rails 2.3.x version, you should install:
 
-  sudo gem install inherited_resources --version=1.0
+  sudo gem install inherited_resources --version=1.0.6
 
 Or checkout from the v1.0 branch:
 

data/Rakefile

@@ -9,7 +9,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "inherited_resources"
-    s.version = InheritedResources::VERSION
+    s.version = InheritedResources::VERSION.dup
     s.rubyforge_project = "inherited_resources"
     s.summary = "Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important."
     s.email = "jose.valim@gmail.com"
@@ -17,8 +17,8 @@ begin
     s.description = "Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important."
     s.authors = ['José Valim']
     s.files =  FileList["[A-Z]*", "init.rb", "{lib}/**/*"]
-    s.add_dependency("responders", "~> 0.5.0")
-    s.add_dependency("has_scope",  "~> 0.4.2")
+    s.add_dependency("responders", "~> 0.6.0")
+    s.add_dependency("has_scope",  "~> 0.5.0")
   end
 
   Jeweler::GemcutterTasks.new

data/lib/generators/rails/inherited_resources_controller_generator.rb

@@ -1,4 +1,4 @@
-require 'generators/rails/scaffold_controller/scaffold_controller_generator'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
 module Rails
   module Generators

data/lib/inherited_resources.rb

@@ -20,7 +20,7 @@ module InheritedResources
   end
 
   class Railtie < ::Rails::Railtie
-    railtie_name :inherited_resources
+    config.inherited_resources = InheritedResources
     config.generators.scaffold_controller = :inherited_resources_controller
   end
 end

data/lib/inherited_resources/actions.rb

@@ -3,26 +3,26 @@ module InheritedResources
   module Actions
 
     # GET /resources
-    def index(&block)
-      respond_with(*with_chain(collection), &block)
+    def index(options={}, &block)
+      respond_with(*(with_chain(collection) << options), &block)
     end
     alias :index! :index
 
     # GET /resources/1
-    def show(&block)
-      respond_with(*with_chain(resource), &block)
+    def show(options={}, &block)
+      respond_with(*(with_chain(resource) << options), &block)
     end
     alias :show! :show
 
     # GET /resources/new
-    def new(&block)
-      respond_with(*with_chain(build_resource), &block)
+    def new(options={}, &block)
+      respond_with(*(with_chain(build_resource) << options), &block)
     end
     alias :new! :new
 
     # GET /resources/1/edit
-    def edit(&block)
-      respond_with(*with_chain(resource), &block)
+    def edit(options={}, &block)
+      respond_with(*(with_chain(resource) << options), &block)
     end
     alias :edit! :edit
 

data/lib/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.2'.freeze
 end

data/test/base_test.rb

@@ -9,6 +9,7 @@ end
 
 class UsersController < AccountsController
   respond_to :html, :xml
+  respond_to :js, :only => [:create, :update, :destroy]
   attr_reader :scopes_applied
 
 protected
@@ -163,6 +164,12 @@ class CreateActionBaseTest < ActionController::TestCase
     assert_equal flash[:notice], 'User was successfully created.'
   end
 
+  def test_show_flash_message_with_javascript_request_when_success
+    User.stubs(:new).returns(mock_user(:save => true))
+    post :create, :format => :js
+    assert_equal flash[:notice], 'User was successfully created.'
+  end
+
   def test_render_new_template_when_user_cannot_be_saved
     User.stubs(:new).returns(mock_user(:save => false, :errors => {:some => :error}))
     post :create
@@ -200,6 +207,12 @@ class UpdateActionBaseTest < ActionController::TestCase
     assert_equal flash[:notice], 'User was successfully updated.'
   end
 
+  def test_show_flash_message_with_javascript_request_when_success
+    User.stubs(:find).returns(mock_user(:update_attributes => true))
+    post :update, :format => :js
+    assert_equal flash[:notice], 'User was successfully updated.'
+  end
+
   def test_render_edit_template_when_user_cannot_be_saved
     User.stubs(:find).returns(mock_user(:update_attributes => false, :errors => {:some => :error}))
     put :update
@@ -230,12 +243,24 @@ class DestroyActionBaseTest < ActionController::TestCase
     assert_equal flash[:notice], 'User was successfully destroyed.'
   end
 
-  def test_show_flash_message_when_cannot_be_deleted
+  def test_show_flash_message_with_javascript_request_when_user_can_be_deleted
+    User.stubs(:find).returns(mock_user(:destroy => true))
+    delete :destroy, :format => :js
+    assert_equal flash[:notice], 'User was successfully destroyed.'
+  end
+
+  def test_show_flash_message_when_user_cannot_be_deleted
     User.stubs(:find).returns(mock_user(:destroy => false, :errors => { :fail => true }))
     delete :destroy
     assert_equal flash[:alert], 'User could not be destroyed.'
   end
 
+  def test_show_flash_message_with_javascript_request_when_user_cannot_be_deleted
+    User.stubs(:find).returns(mock_user(:destroy => false, :errors => { :fail => true }))
+    delete :destroy, :format => :js
+    assert_equal flash[:alert], 'User could not be destroyed.'
+  end
+
   def test_redirects_to_users_list
     User.stubs(:find).returns(mock_user(:destroy => true))
     @controller.expects(:collection_url).returns('http://test.host/')

data/test/test_helper.rb

@@ -1,5 +1,11 @@
 require 'rubygems'
 
+gem 'responders', '0.6.0'
+gem 'activesupport', '3.0.0.beta2'
+gem 'activemodel', '3.0.0.beta2'
+gem 'actionpack', '3.0.0.beta2'
+gem 'railties', '3.0.0.beta2'
+
 begin
   gem "test-unit"
 rescue LoadError
@@ -36,6 +42,16 @@ require_dependency 'inherited_resources'
 
 ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
 
-ActionController::Routing::Routes.draw do |map|
+InheritedResources::Routes = ActionDispatch::Routing::RouteSet.new
+InheritedResources::Routes.draw do |map|
   map.connect ':controller/:action/:id'
+  map.connect ':controller/:action'
+end
+
+ActionController::Base.send :include, InheritedResources::Routes.url_helpers
+
+class ActiveSupport::TestCase
+  setup do
+    @routes = InheritedResources::Routes
+  end
 end

data/test/url_helpers_test.rb

@@ -325,7 +325,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
     
     new_bed = Bed.new
     Bed.stubs(:new).returns(new_bed)
-    new_bed.stubs(:new_record?).returns(true)
+    new_bed.stubs(:persisted?).returns(false)
 
     controller = BedsController.new
     controller.instance_variable_set('@parent_type', :house)
@@ -379,7 +379,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
     new_desk = Desk.new
     Desk.stubs(:new).returns(new_desk)
-    new_desk.stubs(:new_record?).returns(true)
+    new_desk.stubs(:persisted?).returns(false)
 
     controller = Admin::DesksController.new
     controller.instance_variable_set('@parent_type', :house)
@@ -434,7 +434,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
 
     new_dish = Dish.new
     Dish.stubs(:new).returns(new_dish)
-    new_dish.stubs(:new_record?).returns(true)
+    new_dish.stubs(:persisted?).returns(false)
 
     controller = DishesController.new
     controller.instance_variable_set('@parent_type', :table)
@@ -533,7 +533,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
     bed   = Bed.new
     new_bed = Bed.new
     Bed.stubs(:new).returns(new_bed)
-    new_bed.stubs(:new_record?).returns(true)
+    new_bed.stubs(:persisted?).returns(false)
 
     controller = BedsController.new
     controller.instance_variable_set('@parent_type', nil)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +01:00
+date: 2010-04-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: responders
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.0
-    version: 
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: has_scope
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.2
-    version: 
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id002
 description: Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important.
 email: jose.valim@gmail.com
 executables: []
@@ -74,18 +87,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: inherited_resources
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important.