memento 0.3.7 → 0.4.0

data/spec/memento/state_spec.rb

@@ -1,55 +1,55 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Memento::State do
-  
+
   before do
     setup_db
     setup_data
     @session = Memento::Session.create(:user => @user)
   end
-  
+
   it "should belong to session" do
     Memento::State.new(:session => @session).session.should eql(@session)
   end
-  
+
   it "should require session" do
     Memento::State.create.errors[:session].should eql(["can't be blank"])
   end
-  
+
   it "should require action_type to be one of Memento::State::RECORD_CAUSES" do
     Memento::State.create.errors[:action_type].should eql(["can't be blank"])
     Memento::State.create(:action_type => "move").errors[:action_type].should eql(["is not included in the list"])
   end
-  
+
   it "should belong to polymorphic record" do
     Memento::State.new(:record => @user).record.should eql(@user)
     Memento::State.new(:record => @session).record.should eql(@session)
   end
-  
+
   it "should require record" do
     Memento::State.create.errors[:record].should eql(["can't be blank"])
   end
-  
-  
+
+
   describe "valid State" do
     before do
       @state = @session.states.create!(:action_type => "destroy", :record => @project = Project.create(:name => "A") )
     end
-    
+
     it "should give back Memento::Result on undo" do
       result = @state.undo
       result.should be_a(Memento::Result)
       result.object.should be_a(Project)
       result.state.should eql(@state)
     end
-    
+
     it "should give back old data on record_data" do
       @state.record_data.should == (@project.attributes_for_memento)
     end
   end
-  
+
   after do
     shutdown_db
   end
-  
+
 end

data/spec/memento_spec.rb

@@ -5,165 +5,206 @@ describe Memento do
     setup_db
     setup_data
   end
-  
+
   after do
     shutdown_db
   end
-  
-  it "should be a singleton" do
-    Memento.instance.should be_kind_of(Singleton)
+
+  it "should be (like) a singleton" do
     Memento.instance.should eql(Memento.instance)
+    Memento.instance.should eql(Memento)
     lambda{ Memento.new }.should raise_error(NoMethodError)
   end
-  
+
   it "should not be memento by default" do
-    Memento.instance.should_not be_active
+    Memento.should_not be_active
   end
-  
+
   describe "start" do
-    
+
     before do
-      Memento.instance.start(@user)
-      @session = Memento.instance.instance_variable_get("@session")
+      Memento.start(@user)
+      @session = Memento.send(:session)
     end
-    
+
     it "should require user or user_id on start" do
-      lambda{ Memento.instance.start }.should raise_error(ArgumentError)
+      lambda{ Memento.start }.should raise_error(ArgumentError)
     end
-    
+
     it "should set an unsaved memento_session when starting" do
       Memento::Session.count.should eql(0)
       @session.should be_kind_of(Memento::Session)
       @session.should be_new_record
     end
-    
+
     it "should set user on session" do
       @session.user.should eql(User.first)
     end
-    
+
     it "should set user when passing in id as integer" do
-      Memento.instance.start(User.create(:name => "MyUser2").id)
-      Memento.instance.instance_variable_get("@session").user.should eql(User.last)
+      Memento.start(User.create(:name => "MyUser2").id)
+      Memento.send(:session).user.should eql(User.last)
     end
-    
+
     it "should not start memento when user does not exists/is invalid" do
-      Memento.instance.stop
-      Memento.instance.start(123333)
-      Memento.instance.should_not be_active
-      Memento.instance.start("123")
-      Memento.instance.should_not be_active
+      Memento.stop
+      Memento.start(123333)
+      Memento.should_not be_active
+      Memento.start("123")
+      Memento.should_not be_active
     end
-    
+
     it "should be memento" do
-      Memento.instance.should be_active
+      Memento.should be_active
     end
-    
+
   end
-  
+
   describe "stop" do
     before do
-      Memento.instance.start(@user)
-      Memento.instance.stop
+      Memento.start(@user)
+      Memento.stop
     end
-    
+
     it "should not be memento" do
-      Memento.instance.should_not be_active
+      Memento.should_not be_active
     end
-    
+
     it "should remove session if no states created" do
       Memento::Session.count.should eql(0)
     end
   end
-  
+
   describe "memento block" do
-    
+
     it "should record inside of block and stop after" do
-      Memento.instance.should_not be_active
-      Memento.instance.memento(@user) do
-        Memento.instance.should be_active
+      Memento.should_not be_active
+      Memento(@user) do
+        Memento.should be_active
       end
-      Memento.instance.should_not be_active
+      Memento.should_not be_active
     end
-    
+
     it "should give back session when states created" do
