memento 0.3.7 → 0.4.0

data/lib/memento/action_controller_methods.rb

@@ -1,9 +1,9 @@
-class Memento
+module Memento
   module ActionControllerMethods
-    
+
     def memento
       block_result = nil
-      memento_session = Memento.instance.memento(current_user) do
+      memento_session = Memento(current_user) do
         block_result = yield
       end
       if memento_session

data/lib/memento/active_record_methods.rb

@@ -1,82 +1,82 @@
 require 'active_support/core_ext/class/attribute'
 
 module Memento::ActiveRecordMethods
-  
+
   IGNORE_ATTRIBUTES = [:updated_at, :created_at]
-  
+
   def self.included(base)
     base.class_attribute(:memento_options_store, :instance_reader => false, :instance_writer => false)
     base.memento_options_store = {}
     base.extend ClassMethods
   end
-  
+
   module ClassMethods
-    
+
     def memento_changes(*action_types)
       if defined?(@memento_initialized) && @memento_initialized
         raise "Memento initialized twice. Use memento_changes only once per model"
       end
-      
+
       @memento_initialized = true
-      
+
       include InstanceMethods
-      
+
       self.memento_options = action_types.last.is_a?(Hash) ? action_types.pop : {}
-      
+
       action_types = Memento::Action::Base.action_types if action_types.empty?
       action_types.map!(&:to_s).uniq!
       unless (invalid = action_types - Memento::Action::Base.action_types).empty?
         raise ArgumentError.new("Invalid memento_changes: #{invalid.to_sentence}; allowed are only #{Memento::Action::Base.action_types.to_sentence}")
       end
-      
+
       action_types.each do |action_type|
         send :"after_#{action_type}", :"record_#{action_type}"
       end
-      
+
       has_many :memento_states, :class_name => "Memento::State", :as => :record
     end
-    
+
     def memento_options
       self.memento_options_store ||= {}
     end
-    
+
     def memento_options=(options)
       options.symbolize_keys!
       options[:ignore] = [options[:ignore]].flatten.map(&:to_sym) if options[:ignore]
       self.memento_options_store = memento_options_store.merge(options)
     end
   end
-  
+
   module InstanceMethods
-    
+
     def attributes_for_memento
       filter_attributes_for_memento(attributes)
     end
-    
+
     def changes_for_memento
       filter_attributes_for_memento(changes)
     end
-    
+
     def filter_attributes_for_memento(hash)
-      hash.delete_if do |key, value| 
+      hash.delete_if do |key, value|
         ignore_attributes_for_memento.include?(key.to_sym)
       end
     end
     private :filter_attributes_for_memento
-    
+
     def ignore_attributes_for_memento
       Memento::ActiveRecordMethods::IGNORE_ATTRIBUTES + (self.class.memento_options[:ignore] || [])
     end
     private :ignore_attributes_for_memento
-    
+
     Memento::Action::Base.action_types.each do |action_type|
       define_method :"record_#{action_type}" do
-        Memento.instance.add_state(action_type, self)
+        Memento.add_state(action_type, self)
       end
       private :"record_#{action_type}"
     end
   end
-  
+
 end
 
 ActiveRecord::Base.send(:include, Memento::ActiveRecordMethods) if defined?(ActiveRecord::Base)

data/lib/memento/result.rb

@@ -1,37 +1,38 @@
-class Memento::ResultArray < Array
-  
-  def errors
-    self.find_all{ |result| result.failed? }
-  end
-  
-  def failed?
-    self.any?{ |result| result.failed? }
-  end
-  
-  def success?
-    !failed?
-  end
-  
-end
-
-class Memento::Result
-  
-  attr_reader :object, :state
-  
-  def initialize(object, state)
-    @object, @state = object, state
-  end
-  
-  def error
-    error = @object.errors[:memento_undo]
-    error.present? ? error : nil
-  end
-  
-  def failed?
-    !!error
+module Memento
+  class ResultArray < Array
+    def errors
+      self.find_all{ |result| result.failed? }
+    end
+
+    def failed?
+      self.any?{ |result| result.failed? }
+    end
+
+    def success?
+      !failed?
+    end
+
   end
