inherited_resources 1.0.6 → 1.1.pre

data/CHANGELOG

@@ -1,3 +1,7 @@
+# Version 1.1
+
+* Rails 3 compatible
+
 # Version 1.0
 
 * responders was removed from InheritedResources core and is a dependency. To install it, please do:

data/README.rdoc

@@ -10,19 +10,23 @@ a screencast made by Fabio Akita about its features:
 
 http://akitaonrails.com/2009/09/01/screencast-real-thin-restful-controllers-with-inherited-resources
 
-This Inherited Resources branch is tested and compatible with Rails 2.3.x.
+== Rails 3
 
-== Installation
+Inherited Resources master branch is now supports Rails 3 and is backward incompatible.
 
-Inherited Resources is available as gem on Gemcutter, so just run the following:
+You can install it as:
 
-    sudo gem install inherited_resources --version=1.0.3
+  sudo gem install inherited_resources --version=1.1.pre
 
-If you want it as plugin, just do:
+If you want to use the Rails 2.3.x version, you should install:
 
-    script/plugin install git://github.com/josevalim/inherited_resources.git
+  sudo gem install inherited_resources --version=1.0
 
-=== HasScope
+Or checkout from the v1.0 branch:
+
+  http://github.com/josevalim/inherited_resources/tree/v1.0
+
+== HasScope
 
 Since Inherited Resources 1.0, has_scope is not part of its core anymore.
 However, if you are using has_scope in your application, Inherited Resources
@@ -36,7 +40,7 @@ And can be installed as:
 
   sudo gem install has_scope
 
-=== Responders
+== Responders
 
 Since Inherited Resources 1.0, responders are not part of its core anymore,
 but is set as Inherited Resources dependency and it's used by default by
@@ -211,6 +215,24 @@ provided. So you can do:
       end
     end
 
+If you simply want to change the flash message for a particular action, you can
+pass the message to the parent action using the keys :notice and :alert (as you
+would with flash):
+
+    class ProjectsController < InheritedResources::Base
+      def create
+        create!(:notice => "Dude! Nice job creating that project.")
+      end
+    end
+
+You can still pass the block to change the redirect, as mentioned above:
+
+    class ProjectsController < InheritedResources::Base
+      def create
+        create!(:notice => "Dude! Nice job creating that project.") { root_url }
+      end
+    end
+
 Now let's suppose that before create a project you have to do something special
 but you don't want to create a before filter for it:
 

data/Rakefile

@@ -16,9 +16,9 @@ begin
     s.homepage = "http://github.com/josevalim/inherited_resources"
     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]*", "rails/init.rb", "{lib}/**/*"]
-    s.add_dependency("responders", "~> 0.4.6")
-    s.add_dependency("has_scope",  "~> 0.5.0")
+    s.files =  FileList["[A-Z]*", "init.rb", "{lib}/**/*"]
+    s.add_dependency("responders", "~> 0.5.0")
+    s.add_dependency("has_scope",  "~> 0.4.2")
   end
 
   Jeweler::GemcutterTasks.new

data/lib/generators/rails/USAGE

@@ -0,0 +1,10 @@
+Description:
+    Stubs out a scaffolded controller and its views using InheritedResources.
+    Pass the model name, either CamelCased or under_scored. The controller
+    name is retrieved as a pluralized version of the model name.
+
+    To create a controller within a module, specify the model name as a
+    path like 'parent_module/controller_name'.
+
+    This generates a controller class in app/controllers and invokes helper,
+    template engine and test framework generators.

data/lib/generators/rails/inherited_resources_controller_generator.rb

@@ -0,0 +1,11 @@
+require 'generators/rails/scaffold_controller/scaffold_controller_generator'
+
+module Rails
+  module Generators
+    class InheritedResourcesControllerGenerator < ScaffoldControllerGenerator
+      def self.source_root
+        @source_root ||= File.expand_path("templates", File.dirname(__FILE__))
+      end
+    end
+  end
+end

data/lib/generators/rails/templates/controller.rb

@@ -0,0 +1,5 @@
+class <%= controller_class_name %>Controller < InheritedResources::Base
+<% if options[:singleton] -%>
+  defaults :singleton => true
+<% end -%>
+end

data/lib/inherited_resources.rb

@@ -1,11 +1,3 @@
-# respond_to is the only file that should be loaded before hand. All others
-# are loaded on demand.
-#
-unless defined?(ActionController::Responder)
-  require 'inherited_resources/legacy/responder'
-  require 'inherited_resources/legacy/respond_to'
-end
-
 require 'responders'
 I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'inherited_resources', 'locales', 'en.yml'))
 
@@ -27,11 +19,14 @@ module InheritedResources
   def self.flash_keys=(array)
     Responders::FlashResponder.flash_keys = array
   end
+
+  class Railtie < ::Rails::Railtie
+    railtie_name :inherited_resources
+    config.generators.scaffold_controller = :inherited_resources_controller
+  end
 end
 
 class ActionController::Base
-  public :flash, :render
-
   # If you cannot inherit from InheritedResources::Base you can call
   # inherit_resource in your controller to have all the required modules and
   # funcionality included.

data/lib/inherited_resources/actions.rb

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

data/lib/inherited_resources/base.rb

@@ -12,10 +12,7 @@ module InheritedResources
   # or overwrite some helpers in the base_helpers.rb file.
   #
   class Base < ::ApplicationController
-    unloadable
-
     # Overwrite inherit_resources to add specific InheritedResources behavior.
-    #
     def self.inherit_resources(base)
       base.class_eval do
         include InheritedResources::Actions

data/lib/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.0.6'.freeze
+  VERSION = '1.1.pre'.freeze
 end

data/test/aliases_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Student;
-  def self.human_name; 'Student'; end
+class Student
+  extend ActiveModel::Naming
 end
 
 class ApplicationController < ActionController::Base

data/test/association_chain_test.rb

@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class Pet
-  def self.human_name; 'Pet'; end
+  extend ActiveModel::Naming
 end
 
 class Puppet
-  def self.human_name; 'Puppet'; end
+  extend ActiveModel::Naming
 end
 
 class PetsController < InheritedResources::Base

data/test/base_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class User
-  def self.human_name; 'User'; end
+  extend ActiveModel::Naming
 end
 
 class AccountsController < InheritedResources::Base

data/test/belongs_to_test.rb

@@ -1,10 +1,11 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class Post
+  extend ActiveModel::Naming
 end
 
 class Comment
-  def self.human_name; 'Comment'; end
+  extend ActiveModel::Naming
 end
 
 class CommentsController < InheritedResources::Base

data/test/customized_base_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class Car
-  def self.human_name; 'Car'; end
+  extend ActiveModel::Naming
 end
 
 class CarsController < InheritedResources::Base

data/test/test_helper.rb

@@ -17,13 +17,17 @@ require 'mocha'
 ENV["RAILS_ENV"] = "test"
 RAILS_ROOT = "anywhere"
 
-gem 'responders', '~> 0.4.6'
+gem "activesupport", "3.0.0.beta"
+require "active_support"
 
-gem 'activesupport', '= 2.3.5'
-require 'active_support'
+gem "activemodel", "3.0.0.beta"
+require "active_model"
 
-gem 'actionpack', '= 2.3.5'
-require 'action_controller'
+gem "actionpack", "3.0.0.beta"
+require "action_controller"
+require "action_dispatch/middleware/flash"
+
+require "rails/railtie"
 
 I18n.load_path << File.join(File.dirname(__FILE__), 'locales', 'en.yml')
 I18n.reload!

data/test/url_helpers_test.rb

@@ -1,21 +1,29 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class Universe; end
+class Universe
+  extend ActiveModel::Naming
+end
 class UniversesController < InheritedResources::Base
   defaults :singleton => true, :route_instance_name => 'universum'
 end
 
-class House; end
+class House
+  extend ActiveModel::Naming
+end
 class HousesController < InheritedResources::Base
 end
 
-class Backpack; end
+class Backpack
+  extend ActiveModel::Naming
+end
 module Admin; end
 class Admin::BackpacksController < InheritedResources::Base
   defaults :route_collection_name => 'tour_backpacks'
 end
 
-class Table; end
+class Table
+  extend ActiveModel::Naming
+end
 class TablesController < InheritedResources::Base
   belongs_to :house
 end
@@ -34,26 +42,34 @@ class OwnersController < InheritedResources::Base
   singleton_belongs_to :house
 end
 
-class Bed; end
+class Bed
+  extend ActiveModel::Naming
+end
 class BedsController < InheritedResources::Base
   optional_belongs_to :house, :building
 end
 
-class Desk; end
+class Desk
+  extend ActiveModel::Naming
+end
 module Admin
   class DesksController < InheritedResources::Base
     optional_belongs_to :house
   end
 end
 
-class Dish; end
+class Dish
+  extend ActiveModel::Naming
+end
 class DishesController < InheritedResources::Base
   belongs_to :house do
     polymorphic_belongs_to :table, :kitchen
   end
 end
 
-class Center; end
+class Center
+  extend ActiveModel::Naming
+end
 class CentersController < InheritedResources::Base
   acts_as_singleton!
 

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 6
-  version: 1.0.6
+  version: 1.1.pre
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -14,37 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 +01:00
+date: 2010-02-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: responders
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 6
-        version: 0.4.6
-  type: :runtime
-  version_requirements: *id001
+        version: 0.5.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: has_scope
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :runtime
-  version_requirements: *id002
+        version: 0.4.2
+    version: 
 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: []
@@ -58,6 +45,9 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- lib/generators/rails/USAGE
+- lib/generators/rails/inherited_resources_controller_generator.rb
+- lib/generators/rails/templates/controller.rb
 - lib/inherited_resources.rb
 - lib/inherited_resources/actions.rb
 - lib/inherited_resources/base.rb
@@ -66,15 +56,12 @@ files:
 - lib/inherited_resources/blank_slate.rb
 - lib/inherited_resources/class_methods.rb
 - lib/inherited_resources/dsl.rb
-- lib/inherited_resources/legacy/respond_to.rb
-- lib/inherited_resources/legacy/responder.rb
 - lib/inherited_resources/locales/en.yml
 - lib/inherited_resources/polymorphic_helpers.rb
 - lib/inherited_resources/responder.rb
 - lib/inherited_resources/singleton_helpers.rb
 - lib/inherited_resources/url_helpers.rb
 - lib/inherited_resources/version.rb
-- rails/init.rb
 has_rdoc: true
 homepage: http://github.com/josevalim/inherited_resources
 licenses: []
@@ -88,20 +75,18 @@ 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: 1.3.1
+  version: 
 requirements: []
 
 rubyforge_project: inherited_resources
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 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.
@@ -118,7 +103,6 @@ test_files:
 - test/optional_belongs_to_test.rb
 - test/polymorphic_test.rb
 - test/redirect_to_test.rb
-- test/respond_to_test.rb
 - test/singleton_test.rb
 - test/test_helper.rb
 - test/url_helpers_test.rb

data/lib/inherited_resources/legacy/respond_to.rb

@@ -1,151 +0,0 @@
-module ActionController #:nodoc:
-  class Base #:nodoc:
-    attr_accessor :formats
-
-    class_inheritable_accessor :mimes_for_respond_to, :responder, :instance_writer => false
-
-    self.responder = ActionController::Responder
-    self.mimes_for_respond_to = ActiveSupport::OrderedHash.new
-
-    if defined?(ApplicationController)
-      ApplicationController.responder ||= ActionController::Responder
-      ApplicationController.mimes_for_respond_to ||= ActiveSupport::OrderedHash.new
-    end
-
-    # Defines mimes that are rendered by default when invoking respond_with.
-    #
-    # Examples:
-    #
-    #   respond_to :html, :xml, :json
-    #
-    # All actions on your controller will respond to :html, :xml and :json.
-    #
-    # But if you want to specify it based on your actions, you can use only and
-    # except:
-    #
-    #   respond_to :html
-    #   respond_to :xml, :json, :except => [ :edit ]
-    #
-    # The definition above explicits that all actions respond to :html. And all
-    # actions except :edit respond to :xml and :json.
-    #
-    # You can specify also only parameters:
-    #
-    #   respond_to :rjs, :only => :create
-    #
-    def self.respond_to(*mimes)
-      options = mimes.extract_options!
-      clear_respond_to unless mimes_for_respond_to
-
-      only_actions   = Array(options.delete(:only))
-      except_actions = Array(options.delete(:except))
-
-      mimes.each do |mime|
-        mime = mime.to_sym
-        mimes_for_respond_to[mime]          = {}
-        mimes_for_respond_to[mime][:only]   = only_actions   unless only_actions.empty?
-        mimes_for_respond_to[mime][:except] = except_actions unless except_actions.empty?
-      end
-    end
-
-    # Clear all mimes in respond_to.
-    def self.clear_respond_to
-      write_inheritable_attribute(:mimes_for_respond_to, ActiveSupport::OrderedHash.new)
-    end
-
-    def respond_to(*mimes, &block)
-      raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given?
-      if response = retrieve_response_from_mimes(mimes, &block)
-        response.call
-      end
-    end
-
-    def respond_with(*resources, &block)
-      if response = retrieve_response_from_mimes([], &block)
-        options = resources.extract_options!
-        options.merge!(:default_response => response)
-        (options.delete(:responder) || responder).call(self, resources, options)
-      end
-    end
-
-  protected
-
-    # Collect mimes declared in the class method respond_to valid for the
-    # current action.
-    #
-    def collect_mimes_from_class_level #:nodoc:
-      action = action_name.to_sym
-
-      mimes_for_respond_to.keys.select do |mime|
-        config = mimes_for_respond_to[mime]
-
-        if config[:except]
-          !config[:except].include?(action)
-        elsif config[:only]
-          config[:only].include?(action)
-        else
-          true
-        end
-      end
-    end
-
-    # Collects mimes and return the response for the negotiated format. Returns
-    # nil if :not_acceptable was sent to the client.
-    #
-    def retrieve_response_from_mimes(mimes, &block)
-      responder = ActionController::MimeResponds::Responder.new(self)
-      mimes = collect_mimes_from_class_level if mimes.empty?
-      mimes.each { |mime| responder.send(mime) }
-      block.call(responder) if block_given?
-
-      if format = responder.negotiate_mime
-        self.response.template.template_format = format.to_sym
-        self.response.content_type = format.to_s
-        self.formats = [ format.to_sym ]
-        responder.response_for(format) || proc { default_render }
-      else
-        head :not_acceptable
-        nil
-      end
-    end
-  end
-
-  module MimeResponds
-    class Responder #:nodoc:
-      attr_reader :order
-
-      def any(*args, &block)
-        if args.any?
-          args.each { |type| send(type, &block) }
-        else
-          custom(Mime::ALL, &block)
-        end
-      end
-      alias :all :any
-
-      def custom(mime_type, &block)
-        mime_type = mime_type.is_a?(Mime::Type) ? mime_type : Mime::Type.lookup(mime_type.to_s)
-        @order << mime_type
-        @responses[mime_type] ||= block
-      end
-
-      def response_for(mime)
-        @responses[mime] || @responses[Mime::ALL]
-      end
-
-      def negotiate_mime
-        @mime_type_priority.each do |priority|
-          if priority == Mime::ALL
-            return @order.find { |m| m != Mime::ALL } || Mime::SET.first
-          elsif @order.include?(Mime::ALL)
-            return @mime_type_priority.find { |m| m != Mime::ALL } || Mime::SET.first
-          elsif @order.include?(priority)
-            return priority
-          end
-        end
-
-        nil
-      end
-    end
-  end
-end

