memento 0.3.4 → 0.3.5

data/CHANGES.md

@@ -0,0 +1,9 @@
+### dev
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.3.5...master)
+
+### 0.3.5 / 2012-02-06
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.3.4...v0.3.5)
+
+* Compatiblity with Rails 3.2

data/lib/memento/action.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute'
+
 module Memento::Action
   class Base
     def initialize(state)
@@ -5,6 +7,8 @@ module Memento::Action
     end
     
     attr_reader :state
+    class_attribute :action_types, :instance_reader => false, :instance_writer => false
+    self.action_types = []
     
     def record
       @state.record
@@ -19,12 +23,7 @@ module Memento::Action
     end
     
     def self.inherited(child)
-      action_type = child.name.demodulize.underscore
-      write_inheritable_attribute(:action_types, action_types << action_type)
-    end
-    
-    def self.action_types
-      read_inheritable_attribute(:action_types) || []
+      self.action_types << child.name.demodulize.underscore
     end
     
     private

data/lib/memento/active_record_methods.rb

@@ -1,9 +1,13 @@
+require 'active_support/core_ext/class/attribute'
+
 module Memento::ActiveRecordMethods
   
   IGNORE_ATTRIBUTES = [:updated_at, :created_at]
   
   def self.included(base)
-    base.send :extend, ClassMethods
+    base.class_attribute(:memento_options_store, :instance_reader => false, :instance_writer => false)
+    base.memento_options_store = {}
+    base.extend ClassMethods
   end
   
   module ClassMethods
@@ -33,13 +37,13 @@ module Memento::ActiveRecordMethods
     end
     
     def memento_options
-      read_inheritable_attribute(:memento_options) || write_inheritable_attribute(: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]
-      write_inheritable_attribute(:memento_options, memento_options.merge(options))
+      self.memento_options_store = memento_options_store.merge(options)
     end
   end
   

data/lib/memento/version.rb

@@ -1,3 +1,3 @@
 class Memento
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/memento.rb

@@ -1,5 +1,4 @@
 require 'active_record'
-require 'active_support/core_ext/class/inheritable_attributes'
 
 class Memento
   include Singleton

data/spec/memento/active_record_methods_spec.rb

@@ -35,6 +35,10 @@ describe Memento::ActiveRecordMethods do
     }
   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"

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  segments_generated: true
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Yolk Sebastian Munz & Julia Soergel GbR
@@ -15,11 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 +01:00
+date: 2012-02-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,13 +28,12 @@ dependencies:
         segments: 
         - 3
         - 0
-        segments_generated: true
         version: "3.0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: actionpack
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,13 +42,12 @@ dependencies:
         segments: 
         - 3
         - 0
-        segments_generated: true
         version: "3.0"
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,13 +57,12 @@ dependencies:
         - 2
         - 4
         - 0
-        segments_generated: true
         version: 2.4.0
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sqlite3
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,10 +72,8 @@ dependencies:
         - 1
         - 3
         - 3
-        segments_generated: true
         version: 1.3.3
   type: :development
-  prerelease: false
   version_requirements: *id004
 description: Undo for Rails/ActiveRecord - covers destroy, update and create
 email: sebastian@yo.lk
@@ -90,6 +85,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGES.md
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -134,20 +130,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4150374159441153301
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4150374159441153301
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []