josevalim-inherited_resources 0.8.1 → 0.8.2

data/README

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.8.0
+Version: 0.8.2
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 

data/lib/inherited_resources/actions.rb

@@ -30,7 +30,7 @@ module InheritedResources
 
     # POST /resources
     def create(redirect_url=nil, &block)
-      object = build_resource(params[resource_instance_name])
+      object = build_resource
       respond_block, redirect_block = select_block_by_arity(block)
 
       if object.save

data/lib/inherited_resources/base_helpers.rb

@@ -42,11 +42,11 @@ module InheritedResources
       end
 
       # This method is responsable for building the object on :new and :create
-      # methods. You probably won't need to change it. Again, if you overwrite
-      # don't forget to cache the result in an instance_variable.
+      # methods. If you overwrite it, don't forget to cache the result in an
+      # instance variable.
       #
-      def build_resource(attributes={})
-        get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, attributes))
+      def build_resource
+        get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, params[resource_instance_name]))
       end
 
       # This class allows you to set a instance variable to begin your

data/lib/inherited_resources/respond_to.rb

@@ -59,9 +59,6 @@ module ActionController
       end
       class_inheritable_reader :formats_for_respond_to
 
-      # By default, responds only to :html
-      respond_to :html
-
       # Method to clear all respond_to declared until the current controller.
       # This is like freeing the controller from the inheritance chain. :)
       #
@@ -71,6 +68,20 @@ module ActionController
         write_inheritable_hash(:formats_for_respond_to, formats)
       end
 
+      # By default, responds only to :html
+      respond_to :html
+
+      # If ApplicationController is already defined around here, we recriate
+      # the formats_for_respond_to hash. Since we respond only to :html by
+      # default, this is as easy as settings the :formats_for_respond_to key
+      # to {:html=>{}}.
+      #
+      if defined?(ApplicationController)
+        if inheritable = ApplicationController.instance_variable_get("@inheritable_attributes")
+          inheritable.merge!(:formats_for_respond_to => {:html => {}}) if inheritable
+        end
+      end
+
       # respond_with accepts an object and tries to render a view based in the
       # controller and actions that called respond_with. If the view cannot be
       # found, it will try to call :to_format in the object.
@@ -258,14 +269,6 @@ module ActionController
         responder.action_respond_to_format?(default_template_format) && template_exists?
       end
 
-      # If ApplicationController is already defined around here, we should call
-      # inherited_with_inheritable_attributes to insert formats_for_respond_to.
-      # This usually happens only on Rails 2.3.
-      #
-      if defined?(ApplicationController)
-        self.send(:inherited_with_inheritable_attributes, ApplicationController)
-      end
-
   end
 
   module MimeResponds #:nodoc:

data/test/test_helper.rb

@@ -14,12 +14,12 @@ require 'action_controller/test_process'
 I18n.load_path << File.join(File.dirname(__FILE__), 'locales', 'en.yml')
 I18n.reload!
 
+class ApplicationController < ActionController::Base; end
+
 # Add IR to load path and load the main file
 ActiveSupport::Dependencies.load_paths << File.expand_path(File.dirname(__FILE__) + '/../lib')
 require_dependency 'inherited_resources'
 
-class ApplicationController < ActionController::Base; end
-
 ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
 
 ActionController::Routing::Routes.draw do |map|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-23 00:00:00 -07:00
+date: 2009-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: []