resource_controller 0.5.3 → 0.6.6

data/README.rdoc

@@ -4,21 +4,9 @@ resource_controller makes RESTful controllers easier, more maintainable, and sup
 
 == Get It
 
-Add it as a gem dependency
+Install it as a plugin:
 
-  config.gem 'resource_controller'
-  
-...or for the development version
-  
-  config.gem 'giraffesoft-resource_controller', :lib => 'resource_controller', :source => 'http://gems.github.com'
-  
-Or install it as a gem manually  
-  
-  sudo gem install resource_controller
-  
-...or for the development version
-  
-  sudo gem install giraffesoft-resource_controller
+  script/plugin install git://github.com/giraffesoft/resource_controller.git
   
 Or grab the source
   
@@ -84,6 +72,16 @@ Or you can create a whole new block.  This syntax destroys everything that's the
       wants.js { render :template => "show.rjs" }
     end
   end
+
+If you have a nested resource and want to redirect to the parent after create/update and destroy you can do this in the object controller
+
+ class CommentsController < ResourceController::Base
+    belongs_to :post
+    
+    create.wants.html { redirect_to smart_url(parent_url_options) } 
+    update.wants.html { redirect_to smart_url(parent_url_options) } 
+    destroy.wants.html { redirect_to smart_url(parent_url_options) }
+  end
   
 === Scoping
 
@@ -118,6 +116,12 @@ If you want to create a singleton RESTful controller inherit from ResourceContro
   class AccountsController < ResourceController::Singleton
   end
 
+...or if need to inherit from some other class:
+
+  class AccountsController < ApplicationController
+    resource_controller :singleton
+  end
+
 *Note:* This type of controllers handle a single resource only so the index action and all the collection helpers (collection_url, collection_path...) are not available for them.
 
 Loading objects in singletons is similar to plural controllers with one exception. For non-nested singleton controllers you should override the object method as it defaults to nil for them.

data/VERSION.yml

@@ -0,0 +1,5 @@
+--- 
+:major: 0
+:minor: 6
+:build: 
+:patch: 6

data/generators/scaffold_resource/templates/rspec/routing_spec.rb

@@ -11,20 +11,20 @@ describe <%= controller_class_name %>Controller do
       route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new"
     end
   
-    it "should map { :controller => '<%= table_name %>', :action => 'show', :id => 1 } to /<%= table_name %>/1" do
-      route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1"
+    it "should map { :controller => '<%= table_name %>', :action => 'show', :id => '1'} to /<%= table_name %>/1" do
+      route_for(:controller => "<%= table_name %>", :action => "show", :id => "1").should == "/<%= table_name %>/1"
     end
   
-    it "should map { :controller => '<%= table_name %>', :action => 'edit', :id => 1 } to /<%= table_name %>/1<%= resource_edit_path %>" do
-      route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>"
+    it "should map { :controller => '<%= table_name %>', :action => 'edit', :id => '1' } to /<%= table_name %>/1<%= resource_edit_path %>" do
+      route_for(:controller => "<%= table_name %>", :action => "edit", :id => "1").should == "/<%= table_name %>/1<%= resource_edit_path %>"
     end
   
-    it "should map { :controller => '<%= table_name %>', :action => 'update', :id => 1} to /<%= table_name %>/1" do
-      route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1"
+    it "should map { :controller => '<%= table_name %>', :action => 'update', :id => '1' } to /<%= table_name %>/1" do
+      route_for(:controller => "<%= table_name %>", :action => "update", :id => "1").should == {:path => "/<%= table_name %>/1", :method => :put}
     end
   
-    it "should map { :controller => '<%= table_name %>', :action => 'destroy', :id => 1} to /<%= table_name %>/1" do
-      route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1"
+    it "should map { :controller => '<%= table_name %>', :action => 'destroy', :id => '1' } to /<%= table_name %>/1" do
+      route_for(:controller => "<%= table_name %>", :action => "destroy", :id => "1").should == {:path => "/<%= table_name %>/1", :method => :delete}
     end
   end
 

data/generators/scaffold_resource/templates/rspec/views/index_spec.rb

@@ -11,9 +11,9 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do
 <% end -%><% end %>
     assigns[:<%= table_name %>] = [<%= file_name %>_98, <%= file_name %>_99]
 
-    template.stub!(:object_url).and_return(<%= file_name %>_path(@<%= file_name %>)) 
+    template.stub!(:object_url).and_return(<%= file_name %>_path(<%= file_name %>_99))
     template.stub!(:new_object_url).and_return(new_<%= file_name %>_path) 
-    template.stub!(:edit_object_url).and_return(edit_<%= file_name %>_path(@<%= file_name %>)) 
+    template.stub!(:edit_object_url).and_return(edit_<%= file_name %>_path(<%= file_name %>_99))
   end
 
   it "should render list of <%= table_name %>" do

data/lib/resource_controller.rb

@@ -1,17 +1,8 @@
-$LOAD_PATH << File.dirname(__FILE__) unless $LOAD_PATH.include?(File.dirname(__FILE__))
-require 'application'
-require 'resource_controller/accessors'
-require 'resource_controller/action_options'
-require 'resource_controller/actions'
-require 'resource_controller/base'
-require 'resource_controller/class_methods'
-require 'resource_controller/controller'
-require 'resource_controller/failable_action_options'
-require 'resource_controller/helpers'
-require 'resource_controller/response_collector'
-require 'resource_controller/singleton'
-require 'resource_controller/version'
-require 'urligence'
+begin
+  require_dependency 'application_controller'
+rescue LoadError => e
+  require_dependency 'application'
+end
 
 module ResourceController
   ACTIONS           = [:index, :show, :new_action, :create, :edit, :update, :destroy].freeze

data/lib/resource_controller/base.rb

@@ -4,7 +4,7 @@ module ResourceController
   # 
   # Inherit from this class to create your RESTful controller.  See the README for usage.
   # 
-  class Base < ApplicationController
+  class Base < ::ApplicationController
     unloadable
     
     def self.inherited(subclass)
@@ -12,4 +12,4 @@ module ResourceController
       subclass.class_eval { resource_controller }
     end
   end
-end
+end

data/lib/resource_controller/class_methods.rb

@@ -17,8 +17,8 @@ module ResourceController
       actions_to_remove += [*config[:except]] if config[:except]
       actions_to_remove.uniq!
 
-      actions_to_remove.each { |action| undef_method(action)}
+      actions_to_remove.each { |action| undef_method(action) if method_defined?(action) }
     end
     
   end
-end
+end

data/lib/resource_controller/controller.rb

@@ -11,7 +11,7 @@ module ResourceController
         NAME_ACCESSORS.each { |accessor| send(accessor, controller_name.singularize.underscore) }
 
         ACTIONS.each do |action|
-          class_scoping_reader action, FAILABLE_ACTIONS.include?(action) ? FailableActionOptions.new : ActionOptions.new
+          class_scoping_reader action, FAILABLE_ACTIONS.include?(action) ? ResourceController::FailableActionOptions.new : ResourceController::ActionOptions.new
         end
 
         self.helper_method :object_url, :edit_object_url, :new_object_url, :collection_url, :object, :collection, 
@@ -56,6 +56,7 @@ module ResourceController
           destroy do
             flash "Successfully removed!"
             wants.html { redirect_to collection_url }
+            failure.wants.html { redirect_to object_url }
           end
           
           class << self
@@ -66,4 +67,4 @@ module ResourceController
         end
       end
   end
-end
+end

data/lib/resource_controller/helpers.rb

@@ -1,9 +1,3 @@
-require 'resource_controller/helpers/current_objects'
-require 'resource_controller/helpers/internal'
-require 'resource_controller/helpers/nested'
-require 'resource_controller/helpers/singleton_customizations'
-require 'resource_controller/helpers/urls'
-
 module ResourceController
   # == ResourceController::Helpers
   #

data/lib/resource_controller/helpers/nested.rb

@@ -37,7 +37,7 @@ module ResourceController
         # Returns true/false based on whether or not a parent is a singleton.
         #    
         def parent_singleton?
-          !parent_type_from_request.nil?
+          !parent_type_from_request.nil? && parent_type_from_params.nil?
         end
     
         # Returns the current parent param, if there is a parent. (i.e. params[:post_id])

data/lib/resource_controller/singleton.rb

@@ -4,7 +4,7 @@ module ResourceController
   # 
   # Inherit from this class to create your RESTful singleton controller.  See the README for usage.
   # 
-  class Singleton < ApplicationController
+  class Singleton < ::ApplicationController
     unloadable
     
     def self.inherited(subclass)
@@ -12,4 +12,4 @@ module ResourceController
       subclass.class_eval { resource_controller :singleton }
     end
   end
-end
+end

data/test/app/controllers/{application.rb → application_controller.rb}

@@ -2,6 +2,4 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  # Pick a unique cookie name to distinguish our session data from others'
-  session :session_key => '_myapp_session'
 end

data/test/app/controllers/cms/personnel_controller.rb

@@ -0,0 +1,2 @@
+class Cms::PersonnelController < ResourceController::Base
+end

data/test/app/controllers/cms/photos_controller.rb

@@ -0,0 +1,6 @@
+class Cms::PhotosController < ResourceController::Base
+  actions :all, :except => :update
+  
+  belongs_to :personnel
+  create.flash { "#{@photo.title} was created!" }  
+end

data/test/app/controllers/photos_controller.rb

@@ -1,5 +1,6 @@
 class PhotosController < ResourceController::Base
   actions :all, :except => :update
+  actions :all, :except => :update
   
   belongs_to :user
   create.flash { "#{@photo.title} was created!" }

data/test/app/models/personnel.rb

@@ -0,0 +1,3 @@
+class Personnel < ActiveRecord::Base
+  has_many :photos
+end

data/test/app/models/photo.rb

@@ -1,4 +1,5 @@
 class Photo < ActiveRecord::Base
   has_and_belongs_to_many :tags
   belongs_to :user, :class_name => "Account", :foreign_key => "account_id"
