karsthammer-inherited_resources 1.1.2.1 → 1.2.1

data/.gitignore

@@ -0,0 +1 @@
+.bundle

data/CHANGELOG

@@ -1,3 +1,14 @@
+# Version 1.2.1
+
+* Fix a bug with namespaces
+* Use Post.scoped instead of Post.all in collection
+
+# Version 1.2
+
+* Improved lookup for namespaces (by github.com/Sirupsen)
+* Support to custom actions (by github.com/lda)
+* Rails 3.1 compatibility (by github.com/etehtsea)
+
 # Version 1.1
 
 * Rails 3 compatible

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,86 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    builder (2.1.2)
+    columnize (0.3.1)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    has_scope (0.5.0)
+    i18n (0.5.0)
+    linecache (0.43)
+    mail (2.2.14)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mocha (0.9.8)
+      rake
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    responders (0.6.2)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  has_scope (~> 0.5.0)
+  mocha
+  rails (= 3.0.3)
+  responders (~> 0.6.0)
+  ruby-debug

data/README.rdoc

@@ -5,27 +5,12 @@ 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
-code by following fat models and skinny controllers convention. There is
-a screencast made by Fabio Akita about its features:
+code by following fat models and skinny controllers convention. There are
+two screencasts available besides this README:
 
+http://railscasts.com/episodes/230-inherited-resources
 http://akitaonrails.com/2009/09/01/screencast-real-thin-restful-controllers-with-inherited-resources
 
-=== What about views?
-
-Sometimes just DRY the controllers is not enough, a lot of the resources often share the same views, wouldn't it be nice to have view files DRY'ed too? You can! There are currently two projects do just that.
-
-==== Inherited Resources Views
-
-Inherited Resources Views is an extremely easy to use plugin to DRY the views associated with your inherited resources controllers. It is library-agnostic (it only depends on Inherited Resources) and it supports generating both erb and haml templates.
-
-Source: http://github.com/fredwu/inherited_resources_views
-
-==== Inherited Views
-
-Inherited Views is a thin addition to the Inherited Resources project adding default html views which can be later customized on a per controller basis or globally for your rails app. It depends on Inherited Resources, Formtastic and WillPaginate.
-
-Source: http://github.com/gregbell/inherited_views
-
 == Installation
 
 === Rails 3
@@ -34,7 +19,7 @@ Inherited Resources master branch is now supports Rails 3 and is NOT backward co
 
 You can let bundler to install Inherited Resources by adding this line to your application's Gemfile:
 
-  gem 'inherited_resources', '1.1.2'
+  gem 'inherited_resources', '~> 1.2.1'
 
 And then execute:
 
@@ -42,7 +27,7 @@ And then execute:
 
 Or install it yourself as:
 
-  gem install inherited_resources --version=1.1.2
+  gem install inherited_resources --version=1.2.1
 
 === Rails 2.3.x
 
@@ -66,7 +51,7 @@ has_scope gem is available at:
 
 And can be installed as:
 
-  sudo gem install has_scope
+  gem install has_scope
 
 == Responders
 
@@ -79,23 +64,14 @@ how it will change your application:
 
 And it can be installed as:
 
-  sudo gem install responders
+  gem install responders
 
 Using responders will set the flash message to :notice and :alert. You can change
 that through the following configuration value:
 
   InheritedResources.flash_keys = [ :success, :failure ]
 
-== Rspec known bug
-
-Rspec monkey patches a couple of controller methods in a way that Controller specs
-(with integrate views true or false) and Inherited Resources are not compatible.
-
-However, since your controllers inherit from InheritedResources::Base, they are
-already unit-tested in the plugin, so there is no need to test them again in Rspec.
-
-You should test things like url redirection and associations in your integration
-specs.
+Notice the CollectionResponder won't work with InheritedResources, as InheritedResources hardcodes the redirect path based on the current scope (like belongs to, polymorphic associations, etc).
 
 == Basic Usage
 
@@ -307,6 +283,25 @@ 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.
 
+== Smart redirects
+
+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
+in destroy action calculate in following order collection_url, parent_url, root_url.
+
+Example:
+
+    class ButtonsConntroller < InheritedResources::Base
+      belongs_to :window
+      actions :all, :except => [:show, :index]
+    end
+
+This controller redirect to parent window after all CUD actions.
+
 == Success and failure scenarios on destroy
 
 The destroy action can also fail, this usually happens when you have a
