giraffesoft-resource_controller 0.4.9 → 0.4.10

data/lib/resource_controller/helpers/urls.rb

@@ -110,7 +110,11 @@ module ResourceController::Helpers::Urls
     end
     
     def parent_url_options
-      parent? ? [parent_type.to_sym, parent_object] : nil
+      if parent?
+        parent_singleton? ? parent_type.to_sym : [parent_type.to_sym, parent_object]
+      else
+        nil
+      end
     end
     
     # Returns all of the current namespaces of the current controller, symbolized, in array form.

data/lib/resource_controller/singleton.rb

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

data/lib/resource_controller/version.rb

@@ -2,7 +2,7 @@ module ResourceController
   module VERSION
     MAJOR    = 0
     MINOR    = 4
-    TINY     = 9
+    TINY     = 10
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/tasks/gem.rake

@@ -43,7 +43,7 @@ task :gem => :tag_warn
 
 namespace :gem do
   desc 'Upload gems to rubyforge.org'
-  task :release => :gem do
+  task :rubyforge => :gem do
     sh 'rubyforge login'
     sh "rubyforge add_release giraffesoft resource_controller #{ResourceController::VERSION::STRING} pkg/#{spec.full_name}.gem"
     sh "rubyforge add_file    giraffesoft resource_controller #{ResourceController::VERSION::STRING} pkg/#{spec.full_name}.gem"

data/test/app/controllers/accounts_controller.rb

@@ -0,0 +1,6 @@
+class AccountsController < ResourceController::Singleton
+  protected
+    def object
+      Account.find(:first)
+    end
+end

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

@@ -1,3 +1,3 @@
 class Cms::ProductsController < ResourceController::Base
-  create.flash_now 'something'
+  create.flash 'something'
 end

data/test/app/controllers/images_controller.rb

@@ -0,0 +1,4 @@
+class ImagesController < ResourceController::Singleton
+  belongs_to :user
+  actions :create
+end

data/test/app/controllers/options_controller.rb

@@ -0,0 +1,8 @@
+class OptionsController < ResourceController::Base
+  belongs_to :account
+  
+  protected
+    def parent_object
+      Account.find(:first)
+    end
+end

data/test/app/helpers/accounts_helper.rb

@@ -0,0 +1,2 @@
+module AccountsHelper
+end

data/test/app/helpers/images_helper.rb

@@ -0,0 +1,2 @@
+module ImagesHelper
+end

data/test/app/models/account.rb

@@ -1,3 +1,4 @@
 class Account < ActiveRecord::Base
   has_many :photos
+  has_many :options
 end

data/test/app/models/image.rb

@@ -0,0 +1,3 @@
+class Image < ActiveRecord::Base
+  belongs_to :user
+end

data/test/app/models/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  has_one :image
+end

data/test/app/views/accounts/_form.html.erb

@@ -0,0 +1,4 @@
+<p>
+  <label for="account_name">Name:</label>
+  <%= f.text_field :name %>
+</p>

data/test/app/views/accounts/edit.html.erb

@@ -0,0 +1,14 @@
+<h1>Editing Account</h1>
+
+<%= error_messages_for :account %>
+
+<% form_for(:account, :url => object_url, :html => { :method => :put }) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p>
+    <%=submit_tag "Update"%>
+  </p>
+<% end %>
+
+<br/>
+
+<%= link_to 'Show', object_url %>

data/test/app/views/accounts/new.html.erb

@@ -0,0 +1,12 @@
+<h1>New Account</h1>
+
+<%= error_messages_for :account %>
+
+<% form_for(:account, :url => object_url) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p>
+    <%= submit_tag "Create" %>
+  </p>
+<% end %>
+<br/>
+<%= link_to 'Back', object_url %>

data/test/app/views/accounts/show.html.erb

@@ -0,0 +1,5 @@
+<p>
+  <strong>Name:</strong><%=h @account.name %>
+</p>
+
+<%= link_to 'Edit', edit_object_url %>

data/test/app/views/images/_form.html.erb

@@ -0,0 +1,4 @@
+<p>
+  <label for="image_user_id">User:</label>
+  <%= f.text_field :user_id %>
+</p>

data/test/app/views/images/edit.html.erb

@@ -0,0 +1,14 @@
+<h1>Editing Image</h1>
+
+<%= error_messages_for :image %>
+
+<% form_for(:image, :url => object_url, :html => { :method => :put }) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p>
+    <%=submit_tag "Update"%>
+  </p>
+<% end %>
+
+<br/>
+
+<%= link_to 'Show', object_url %>

data/test/app/views/images/new.html.erb

@@ -0,0 +1,12 @@
+<h1>New Image</h1>
+
+<%= error_messages_for :image %>
+
+<% form_for(:image, :url => object_url) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p>
+    <%= submit_tag "Create" %>
+  </p>
+<% end %>
+<br/>
+<%= link_to 'Back', object_url %>

data/test/app/views/options/_form.html.erb

@@ -0,0 +1,8 @@
+<p>
+  <label for="option_account_id">Account:</label>
+  <%= f.text_field :account_id %>
+</p>
+<p>
+  <label for="option_name">Title:</label>
+  <%= f.text_field :title %>
+</p>

data/test/app/views/options/edit.html.erb

@@ -0,0 +1,16 @@
+<h1>Editing Option</h1>
+
+<%= error_messages_for :option %>
+
+<% form_for(:option, :url => object_url, :html => { :method => :put }) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p>
+    <%=submit_tag "Update"%>
+  </p>
+<% end %>
+
+<br/>
+
+<%= link_to 'Show', object_url %>
+|
+<%= link_to 'Back', collection_url %>

data/test/app/views/options/index.html.erb

@@ -0,0 +1,21 @@
+<h1>Listing Options</h1>
+
+<table>
+  <tr>
+    <th>Account</th>
+    <th>Title</th>
+  </tr>
+  <%- @options.each do |option|%>
+    <tr>
+      <td><%=h option.account_id %></td>
+      <td><%=h option.title %></td>
+    
+      <td><%=link_to 'Show', object_url(option) %></td>
+      <td><%=link_to 'Edit', edit_object_url(option) %></td>
+      <td><%=link_to 'Destroy', object_url(option), :confirm => 'Are you sure?', :method => :delete %></td>
+    </tr>
+  <% end %>
+</table>
+<br/>
+
+<%= link_to 'New Option', new_object_url %>

data/test/app/views/options/new.html.erb

@@ -0,0 +1,12 @@
+<h1>New Option</h1>
+
+<%= error_messages_for :option %>
+
+<% form_for(:option, :url => collection_url) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p>
+    <%= submit_tag "Create" %>
+  </p>
+<% end %>
+<br/>
+<%= link_to 'Back', collection_url %>

data/test/app/views/options/show.html.erb

@@ -0,0 +1,10 @@
+<p>
+  <strong>Account:</strong><%=h @option.account_id %>
+</p>
+<p>
+  <strong>Title:</strong><%=h @option.title %>
+</p>
+
+<%= link_to 'Edit', edit_object_url %>
+|
+<%= link_to 'Back', collection_url %>

data/test/config/database.yml

@@ -5,9 +5,6 @@ development:
   password:
   socket: /tmp/mysql.sock
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
 test:
   adapter: mysql
   database: resource_controller_test

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' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -43,7 +43,7 @@ Rails::Initializer.run do |config|
   
   # See Rails::Configuration for more options
   
-  config.action_controller.session = { :session_key => "_myapp_session", :secret => "some secret phrase" }
+  config.action_controller.session = { :session_key => "_myapp_session", :secret => "6c1372e61789239a727cdbc8252eb6da" }
 end
 
 require "#{RAILS_ROOT}/../init"

data/test/config/routes.rb

@@ -7,6 +7,7 @@ ActionController::Routing::Routes.draw do |map|
 
   map.resources :users do |user|
     user.resources :photos, :name_prefix => "user_"
+    user.resource :image
   end
 
   map.resources :somethings
@@ -26,7 +27,13 @@ ActionController::Routing::Routes.draw do |map|
   end
   
   map.resources :comments
-
+  
+  map.resource :account, :has_many => :options
+  
+  map.resource :image
+  
+  map.resources :options
+  
   # The priority is based upon order of creation: first created -> highest priority.
   
   # Sample of regular route:

data/test/db/migrate/002_create_products.rb

@@ -6,6 +6,6 @@ class CreateProducts < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :cms_products
+    drop_table :products
   end
 end

data/test/db/migrate/004_create_options.rb

@@ -1,8 +1,9 @@
 class CreateOptions < ActiveRecord::Migration
   def self.up
     create_table :options do |t|
-      t.column :product_id, :integer
-      t.column :title, :string
+      t.references :product
+      t.references :account
+      t.string :title
     end
   end
 

data/test/db/migrate/011_create_images.rb

@@ -0,0 +1,12 @@
+class CreateImages < ActiveRecord::Migration
+  def self.up
+    create_table :images, :force => true do |t|
+      t.references :user      
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :images
+  end
+end

data/test/db/migrate/012_create_users.rb

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

data/test/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 11) do
+ActiveRecord::Schema.define(:version => 12) do
 
   create_table "accounts", :force => true do |t|
     t.string "name"
@@ -21,8 +21,15 @@ ActiveRecord::Schema.define(:version => 11) do
     t.text    "body"
   end
 
+  create_table "images", :force => true do |t|
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "options", :force => true do |t|
     t.integer "product_id"
+    t.integer "account_id"
     t.string  "title"
   end
 
@@ -49,11 +56,6 @@ ActiveRecord::Schema.define(:version => 11) do
     t.string "title"
   end
 
-  create_table "ratings", :force => true do |t|
-    t.integer "comment_id"
-    t.integer "stars"
-  end
-
   create_table "somethings", :force => true do |t|
     t.string "title"
   end
@@ -62,4 +64,9 @@ ActiveRecord::Schema.define(:version => 11) do
     t.string "name"
   end
 
+  create_table "users", :force => true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end

data/test/test/fixtures/images.yml

@@ -0,0 +1,6 @@
+one:
+  id: 1
+  user_id: 1
+two:
+  id: 2
+  user_id: 1

data/test/test/fixtures/users.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/images_controller_test.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'images_controller'
+
+# Re-raise errors caught by the controller.
+class ImagesController; def rescue_action(e) raise e end; end
+
+class ImagesControllerTest < Test::Unit::TestCase
+  def setup
+    @controller           = ImagesController.new
+    @request              = ActionController::TestRequest.new
+    @response             = ActionController::TestResponse.new
+    @image = images :one
+  end
+
+  context "with user as parent" do
+    
+    context "on post to :create" do
+      setup do
+        post :create, :user_id => 1, :photo => {}
+      end
+
+      should_redirect_to 'user_image_path(@image.user)'
+      should_assign_to :image
+      should_assign_to :user
+      should "scope image to user" do
+        assert users(:one), assigns(:image).user
+      end
+    end
+    
+  end  
+  
+  should "not respond to show" do
+    assert_raise(ActionController::UnknownAction) do
+      get :show
+    end
+  end
+end