memento 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a398d1db995dde129200972e15977dd8e7988b81
-  data.tar.gz: 6ead2aab247ffbe93318efc279a84ab0f4b6023e
+SHA256:
+  metadata.gz: 0ffb4f13c2e20305cc1278a65fddde559e090748407cf824316e65aa23ff2c7e
+  data.tar.gz: 60c42b17605cf297072f936f096f7d7cc539252338df1cf44d84a4cf87cb32ec
 SHA512:
-  metadata.gz: b2e302f650ed080fabd0807fdaeb6d73aa3d60836dec5f7ef6a5aacddca58f32191e2e66d4006a5950ca92fb79787216be1cce48d6a2d37551f16996a8ee7461
-  data.tar.gz: 985907459e9ec2f51a4fb847e317f5872195bdfeee31038a1ec4de8e9e2c7e5bb3dfecfa793e33460ec781d5218b68a9e54bc314396a0db396701f007a7aaa30
+  metadata.gz: 50c98b769d00c6433da06824e1f9d46e17b9a5011d896dee58c9b973bbb3b3369cf133d4fac829ee666f98b41c6b05088d139246cb14b45cd5b5a30c54f6a6e1
+  data.tar.gz: 04f573dd73bbdf067882ce76bde3e3e745918d3ec14676cabbe3a197d9921239faede0823104f77f4eacfb6a881d1d4f3092ec13871b7cdaa0316cf9096cab2e

data/.gitignore

@@ -4,4 +4,5 @@ coverage
 rdoc
 pkg
 .rvmrc
+.ruby-version
 Gemfile.lock

data/CHANGES.md