@@ -322,24 +317,6 @@ be something like this:
       end
     end
 
-== Some DSL
-
-For those DSL lovers, InheritedResources won't leave you alone. You can overwrite
-your success/failure blocks straight from your class binding. For it, you just
-need to add a DSL module to your application controller:
-
-    class ApplicationController < ActionController::Base
-      include InheritedResources::DSL
-    end
-
-And then you can rewrite the last example as:
-
-    class ProjectsController < InheritedResources::Base
-      update! do |success, failure|
-        failure.html { redirect_to project_url(@project) }
-      end
-    end
-
 == Belongs to
 
 Finally, our Projects are going to get some Tasks. Then you create a
@@ -463,6 +440,20 @@ option.
 
 It will deal with everything again and hide the action :index from you.
 
+== Namespaced Controllers
+
+Namespaced controllers works out the box.
+
+    class Forum::PostsController < InheritedResources::Base
+    end
+
+Inherited Resources prioritizes the default resource class for the namespaced controller in
+this order:
+
+    Forum::Post
+    ForumPost
+    Post
+
 == URL Helpers
 
 When you use InheritedResources it creates some URL helpers.
@@ -506,6 +497,43 @@ Another nice thing is that those urls are not guessed during runtime. They are
 all created when your application is loaded (except for polymorphic
 associations, that relies on Rails polymorphic_url).
 
+== Custom actions
+
+Since version 1.2, Inherited Resources allows you to define custom actions in controller:
+
+    class ButtonsController < InheritedResources::Base
+      custom_actions :resource => :delete, :collection => :search
+    end
+
+This code creates delete and search actions in controller (they behaves like show and
+index actions accordingly). Also, it will produce delete_resource_{path,url} and 
+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,
+check this Wiki page:
+
+https://github.com/josevalim/inherited_resources/wiki/Views-Inheritance
+
+== Some DSL
+
+For those DSL lovers, InheritedResources won't leave you alone. You can overwrite
+your success/failure blocks straight from your class binding. For it, you just
+need to add a DSL module to your application controller:
+
+    class ApplicationController < ActionController::Base
+      include InheritedResources::DSL
+    end
+
+And then you can rewrite the last example as:
+
+    class ProjectsController < InheritedResources::Base
+      update! do |success, failure|
+        failure.html { redirect_to project_url(@project) }
+      end
+    end
+
 == Bugs and Feedback
 
 If you discover any bugs or want to drop a line, join us in the mailing list:

data/Rakefile

@@ -3,28 +3,6 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require File.join(File.dirname(__FILE__), 'lib', 'inherited_resources', 'version')
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "inherited_resources"
-    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"
-    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]*", "init.rb", "{lib}/**/*"]
-    s.add_dependency("responders", "~> 0.6.0")
-    s.add_dependency("has_scope",  "~> 0.5.0")
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
 
 desc 'Run tests for InheritedResources.'
 Rake::TestTask.new(:test) do |t|

data/karsthammer-inherited_resources.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "inherited_resources/version"
+
+Gem::Specification.new do |s|
+  s.name        = "karsthammer-inherited_resources"
+  s.version     = InheritedResources::VERSION.dup
+  s.platform    = Gem::Platform::RUBY
+  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       = "developers@plataformatec.com.br"
+  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     = ['Karst Hammer', 'José Valim']
+
+  s.rubyforge_project = "inherited_resources"
+
+  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("has_scope",  "~> 0.5.0")
+end

data/lib/inherited_resources/actions.rb

@@ -31,7 +31,7 @@ module InheritedResources
       object = build_resource
 
       if create_resource(object)
-        options[:location] ||= resource_url rescue nil
+        options[:location] ||= smart_resource_url
       end
 
       respond_with_dual_blocks(object, options, &block)
@@ -42,8 +42,8 @@ module InheritedResources
     def update(options={}, &block)
       object = resource
 
-      if update_resource(object, params[resource_instance_name])
-        options[:location] ||= resource_url rescue nil
+      if update_resource(object, resource_params)
+        options[:location] ||= smart_resource_url
       end
 
       respond_with_dual_blocks(object, options, &block)
@@ -53,7 +53,7 @@ module InheritedResources
     # DELETE /resources/1
     def destroy(options={}, &block)
       object = resource
-      options[:location] ||= collection_url rescue nil
+      options[:location] ||= smart_collection_url
 
       destroy_resource(object)
       respond_with_dual_blocks(object, options, &block)

data/lib/inherited_resources/base.rb

@@ -24,18 +24,19 @@ module InheritedResources
         respond_to :html
         self.responder = InheritedResources::Responder
 
-        helper_method :collection_url, :collection_path, :resource_url, :resource_path,
-                      :new_resource_url, :new_resource_path, :edit_resource_url, :edit_resource_path,
-                      :parent_url, :parent_path, :resource, :collection, :resource_class, :association_chain,
-                      :resource_instance_name, :resource_collection_name
+        helper_method :resource, :collection, :resource_class, :association_chain,
+                      :resource_instance_name, :resource_collection_name,
+                      :resource_url, :resource_path,
+                      :collection_url, :collection_path,
+                      :new_resource_url, :new_resource_path,
+                      :edit_resource_url, :edit_resource_path,
+                      :parent_url, :parent_path,
+                      :smart_resource_url, :smart_collection_url
 
-        base.with_options :instance_writer => false do |c|
-          c.class_inheritable_accessor :resource_class
-          c.class_inheritable_array :parents_symbols
-          c.class_inheritable_hash :resources_configuration
-        end
+        self.class_attribute :resource_class,  :parents_symbols,  :resources_configuration, :instance_writer => false
 
-        protected :resource_class, :parents_symbols, :resources_configuration
+        protected :resource_class, :parents_symbols, :resources_configuration,
+          :resource_class?, :parents_symbols?, :resources_configuration?
       end
     end
 

data/lib/inherited_resources/base_helpers.rb

@@ -20,7 +20,10 @@ module InheritedResources
       #   end
       #
       def collection
-        get_collection_ivar || set_collection_ivar(end_of_association_chain.all)
+        get_collection_ivar || begin
+          c = end_of_association_chain
+          set_collection_ivar(c.respond_to?(:scoped) ? c.scoped : c.all)
+        end
       end
 
       # This is how the resource is loaded.
@@ -38,7 +41,7 @@ module InheritedResources
       # probably render a 500 error message.
       #
       def resource
-        get_resource_ivar || set_resource_ivar(end_of_association_chain.find(params[:id]))
+        get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_find, params[:id]))
       end
 
       # This method is responsable for building the object on :new and :create
@@ -46,7 +49,7 @@ module InheritedResources
       # instance variable.
       #
       def build_resource
-        get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, params[resource_instance_name] || {}))
+        get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, resource_params))
       end
 
       # Responsible for saving the resource on :create method. Overwriting this
@@ -155,6 +158,10 @@ module InheritedResources
         self.resources_configuration[:self][:instance_name]
       end
 
+      def resource_request_name
+        self.resources_configuration[:self][:request_name]
+      end
+
       # This methods gets your begin_of_association_chain, join it with your
       # parents chain and returns the scoped association.
       #
@@ -195,6 +202,11 @@ module InheritedResources
         resource_collection_name
       end
 
+      # Returns finder method for instantiate resource by params[:id]
+      def method_for_find
+        resources_configuration[:self][:finder] || :find
+      end
+
       # Get resource ivar based on the current resource controller.
       #
       def get_resource_ivar #:nodoc:
@@ -265,6 +277,31 @@ module InheritedResources
         []
       end
 
+      # URL to redirect to when redirect implies resource url.
+      def smart_resource_url
+        url = nil
+        if respond_to? :show
+          url = resource_url rescue nil
+        end
+        url ||= smart_collection_url
+      end
+
+      # URL to redirect to when redirect implies collection url.
+      def smart_collection_url
+        url = nil
+        if respond_to? :index
+          url ||= collection_url rescue nil
+        end
+        if respond_to? :parent
+          url ||= parent_url rescue nil
+        end
+        url ||= root_url rescue nil
+      end
+
+      # extract attributes from params
+      def resource_params
+        params[resource_request_name] || params[resource_instance_name] || {}
+      end
   end
 end