@@ -14,7 +14,7 @@ class BlogetMigration < ActiveRecord::Migration t.string :poster_type, :null => false t.string :title, :null => false t.text :content, :null => false - t.string :state, :null => false, :default => 'draft' + t.boolean :published, :null => false, :default => false t.timestamps end generators/bloget/templates/migrate/bloget_migration.rb @@ -37,7 +37,7 @@ class CommentsControllerTest < ActionController::TestCase a_post = create_post post :create, :post_id => a_post.permalink, :comment => { :content => 'My comment' } - assert_redirected_to :controller => 'posts', :action => 'show' + assert_match /#{a_post.permalink}#comment_\d+$/, redirect_to_url assert_match "success", flash[:notice] end generators/bloget/templates/test/functional/comments_controller_test.rb @@ -75,23 +75,9 @@ class PostsControllerTest < ActionController::TestCase :permalink => get_permalink, :content => 'Some content' } - assert_redirected_to :action => 'show' - assert_match "success", flash[:notice] - end - def test_post_should_be_published_when_published_passed_in_params - blogger = create_blogger - @controller.stubs(:logged_in?).returns(true) - @controller.stubs(:current_user).returns(blogger.poster) - - p = create_post - Post.stubs(:new).returns(p) - p.stubs(:save).returns(true) - p.expects(:publish!) - - post :create, :post => { - :state => 'published' - } + assert_match /\/posts\/[a-z\d\-_]+$/, redirect_to_url + assert_match "success", flash[:notice] end def test_must_be_logged_in_to_get_edit_form @@ -169,7 +155,7 @@ class PostsControllerTest < ActionController::TestCase end def test_should_not_show_draft_posts_in_index - post = create_post(:state => 'draft', :title => String.random) + post = create_post(:published => false, :title => String.random) get :index assert_select "h2 a", :text => post.display_title, :count => 0 @@ -180,7 +166,7 @@ class PostsControllerTest < ActionController::TestCase @controller.stubs(:logged_in?).returns(true) @controller.stubs(:current_user).returns(blogger.poster) - post = create_post(:state => 'draft', :title => String.random) + post = create_post(:published => false, :title => String.random) get :index assert_select "h2 a", post.display_title @@ -188,7 +174,7 @@ class PostsControllerTest < ActionController::TestCase end def test_should_not_show_individual_post_in_draft_state - post = create_post(:state => 'draft') + post = create_post(:published => false) get :show, :id => post.permalink assert_response 401 end @@ -198,7 +184,7 @@ class PostsControllerTest < ActionController::TestCase @controller.stubs(:logged_in?).returns(true) @controller.stubs(:current_user).returns(blogger.poster) - post = create_post(:state => 'draft') + post = create_post(:published => false) get :show, :id => post.permalink assert_response :success end generators/bloget/templates/test/functional/posts_controller_test.rb @@ -46,13 +46,7 @@ class PostTest < ActiveSupport::TestCase assert !p2.valid? assert_not_nil p2.errors[:permalink] end - - def test_can_have_a_state - p = create_post - - assert p.respond_to?(:state) - end - + def test_should_have_default_state_of_draft p = Post.new(:poster_id => 1, :poster_type => 'User', @@ -72,12 +66,5 @@ class PostTest < ActiveSupport::TestCase p.publish! assert p.published? end - - def test_should_not_have_other_states - p = create_post - p.state = 'ready' - - assert !p.valid? - end - + end generators/bloget/templates/test/unit/posts_test.rb @@ -1,4 +1,4 @@ -<%= render :partial => "comment" %> +<%= render :partial => "comment", :object => @comment %> <p><%= link_to "<< Back to post", post_url(@comment.post) %></p> generators/bloget/templates/views/comments/show.html.erb @@ -9,10 +9,8 @@ </div> <div class="field"> - <label for="post_state">State:</label><br /> - <% Post.states.each do |state| %> - <%= form.radio_button :state, state %> <%= state.to_s.capitalize %><br /> - <% end %> + <label for="post_published">Published?</label> + <%= form.check_box :published %> </div> <div class="field"> generators/bloget/templates/views/posts/_form.html.erb @@ -23,36 +23,30 @@ module Bloget @blog ||= Blog.instance @rss = formatted_posts_url(:format => 'atom') - - conditions = Hash.new - unless logged_in? and Blogger.valid_blogger?(current_user) - conditions[:state] = 'published' - end - - find_args = {:order => 'created_at DESC'} - unless conditions.empty? - find_args[:conditions] = conditions - end + + posts = if logged_in? and Blogger.valid_blogger?(current_user) + Post.chronologically + else + Post.published.chronologically + end respond_to do |format| - format.html do - if Post.respond_to?(:paginate) - @posts = Post.paginate(:all, find_args.merge(:page => params[:page])) + if posts.respond_to?(:paginate) + @posts = posts.paginate(:all, :page => params[:page]) else - @posts = Post.find(:all, find_args) + @posts = posts.find(:all) end end format.atom do - if Post.respond_to?(:paginate) - @posts = Post.paginate(:all, find_args.merge(:page => params[:page])) + if posts.respond_to?(:paginate) + @posts = posts.paginate(:all, :page => params[:page]) else - @posts = Post.find(:all, find_args.merge(:limit => 20)) + @posts = posts.find(:all) end render :layout => false end - end end @@ -69,7 +63,6 @@ module Bloget @post.poster = current_user if @post.save - @post.publish! if params[:post][:state] == 'published' flash[:notice] = "The post was successfully saved." redirect_to post_url(@post) else lib/bloget/controllers/posts_controller.rb @@ -14,25 +14,11 @@ module Bloget validates_presence_of :permalink validates_uniqueness_of :permalink validates_format_of :permalink, :with => /^[\w\-]+$/, - :message => 'must only be made up of numbers, letters, and dashes' - - acts_as_state_machine :initial => :draft - - state :draft - state :published, :enter => lambda { |o| o.save if o.new_record? } - - validates_inclusion_of :state, :in => states.map { |s| s.to_s } - - event :publish do - transitions :from => :draft, :to => :published, :guard => lambda { - |o| o.valid? - } - end - - event :unpublish do - transitions :from => :published, :to => :draft - end + :message => 'must only be made up of numbers, letters, and dashes' + named_scope :published, { :conditions => ['published = ?', true] } + named_scope :draft, { :conditions => ['published = ?', false] } + named_scope :chronologically, { :order => 'created_at DESC' } end end @@ -42,10 +28,30 @@ module Bloget def display_title title = read_attribute(:title) - title += " [DRAFT]" if !title.empty? and state == 'draft' + title += " [DRAFT]" if !title.empty? and draft? title end - + + def publish + update_attribute(:published, true) + end + + alias :publish! :publish + + def unpublish + update_attribute(:published, false) + end + + alias :unpublish! :unpublish + + def draft? + !published? + end + + def state + published? ? 'published' : 'draft' + end + end end end lib/bloget/models/post.rb @@ -21,15 +21,13 @@ namespace :bloget do desc "Installs required and recommended plugins for Bloget." task :install_friends do Dir.chdir(RAILS_ROOT) do - puts `ruby script/plugin install http://svn.techno-weenie.net/projects/plugins/restful_authentication/` - puts `ruby script/plugin install svn://errtheblog.com/svn/plugins/will_paginate` - puts `ruby script/plugin install http://elitists.textdriven.com/svn/plugins/acts_as_state_machine/trunk/` + puts `ruby script/plugin install git://github.com/technoweenie/restful-authentication.git` + puts `ruby script/plugin install git://github.com/mislav/will_paginate.git` end end desc "Sets up a Rails app with the recommended infrastructure for Bloget." task :setup_app => [:load_rails, :install_friends] do -# puts `ruby script/generate authenticated user sessions --force` Rails::Generator::Scripts::Generate.new.run(['authenticated', 'user', 'sessions']) Rails::Generator::Scripts::Generate.new.run(['bloget_app']) end tasks/bloget_tasks.rake 839ea2b03a484202f3692444673cb9168353e4e9 Clinton R. Nixon crnixon@gmail.com http://github.com/vigetlabs/bloget/commit/6f695692cd7b98a1ee3261dff1e35dab31ae4ce7 6f695692cd7b98a1ee3261dff1e35dab31ae4ce7 2009-01-23T13:58:52-08:00 2009-01-23T13:58:52-08:00 Removed aasm; fixed tests b4b355f4cc7ad2614654407016a88fb0f3d21368 Clinton R. Nixon crnixon@gmail.com