data/lib/inherited_resources/legacy/responder.rb

@@ -1,220 +0,0 @@
-module ActionController #:nodoc:
-  # Responder is responsible to expose a resource for different mime requests,
-  # usually depending on the HTTP verb. The responder is triggered when
-  # respond_with is called. The simplest case to study is a GET request:
-  #
-  #   class PeopleController < ApplicationController
-  #     respond_to :html, :xml, :json
-  #
-  #     def index
-  #       @people = Person.find(:all)
-  #       respond_with(@people)
-  #     end
-  #   end
-  #
-  # When a request comes, for example with format :xml, three steps happen:
-  #
-  #   1) responder searches for a template at people/index.xml;
-  #
-  #   2) if the template is not available, it will invoke :to_xml in the given resource;
-  #
-  #   3) if the responder does not respond_to :to_xml, call :to_format on it.
-  #
-  # === Builtin HTTP verb semantics
-  #
-  # Rails default responder holds semantics for each HTTP verb. Depending on the
-  # content type, verb and the resource status, it will behave differently.
-  #
-  # Using Rails default responder, a POST request for creating an object could
-  # be written as:
-  #
-  #   def create
-  #     @user = User.new(params[:user])
-  #     flash[:notice] = 'User was successfully created.' if @user.save
-  #     respond_with(@user)
-  #   end
-  #
-  # Which is exactly the same as:
-  #
-  #   def create
-  #     @user = User.new(params[:user])
-  #
-  #     respond_to do |format|
-  #       if @user.save
-  #         flash[:notice] = 'User was successfully created.'
-  #         format.html { redirect_to(@user) }
-  #         format.xml { render :xml => @user, :status => :created, :location => @user }
-  #       else
-  #         format.html { render :action => "new" }
-  #         format.xml { render :xml => @user.errors, :status => :unprocessable_entity }
-  #       end
-  #     end
-  #   end
-  #
-  # The same happens for PUT and DELETE requests.
-  #
-  # === Nested resources
-  #
-  # You can given nested resource as you do in form_for and polymorphic_url.
-  # Consider the project has many tasks example. The create action for
-  # TasksController would be like:
-  #
-  #   def create
-  #     @project = Project.find(params[:project_id])
-  #     @task = @project.comments.build(params[:task])
-  #     flash[:notice] = 'Task was successfully created.' if @task.save
-  #     respond_with(@project, @task)
-  #   end
-  #
-  # Giving an array of resources, you ensure that the responder will redirect to
-  # project_task_url instead of task_url.
-  #
-  # Namespaced and singleton resources requires a symbol to be given, as in
-  # polymorphic urls. If a project has one manager which has many tasks, it
-  # should be invoked as:
-  #
-  #   respond_with(@project, :manager, @task)
-  #
-  # Check polymorphic_url documentation for more examples.
-  #
-  class Responder
-    attr_reader :controller, :request, :format, :resource, :resources, :options
-
-    ACTIONS_FOR_VERBS = {
-      :post => :new,
-      :put => :edit
-    }
-
-    def initialize(controller, resources, options={})
-      @controller = controller
-      @request = controller.request
-      @format = controller.formats.first
-      @resource = resources.is_a?(Array) ? resources.last : resources
-      @resources = resources
-      @options = options
-      @action = options.delete(:action)
-      @default_response = options.delete(:default_response)
-    end
-
-    delegate :head, :render, :redirect_to,   :to => :controller
-    delegate :get?, :post?, :put?, :delete?, :to => :request
-
-    # Undefine :to_json and :to_yaml since it's defined on Object
-    undef_method(:to_json) if method_defined?(:to_json)
-    undef_method(:to_yaml) if method_defined?(:to_yaml)
-
-    # Initializes a new responder an invoke the proper format. If the format is
-    # not defined, call to_format.
-    #
-    def self.call(*args)
-      new(*args).respond
-    end
-
-    # Main entry point for responder responsible to dispatch to the proper format.
-    #
-    def respond
-      method = :"to_#{format}"
-      respond_to?(method) ? send(method) : to_format
-    end
-
-    # HTML format does not render the resource, it always attempt to render a
-    # template.
-    #
-    def to_html
-      default_render
-    rescue ActionView::MissingTemplate => e
-      navigation_behavior(e)
-    end
-
-    # All others formats follow the procedure below. First we try to render a
-    # template, if the template is not available, we verify if the resource
-    # responds to :to_format and display it.
-    #
-    def to_format
-      default_render
-    rescue ActionView::MissingTemplate => e
-      raise unless resourceful?
-      api_behavior(e)
-    end
-
-  protected
-
-    # This is the common behavior for "navigation" requests, like :html, :iphone and so forth.
-    def navigation_behavior(error)
-      if get?
-        raise error
-      elsif has_errors? && default_action
-        render :action => default_action
-      else
-        redirect_to resource_location
-      end
-    end
-
-    # This is the common behavior for "API" requests, like :xml and :json.
-    def api_behavior(error)
-      if get?
-        display resource
-      elsif has_errors?
-        display resource.errors, :status => :unprocessable_entity
-      elsif post?
-        display resource, :status => :created, :location => resource_location
-      else
-        head :ok
-      end
-    end
-
-    # Checks whether the resource responds to the current format or not.
-    #
-    def resourceful?
-      resource.respond_to?(:"to_#{format}")
-    end
-
-    # Returns the resource location by retrieving it from the options or
-    # returning the resources array.
-    #
-    def resource_location
-      options[:location] || resources
-    end
-
-    # If a given response block was given, use it, otherwise call render on
-    # controller.
-    #
-    def default_render
-      @default_response.call
-    end
-
-    # display is just a shortcut to render a resource with the current format.
-    #
-    #   display @user, :status => :ok
-    #
-    # For xml request is equivalent to:
-    #
-    #   render :xml => @user, :status => :ok
-    #
-    # Options sent by the user are also used:
-    #
-    #   respond_with(@user, :status => :created)
-    #   display(@user, :status => :ok)
-    #
-    # Results in:
-    #
-    #   render :xml => @user, :status => :created
-    #
-    def display(resource, given_options={})
-      controller.send :render, given_options.merge!(options).merge!(format => resource)
-    end
-
-    # Check if the resource has errors or not.
-    #
-    def has_errors?
-      resource.respond_to?(:errors) && !resource.errors.empty?
-    end
-
-    # By default, render the :edit action for html requests with failure, unless
-    # the verb is post.
-    #
-    def default_action
-      @action ||= ACTIONS_FOR_VERBS[request.method]
-    end
-  end
-end

data/rails/init.rb

@@ -1 +0,0 @@
-require 'inherited_resources'

data/test/respond_to_test.rb

@@ -1,174 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class Project
-  def to_html
-    'Generated HTML'
-  end
-
-  def to_xml
-    'Generated XML'
-  end
-
-  [:to_json, :to_rss, :to_rjs].each do |method|
-    undef_method method if respond_to? method
-  end
-end
-
-class ProjectsController < ActionController::Base
-  respond_to :html
-  respond_to :xml,  :except => :edit
-  respond_to :rjs,  :only => :edit
-  respond_to :rss,  :only => :index
-  respond_to :json, :except => :index
-  respond_to :csv,  :except => :index
-
-  def index
-    respond_with(Project.new)
-  end
-
-  def respond_with_resource
-    respond_with(Project.new)
-  end
-
-  def respond_with_resource_and_options
-    respond_with(Project.new, :location => 'http://test.host/')
-  end
-
-  def respond_with_resource_and_blocks
-    respond_with(Project.new) do |format|
-      format.json { render :text => 'Render JSON' }
-      format.rss  { render :text => 'Render RSS' }
-    end
-  end
-
-  # If the user request Mime::ALL and we have a template called action.html.erb,
-  # the html template should be rendered *unless* html is specified inside the
-  # block. This tests exactly this case.
-  #
-  def respond_to_skip_default_template
-    respond_with(Project.new) do |format|
-      format.html { render :text => 'Render HTML' }
-    end
-  end
-end
-
-class SuperProjectsController < ProjectsController
-end
-
-class NonInheritedResourcesController < ActionController::Base
-  def index
-    respond_to do |format|
-      format.xml { render :text => 'Render XML' }
-      format.any { render :text => 'Render HTML' }
-    end
-  end
-end
-
-class RespondToFunctionalTest < ActionController::TestCase
-  tests ProjectsController
-
-  def test_respond_with_layout_rendering
-    @request.accept = 'text/html'
-    get :index
-    assert_equal 'Index HTML', @response.body.strip
-  end
-
-  def test_respond_with_calls_to_format_on_resource
-    @request.accept = 'application/xml'
-    get :index
-    assert_equal 'Generated XML', @response.body.strip
-  end
-
-  def test_respond_with_inherits_format
-    @request.accept = 'application/xml'
-    get :index
-    assert_equal 'Generated XML', @response.body.strip
-  end
-
-  def test_respond_with_renders_status_not_acceptable_if_mime_type_is_not_registered
-    @request.accept = 'text/csv'
-    get :index
-    assert_equal '406 Not Acceptable', @response.status
-  end
-
-  def test_respond_with_raises_error_if_could_not_respond
-    @request.accept = 'application/rss+xml'
-    assert_raise ActionView::MissingTemplate do
-      get :index
-    end
-  end
-
-  def test_respond_to_all
-    @request.accept = '*/*'
-    get :index
-    assert_equal 'Index HTML', @response.body.strip
-  end
-
-  def test_respond_with_sets_content_type_properly
-    @request.accept = 'text/html'
-    get :index
-    assert_equal 'text/html', @response.content_type
-    assert_equal :html, @response.template.template_format
-
-    @request.accept = 'application/xml'
-    get :index
-    assert_equal 'application/xml', @response.content_type
-    assert_equal :xml, @response.template.template_format
-  end
-
-  def test_respond_with_forwads_extra_options_to_render
-    @request.accept = 'application/xml'
-    get :respond_with_resource_and_options
-    assert_equal 'Generated XML', @response.body.strip
-    assert_equal 'http://test.host/', @response.headers['Location']
-  end
-
-  def test_respond_to_when_a_resource_is_given_as_option
-    @request.accept = 'text/html'
-    get :respond_with_resource
-    assert_equal 'RespondTo HTML', @response.body.strip
-
-    @request.accept = 'application/xml'
-    get :respond_with_resource
-    assert_equal 'Generated XML', @response.body.strip
-
-    @request.accept = 'application/rss+xml'
-    get :respond_with_resource
-    assert_equal '406 Not Acceptable', @response.status
-
-    @request.accept = 'application/json'
-    assert_raise ActionView::MissingTemplate do
-      get :respond_with_resource
-    end
-  end
-
-  def test_respond_to_overwrite_class_method_definition
-    @request.accept = 'application/rss+xml'
-    get :respond_with_resource_and_blocks
-    assert_equal 'Render RSS', @response.body.strip
-  end
-
-  def test_respond_to_first_configured_mime_in_respond_to_when_mime_type_is_all
-    @request.accept = '*/*'
-    assert_raise ActionView::MissingTemplate do
-      get :respond_with_resource_and_blocks
-    end
-    assert_equal 'text/html', @response.content_type
-  end
-
-  def test_respond_to_skip_default_template_when_it_is_in_block
-    @request.accept = '*/*'
-    get :respond_to_skip_default_template
-    assert_equal 'Render HTML', @response.body.strip
-  end
-end
-
-class RespondToFunctionalStandardControllerTest < ActionController::TestCase
-  tests NonInheritedResourcesController
-  
-  def test_respond_with_no_specific_format
-    @request.accept = 'application/xml,application/xhtml+xml,text/html'
-    get :index
-    assert_equal 'Render HTML', @response.body.strip
-  end
-end