generators/scaffold_resource/templates/old_migration.rb generators/scaffold_resource/templates/view__form.erb generators/scaffold_resource/templates/view_edit.erb generators/scaffold_resource/templates/view_index.erb generators/scaffold_resource/templates/view_new.erb generators/scaffold_resource/templates/view_show.erb @@ -1,4 +1,4 @@ -Copyright (c) 2007 James Golick +Copyright (c) 2008 James Golick Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation LICENSE @@ -3,12 +3,6 @@ resource_controller makes RESTful controllers easier, more maintainable, and super readable. With the RESTful controller pattern hidden away, you can focus on what makes your controller special. == Get It - -resource_controller is currently available in two streams: - -=== 1.2.3+ Compatible - -Install it: svn export http://svn.jamesgolick.com/resource_controller/tags/stable vendor/plugins/resource_controller @@ -16,20 +10,6 @@ SVN (stable): {http://svn.jamesgolick.com/resource_controller/tags/stable}[http: SVN (ongoing): {http://svn.jamesgolick.com/resource_controller/trunk}[http://svn.jamesgolick.com/resource_controller/trunk] - Note: If you want to run the tests, cd in to the test directory, and type rake test. - -=== Edge/Rails 2.0 Compatible - -Install it: - - svn export http://svn.jamesgolick.com/resource_controller/tags/edge_compatible/stable vendor/plugins/resource_controller - -SVN (stable): {http://svn.jamesgolick.com/resource_controller/tags/edge_compatible/stable}[http://svn.jamesgolick.com/resource_controller/tags/edge_compatible/stable] - -SVN (ongoing): {http://svn.jamesgolick.com/resource_controller/branches/edge_compatible}[http://svn.jamesgolick.com/resource_controller/branches/edge_compatible] - - Note: If you want to run the tests in the edge-compatible version, cd in to the test directory, and type rake rails:freeze:edge, and then rake test. - = Usage Creating a basic RESTful controller is as easy as... README @@ -20,3 +20,36 @@ Rake::RDocTask.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('README') rdoc.rdoc_files.include('lib/**/*.rb') end + +desc "Do all necessary tagging for a release" +task :release => [:tag_release, :upload_docs] + +task :tag_release do + unless ENV.include?('human') && ENV.include?('tag') + raise "Usage: rake release human=0.something tag=rel_2.0" + end + + tag_name = ENV['tag'] + human_name = ENV['human'] + repo_root = "http://svn.jamesgolick.com/resource_controller" + + puts "tagging #{human_name}" + `svn copy #{repo_root}/trunk #{repo_root}/tags/#{tag_name} -m"tagging #{human_name}"` + + puts "deleting previous stable tags" + `svn rm #{repo_root}/tags/stable -m"deleting previous stable tags"` + + puts "tag stable release" + `svn copy #{repo_root}/tags/#{tag_name} #{repo_root}/tags/stable -m"tag stable release"` +end + +task :upload_docs => :rdoc do + puts 'Deleting previous rdoc' + `ssh jamesgolick.com 'rm -Rf /home/apps/jamesgolick.com/public/resource_controller/rdoc'` + + puts "Uploading current rdoc" + `scp -r rdoc jamesgolick.com:/home/apps/jamesgolick.com/public/resource_controller` + + puts "Deleting rdoc" + `rm -Rf rdoc` +end Rakefile @@ -39,11 +39,18 @@ class ScaffoldResourceGenerator < Rails::Generator::NamedBase m.directory(File.join('test/functional', controller_class_path)) m.directory(File.join('test/unit', class_path)) - for action in scaffold_views - template_ext = (defined? Haml )? "haml" : "rhtml" - + generator_template_ext = (defined? Haml )? "haml" : "erb" + + # we want to call erb templates .rhtml or .haml if this is rails 1 + if RAILS_GEM_VERSION.to_i == 1 + template_ext = generator_template_ext == 'erb' ? 'rhtml' : generator_template_ext + else + template_ext = "html.#{generator_template_ext}" + end + + scaffold_views.each do |action| m.template( - "view_#{action}.#{template_ext}", + "view_#{action}.#{generator_template_ext}", File.join('app/views', controller_class_path, controller_file_name, "#{action}.#{template_ext}") ) end @@ -62,8 +69,10 @@ class ScaffoldResourceGenerator < Rails::Generator::NamedBase m.template('fixtures.yml', File.join('test/fixtures', "#{table_name}.yml")) unless options[:skip_migration] + migration_template = RAILS_GEM_VERSION.to_i == 1 ? 'old_migration.rb' : 'migration.rb' + m.migration_template( - 'migration.rb', 'db/migrate', + migration_template, 'db/migrate', :assigns => { :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}", :attributes => attributes generators/scaffold_resource/scaffold_resource_generator.rb @@ -2,8 +2,10 @@ class <%= migration_name %> < ActiveRecord::Migration def self.up create_table :<%= table_name %>, :force => true do |t| <% for attribute in attributes -%> - t.column :<%= attribute.name %>, :<%= attribute.type %> + t.<%= attribute.type %> :<%= attribute.name %> <% end -%> + + t.timestamps end end generators/scaffold_resource/templates/migration.rb @@ -100,13 +100,13 @@ module ResourceController::Helpers::Urls # Used internally to provide the options to smart_url from Urligence. # def object_url_options(action_prefix = nil, alternate_object = nil) - namespaces + [*parent_url_options] + [action_prefix, [route_name.to_sym, alternate_object || object]] + [action_prefix] + namespaces + [parent_url_options, [route_name.to_sym, alternate_object || object]] end # Used internally to provide the options to smart_url from Urligence. # def new_object_url_options - namespaces + [*parent_url_options] + [:new, route_name.to_sym] + [:new] + namespaces + [parent_url_options, route_name.to_sym] end def parent_url_options lib/resource_controller/helpers/urls.rb @@ -3,5 +3,5 @@ class ApplicationController < ActionController::Base # Pick a unique cookie name to distinguish our session data from others' - session :session_key => '_test_session_id' + session :session_key => '_myapp_session' end test/app/controllers/application.rb @@ -2,7 +2,7 @@ <%= error_messages_for :product %> -<% form_for(:product, :url => smart_url(:cms, @product), :html => { :method => :put }) do |f| %> +<% form_for(:product, :url => object_url, :html => { :method => :put }) do |f| %> <p> <b>Name</b><br /> <%= f.text_field :name %> @@ -13,5 +13,5 @@ </p> <% end %> -<%= link_to 'Show', smart_url(:cms, @product) %> | -<%= link_to 'Back', smart_url(:cms, :products) %> \ No newline at end of file +<%= link_to 'Show', object_url %> | +<%= link_to 'Back', collection_url %> \ No newline at end of file test/app/views/cms/products/edit.rhtml @@ -8,13 +8,13 @@ <% for product in @products %> <tr> <td><%=h product.name %></td> - <td><%= link_to 'Show', smart_url(:cms, product) %></td> - <td><%= link_to 'Edit', smart_url(:cms, :edit, product) %></td> - <td><%= link_to 'Destroy', smart_url(:cms, product), :confirm => 'Are you sure?', :method => :delete %></td> + <td><%= link_to 'Show', object_url(product) %></td> + <td><%= link_to 'Edit', edit_object_url(product) %></td> + <td><%= link_to 'Destroy', object_url(product), :confirm => 'Are you sure?', :method => :delete %></td> </tr> <% end %> </table> <br /> -<%= link_to 'New product', smart_url(:cms, :new, :product) %> \ No newline at end of file +<%= link_to 'New product', new_object_url %> \ No newline at end of file test/app/views/cms/products/index.rhtml @@ -2,7 +2,7 @@ <%= error_messages_for :product %> -<% form_for(:product, :url => smart_url(:cms, :products)) do |f| %> +<% form_for(:product, :url => collection_url) do |f| %> <p> <b>Name</b><br /> <%= f.text_field :name %> @@ -13,4 +13,4 @@ </p> <% end %> -<%= link_to 'Back', smart_url(:cms, :products) %> \ No newline at end of file +<%= link_to 'Back', collection_url %> \ No newline at end of file test/app/views/cms/products/new.rhtml @@ -4,5 +4,5 @@ </p> -<%= link_to 'Edit', smart_url(:cms, :edit, @product) %> | -<%= link_to 'Back', smart_url(:cms, :products) %> \ No newline at end of file +<%= link_to 'Edit', edit_object_url %> | +<%= link_to 'Back', collection_url %> \ No newline at end of file test/app/views/cms/products/show.rhtml @@ -5,7 +5,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '1.2.6' 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') @@ -42,6 +42,8 @@ Rails::Initializer.run do |config| # config.active_record.default_timezone = :utc # See Rails::Configuration for more options + + config.action_controller.session = { :session_key => "_myapp_session", :secret => "some secret phrase" } end require "#{RAILS_ROOT}/../init" test/config/environment.rb @@ -18,9 +18,9 @@ ActionController::Routing::Routes.draw do |map| end map.resources :tags - - map.resources :products, :name_prefix => "cms_" do |product| - product.resources :options, :name_prefix => "cms_product_" + + map.namespace :cms do |cms| + cms.resources :products, :has_many => :options end map.resources :posts do |post| test/config/routes.rb @@ -1,41 +1,61 @@ -# This file is autogenerated. Instead of editing this file, please use the -# migrations feature of ActiveRecord to incrementally modify your database, and +# 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 # then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your database schema. If you need +# to create the application database on another system, you should be using db:schema:load, not running +# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended to check this file into your version control system. ActiveRecord::Schema.define(:version => 11) do create_table "accounts", :force => true do |t| - t.column "name", :string + t.string "name" end create_table "comments", :force => true do |t| - t.column "post_id", :integer - t.column "author", :string - t.column "body", :text + t.integer "post_id" + t.string "author" + t.text "body" end create_table "options", :force => true do |t| - t.column "product_id", :integer - t.column "title", :string + t.integer "product_id" + t.string "title" end create_table "photos", :force => true do |t| - t.column "title", :string - t.column "account_id", :integer + t.string "title" + t.integer "account_id" end create_table "photos_tags", :force => true do |t| - t.column "photo_id", :integer - t.column "tag_id", :integer + t.integer "photo_id" + t.integer "tag_id" end create_table "posts", :force => true do |t| - t.column "title", :string, :default => "" - t.column "body", :text + t.string "title", :default => "" + t.text "body" end create_table "products", :force => true do |t| - t.column "name", :string + t.string "name" + end + + create_table "projects", :force => true do |t| + 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 create_table "projects", :force => true do |t| @@ -52,7 +72,7 @@ ActiveRecord::Schema.define(:version => 11) do end create_table "tags", :force => true do |t| - t.column "name", :string + t.string "name" end end test/db/schema.rb @@ -48,7 +48,7 @@ class PhotosControllerTest < Test::Unit::TestCase should_assign_to :photo should_assign_to :user should "scope photo to user" do - assert accounts :one, assigns(:photo).user + assert accounts(:one), assigns(:photo).user end end end test/test/functional/photos_controller_test.rb @@ -21,6 +21,10 @@ class TagsControllerTest < Test::Unit::TestCase should_assign_to :products should_render_template "index" should_respond_with :success + + should "respond with html" do + assert_equal 'text/html', @response.content_type + end end context "xhr to :index" do @@ -29,8 +33,11 @@ class TagsControllerTest < Test::Unit::TestCase end should_assign_to :products - should_render_template "index.rjs" should_respond_with :success + + should "respond with rjs" do + assert_equal 'text/javascript', @response.content_type + end end context "post to create" do test/test/functional/tags_controller_test.rb @@ -1,3 +1,4 @@ +$:.reject! { |path| path.include? 'TextMate' } ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'test_help' test/test/test_helper.rb @@ -37,16 +37,16 @@ class Helpers::UrlsTest < Test::Unit::TestCase end should "return the correct object options for a namespaced controller" do - assert_equal [:cms, nil, nil, [:product, @product]], @products_controller.send(:object_url_options) + assert_equal [nil, :cms, nil, [:product, @product]], @products_controller.send(:object_url_options) end should "return the correct object options when passed an action" do - assert_equal [:cms, nil, :edit, [:product, @product]], @products_controller.send(:object_url_options, :edit) + assert_equal [:edit, :cms, nil, [:product, @product]], @products_controller.send(:object_url_options, :edit) end should "accept an alternate object when passed one" do p = Product.new - assert_equal [:cms, nil, nil, [:product, p]], @products_controller.send(:object_url_options, nil, p) + assert_equal [nil, :cms, nil, [:product, p]], @products_controller.send(:object_url_options, nil, p) end context "with parent" do @@ -59,7 +59,7 @@ class Helpers::UrlsTest < Test::Unit::TestCase should "return the correct object options for object_url_options" do @controller.expects(:object).returns @object - assert_equal [[:user, @user], :edit, [:post, @object]], @controller.send(:object_url_options, :edit) + assert_equal [:edit, [:user, @user], [:post, @object]], @controller.send(:object_url_options, :edit) end should "return the correct object options for collection" do test/test/unit/helpers/urls_test.rb @@ -22,5 +22,4 @@ class HelpersTest < Test::Unit::TestCase end end end - end test/test/unit/helpers_test.rb generators/scaffold_resource/templates/view__form.rhtml generators/scaffold_resource/templates/view_edit.rhtml generators/scaffold_resource/templates/view_index.rhtml generators/scaffold_resource/templates/view_new.rhtml generators/scaffold_resource/templates/view_show.rhtml release.rb 34add5d478a6c0cda4dc13948e9438fb35fa6299 james james@a0c33c4f-3f3c-0410-8ba4-d3650ac1a399 http://github.com/jamesgolick/resource_controller/commit/3cd4f285f6e022e36840ad0c901b2acc38ebc77c 3cd4f285f6e022e36840ad0c901b2acc38ebc77c 2008-02-15T13:54:01-08:00 2008-02-15T13:54:01-08:00 merge back from trunk so that deep_nesting reflects the lack of edge_compatible branches git-svn-id: http://svn.jamesgolick.com/resource_controller/branches/deep_nesting@158 a0c33c4f-3f3c-0410-8ba4-d3650ac1a399 029b80326b0ad901154a20b80abac5c296f033a1 james james@a0c33c4f-3f3c-0410-8ba4-d3650ac1a399