-      Memento.instance.memento(@user) do
+      Memento(@user) do
         Project.create!
       end.should be_a(Memento::Session)
     end
-    
+
     it "should give back false when no states created" do
-      Memento.instance.memento(@user) do
+      Memento(@user) do
         1 + 1
       end.should be_false
     end
-    
+
     it "should raise error in block and stop session" do
       lambda {
-        Memento.instance.memento(@user) do
+        Memento(@user) do
           raise StandardError
         end.should be_nil
       }.should raise_error(StandardError)
-      Memento.instance.should_not be_active
+      Memento.should_not be_active
     end
-    
+
   end
-  
+
   describe "when active" do
     before do
       @project =  Project.create(:name => "P1")
-      Memento.instance.start(@user)
+      Memento.start(@user)
     end
-    
+
     after do
-      Memento.instance.stop
+      Memento.stop
     end
-    
+
     it "should create memento_state for ar-object with action_type" do
       Memento::State.count.should eql(0)
-      Memento.instance.add_state :destroy, @project
+      Memento.add_state :destroy, @project
       Memento::State.count.should eql(1)
       Memento::State.first.action_type.should eql("destroy")
       Memento::State.first.record.should eql(Project.last)
     end
-    
+
     it "should save session on first added state" do
       Memento::Session.count.should eql(0)
-      Memento.instance.add_state :destroy, @project
+      Memento.add_state :destroy, @project
       Memento::Session.count.should eql(1)
     end
-    
+
     describe "when ignoring" do
       it "should NOT create memento_state for ar-object with action_type" do
-        Memento.instance.ignore do
-          Memento.instance.add_state :destroy, Project.create(:name => "P1")
+        Memento.ignore do
+          Memento.add_state :destroy, Project.create(:name => "P1")
         end
-        
+
         Memento::State.count.should eql(0)
       end
     end
-    
+
   end
-  
+
   describe "when not active" do
-    
+
     it "should NOT create memento_state for ar-object with action_type" do
-      Memento.instance.add_state :destroy, Project.create(:name => "P1")
+      Memento.add_state :destroy, Project.create(:name => "P1")
       Memento::State.count.should eql(0)
     end
-    
+
   end
-  
+
   context "serializer" do
-    
+
     it "should default to yaml" do
       Memento.serializer.should eql(YAML)
     end
-    
+
     it "should be changeable" do
       Memento.serializer = Marshal
       Memento.serializer.should eql(Marshal)
     end
-    
+
   end
-  
+
+  describe "multiple threads" do
+    describe "start" do
+      before do
+        Thread.new do
+          Memento.start(@user)
+        end
+      end
+
+      it "should start Memento not in main thread" do
+        sleep(0.1)
+        Memento.should_not be_active
+      end
+
+      it "should start Memento not in separat thread" do
+        sleep(0.1)
+        t = Thread.new do
+          Memento.should_not be_active
+        end
+        t.join
+      end
+    end
+
+    describe "ignore" do
+      before do
+        @t = Thread.new do
+          Memento.ignore { Memento.should be_ignore;sleep(0.2) }
+        end
+      end
+
+      after do
+        @t.join
+      end
+
+      it "should set ignore status by thread" do
+        Memento.should_not be_ignore
+        sleep(0.1)
+        Memento.should_not be_ignore
+      end
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -26,27 +26,27 @@ def setup_db
       t.integer :ignore_this
       t.timestamps
     end
-    
+
     create_table :users do |t|
       t.column :email, :string
       t.column :name, :string
       t.timestamps
     end
-    
+
     create_table :customers do |t|
       t.column :name, :string
       t.timestamps
     end
-    
+
     create_table :timestampless_objects do |t|
       t.column :name, :string
     end
-    
+
     create_table :memento_sessions do |t|
       t.references :user
       t.timestamps
     end
-    
+
     create_table :memento_states do |t|
       t.string :action_type
       t.binary :record_data, :limit => 16777215
@@ -54,20 +54,20 @@ def setup_db
       t.references :session
       t.timestamps
     end
-    
+
   end
 end
 
 def setup_data
   @user = User.create(:name => "MyUser")
 end
- 
+
 def shutdown_db
   ActiveRecord::Base.connection.tables.each do |table|
     ActiveRecord::Base.connection.drop_table(table)
   end
 end
- 
+
 class User < ActiveRecord::Base
 end unless defined?(User)
 
@@ -77,7 +77,7 @@ end unless defined?(Customer)
 
 class Project < ActiveRecord::Base
   belongs_to :customer
-  
+
   memento_changes :ignore => :ignore_this
 end unless defined?(Project)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memento
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord