giraffesoft-resource_controller 0.5.3 → 0.5.5

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
   

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:patch: 5
+:major: 0
+:minor: 5

data/lib/resource_controller.rb

@@ -1,17 +1,4 @@
-$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'
+require_dependency 'application'
 
 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/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/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/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.0' 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"
 
   # 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

@@ -14,7 +14,6 @@ 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|

data/test/db/migrate/013_create_personnel.rb

@@ -0,0 +1,11 @@
+class CreatePersonnel < ActiveRecord::Migration
+  def self.up
+    create_table :personnel, :force => true do |t|
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :personnel
+  end
+end

data/test/db/migrate/014_add_personnel_id_to_photos.rb

@@ -0,0 +1,9 @@
+class AddPersonnelIdToPhotos < ActiveRecord::Migration
+  def self.up
+    add_column :photos, :personnel_id, :integer
+  end
+
+  def self.down
+    remove_column :photos, :personnel_id
+  end
+end

data/test/db/schema.rb

@@ -1,5 +1,5 @@
 # This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of ActiveRecord to incrementally modify your database, and
+# please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
 # Note that this schema.rb definition is the authoritative source for your database schema. If you need
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 12) do
+ActiveRecord::Schema.define(:version => 14) do
 
   create_table "accounts", :force => true do |t|
     t.string "name"
@@ -33,9 +33,15 @@ ActiveRecord::Schema.define(:version => 12) do
     t.string  "title"
   end
 
+  create_table "personnel", :force => true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "photos", :force => true do |t|
     t.string  "title"
     t.integer "account_id"
+    t.integer "personnel_id"
   end
 
   create_table "photos_tags", :force => true do |t|
@@ -45,7 +51,7 @@ ActiveRecord::Schema.define(:version => 12) do
 
   create_table "posts", :force => true do |t|
     t.string "title", :default => ""
-    t.text   "body"
+    t.text   "body",  :default => ""
   end
 
   create_table "products", :force => true do |t|

data/test/test/fixtures/personnel.yml

@@ -0,0 +1,5 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+two:
+  id: 2

data/test/test/functional/cms/options_controller_test.rb

@@ -4,7 +4,7 @@ require 'cms/options_controller'
 # Re-raise errors caught by the controller.
 class Cms::OptionsController; def rescue_action(e) raise e end; end
 
-class Cms::OptionsControllerTest < Test::Unit::TestCase
+class Cms::OptionsControllerTest < ActionController::TestCase
   def setup
     @controller = Cms::OptionsController.new
     @request    = ActionController::TestRequest.new

data/test/test/functional/cms/photos_controller_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'cms/photos_controller'
+
+# Re-raise errors caught by the controller.
+class Cms::PhotosController; def rescue_action(e) raise e end; end
+
+class Cms::PhotosControllerTest < ActionController::TestCase
+  def setup
+    @controller = Cms::PhotosController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @photo      = Photo.find 1
+  end
+  
+  context "with personnel as parent" do
+    context "on get to :index" do
+      setup do
+        get :index, :personnel_id => 1
+      end
+
+      should_respond_with :success
+      should_render_template "index"
+      should_assign_to :photos
+      should_assign_to :personnel
+      should "scope photos to personnel" do
+        assert assigns(:photos).all? { |photo| photo.personnel.id == 1 }
+      end
+    end
+    
+    context "on post to :create" do
+      setup do
+        post :create, :personnel_id => 1, :photo => {}
+      end
+
+      should_redirect_to 'cms_personnel_photo_path(@photo.personnel, @photo)'
+      should_assign_to :photo
+      should_assign_to :personnel
+      should "scope photo to personel" do
+        assert personnel(:one), assigns(:photo).personnel
+      end
+    end
+  end
+end

data/test/test/functional/cms/products_controller_test.rb

@@ -4,7 +4,7 @@ require 'cms/products_controller'
 # Re-raise errors caught by the controller.
 class Cms::ProductsController; def rescue_action(e) raise e end; end
 
-class Cms::ProductsControllerTest < Test::Unit::TestCase
+class Cms::ProductsControllerTest < ActionController::TestCase
   def setup
     @controller = Cms::ProductsController.new
     @request    = ActionController::TestRequest.new