memento 0.3.0 → 0.3.1

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+.rvmrc

data/README.rdoc

@@ -4,7 +4,7 @@ RubyGem/Plugin for undo in Rails/ActiveRecord - covers destroy, update and creat
 
 == Install
 
-memento will only work with Rails 2.3 or above.
+memento will only work with Rails 3.0 and Ruby 1.9.2.
 
 == as a ruby-gem
 

data/Rakefile

@@ -1,5 +1,17 @@
 require 'rubygems'
 require 'rake'
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
 
 begin
   require 'jeweler'
@@ -17,17 +29,3 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:build: 
-:patch: 0
 :major: 0
 :minor: 3
+:patch: 1
+:build: 

data/generators/memento_migration/templates/migration.rb

@@ -8,7 +8,7 @@ class MementoMigration < ActiveRecord::Migration
   
     create_table :memento_states do |t|
       t.string :action_type
-      t.binary :record_data, :limit => 1.megabytes
+      t.binary :record_data, :limit => 16777215
       t.references :record, :polymorphic => true
       t.references :session
       t.timestamps

data/lib/memento.rb

@@ -1,3 +1,5 @@
+require 'active_record'
+
 class Memento
   include Singleton
   
@@ -12,7 +14,7 @@ class Memento
   end
   
   def start(user_or_id)
-    user = User.find_by_id(user_or_id)
+    user = user_or_id.is_a?(User) ? user_or_id : User.find_by_id(user_or_id)
     @session = user ? Memento::Session.new(:user => user) : nil
   end
   
@@ -37,8 +39,13 @@ class Memento
     @ignore = false
   end
   
-  cattr_accessor :serializer
-  self.serializer = YAML
+  def self.serializer=(serializer)
+    @serializer = serializer
+  end
+  
+  def self.serializer
+    @serializer ||= YAML
+  end
   
   private
   

data/lib/memento/action/update.rb

@@ -21,7 +21,7 @@ class Memento::Action::Update < Memento::Action::Base
   private
   
   def update_record
-    returning(record) do |object|
+    record.tap do |object|
       record_data.each do |attribute, values|
         object.send(:"#{attribute}=", values.first)
       end
@@ -35,20 +35,19 @@ class Memento::Action::Update < Memento::Action::Base
       values = values.map{|v| v.is_a?(Time) ? v.to_s(:db) : v }
       current_value = record.send(:"#{attribute}")
       current_value = current_value.utc.to_s(:db) if current_value.is_a?(Time)
-      
       values.include?(current_value) 
     end || record_data.size.zero?
   end
   
   def was_destroyed
     new_object do |object|
-      object.errors.add(:memento_undo, ActiveSupport::StringInquirer.new("was_destroyed"))
+      object.errors[:memento_undo] << ActiveSupport::StringInquirer.new("was_destroyed")
       object.id = state.record_id
     end
   end
   
   def was_changed
-    record.errors.add(:memento_undo, ActiveSupport::StringInquirer.new("was_changed"))
+    record.errors[:memento_undo] << ActiveSupport::StringInquirer.new("was_changed")
     record
   end
   

data/lib/memento/action_controller_methods.rb

@@ -1,8 +1,6 @@
 class Memento
   module ActionControllerMethods
     
-    private
-    
     def memento
       block_result = nil
       memento_session = Memento.instance.memento(current_user) do
@@ -13,6 +11,7 @@ class Memento
       end
       block_result
     end
+    private :memento
   end
 end
 

data/lib/memento/active_record_methods.rb

@@ -9,6 +9,12 @@ module Memento::ActiveRecordMethods
   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 : {}
@@ -20,10 +26,7 @@ module Memento::ActiveRecordMethods
       end
       
       action_types.each do |action_type|
-        callback_exists = send(:"after_#{action_type}_callback_chain").any? do |callback|
-          callback.method.to_sym == :"record_#{action_type}"
-        end
-        send :"after_#{action_type}", :"record_#{action_type}" unless callback_exists
+        send :"after_#{action_type}", :"record_#{action_type}"
       end
       
       has_many :memento_states, :class_name => "Memento::State", :as => :record
@@ -50,22 +53,23 @@ module Memento::ActiveRecordMethods
       filter_attributes_for_memento(changes)
     end
     
-    private
-    
     def filter_attributes_for_memento(hash)
       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)
       end
+      private :"record_#{action_type}"
     end
   end
   

data/lib/memento/result.rb

@@ -23,7 +23,8 @@ class Memento::Result
   end
   
   def error
-    @object.errors[:memento_undo]
+    error = @object.errors[:memento_undo]
+    error.present? ? error : nil
   end
   
   def failed?

data/lib/memento/session.rb

@@ -20,7 +20,7 @@ class Memento::Session < ActiveRecord::Base
   
   def undo!
     transaction do
-      returning(undo) do |results|
+      undo.tap do |results|
         raise Memento::ErrorOnRewind if results.failed?
       end
     end

data/lib/memento/state.rb

@@ -27,7 +27,7 @@ class Memento::State < ActiveRecord::Base
   
   def record_data=(data)
     @record_data = nil
-    write_attribute(:record_data, Memento.serializer.dump(data))
+    write_attribute(:record_data, data.is_a?(String) ? data : Memento.serializer.dump(data))
   end
   
   def fetch?