-  
-  def success?
-    !failed?
+
+  class Result
+
+    attr_reader :object, :state
+
+    def initialize(object, state)
+      @object, @state = object, state
+    end
+
+    def error
+      error = @object.errors[:memento_undo]
+      error.present? ? error : nil
+    end
+
+    def failed?
+      !!error
+    end
+
+    def success?
+      !failed?
+    end
   end
 end

data/lib/memento/session.rb

@@ -1,29 +1,30 @@
-class Memento::Session < ActiveRecord::Base
-  self.table_name = "memento_sessions"
-  
-  has_many :states, :class_name => "Memento::State", :dependent => :delete_all, :order => "id DESC"
-  belongs_to :user
-  validates_presence_of :user
-  
-  def add_state(action_type, record)
-    states.store(action_type, record)
-  end
-  
-  def undo
-    states.map(&:undo).inject(Memento::ResultArray.new) do |results, result|
-      result.state.destroy if result.success?
-      results << result
+module Memento
+  class Session < ActiveRecord::Base
+    self.table_name = "memento_sessions"
+
+    has_many :states, :class_name => "Memento::State", :dependent => :delete_all, :order => "id DESC"
+    belongs_to :user
+    validates_presence_of :user
+
+    def add_state(action_type, record)
+      states.store(action_type, record)
     end
-  ensure
-    destroy if states.count.zero?
-  end
-  
-  def undo!
-    transaction do
-      undo.tap do |results|
-        raise Memento::ErrorOnRewind if results.failed?
+
+    def undo
+      states.map(&:undo).inject(Memento::ResultArray.new) do |results, result|
+        result.state.destroy if result.success?
+        results << result
+      end
+    ensure
+      destroy if states.count.zero?
+    end
+
+    def undo!
+      transaction do
+        undo.tap do |results|
+          raise Memento::ErrorOnRewind if results.failed?
+        end
       end
     end
   end
-  
 end

data/lib/memento/state.rb

@@ -1,47 +1,48 @@
-class Memento::State < ActiveRecord::Base
-  self.table_name = "memento_states"
-  
-  belongs_to :session, :class_name => "Memento::Session"
-  belongs_to :record, :polymorphic => true
-  
-  validates_presence_of :session
-  validates_presence_of :record
-  validates_presence_of :action_type
-  validates_inclusion_of :action_type, :in => Memento::Action::Base.action_types, :allow_blank => true
-  
-  before_create :set_record_data
-  
-  def self.store(action_type, record)
-    self.new(:action_type => action_type.to_s, :record => record) do |state|
-      state.save if state.fetch?
+module Memento
+  class State < ActiveRecord::Base
+    self.table_name = "memento_states"
+
+    belongs_to :session, :class_name => "Memento::Session"
+    belongs_to :record, :polymorphic => true
+
+    validates_presence_of :session
+    validates_presence_of :record
+    validates_presence_of :action_type
+    validates_inclusion_of :action_type, :in => Memento::Action::Base.action_types, :allow_blank => true
+
+    before_create :set_record_data
+
+    def self.store(action_type, record)
+      self.new(:action_type => action_type.to_s, :record => record) do |state|
+        state.save if state.fetch?
+      end
+    end
+
+    def undo
+      Memento::Result.new(action.undo, self)
+    end
+
+    def record_data
+      @record_data ||= Memento.serializer.load(read_attribute(:record_data))
+    end
+
+    def record_data=(data)
+      @record_data = nil
+      write_attribute(:record_data, data.is_a?(String) ? data : Memento.serializer.dump(data))
+    end
+
+    def fetch?
+      action.fetch?
+    end
+
+    private
+
+    def set_record_data
+      self.record_data = action.fetch
+    end
+
+    def action
+      "memento/action/#{action_type}".classify.constantize.new(self)
     end
   end
-  
-  def undo
-    Memento::Result.new(action.undo, self)
-  end
-  
-  def record_data
-    @record_data ||= Memento.serializer.load(read_attribute(:record_data))
-  end
-  
-  def record_data=(data)
-    @record_data = nil
-    write_attribute(:record_data, data.is_a?(String) ? data : Memento.serializer.dump(data))
-  end
-  
-  def fetch?
-    action.fetch?
-  end
-  
-  private
-  
-  def set_record_data
-    self.record_data = action.fetch
-  end
-  
-  def action
-    "memento/action/#{action_type}".classify.constantize.new(self)
-  end
-  
 end

data/lib/memento/version.rb

@@ -1,3 +1,3 @@
-class Memento
-  VERSION = "0.3.7"
+module Memento
+  VERSION = "0.4.0"
 end

data/memento.gemspec

@@ -11,12 +11,12 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/yolk/memento}
   s.summary = %q{Undo for Rails/ActiveRecord - covers destroy, update and create}
   s.description = %q{Undo for Rails/ActiveRecord - covers destroy, update and create}
-  
+
   s.files = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_dependency 'activerecord',        '~> 3.2.5'
   s.add_dependency 'actionpack',          '~> 3.2.5'
 

data/spec/memento/action/create_spec.rb

@@ -4,32 +4,32 @@ describe Memento::Action::Create, "when object is created" do
   before do
     setup_db
     setup_data
-    Memento.instance.start(@user)
+    Memento.start(@user)
     @project = Project.create!(:name => "P1", :closed_at => 3.days.ago).reload
-    Memento.instance.stop
+    Memento.stop
   end
-  
+
   after do
     shutdown_db
   end
-    
+
   it "should create memento_state for ar-object with no data" do
     Memento::State.count.should eql(1)
     Memento::State.first.action_type.should eql("create")
     Memento::State.first.record.should eql(@project) # it was destroyed, remember?
     Memento::State.first.reload.record_data.should eql(nil)
   end
-  
+
   it "should create object" do
     Project.find_by_id(@project.id).should_not be_nil
     Project.count.should eql(1)
   end
-  
+
   it "should allow undoing the creation" do
     Memento::Session.last.undo
     Project.count.should eql(0)
   end
-  
+
   describe "when undoing the creation" do
     it "should give back undone_object" do
       Memento::Session.last.undo.map{|e| e.object.class }.should eql([Project])
@@ -42,7 +42,7 @@ describe Memento::Action::Create, "when object is created" do
       undone.first.should_not be_success
       undone.first.error.first.should be_was_changed
     end
-    
+
     describe "when record was already destroyed" do
       it "should give back fake unsaved record with id set" do
         Project.last.destroy
@@ -56,24 +56,24 @@ describe Memento::Action::Create, "when object is created" do
       end
     end
   end
-  
-  
-  
+
+
+
 end
 
 describe Memento::Action::Create, "when object without timestamp is created" do
   before do
     setup_db
     setup_data
-    Memento.instance.memento(@user) do
+    Memento(@user) do
       @obj = TimestamplessObject.create!(:name => "O1").reload
     end
   end
-  
+
   after do
     shutdown_db
   end
-  
+
   describe "when undoing the creation" do
     it "should give back undone_object" do
       Memento::Session.last.undo.map{|e| e.object.class }.should eql([TimestamplessObject])

data/spec/memento/action/destroy_spec.rb

@@ -5,27 +5,27 @@ describe Memento::Action::Destroy, "when object gets destroyed" do
     setup_db
     setup_data
     @project = Project.create!(:name => "P1", :closed_at => 3.days.ago).reload
-    Memento.instance.start(@user)
+    Memento.start(@user)
     @project.destroy
   end
-  
+
   after do
-    Memento.instance.stop
+    Memento.stop
     shutdown_db
   end
-    
+
   it "should create memento_state for ar-object with full attributes_for_memento" do
     Memento::State.count.should eql(1)
     Memento::State.first.action_type.should eql("destroy")
     Memento::State.first.record.should be_nil # it was destroyed, remember?
     Memento::State.first.reload.record_data.should == @project.attributes_for_memento
   end
-  
+
   it "should destroy object" do
     Project.find_by_id(@project.id).should be_nil
     Project.count.should be_zero
   end
-  
+
   it "should allow undoing the destruction" do
     Project.count.should be_zero
     Memento::Session.last.undo
@@ -34,10 +34,10 @@ describe Memento::Action::Destroy, "when object gets destroyed" do
       @project.attributes_for_memento.reject{|k, v| k.to_sym == :id }
     )
   end
-  
+
   it "should give back undone_object on undoing the destruction" do
     Memento::Session.last.undo.map{|e| e.object.class }.should eql([Project])
   end
-  
-  
+
+
 end