memento 0.3.7 → 0.4.0

data/spec/memento/action/update_spec.rb

@@ -9,19 +9,19 @@ describe Memento::Action::Update do
     @project = Project.create!(:name => "P1", :closed_at => @time1, :notes => "Bla bla").reload
     @customer = Customer.create!(:name => "C1")
   end
-  
+
   after do
     shutdown_db
   end
-  
+
   describe "when object gets updated" do
-    
+
     before do
-      Memento.instance.memento(@user) do
+      Memento(@user) do
         @project.update_attributes(:name => "P2", :closed_at => @time2, :customer => @customer, :notes => "Bla bla")
       end
     end
-    
+
     it "should create memento_state for ar-object from changes_for_memento" do
       Memento::State.count.should eql(1)
       Memento::State.first.action_type.should eql("update")
@@ -32,7 +32,7 @@ describe Memento::Action::Update do
       Memento::State.first.record_data["closed_at"][0].utc.to_s.should eql(@time1.utc.to_s)
       Memento::State.first.record_data["closed_at"][1].utc.to_s.should eql(@time2.utc.to_s)
     end
-  
+
     it "should update object" do
       @project.reload.name.should eql("P2")
       @project.customer.should eql(@customer)
@@ -40,7 +40,7 @@ describe Memento::Action::Update do
       @project.should_not be_changed
       Project.count.should eql(1)
     end
-  
+
     it "should allow undoing the update" do
       undone = Memento::Session.last.undo.first
       undone.should be_success
@@ -49,12 +49,12 @@ describe Memento::Action::Update do
       undone.object.customer.should be_nil
       undone.object.closed_at.to_s.should eql(@time1.to_s)
     end
-  
+
     describe "when record was destroyed before undo" do
       before do
         @project.destroy
       end
-    
+
       it "should return fake object with error" do
         undone = Memento::Session.last.undo.first
         undone.should_not be_success
@@ -63,20 +63,20 @@ describe Memento::Action::Update do
         undone.object.id.should eql(1)
       end
     end
-  
+
     describe "when record was changed before undo" do
-    
+
       describe "with mergeable unrecorded changes" do
         before do
           @project.update_attributes({:notes => "Bla!"})
           @result = Memento::Session.first.undo.first
           @object = @result.object
         end
-    
+
         it "should be success" do
           @result.should be_success
         end
-    
+
         it "should return correctly updated object" do
           @object.class.should eql(Project)
           @object.name.should eql("P1")
@@ -85,21 +85,21 @@ describe Memento::Action::Update do
           @object.notes.should eql("Bla!")
         end
       end
-  
+
       describe "with mergeable recorded changes" do
         before do
-          Memento.instance.memento(@user) do
+          Memento(@user) do
             @project.update_attributes({:notes => "Bla\nBla!"})
           end
           Memento::State.last.update_attributes(:created_at => 1.minute.from_now)
           @result = Memento::Session.first.undo.first
           @object = @result.object
         end
-    
+
         it "should be success" do
           @result.should be_success
         end
-    
+
         it "should return correctly updated object" do
           @object.class.should eql(Project)
           @object.name.should eql("P1")
@@ -107,13 +107,13 @@ describe Memento::Action::Update do
           @object.closed_at.to_s.should eql(@time1.to_s)
           @object.notes.should eql("Bla\nBla!")
         end
-    
+
         describe "when second state is undone" do
           before do
             @result = Memento::Session.first.undo.first
             @object = @result.object
           end
-    
+
           it "should be success" do
             @result.should be_success
           end
@@ -138,11 +138,11 @@ describe Memento::Action::Update do
         it "should fail" do
           @result.should be_failed
         end
-        
+
         it "should set error" do
           @result.error.first.should be_was_changed
         end
-    
+
         it "should return not undone object" do
           @object.name.should eql("P3")
           @object.customer.should eql(@customer)
@@ -150,34 +150,34 @@ describe Memento::Action::Update do
           @object.should_not be_changed
         end
       end
-    
+
       describe "with unmergeable recorded changes" do
         before do
-          Memento.instance.memento(@user) do
+          Memento(@user) do
             @project.update_attributes!({:name => "P3"})
           end
           Memento::State.last.update_attributes(:created_at => 1.minute.from_now)
           @result = Memento::Session.first.undo.first
           @object = @result.object
         end
-    
+
         it "should fail" do
           @result.should be_failed
         end
-    
+
         it "should return not undone object" do
           @object.name.should eql("P3")
           @object.customer.should eql(@customer)
           @object.closed_at.to_s.should eql(@time2.to_s)
           @object.should_not be_changed
         end
-      
+
         describe "when second state is undone" do
           before do
             @result = Memento::Session.last.undo.first
             @object = @result.object
           end
-        
+
           it "should be success" do
             @result.should be_success
           end
@@ -192,22 +192,22 @@ describe Memento::Action::Update do
         end
       end
     end
-  
+
   end
-  
+
   describe "when object gets updated with no changes" do
-    
+
     before do
