inherited_resources 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6392aaded1e0d085dc72577ecbc0793327b6a00
-  data.tar.gz: d4891c303bae5e1255a5a74b580a1cfb0162f5d9
+  metadata.gz: 121b6dce978ba43045adaee54c37906c299ced3a
+  data.tar.gz: 1b1549e0cc0feae4551f0455434c2df483c11598
 SHA512:
-  metadata.gz: 034f81e33b0c640c9f4ca86499b7a9869fced0a34d278ce89b73e146c96ed2a0dece341bbe398de25b68c54add3142395f71224c15ecc01dd039cf435726669d
-  data.tar.gz: 606ca852e3a8b8a548e1edb65500dd7491dd692498298aaf12b555b036778334f442d98cbf04b030641abc7f033fe7d2f99105e3822c92c55b83aacb1b1b2a50
+  metadata.gz: 747c499e0d0f62c0a42ac5915782159678471318a232ce00251315edddd86f900edbb0aeef47c93ad8883983df2fafc426680a1b1812fa87bc4d987a385ade7a
+  data.tar.gz: b687a4fd01330c6246fc57748c8d522e46e2e892a185d8aac18b9c6c148432864a49947f6587724a0f7191739e52764abe95487cffb07a382252a19fb7ee57c0

data/CHANGELOG

@@ -1,4 +1,10 @@
-# 1.5.0
+# Version 1.5.1
+
+* Lock the Rails version until only 4.2.
+* Fix parent class lookup.
+* Fix resource_class default value definition.
+
+# Version 1.5.0
 
 * Supports nested modules (namespaced models and controllers).
 * Supports Rails 4 Strong Parameters notation.

data/Gemfile

@@ -2,9 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '>= 3.2', '< 5'
 gem 'mocha'
-gem 'turn'
+gem 'minitest-rg'
 
 group :test do
   gem 'strong_parameters'

data/Gemfile.lock

@@ -1,106 +1,71 @@
 PATH
   remote: .
   specs:
-    inherited_resources (1.5.0)
+    inherited_resources (1.5.1)
+      actionpack (>= 3.2, < 4.2)
       has_scope (~> 0.6.0.rc)
+      railties (>= 3.2, < 4.2)
       responders (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.5)
+      actionview (= 4.1.5)
+      activesupport (= 4.1.5)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.5)
+      activesupport (= 4.1.5)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.5)
+      activesupport (= 4.1.5)
+      builder (~> 3.1)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    ansi (1.4.3)
-    arel (4.0.0)
-    atomic (1.1.10)
-    builder (3.1.4)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
     erubis (2.7.0)
     has_scope (0.6.0.rc)
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
-    hike (1.2.3)
-    i18n (0.6.4)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.23)
-    minitest (4.7.5)
-    mocha (0.14.0)
+    i18n (0.6.11)
+    json (1.8.1)
+    metaclass (0.0.4)
+    minitest (5.4.1)
+    minitest-rg (5.1.0)
+      minitest (~> 5.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+    railties (4.1.5)
+      actionpack (= 4.1.5)
+      activesupport (= 4.1.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    responders (1.1.0)
-      railties (>= 3.2, < 5)
-    sprockets (2.10.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
+    rake (10.3.2)
+    responders (1.1.1)
+      railties (>= 3.2, < 4.2)
     strong_parameters (0.1.4)
       actionpack (>= 3.2.0)
       activemodel (>= 3.2.0)
       railties (>= 3.2.0)
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.14)
-      polyglot
-      polyglot (>= 0.3.1)
-    turn (0.9.6)
-      ansi
-    tzinfo (0.3.37)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   inherited_resources!
+  minitest-rg
   mocha
-  rails (>= 3.2, < 5)
   strong_parameters
-  turn

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 José Valim http://blog.plataformatec.com.br
+Copyright (c) 2009-2012 José Valim
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,3 +1,12 @@
+## Deprecation notice
+ 
+Since Rails 3 came out, I have no longer used Inherited Resources and it is no
+longer actively maintained. I have found that the responders abstraction
+offers the perfect balance between hiding and showing too much logic in controllers.
+That said, I suggest developers to make use of Rails' `respond_with` feature
+alongside the [responders gem](https://github.com/plataformatec/responders) as a
+replacement to Inherited Resources.
+
 ## Inherited Resources
 
 Inherited Resources speeds up development by making your controllers inherit
@@ -208,7 +217,7 @@ projects collection:
 class ProjectsController < InheritedResources::Base
   protected
     def collection
-      @projects ||= end_of_association_chain.paginate(:page => params[:page])
+      get_collection_ivar || set_collection_ivar(end_of_association_chain.paginate(:page => params[:page]))
     end
 end
 ```
@@ -726,5 +735,4 @@ If you discover any bugs, please describe it in the issues tracker, including Ra
 
 Questions are better handled on StackOverflow.
 
-Copyright (c) 2009-2012 José Valim http://blog.plataformatec.com.br
-See the attached MIT License.
+MIT License. Copyright (c) 2009-2012 José Valim.

data/inherited_resources.gemspec

@@ -19,5 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("responders", "~> 1.0")
+  s.add_dependency("actionpack", ">= 3.2", "< 4.2")
+  s.add_dependency("railties", ">= 3.2", "< 4.2")
   s.add_dependency("has_scope",  "~> 0.6.0.rc")
 end

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

@@ -2,4 +2,13 @@ class <%= controller_class_name %>Controller < InheritedResources::Base
 <% if options[:singleton] -%>
   defaults :singleton => true
 <% end -%>
+<% if Rails::VERSION::MAJOR >= 4 || defined?(ActiveModel::ForbiddenAttributesProtection) -%>
+
+  private
+
+    def <%= singular_name %>_params
+      params.require(:<%= singular_name %>).permit(<%= attributes_names.map{ |a_name| ":#{a_name}" }.join(", ") %>)
+    end
+<% end -%>
 end
+

data/lib/inherited_resources/class_methods.rb

@@ -182,8 +182,9 @@ module InheritedResources
 
                 klass = model_name
                 while namespace != ''
-                  klass = "#{namespace}::#{model_name}"
-                  if klass.safe_constantize
+                  new_klass = "#{namespace}::#{model_name}"
+                  if new_klass.safe_constantize
+                    klass = new_klass
                     break
                   else
                     namespace = namespace.deconstantize
@@ -312,7 +313,7 @@ module InheritedResources
       def initialize_resources_class_accessors! #:nodoc:
         # First priority is the namespaced model, e.g. User::Group
         self.resource_class ||= begin
-          namespaced_class = self.name.sub(/Controller/, '').singularize
+          namespaced_class = self.name.sub(/Controller$/, '').singularize
           namespaced_class.constantize
         rescue NameError
           nil
@@ -320,7 +321,7 @@ module InheritedResources
 
         # Second priority is the top namespace model, e.g. EngineName::Article for EngineName::Admin::ArticlesController
         self.resource_class ||= begin
-          namespaced_classes = self.name.sub(/Controller/, '').split('::')
+          namespaced_classes = self.name.sub(/Controller$/, '').split('::')
           namespaced_class = [namespaced_classes.first, namespaced_classes.last].join('::').singularize
           namespaced_class.constantize
         rescue NameError
@@ -329,7 +330,7 @@ module InheritedResources
 
         # Third priority the camelcased c, i.e. UserGroup
         self.resource_class ||= begin
-          camelcased_class = self.name.sub(/Controller/, '').gsub('::', '').singularize
+          camelcased_class = self.name.sub(/Controller$/, '').gsub('::', '').singularize
           camelcased_class.constantize
         rescue NameError
           nil

data/lib/inherited_resources/polymorphic_helpers.rb

@@ -15,9 +15,15 @@ module InheritedResources
   #
   # Your routes should be something like:
   #
-  #   m.resources :files,    :has_many => :comments #=> /files/13/comments
-  #   m.resources :tasks,    :has_many => :comments #=> /tasks/17/comments
-  #   m.resources :messages, :has_many => :comments #=> /messages/11/comments
+  #   resources :files do
+  #     resources :comments #=> /files/13/comments
+  #   end
+  #   resources :tasks do
+  #     resources :comments #=> /tasks/17/comments
+  #   end
+  #   resources :messages do
+  #     resources :comments #=> /messages/11/comments
+  #   end
   #
   # When using polymorphic associations, you get some free helpers:
   #
@@ -74,10 +80,16 @@ module InheritedResources
   #
   # Finally your routes should be something like:
   #
-  #   map.resources :projects do |m|
-  #     m.resources :files,    :has_many => :comments #=> /projects/1/files/13/comments
-  #     m.resources :tasks,    :has_many => :comments #=> /projects/1/tasks/17/comments
-  #     m.resources :messages, :has_many => :comments #=> /projects/1/messages/11/comments
+  #   resources :projects do
+  #     resources :files do
+  #       resources :comments #=> /projects/1/files/13/comments
+  #     end
+  #     resources :tasks do
+  #       resources :comments #=> /projects/1/tasks/17/comments
+  #     end
+  #     resources :messages do
+  #       resources :comments #=> /projects/1/messages/11/comments
+  #     end
   #   end
   #
   # The helpers work in the same way as above.

data/lib/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

data/test/aliases_test.rb

@@ -129,13 +129,6 @@ class AliasesTest < ActionController::TestCase
     mock_student = mock_student(:save => true, :to_xml => "XML")
     Student.stubs(:new).returns(mock_student)
 
-    # Bug in mocha does not accept strings on respond_to
-    mock_student.singleton_class.class_eval do
-      def respond_to?(method, *)
-        method == "to_xml" || super
-      end
-    end
-
     post :create
     assert_equal "http://test.host/", @response.location
   end

data/test/base_test.rb

@@ -105,13 +105,6 @@ class ShowActionBaseTest < ActionController::TestCase
     User.expects(:find).with('42').returns(mock_user)
     mock_user.expects(:to_xml).returns("Generated XML")
 
-    # Bug in mocha does not accept strings on respond_to
-    mock_user.singleton_class.class_eval do
-      def respond_to?(method, *)
-        method == "to_xml" || super
-      end
-    end
-
     get :show, :id => '42'
     assert_response :success
     assert_equal 'Generated XML', @response.body
@@ -139,13 +132,6 @@ class NewActionBaseTest < ActionController::TestCase
     User.expects(:new).returns(mock_user)
     mock_user.expects(:to_xml).returns("Generated XML")
 
-    # Bug in mocha does not accept strings on respond_to
-    mock_user.singleton_class.class_eval do
-      def respond_to?(method, *)
-        method == "to_xml" || super
-      end
-    end
-
     get :new
     assert_response :success
     assert_equal 'Generated XML', @response.body
@@ -198,7 +184,7 @@ class CreateActionBaseTest < ActionController::TestCase
   def test_redirect_to_the_created_user
     User.stubs(:new).returns(mock_user(:save => true))
     @controller.expects(:resource_url).returns('http://test.host/')
-    post :create
+    post :create, format: :html
     assert_redirected_to 'http://test.host/'
   end
 

data/test/class_methods_test.rb

@@ -23,6 +23,22 @@ class DeansController < InheritedResources::Base
   belongs_to :school
 end
 
+module Controller
+  class User; end
+
+  class UsersController < InheritedResources::Base; end
+
+  module Admin
+    class UsersController < InheritedResources::Base; end
+  end
+end
+
+class ControllerGroup; end
+
+module Controller
+  class GroupsController < InheritedResources::Base; end
+end
+
 module Library
   class Category
   end
@@ -148,8 +164,22 @@ class BelongsToErrorsTest < ActiveSupport::TestCase
     assert_equal Library::Category, Library::SubcategoriesController.resources_configuration[:category][:parent_class]
   end
 
+  def test_belongs_to_for_namespaced_controller_and_non_namespaced_model_sets_parent_class_properly
+    Library::SubcategoriesController.send(:belongs_to, :book)
+    assert_equal Book, Library::SubcategoriesController.resources_configuration[:book][:parent_class]
+  end
+
   def test_belongs_to_without_namespace_sets_parent_class_properly
     FoldersController.send(:belongs_to, :book)
     assert_equal Book, FoldersController.resources_configuration[:book][:parent_class]
   end
 end
+
+class SpecialCasesClassMethodTest < ActionController::TestCase
+
+  def test_resource_class_to_corresponding_model_class
+    assert_equal Controller::User, Controller::UsersController.send(:resource_class)
+    assert_equal Controller::User, Controller::Admin::UsersController.send(:resource_class)
+    assert_equal ControllerGroup, Controller::GroupsController.send(:resource_class)
+  end
+end

data/test/test_helper.rb

@@ -3,9 +3,10 @@ require 'bundler'
 
 Bundler.setup
 
-require 'test/unit'
-require 'mocha/setup'
-begin; require 'turn/autorun'; rescue LoadError; end
+require 'minitest'
+require 'mocha/mini_test'
+require 'minitest/rg'
+require 'minitest/autorun'
 
 ENV["RAILS_ENV"] = "test"
 RAILS_ROOT = "anywhere"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inherited_resources
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: responders
@@ -25,6 +25,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: inherited_resources
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Inherited Resources speeds up development by making your controllers inherit
@@ -295,3 +335,4 @@ test_files:
 - test/views/users/update.js.erb
 - test/views/venue/show.html.erb
 - test/views/widgets/new.html.erb
+has_rdoc: