@@ -16,4 +16,5 @@ public/themes *.swp vendor/engines/adva_rbac/spec/db/*.sqlite3 vendor/engines/adva_rbac/spec/log/* -.DS_Store \ No newline at end of file +.DS_Store +*~ .gitignore @@ -4,7 +4,8 @@ class Admin::WikipagesController < Admin::BaseController before_filter :set_section before_filter :set_wikipage, :only => [:show, :edit, :update, :destroy] before_filter :set_categories, :only => [:new, :edit] - + before_filter :optimistic_lock, :only => :update + cache_sweeper :wikipage_sweeper, :category_sweeper, :tag_sweeper, :only => [:create, :update, :destroy] @@ -96,4 +97,18 @@ class Admin::WikipagesController < Admin::BaseController params[:wikipage] ||= {} params[:wikipage][key] = value end + + def optimistic_lock + return unless params[:wikipage] + + unless updated_at = params[:wikipage].delete(:updated_at) + # TODO raise something more explicit here + raise t(:'adva.wiki.exception.missing_timestamp') + end + + if @wikipage.updated_at && (Time.zone.parse(updated_at) != @wikipage.updated_at) + flash[:error] = t(:'adva.wiki.flash.optimistic_lock.failure') + render :action => :edit + end + end end engines/adva_wiki/app/controllers/admin/wikipages_controller.rb @@ -97,7 +97,9 @@ class AdminWikipagesControllerTest < ActionController::TestCase describe "PUT to :update" do action do Wikipage.with_observers :wikipage_sweeper do - put :update, default_params.merge(:id => @wikipage.id).merge(@params || {}) + params = default_params.merge(:id => @wikipage.id).merge(@params || {}) + params[:wikipage][:updated_at] = "#{@wikipage.updated_at}" + put :update, params end end @@ -153,6 +155,91 @@ class AdminWikipagesControllerTest < ActionController::TestCase end end end + + describe "PUT to :update" do + with "incorrect time stamp" do + action do + Wikipage.with_observers :wikipage_sweeper do + params = default_params.merge(@params || { :wikipage => {} }).merge(:id => @wikipage.id) + params[:wikipage][:updated_at] = "#{Time.parse('2002-01-01 12:00:00')}" + put :update, params + end + end + # FIXME - test with optimistic locking failing, too + with "no version param given" do + with :valid_wikipage_params do + it_guards_permissions :update, :wikipage + it_assigns :site, :section, :wikipage + it_assigns_flash_cookie :error => :not_nil + it_does_not_trigger_any_event + it_does_not_sweep_page_cache #:by_reference => :wikipage + end + end + end + end + + describe "PUT to :update" do + action do + Wikipage.with_observers :wikipage_sweeper do + params = default_params.merge(@params || { :wikipage => {} }).merge(:id => @wikipage.id) + params[:wikipage][:updated_at] = "#{@wikipage.updated_at}" + #params[:wikipage][:updated_at] = nil + #params[:article][:updated_at] = "#{@wikipage.updated_at}" + put :update, params + end + end + + it_guards_permissions :update, :wikipage + + # FIXME - test with optimistic locking failing, too + with "no version param given" do + it_guards_permissions :update, :wikipage + + with :access_granted do + with :valid_wikipage_params do + it_updates :wikipage + + it_redirects_to { edit_admin_wikipage_url(@site, @section, @wikipage) } + + it_assigns_flash_cookie :notice => :not_nil + it_triggers_event :wikipage_updated + it_sweeps_page_cache :by_reference => :wikipage + end + end + + with :invalid_wikipage_params do + it_does_not_update :wikipage + it_renders :template, :edit + it_assigns_flash_cookie :error => :not_nil + it_does_not_trigger_any_event + it_does_not_sweep_page_cache + end + end + + with "a version param given" do + before { @params = { :wikipage => { :version => '1' } } } + it_guards_permissions :update, :wikipage + + with :access_granted do + with 'the wikipage has the requested revision (succeeds)' do + it_rollsback :wikipage, :to => 1 + it_triggers_event :wikipage_rolledback + it_assigns_flash_cookie :notice => :not_nil + it_redirects_to { edit_admin_wikipage_url(@site, @section, @wikipage) } + it_sweeps_page_cache :by_reference => :wikipage + end + + with "the wikipage does not have the requested revision (fails)" do + before { @params = { :wikipage => { :version => '10' } } } + it_does_not_rollback :wikipage + it_does_not_trigger_any_event + it_assigns_flash_cookie :error => :not_nil + it_redirects_to { edit_admin_wikipage_url(@site, @section, @wikipage) } + it_does_not_sweep_page_cache + end + end + end + end describe "DELETE to :destroy" do action { delete :destroy, default_params.update(:id => @wikipage.id) } @@ -165,4 +252,4 @@ class AdminWikipagesControllerTest < ActionController::TestCase it_sweeps_page_cache :by_reference => :wikipage end end -end \ No newline at end of file +end engines/adva_wiki/test/functional/admin/wikipages_controller_test.rb @@ -259,4 +259,4 @@ class WikiControllerTest < ActionController::TestCase it_renders :template, 'comments/comments', :format => :atom end end -end \ No newline at end of file +end engines/adva_wiki/test/functional/wiki_controller_test.rb 99cdcff186f0ed416cc03e6b8a3ce84f2d9a7a75 chris chris@turnstile.(none) http://github.com/svenfuchs/adva_cms/commit/1f17e66297924b7223fab9fa592c9d9f0b556b1c 1f17e66297924b7223fab9fa592c9d9f0b556b1c 2009-09-08T12:37:43-07:00 2009-09-08T12:37:43-07:00 added optimistic lock to wiki backend 0da5c62201a78c024ec0cdc3f59fed32c9dce1f3 chris chris@turnstile.(none)