-      Memento.instance.memento(@user) do
+      Memento(@user) do
         @project.update_attributes(:name => "P1", :customer => nil, :notes => "Bla bla")
       end
     end
-    
+
     it "should not create session/state" do
       Memento::Session.count.should eql(0)
       Memento::State.count.should eql(0)
     end
-    
+
   end
-  
+
 end

data/spec/memento/action_controller_methods_spec.rb

@@ -1,11 +1,11 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 class FooController < ActionController::Base
-  
+
 end
 
 describe Memento::ActionControllerMethods do
-  
+
   before do
     setup_db
     setup_data
@@ -14,15 +14,15 @@ describe Memento::ActionControllerMethods do
     @headers = {}
     @controller.stub!(:response).and_return(mock("response", :headers => @headers))
   end
-  
+
   after do
     shutdown_db
   end
-  
+
   it "should add memento-method to ActionController::Base" do
     FooController.private_instance_methods.map(&:to_sym).should include(:memento)
   end
-  
+
   it "should call memento#memento with user and block" do
     project = Project.create!
     @controller.send(:memento) do
@@ -32,22 +32,22 @@ describe Memento::ActionControllerMethods do
     project.memento_states.count.should eql(1)
     Memento::Session.count.should eql(1)
   end
-  
+
   it "should set header X-MementoSessionId" do
     @controller.send(:memento) { Project.create!.update_attributes(:name => "P7") }
     @headers.should == {'X-Memento-Session-Id' => Memento::Session.last.id.to_s }
   end
-  
+
   it "should return result of given block" do
     @controller.send(:memento) do
       1 + 2
     end.should eql(3)
   end
-  
+
   it "should not set header when no session stored" do
     @controller.send(:memento) { Customer.create! } # not stored
     @headers['X-MementoSessionId'].should be_nil
     @headers.should_not have_key('X-Memento-Session-Id')
   end
-  
+
 end

data/spec/memento/active_record_methods_spec.rb

@@ -1,44 +1,44 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Memento::ActiveRecordMethods do
-  
+
   before do
     setup_db
     setup_data
   end
-  
+
   it "should declare protected methods on Project" do
     Project.private_instance_methods.map(&:to_sym).should include(:record_destroy, :record_update, :record_create)
   end
-  
+
   it "should set hook on create to call Memento" do
     project = Project.new(:name => "Project X")
-    Memento.instance.should_receive(:add_state).once().with("create", project)
+    Memento.should_receive(:add_state).once().with("create", project)
     project.save!
   end
-  
+
   it "should set hook on update to call Memento" do
     project = Project.create!(:name => "Project X")
-    Memento.instance.should_receive(:add_state).once().with("update", project)
+    Memento.should_receive(:add_state).once().with("update", project)
     project.update_attributes(:name => "Project XY")
   end
-  
+
   it "should set hook on destroy to call Memento" do
     project = Project.create!(:name => "Project X")
-    Memento.instance.should_receive(:add_state).once().with("destroy", project)
+    Memento.should_receive(:add_state).once().with("destroy", project)
     project.destroy
   end
-  
+
   it "should define attributes_for_memento and ignore attributes given by options" do
     Project.create!(:name => "Project X").attributes_for_memento.should == {
       "id"=>1, "name"=>"Project X", "notes"=>nil, "customer_id"=>nil, "closed_at"=>nil
     }
   end
-  
+
   it "should set memento_options" do
     Project.memento_options.should eql({:ignore=>[:ignore_this]})
   end
-  
+
   it "should define changes_for_memento and ignore attributes given by options" do
     project = Project.create!(:name => "Project X")
     project.name = "A Project"
@@ -48,22 +48,22 @@ describe Memento::ActiveRecordMethods do
     project.changes_for_memento.should_not == project.changes
     project.changes_for_memento.should == {"name"=>["Project X", "A Project"], "notes"=>[nil, "new"]}
   end
-  
+
   it "should define has_many association to memento_states" do
     project = Project.create!(:name => "Project X")
     project.memento_states.should be_empty
-    Memento.instance.memento(@user) { project.update_attributes(:name => "Project Y") }
+    Memento(@user) { project.update_attributes(:name => "Project Y") }
     project.memento_states.count.should eql(1)
-    Memento.instance.memento(@user) { project.update_attributes(:name => "Project Y") }
+    Memento(@user) { project.update_attributes(:name => "Project Y") }
     project.memento_states.count.should eql(1)
-    Memento.instance.memento(@user) { Project.create!.update_attributes(:name => "Project X") }
+    Memento(@user) { Project.create!.update_attributes(:name => "Project X") }
     project.memento_states.count.should eql(1)
     Project.last.memento_states.count.should eql(2)
     Memento::State.count.should eql(3)
   end
-  
+
   after do
     shutdown_db
   end
-  
+
 end

data/spec/memento/result_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Memento::Result do
-  
+
   describe "when initalized with valid object" do
     before do
       @object = mock("object", :errors => {})
@@ -12,7 +12,7 @@ describe Memento::Result do
     it "should have an object attribute" do
       @result.object.should eql(@object)
     end