@@ -1,6 +1,13 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.4.3...master)
+[full changelog](http://github.com/yolk/valvat/compare/v0.5.0...master)
+
+### 0.5.0 / 2019-06-13
+[full changelog](http://github.com/yolk/valvat/compare/v0.4.3...v0.5.0)
+
+* Added exclusive support for 1Rails 5.1 and upwards
+* Renamed record_* methods to memento_record_after_*
+* Fixed generators for Rails 4
 
 ### 0.4.3 / 2014-04-07
 
@@ -45,4 +52,4 @@
 
 [full changelog](http://github.com/yolk/valvat/compare/v0.3.4...v0.3.5)
 
-* Compatiblity with Rails 3.2
+* Compatiblity with Rails 3.2

data/generators/memento_migration/memento_migration_generator.rb

@@ -1,10 +1,14 @@
-class MementoMigrationGenerator < Rails::Generator::Base
-  def manifest
-    record do |m|
-      m.migration_template("migration.rb", 'db/migrate',
-                           :assigns => {  },
-                           :migration_file_name => "memento_migration"
-                           )
-    end
+require 'rails/generators'
+require 'rails/generators/active_record'
+
+class MementoMigrationGenerator < Rails::Generators::Base
+  include ::Rails::Generators::Migration
+  include ActiveRecord::Generators::Migration
+
+  source_root File.expand_path '../templates', __FILE__
+
+  def add_memento_migration
+    migration_template "migration.rb", 'db/migrate/memento_migration.rb'
   end
-end
+
+end

data/generators/memento_migration/templates/migration.rb

@@ -1,9 +1,9 @@
 class MementoMigration < ActiveRecord::Migration
 
-  def self.up
+  def change
     create_table :memento_sessions do |t|
       t.references :user
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :memento_states do |t|
@@ -11,13 +11,8 @@ class MementoMigration < ActiveRecord::Migration
       t.binary :record_data, :limit => 16777215
       t.references :record, :polymorphic => true
       t.references :session
-      t.timestamps
+      t.timestamps null: false
     end
   end
 
-  def self.down
-    drop_table :memento_states
-    drop_table :memento_sessions
-  end
-
-end
+end

data/lib/memento.rb

@@ -53,6 +53,10 @@ module Memento
       @serializer ||= YAML
     end
 
+    def ignore?
+      !!Thread.current[:memento_ignore]
+    end
+
     private
 
     def session
@@ -63,10 +67,6 @@ module Memento
       Thread.current[:memento_session] = session
     end
 
-    def ignore?
-      !!Thread.current[:memento_ignore]
-    end
-
     def save_session
       active? && (!session.changed? || session.save)
     end
@@ -76,9 +76,11 @@ end
 def Memento(user_or_id, &block)
   Memento.watch(user_or_id, &block)
 end
+
+require 'memento/railtie'
 require 'memento/result'
 require 'memento/action'
 require 'memento/active_record_methods'
 require 'memento/action_controller_methods'
 require 'memento/state'
-require 'memento/session'
+require 'memento/session'

data/lib/memento/action/update.rb

@@ -52,4 +52,4 @@ module Memento
       record
     end
   end
-end
+end

data/lib/memento/active_record_methods.rb

@@ -30,7 +30,7 @@ module Memento::ActiveRecordMethods
       end
 
       action_types.each do |action_type|
-        send :"after_#{action_type}", :"record_#{action_type}"
+        send :"after_#{action_type}", :"memento_record_after_#{action_type}"
       end
 
       has_many :memento_states, :class_name => "Memento::State", :as => :record
@@ -54,7 +54,7 @@ module Memento::ActiveRecordMethods
     end
 
     def changes_for_memento
-      filter_attributes_for_memento(changes)
+      filter_attributes_for_memento(saved_changes)
     end
 
     def filter_attributes_for_memento(hash)
@@ -70,13 +70,13 @@ module Memento::ActiveRecordMethods
     private :ignore_attributes_for_memento
 
     Memento::Action::Base.action_types.each do |action_type|
-      define_method :"record_#{action_type}" do
+      define_method :"memento_record_after_#{action_type}" do
         Memento.add_state(action_type, self)
       end
-      private :"record_#{action_type}"
+      private :"memento_record_after_#{action_type}"
     end
   end
 
 end
 
-ActiveRecord::Base.send(:include, Memento::ActiveRecordMethods) if defined?(ActiveRecord::Base)
+ActiveRecord::Base.send(:include, Memento::ActiveRecordMethods) if defined?(ActiveRecord::Base)

data/lib/memento/railtie.rb

@@ -0,0 +1,7 @@
+module Memento
+  class Railtie < Rails::Railtie
+    generators do
+      require File.join File.dirname(__FILE__), '..', '..', 'generators', 'memento_migration', 'memento_migration_generator'
+    end
+  end
+end if defined?(Rails)

data/lib/memento/state.rb

@@ -12,13 +12,16 @@ module Memento
     validates_presence_of :action_type
     validates_inclusion_of :action_type, :in => Memento::Action::Base.action_types, :allow_blank => true
 
-    before_create :set_record_data
+    # before_create :set_record_data
 
     def self.store(action_type, record)
       new do |state|
         state.action_type = action_type.to_s
         state.record = record
-        state.save if state.fetch?
+        if state.fetch?
+          state.set_record_data
+          state.save
+        end
       end
     end
 
@@ -27,7 +30,7 @@ module Memento
     end
 
     def record_data
-      @record_data ||= Memento.serializer.load(read_attribute(:record_data))
+      @record_data ||= read_attribute(:record_data) ? Memento.serializer.load(read_attribute(:record_data)) : {}
     end
 
     def record_data=(data)
@@ -39,14 +42,14 @@ module Memento
       action.fetch?
     end
 
-    private
-
     def set_record_data
       self.record_data = action.fetch
     end
 
+    private
+
     def action
       "memento/action/#{action_type}".classify.constantize.new(self)
     end
   end
-end
+end

data/lib/memento/version.rb

@@ -1,3 +1,3 @@
 module Memento
-  VERSION = "0.4.3"
-end
+  VERSION = "0.5.0"
+end

data/memento.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   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'
+  s.add_dependency 'activerecord',        '>= 5.1'
+  s.add_dependency 'actionpack',          '>= 5.1'
 
   s.add_development_dependency 'rspec',   '>= 2.4.0'
   s.add_development_dependency 'sqlite3', '>= 1.3.5'

data/spec/memento/action/update_spec.rb

@@ -210,4 +210,4 @@ describe Memento::Action::Update do
 
   end
 
-end
+end

data/spec/memento/active_record_methods_spec.rb

@@ -8,7 +8,7 @@ describe Memento::ActiveRecordMethods do
   end
 
   it "should declare protected methods on Project" do
-    Project.private_instance_methods.map(&:to_sym).should include(:record_destroy, :record_update, :record_create)
+    Project.private_instance_methods.map(&:to_sym).should include(:memento_record_after_destroy, :memento_record_after_update, :memento_record_after_create)
   end
 
   it "should set hook on create to call Memento" do
@@ -39,16 +39,6 @@ describe Memento::ActiveRecordMethods 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"
-    project.updated_at = 5.minutes.ago
-    project.notes = "new"
-    project.ignore_this = 2
-    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
@@ -66,4 +56,4 @@ describe Memento::ActiveRecordMethods do
     shutdown_db
   end
 
-end
+end

data/spec/memento/session_spec.rb

@@ -118,4 +118,4 @@ describe Memento::Session do
     shutdown_db
   end
 
-end
+end

data/spec/memento/state_spec.rb

@@ -32,7 +32,8 @@ describe Memento::State do
 
   describe "valid State" do
     before do
-      @state = @session.states.create!({:action_type => "destroy", :record => @project = Project.create(:name => "A")} )
+      @state = @session.states.store("destroy", @project = Project.create(:name => "A"))
+      @project.destroy
     end
 
     it "should give back Memento::Result on undo" do
@@ -51,4 +52,4 @@ describe Memento::State do
     shutdown_db
   end
 
-end
+end

data/spec/memento_spec.rb

@@ -94,7 +94,7 @@ describe Memento do
     it "should give back false when no states created" do
       Memento(@user) do
         1 + 1
-      end.should be_false
+      end.should eql(false)
     end
 
     it "should raise error in block and stop session" do
@@ -207,4 +207,4 @@ describe Memento do
     end
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -17,7 +17,13 @@ require 'memento'
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 # catch AR schema statements
-$stdout = StringIO.new
+# $stdout = StringIO.new
+
+RSpec.configure do |config|
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+  config.expect_with(:rspec) { |c| c.syntax = :should }
+end
 
 def setup_db
   ActiveRecord::Schema.define(:version => 1) do
@@ -27,18 +33,18 @@ def setup_db
       t.column :notes, :text
       t.references :customer
       t.integer :ignore_this
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :users do |t|
       t.column :email, :string
       t.column :name, :string
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :customers do |t|
       t.column :name, :string
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :timestampless_objects do |t|
@@ -47,7 +53,7 @@ def setup_db
 
     create_table :memento_sessions do |t|
       t.references :user
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :memento_states do |t|
@@ -55,7 +61,7 @@ def setup_db
       t.binary :record_data, :limit => 16777215
       t.references :record, :polymorphic => true
       t.references :session
-      t.timestamps
+      t.timestamps null: false
     end
 
   end
@@ -79,11 +85,11 @@ class Customer < ActiveRecord::Base
 end unless defined?(Customer)
 
 class Project < ActiveRecord::Base
-  belongs_to :customer
+  belongs_to :customer, optional: true
 
   memento_changes :ignore => :ignore_this
 end unless defined?(Project)
 
 class TimestamplessObject < ActiveRecord::Base
   memento_changes
-end unless defined?(TimestamplessObject)
+end unless defined?(TimestamplessObject)

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: memento
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Yolk Sebastian Munz & Julia Soergel GbR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
 description: Undo for Rails/ActiveRecord - covers destroy, update and create
@@ -72,8 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -90,6 +89,7 @@ files:
 - lib/memento/action/update.rb
 - lib/memento/action_controller_methods.rb
 - lib/memento/active_record_methods.rb
+- lib/memento/railtie.rb
 - lib/memento/result.rb
 - lib/memento/session.rb
 - lib/memento/state.rb
@@ -114,17 +114,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Undo for Rails/ActiveRecord - covers destroy, update and create

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0-p247