+  belongs_to :personnel
 end

data/test/app/views/cms/photos/edit.rhtml

@@ -0,0 +1,17 @@
+<h1>Editing photo</h1>
+
+<%= error_messages_for :photo %>
+
+<% form_for(:photo, :url => photo_path(@photo), :html => { :method => :put }) do |f| %>
+  <p>
+    <b>Title</b><br />
+    <%= f.text_field :title %>
+  </p>
+
+  <p>
+    <%= submit_tag "Update" %>
+  </p>
+<% end %>
+
+<%= link_to 'Show', photo_path(@photo) %> |
+<%= link_to 'Back', photos_path %>

data/test/app/views/cms/photos/index.rhtml

@@ -0,0 +1,20 @@
+<h1>Listing photos</h1>
+
+<table>
+  <tr>
+    <th>Title</th>
+  </tr>
+  
+<% for photo in @photos %>
+  <tr>
+    <td><%=h photo.title %></td>
+    <td><%= link_to 'Show', object_url(photo) %></td>
+    <td><%= link_to 'Edit', edit_object_url(photo) %></td>
+    <td><%= link_to 'Destroy', object_url(photo), :confirm => 'Are you sure?', :method => :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New photo', new_object_url %>

data/test/app/views/cms/photos/new.rhtml

@@ -0,0 +1,16 @@
+<h1>New photo</h1>
+
+<%= error_messages_for :photo %>
+
+<% form_for(:photo, :url => photos_path) do |f| %>
+  <p>
+    <b>Title</b><br />
+    <%= f.text_field :title %>
+  </p>
+
+  <p>
+    <%= submit_tag "Create" %>
+  </p>
+<% end %>
+
+<%= link_to 'Back', photos_path %>

data/test/app/views/cms/photos/show.rhtml

@@ -0,0 +1,8 @@
+<p>
+  <b>Title:</b>
+  <%=h @photo.title %>
+</p>
+
+
+<%= link_to 'Edit', edit_photo_path(@photo) %> |
+<%= link_to 'Back', photos_path %>

data/test/config/boot.rb

@@ -44,6 +44,7 @@ module Rails
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -67,7 +68,7 @@ module Rails
 
     class << self
       def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+        Gem::RubyGemsVersion rescue nil
       end
 
       def gem_version
@@ -82,14 +83,14 @@ module Rails
 
       def load_rubygems
         require 'rubygems'
-
-        unless rubygems_version >= '0.9.4'
-          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+        min_version = '1.3.1'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
         end
 
       rescue LoadError
-        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
         exit 1
       end
 

data/test/config/database.yml

@@ -1,13 +1,9 @@
 development:
-  adapter: mysql
-  database: resource_controller_test
-  username: root
-  password:
-  socket: /tmp/mysql.sock
+  adapter: sqlite3
+  database: db/test.sqlite3
+  timeout: 5000
 
 test:
-  adapter: mysql
-  database: resource_controller_test
-  username: root
-  password:
-  socket: /tmp/mysql.sock
+  adapter: sqlite3
+  database: db/test.sqlite3
+  timeout: 5000

data/test/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.1.1' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -20,7 +20,7 @@ Rails::Initializer.run do |config|
   # config.plugins = %W( exception_notification ssl_requirement )
 
   # Add additional load paths for your own custom dirs
-  config.load_paths += %W( #{RAILS_ROOT}/../lib )
+  # config.load_paths += %W( #{RAILS_ROOT}/../lib )
 
   # Force all environments to use the same logger level 
   # (by default production uses :info, the others :debug)
@@ -29,6 +29,8 @@ Rails::Initializer.run do |config|
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake db:sessions:create')
   # config.action_controller.session_store = :active_record_store
+  config.gem "resource_controller", :version => "10.0.0"
+  config.gem "thoughtbot-shoulda", :lib => "shoulda/rails", :version => "2.9.0"
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper, 
@@ -44,6 +46,4 @@ Rails::Initializer.run do |config|
   # See Rails::Configuration for more options
   
   config.action_controller.session = { :session_key => "_myapp_session", :secret => "6c1372e61789239a727cdbc8252eb6da" }
-  
-  config.gem 'resource_controller'
 end

data/test/config/environments/development.rb

@@ -8,13 +8,9 @@ config.cache_classes = false
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils = true
 
-# Enable the breakpoint server that script/breakpointer connects to
-config.breakpoint_server = true
-
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
-config.action_view.cache_template_extensions         = false
 config.action_view.debug_rjs                         = true
 
 # Don't care if the mailer can't send

data/test/config/initializers/inflections.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format 
+# (all these examples are active by default):
+# Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.irregular "personnel", "personnel"
+end

data/test/config/routes.rb

@@ -20,6 +20,9 @@ ActionController::Routing::Routes.draw do |map|
   
   map.namespace :cms do |cms|
     cms.resources :products, :has_many => :options
+    cms.resources :personnel do |personnel|
+      personnel.resources :photos
+    end
   end
 
   map.resources :posts do |post|