-    
+
     it "should have an state attribute" do
       @result.state.should eql(@state)
     end
@@ -26,13 +26,13 @@ describe Memento::Result do
       @result.should_not be_failed
     end
   end
-  
+
   describe "when initalized with object with errors" do
     before do
       @object = mock("object", :errors => {:memento_undo => "123"})
       @result = Memento::Result.new(@object, mock("state1"))
     end
-    
+
     it "should have an object attribute" do
       @result.object.should eql(@object)
     end
@@ -50,40 +50,40 @@ describe Memento::Result do
 end
 
 describe Memento::ResultArray do
-  
+
   before do
     @results = Memento::ResultArray.new()
   end
-  
+
   it "should have an empty errors array" do
     @results.errors.should eql([])
   end
-  
+
   it "should have no errors" do
     @results.should be_success
     @results.should_not be_failed
   end
-  
+
   describe "when Memento::Result without errors added" do
     before do
       @object = mock("object", :errors => {:memento_undo => "123"})
       @results << Memento::Result.new(mock("object2", :errors => {}), mock("state1"))
       @results << (@with_error = Memento::Result.new(@object, mock("state2")))
     end
-    
+
     it "should have two entrys" do
       @results.size.should eql(2)
     end
-    
+
     it "should have one error" do
       @results.errors.size.should eql(1)
       @results.errors.should eql([@with_error])
     end
-    
+
     it "should have an error" do
       @results.should_not be_success
       @results.should be_failed
     end
   end
-  
+
 end

data/spec/memento/session_spec.rb

@@ -1,50 +1,50 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Memento::Session do
-  
+
   before do
     setup_db
     setup_data
     @session = Memento::Session.create(:user => @user)
   end
-  
+
   it "should belong to user" do
     @session.user.should eql(@user)
   end
-  
+
   it "should require user" do
     Memento::Session.create.errors[:user].should eql(["can't be blank"])
   end
-  
+
   it "should have_many states" do
     @session.states.should eql([])
     @session.states.create!(:action_type => "destroy", :record => Project.create!)
     @session.states.count.should eql(1)
   end
-  
+
   context "undo" do
     before do
       @state1 = @session.states.create!(:action_type => "update", :record => @p1 = Project.create!)
       @other = Memento::Session.create!(:user => @user).states.create!(:action_type => "destroy", :record => Project.create!)
       @state2 = @session.states.create!(:action_type => "update", :record => @p2 = Project.create!)
     end
-    
+
     describe "and all states succeed" do
       it "should return ResultsArray" do
         @session.undo.should be_a(Memento::ResultArray)
       end
-      
+
       it "should remove all states" do
         @session.undo
         Memento::State.count.should eql(1)
       end
-      
+
       it "should remove itself" do
         @session.undo
         Memento::Session.find_by_id(@session.id).should be_nil
       end
     end
-    
+
     describe "and all states fail" do
       before do
         @state1.update_attributes(:record_data => {:name => ["A", "B"]})
@@ -52,22 +52,22 @@ describe Memento::Session do
         @state2.update_attributes(:record_data => {:name => ["A", "B"]})
         @p2.update_attributes(:name => "C")
       end
-      
+
       it "should keep all states" do
         @session.undo
         Memento::State.count.should eql(3)
       end
-      
+
       it "should keep itself" do
         @session.undo
         @session.reload
       end
-      
+
       it "should raise Memento::ErrorOnRewind on undo!" do
         lambda{ @session.undo! }.should raise_error(Memento::ErrorOnRewind)
       end
     end
-    
+
     describe "and some states succeed, some fail" do
       before do
         @state1.update_attributes(:record_data => {:name => ["A", "B"]})
@@ -78,7 +78,7 @@ describe Memento::Session do
         @session.undo! rescue
         Memento::State.count.should eql(3)
       end
-      
+
       it "should NOT keep all states when using undo" do
         @session.undo
         Memento::State.count.should eql(2)
@@ -88,34 +88,34 @@ describe Memento::Session do
         @session.undo rescue nil
         @session.reload
       end
-      
+
       it "should raise Memento::ErrorOnRewind on undo!" do
         lambda{ @session.undo! }.should raise_error(Memento::ErrorOnRewind)
       end
     end
-  
+
     it "should undo states in reverse order of creation (newest first)" do
       @session.undo.map(&:state).map(&:id).should eql([@state2.id, @state1.id])
     end
   end
-  
+
   describe "with states" do
     before do
       @session.states.create!(:action_type => "destroy", :record => Project.create!)
       Memento::Session.create!(:user => @user).states.create!(:action_type => "destroy", :record => Project.create!)
       @state2 = @session.states.create!(:action_type => "update", :record => Project.create!)
     end
-    
+
     it "should destroy all states when destroyed" do
       Memento::State.count.should eql(3)
       @session.destroy
       Memento::State.count.should eql(1)
     end
-    
+
   end
-  
+
   after do
     shutdown_db
   end
-  
+
 end