data/memento.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memento}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yolk Sebastian Munz & Julia Soergel GbR"]
-  s.date = %q{2010-01-26}
+  s.date = %q{2010-11-14}
   s.email = %q{sebastian@yo.lk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION.yml",
      "generators/memento_migration/memento_migration_generator.rb",
      "generators/memento_migration/templates/migration.rb",
+     "init.rb",
      "lib/memento.rb",
      "lib/memento/action.rb",
      "lib/memento/action/create.rb",
@@ -36,7 +37,6 @@ Gem::Specification.new do |s|
      "lib/memento/session.rb",
      "lib/memento/state.rb",
      "memento.gemspec",
-     "rails/init.rb",
      "spec/memento/action/create_spec.rb",
      "spec/memento/action/destroy_spec.rb",
      "spec/memento/action/update_spec.rb",
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/yolk/memento}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Undo for Rails/ActiveRecord - covers destroy, update and create}
   s.test_files = [
     "spec/memento/action/create_spec.rb",
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/spec/memento/action/create_spec.rb

@@ -40,7 +40,7 @@ describe Memento::Action::Create, "when object is created" do
       undone = Memento::Session.last.undo
       Project.count.should eql(1)
       undone.first.should_not be_success
-      undone.first.error.should be_was_changed
+      undone.first.error.first.should be_was_changed
     end
     
     describe "when record was already destroyed" do

data/spec/memento/action/update_spec.rb

@@ -58,7 +58,7 @@ describe Memento::Action::Update do
       it "should return fake object with error" do
         undone = Memento::Session.last.undo.first
         undone.should_not be_success
-        undone.error.should be_was_destroyed
+        undone.error.first.should be_was_destroyed
         undone.object.class.should eql(Project)
         undone.object.id.should eql(1)
       end
@@ -140,7 +140,7 @@ describe Memento::Action::Update do
         end
         
         it "should set error" do
-          @result.error.should be_was_changed
+          @result.error.first.should be_was_changed
         end
     
         it "should return not undone object" do

data/spec/memento/action_controller_methods_spec.rb

@@ -2,8 +2,6 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 class FooController < ActionController::Base
   
-  private
-  
 end
 
 describe Memento::ActionControllerMethods do
@@ -22,7 +20,7 @@ describe Memento::ActionControllerMethods do
   end
   
   it "should add memento-method to ActionController::Base" do
-    FooController.private_instance_methods.should include("memento")
+    FooController.private_instance_methods.map(&:to_sym).should include(:memento)
   end
   
   it "should call memento#memento with user and block" do

data/spec/memento/active_record_methods_spec.rb

@@ -7,8 +7,8 @@ describe Memento::ActiveRecordMethods do
     setup_data
   end
   
-  it "should declare private methods on Project" do
-    Project.private_instance_methods.should include("record_destroy", "record_update", "record_create")
+  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

data/spec/memento/session_spec.rb

@@ -13,7 +13,7 @@ describe Memento::Session do
   end
   
   it "should require user" do
-    Memento::Session.create.errors[:user].should eql("can't be blank")
+    Memento::Session.create.errors[:user].should eql(["can't be blank"])
   end
   
   it "should have_many states" do

data/spec/memento/state_spec.rb

@@ -13,12 +13,12 @@ describe Memento::State do
   end
   
   it "should require session" do
-    Memento::State.create.errors[:session].should eql("can't be blank")
+    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")
+    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
@@ -27,7 +27,7 @@ describe Memento::State do
   end
   
   it "should require record" do
-    Memento::State.create.errors[:record].should eql("can't be blank")
+    Memento::State.create.errors[:record].should eql(["can't be blank"])
   end
   
   

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'active_support'
 require 'active_record'
 require 'action_controller'
-require 'spec'
+require 'rspec'
 
 # Initialize time_zones from rails
 Time.zone_default = Time.__send__(:get_zone, 'Berlin') || raise("Err")
@@ -13,10 +13,6 @@ $:.unshift(File.dirname(__FILE__))
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'memento'
 
-Spec::Runner.configure do |config|
-  
-end
-
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 # catch AR schema statements
 $stdout = StringIO.new
@@ -54,7 +50,7 @@ def setup_db
     
     create_table :memento_states do |t|
       t.string :action_type
-      t.binary :record_data, :limit => 1.megabytes
+      t.binary :record_data, :limit => 16777215
       t.references :record, :polymorphic => true
       t.references :session
       t.timestamps
@@ -74,18 +70,18 @@ def shutdown_db
 end
  
 class User < ActiveRecord::Base
-end
+end unless defined?(User)
 
 class Customer < ActiveRecord::Base
   has_many :projects
-end
+end unless defined?(Customer)
 
 class Project < ActiveRecord::Base
   belongs_to :customer
   
   memento_changes :ignore => :ignore_this
-end
+end unless defined?(Project)
 
 class TimestamplessObject < ActiveRecord::Base
   memento_changes
-end
+end unless defined?(TimestamplessObject)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: memento
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Yolk Sebastian Munz & Julia Soergel GbR
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +01:00
+date: 2010-11-14 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +37,7 @@ files:
 - VERSION.yml
 - generators/memento_migration/memento_migration_generator.rb
 - generators/memento_migration/templates/migration.rb
+- init.rb
 - lib/memento.rb
 - lib/memento/action.rb
 - lib/memento/action/create.rb
@@ -43,7 +49,6 @@ files:
 - lib/memento/session.rb
 - lib/memento/state.rb
 - memento.gemspec
-- rails/init.rb
 - spec/memento/action/create_spec.rb
 - spec/memento/action/destroy_spec.rb
 - spec/memento/action/update_spec.rb
@@ -64,21 +69,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Undo for Rails/ActiveRecord - covers destroy, update and create