inherited_resources 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+# Version 1.3.1
+
+* Fix polymorphic_belongs_to to get the parent
+* Addes support for Rails 3.2
+* Addes support to responders >= 0.6.0
+
 # Version 1.3.0
 
 * Added support for multiple polymorphic optional nesting

data/Gemfile

@@ -1,12 +1,6 @@
-source "http://rubygems.org"
+source :rubygems
 
-gem "rails", "3.1.0.rc4"
-gem "responders", "~> 0.6.0"
-gem "has_scope", "~> 0.5.0"
-gem "mocha"
+gemspec
 
-if RUBY_VERSION < "1.9"
-  gem "ruby-debug"
-else
-  gem "test-unit"
-end
+gem 'rails', '~> 3.1'
+gem 'mocha'

data/Gemfile.lock

@@ -1,104 +1,100 @@
+PATH
+  remote: .
+  specs:
+    inherited_resources (1.3.1)
+      has_scope (~> 0.5.0)
+      responders (~> 0.6)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      mail (~> 2.3.0)
-    actionpack (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
+      mail (~> 2.4.0)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.0)
-      rack-cache (~> 1.0.1)
-      rack-mount (~> 0.8.1)
-      rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.10)
-      tzinfo (~> 0.3.27)
-    activemodel (3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-      bcrypt-ruby (~> 2.1.4)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-      arel (~> 2.1.1)
-      tzinfo (~> 0.3.27)
-    activeresource (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-    activesupport (3.1.0.rc4)
       multi_json (~> 1.0)
-    arel (2.1.1)
-    bcrypt-ruby (2.1.4)
+    arel (3.0.2)
     builder (3.0.0)
-    columnize (0.3.4)
     erubis (2.7.0)
-    has_scope (0.5.0)
-    hike (1.1.0)
+    has_scope (0.5.1)
+    hike (1.2.1)
     i18n (0.6.0)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mail (2.3.0)
+    journey (1.0.3)
+    json (1.6.5)
+    mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    mocha (0.9.8)
-      rake
-    multi_json (1.0.3)
-    polyglot (0.3.1)
-    rack (1.3.0)
-    rack-cache (1.0.2)
+    metaclass (0.0.1)
+    mime-types (1.17.2)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.1.0)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.1)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.0)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc4)
-      actionmailer (= 3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      activerecord (= 3.1.0.rc4)
-      activeresource (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc4)
-    railties (3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+      railties (= 3.2.2)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.8.7)
-    rbx-require-relative (0.0.5)
-    rdoc (3.6.1)
-    responders (0.6.4)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sprockets (2.0.0.beta.10)
-      hike (~> 1.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    responders (0.8.0)
+      railties (~> 3.1)
+    sprockets (2.1.2)
+      hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
-    tilt (1.3.2)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.28)
+    tzinfo (0.3.32)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  has_scope (~> 0.5.0)
+  inherited_resources!
   mocha
-  rails (= 3.1.0.rc4)
-  responders (~> 0.6.0)
-  ruby-debug
+  rails (~> 3.1)

data/README.rdoc

@@ -1,10 +1,18 @@
+=== Deprecation notice
+
+Since Rails 3 came out, I have no longer used Inherited Resources. I have found that the
+responders abstraction and custom Rails generators offer the perfect balance between
+hiding and showing too much logic. That said, I suggest developers to make use of the
+responders gem (at https://github.com/plataformatec/responders) and no longer use Inherited
+Resources.
+
 == Inherited Resources
 
 Inherited Resources speeds up development by making your controllers inherit
 all restful actions so you just have to focus on what is important. It makes
 your controllers more powerful and cleaner at the same time.
 
-Plus, making your controllers follow a pattern, it helps you to write better
+In addition to making your controllers follow a pattern, it helps you to write better
 code by following fat models and skinny controllers convention. There are
 two screencasts available besides this README:
 
@@ -23,7 +31,7 @@ And then execute:
 
   bundle install 
 
-Or install it yourself as:
+Or install it yourself with:
 
   gem install inherited_resources
 
@@ -57,7 +65,7 @@ how it will change your application:
 
   http://github.com/plataformatec/responders
 
-And it can be installed as:
+And it can be installed with:
 
   gem install responders
 
@@ -85,7 +93,7 @@ The next step is to define which mime types this controller provides:
       respond_to :html, :xml, :json
     end
 
-You can also specify them based per action:
+You can also specify them per action:
 
     class ProjectsController < InheritedResources::Base
       respond_to :html, :xml, :json
@@ -93,7 +101,7 @@ You can also specify them based per action:
       respond_to :iphone, :except => [ :edit, :update ]
     end
 
-For each request, it first checkes if the "controller/action.format" file is
+For each request, it first checks if the "controller/action.format" file is
 available (for example "projects/create.xml") and if it's not, it checks if
 the resource respond to :to_format (in this case, :to_xml). Otherwise returns 404.
 
@@ -129,8 +137,8 @@ call inherit_resources in your controller class scope:
 == Overwriting defaults
 
 Whenever you inherit from InheritedResources, several defaults are assumed.
-For example you can have an AccountsController to account management while the
-resource is an User:
+For example you can have an AccountsController for account management while the
+resource is a User:
 
     class AccountsController < InheritedResources::Base
       defaults :resource_class => User, :collection_name => 'users', :instance_name => 'user'
@@ -141,7 +149,7 @@ the routes used will still be accounts_url and account_url. If you plan also to
 change the routes, you can use :route_collection_name and :route_instance_name.
 
 Namespaced controllers work out of the box, but if you need to specify a
-different route prefix, you can do the following:
+different route prefix you can do the following:
 
     class Administrators::PeopleController < InheritedResources::Base
       defaults :route_prefix => 'admin'
@@ -167,10 +175,10 @@ and scopes (more about this below).
 
 InheritedResources also introduces another method called begin_of_association_chain.
 It's mostly used when you want to create resources based on the @current_user and
-you have urls like "account/projects". In such cases, you have to do
+you have urls like "account/projects". In such cases you have to do
 @current_user.projects.find or @current_user.projects.build in your actions.
 
-You can deal with it just doing:
+You can deal with it just by doing:
 
     class ProjectsController < InheritedResources::Base
       protected
@@ -204,8 +212,8 @@ why all methods have aliases. So this is equivalent:
       end
     end
 
-Even more, since most of the times when you change a create, update or destroy
-action is because you want to to change to where it redirects, a shortcut is
+Since most of the time when you change a create, update or destroy
+action you do so because you want to to change its redirect url, a shortcut is 
 provided. So you can do:
 
     class ProjectsController < InheritedResources::Base
@@ -243,7 +251,7 @@ but you don't want to create a before filter for it:
       end
     end
 
-Yes, that simple! The nice part is since you already set the instance variable
+Yes, it's that simple! The nice part is since you already set the instance variable
 @project, it will not build a project again.
 
 Before we finish this topic, we should talk about one more thing: "success/failure
@@ -262,7 +270,7 @@ Our first attempt to do this would be:
      end
     end
 
-Looks to verbose, right? We can actually do:
+Looks too verbose, right? We can actually do:
 
     class ProjectsController < InheritedResources::Base
       def update
@@ -273,7 +281,7 @@ Looks to verbose, right? We can actually do:
     end
 
 Much better! So explaining everything: when you give a block which expects one
-argument it will be executed in both scenarios: success and failure. But If you
+argument it will be executed in both scenarios: success and failure. But if you
 give a block that expects two arguments, the first will be executed only in
 success scenarios and the second in failure scenarios. You keep everything
 clean and organized inside the same action.
@@ -284,8 +292,8 @@ Although the syntax above is a nice shortcut, you won't need to do it frequently
 because (since version 1.2) Inherited Resources has smart redirects. Redirects
 in actions calculates depending on the existent controller methods.
 
-Redirects in create and update actions calculates in following order resource_url,
-collection_url, parent_url (which we are going to see later), root_url. Redirect
+Redirects in create and update actions calculates in the following order resource_url,
+collection_url, parent_url (which we are going to see later), and root_url. Redirect
 in destroy action calculate in following order collection_url, parent_url, root_url.
 
 Example:
@@ -506,7 +514,7 @@ search_resources_{path,url} url helpers.
 
 == What about views?
 
-Sometimes just DRY the controllers is not enough, if you need to DRY up your views,
+Sometimes just DRYing up the controllers is not enough. If you need to DRY up your views,
 check this Wiki page:
 
 https://github.com/josevalim/inherited_resources/wiki/Views-Inheritance

data/Rakefile

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-require 'rake'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Run tests for InheritedResources.'
 Rake::TestTask.new(:test) do |t|

data/inherited_resources.gemspec

@@ -16,9 +16,8 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("responders", "~> 0.6.0")
+  s.add_dependency("responders", "~> 0.6")
   s.add_dependency("has_scope",  "~> 0.5.0")
-end
+end

data/lib/inherited_resources/class_methods.rb

@@ -181,6 +181,7 @@ module InheritedResources
             nil
           end
 
+
           config[:collection_name] = options.delete(:collection_name) || symbol.to_s.pluralize.to_sym
           config[:instance_name]   = options.delete(:instance_name) || symbol
           config[:param]           = options.delete(:param) || :"#{symbol}_id"

data/lib/inherited_resources/polymorphic_helpers.rb

@@ -90,25 +90,32 @@ module InheritedResources
       # as parent types.
       #
       def parent_type
+        unless @parent_type
+          symbols_for_association_chain
+        end
+
         @parent_type
       end
 
       def parent_class
-        parent.class if @parent_type
+        parent.class if parent_type
       end
 
       # Returns the parent object. They are also available with the instance
       # variable name: @task, @file, @note...
       #
       def parent
-        instance_variable_get("@#{@parent_type}") if @parent_type
+        if parent_type
+          p = instance_variable_get("@#{parent_type}")
+          p || instance_variable_set("@#{parent_type}", association_chain[-1])
+        end
       end
 
       # If the polymorphic association is optional, we might not have a parent.
       #
       def parent?
         if resources_configuration[:polymorphic][:optional]
-          parents_symbols.size > 1 || !@parent_type.nil?
+          parents_symbols.size > 1 || !parent_type.nil?
         else
           true
         end

data/lib/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

data/test/class_methods_test.rb

@@ -27,7 +27,7 @@ class ActionsClassMethodTest < ActionController::TestCase
   tests BooksController
 
   def test_cannot_render_actions
-    assert_raise ActionController::UnknownAction do
+    assert_raise AbstractController::ActionNotFound do
       get :new
     end
   end

data/test/nested_model_with_shallow_test.rb

@@ -59,15 +59,15 @@ class NestedModelWithShallowTest < ActionController::TestCase
 
   def test_expose_a_newly_create_group_with_speciality
     Speciality.expects(:find).with('37').twice.returns(mock_speciality)
-    Plan::Group.expects(:build).with({'these' => :params}).returns(mock_group(:save => true))
-    post :create, :speciality_id => '37', :group => {:these => :params}
+    Plan::Group.expects(:build).with({'these' => 'params'}).returns(mock_group(:save => true))
+    post :create, :speciality_id => '37', :group => {'these' => 'params'}
     assert_equal mock_group, assigns(:group)
   end
 
   def test_expose_a_update_group_with_speciality
     should_find_parents
-    mock_group.expects(:update_attributes).with('these' => :params).returns(true)
-    post :update, :id => 'forty_two', :group => {:these => :params}
+    mock_group.expects(:update_attributes).with('these' => 'params').returns(true)
+    post :update, :id => 'forty_two', :group => {'these' => 'params'}
     assert_equal mock_group, assigns(:group)
   end
 

data/test/polymorphic_test.rb

@@ -2,6 +2,8 @@ require File.expand_path('test_helper', File.dirname(__FILE__))
 
 class Factory; end
 class Company; end
+class User; end
+class Photo; end
 
 class Employee
   def self.human_name; 'Employee'; end
@@ -11,6 +13,15 @@ class EmployeesController < InheritedResources::Base
   belongs_to :factory, :company, :polymorphic => true
 end
 
+class PhotosController < InheritedResources::Base
+  belongs_to :user, :task, :polymorphic => true
+
+  def index
+    parent
+    # Overwrite index
+  end
+end
+
 class PolymorphicFactoriesTest < ActionController::TestCase
   tests EmployeesController
 
@@ -184,3 +195,21 @@ class PolymorphicCompanyTest < ActionController::TestCase
       @mock_employee ||= mock(stubs)
     end
 end
+
+class PolymorphicPhotosTest < ActionController::TestCase
+  tests PhotosController
+
+  def setup
+    User.expects(:find).with('37').returns(mock_user)
+  end
+
+  def test_parent_as_instance_variable_on_index_when_method_overwritten
+    get :index, :user_id => '37'
+    assert_equal mock_user, assigns(:user)
+  end
+
+  protected
+    def mock_user(stubs={})
+      @mock_user ||= mock(stubs)
+    end
+end

data/test/url_helpers_test.rb

@@ -126,8 +126,7 @@ end
 # Create a TestHelper module with some helpers
 class UrlHelpersTest < ActiveSupport::TestCase
   def mock_polymorphic(controller, route)
-    controller.expects(:url_for).with(:no=>"no")
-    controller._routes.url_helpers.expects("hash_for_#{route}").returns({:no=>"no"})    
+    controller.expects(route)
   end
 
   def test_url_helpers_on_simple_inherited_resource
@@ -669,7 +668,7 @@ class UrlHelpersTest < ActiveSupport::TestCase
     new_bed.stubs(:persisted?).returns(false)
 
     controller = BedsController.new
-    controller.instance_variable_set('@parent_type', nil)
+    controller.stubs(:parent_type).returns(nil)
     controller.instance_variable_set('@bed', bed)
 
     [:url, :path].each do |path_or_url|

data/test/views/photos/index.html.erb

@@ -0,0 +1 @@
+Index HTML

metadata

@@ -1,64 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: inherited_resources
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.3.1
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 0
-  version: 1.3.0
 platform: ruby
-authors: 
-- "Jos\xC3\xA9 Valim"
+authors:
+- José Valim
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-01 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: responders
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70244803257400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
-        version: 0.6.0
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: has_scope
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70244803257400
+- !ruby/object:Gem::Dependency
+  name: has_scope
+  requirement: &70244803256640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         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.
+  prerelease: false
+  version_requirements: *70244803256640
+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: developers@plataformatec.com.br
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -134,6 +115,7 @@ files:
 - test/views/pets/index.html.erb
 - test/views/pets/new.html.erb
 - test/views/pets/show.html.erb
+- test/views/photos/index.html.erb
 - test/views/plates/edit.html.erb
 - test/views/plates/index.html.erb
 - test/views/plates/new.html.erb
@@ -174,41 +156,38 @@ files:
 - test/views/users/new.html.erb
 - test/views/users/show.html.erb
 - test/views/users/update.js.erb
-has_rdoc: true
 homepage: http://github.com/josevalim/inherited_resources
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2360799182694923826
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2360799182694923826
 requirements: []
-
 rubyforge_project: inherited_resources
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 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.
-test_files: 
+summary: Inherited Resources speeds up development by making your controllers inherit
+  all restful actions so you just have to focus on what is important.
+test_files:
 - test/aliases_test.rb
 - test/association_chain_test.rb
 - test/base_test.rb
@@ -259,6 +238,7 @@ test_files:
 - test/views/pets/index.html.erb
 - test/views/pets/new.html.erb
 - test/views/pets/show.html.erb
+- test/views/photos/index.html.erb
 - test/views/plates/edit.html.erb
 - test/views/plates/index.html.erb
 - test/views/plates/new.html.erb