memento 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76b7624faf71509088b847be6d9458cf957ded70
-  data.tar.gz: a5cf8246d670739ad8f35c8aa61ac083423b424b
+  metadata.gz: a398d1db995dde129200972e15977dd8e7988b81
+  data.tar.gz: 6ead2aab247ffbe93318efc279a84ab0f4b6023e
 SHA512:
-  metadata.gz: 92328c9544701039b73f2bc6e10e573b04d9c8ac9235ad3f296f14278fecb168109141447bd7750dff6afe4adc3e05af59d2d45f304a2b805a985ff0210800e6
-  data.tar.gz: a02d9c4c3486015d8481084ecf50c77b0ad7f101da4214558aae8c3ae890b035844302ffe4926e292a0cb2d5538d19bc8d72146a1fb993336574cd66bd694a16
+  metadata.gz: b2e302f650ed080fabd0807fdaeb6d73aa3d60836dec5f7ef6a5aacddca58f32191e2e66d4006a5950ca92fb79787216be1cce48d6a2d37551f16996a8ee7461
+  data.tar.gz: 985907459e9ec2f51a4fb847e317f5872195bdfeee31038a1ec4de8e9e2c7e5bb3dfecfa793e33460ec781d5218b68a9e54bc314396a0db396701f007a7aaa30

data/CHANGES.md

@@ -1,6 +1,18 @@
 ### dev
 
-[full changelog](http://github.com/yolk/valvat/compare/v0.4.1...master)
+[full changelog](http://github.com/yolk/valvat/compare/v0.4.3...master)
+
+### 0.4.3 / 2014-04-07
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.4.2...v0.4.3)
+
+* Full Rails 4 compatibility
+
+### 0.4.2 / 2013-07-19
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.4.1...v0.4.2)
+
+* Replaced find_by_* calls for compatibility with ActiveRecord 4.0
 
 ### 0.4.1 / 2012-11-01
 

data/lib/memento.rb

@@ -21,7 +21,7 @@ module Memento
 
     def start(user_or_id)
       user = user_or_id.is_a?(User) ? user_or_id : User.where(:id => user_or_id).first
-      self.session = user ? Memento::Session.new({:user => user}, :without_protection => true) : nil
+      self.session = user ? Memento::Session.new(:user => user) : nil
     end
 
     def stop

data/lib/memento/session.rb

@@ -2,10 +2,11 @@ module Memento
   class Session < ActiveRecord::Base
     self.table_name = "memento_sessions"
 
-    has_many :states, :class_name => "Memento::State", :dependent => :delete_all, :order => "id DESC"
+    has_many :states, -> { order "id DESC" },
+             :class_name => "Memento::State", :dependent => :delete_all
     belongs_to :user
 
-    attr_accessible nil
+    # attr_accessible nil
 
     validates_presence_of :user
 

data/lib/memento/state.rb

@@ -5,7 +5,7 @@ module Memento
     belongs_to :session, :class_name => "Memento::Session"
     belongs_to :record, :polymorphic => true
 
-    attr_accessible nil
+    # attr_accessible nil
 
     validates_presence_of :session
     validates_presence_of :record

data/lib/memento/version.rb

@@ -1,3 +1,3 @@
 module Memento
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 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',        '>= 3.2.5'
+  s.add_dependency 'actionpack',          '>= 3.2.5'
 
   s.add_development_dependency 'rspec',   '>= 2.4.0'
   s.add_development_dependency 'sqlite3', '>= 1.3.5'

data/spec/memento/session_spec.rb

@@ -5,7 +5,7 @@ describe Memento::Session do
   before do
     setup_db
     setup_data
-    @session = Memento::Session.create({:user => @user}, :without_protection => true)
+    @session = Memento::Session.create({:user => @user})
   end
 
   it "should belong to user" do
@@ -17,24 +17,16 @@ describe Memento::Session do
   end
 
   it "should have_many states" do
-    @session.states.should eql([])
-    @session.states.create!({:action_type => "destroy", :record => Project.create!}, :without_protection => true)
+    @session.states.should be_empty
+    @session.states.create!({:action_type => "destroy", :record => Project.create!})
     @session.states.count.should eql(1)
   end
 
-  it "should disallow all mass assignment" do
-    Memento::Session.accessible_attributes.deny?("id").should eql(true)
-    Memento::Session.accessible_attributes.deny?("created_at").should eql(true)
-    Memento::Session.accessible_attributes.deny?("updated_at").should eql(true)
-    Memento::Session.accessible_attributes.deny?("user_id").should eql(true)
-    Memento::Session.accessible_attributes.deny?("user").should eql(true)
-  end
-
   context "undo" do
     before do
-      @state1 = @session.states.create!({:action_type => "update", :record => @p1 = Project.create!}, :without_protection => true)
-      @other = Memento::Session.create!({:user => @user}, :without_protection => true).states.create!({:action_type => "destroy", :record => Project.create!}, :without_protection => true)
-      @state2 = @session.states.create!({:action_type => "update", :record => @p2 = Project.create!}, :without_protection => true)
+      @state1 = @session.states.create!({:action_type => "update", :record => @p1 = Project.create!})
+      @other = Memento::Session.create!({:user => @user}).states.create!({:action_type => "destroy", :record => Project.create!})
+      @state2 = @session.states.create!({:action_type => "update", :record => @p2 = Project.create!})
     end
 
     describe "and all states succeed" do
@@ -55,9 +47,9 @@ describe Memento::Session do
 
     describe "and all states fail" do
       before do
-        @state1.update_attributes({:record_data => {:name => ["A", "B"]}}, :without_protection => true)
+        @state1.update_attributes({:record_data => {:name => ["A", "B"]}})
         @p1.update_attributes(:name => "C")
-        @state2.update_attributes({:record_data => {:name => ["A", "B"]}}, :without_protection => true)
+        @state2.update_attributes({:record_data => {:name => ["A", "B"]}})
         @p2.update_attributes(:name => "C")
       end
 
@@ -78,7 +70,7 @@ describe Memento::Session do
 
     describe "and some states succeed, some fail" do
       before do
-        @state1.update_attributes({:record_data => {:name => ["A", "B"]}}, :without_protection => true)
+        @state1.update_attributes({:record_data => {:name => ["A", "B"]}})
         @p1.update_attributes(:name => "C")
       end
 
@@ -109,9 +101,9 @@ describe Memento::Session do
 
   describe "with states" do
     before do
-      @session.states.create!({:action_type => "destroy", :record => Project.create!}, :without_protection => true)
-      Memento::Session.create!({:user => @user}, :without_protection => true).states.create!({:action_type => "destroy", :record => Project.create!}, :without_protection => true)
-      @state2 = @session.states.create!({:action_type => "update", :record => Project.create!}, :without_protection => true)
+      @session.states.create!({:action_type => "destroy", :record => Project.create!})
+      Memento::Session.create!({:user => @user}).states.create!({:action_type => "destroy", :record => Project.create!})
+      @state2 = @session.states.create!({:action_type => "update", :record => Project.create!})
     end
 
     it "should destroy all states when destroyed" do

data/spec/memento/state_spec.rb

@@ -5,11 +5,11 @@ describe Memento::State do
   before do
     setup_db
     setup_data
-    @session = Memento::Session.create({:user => @user}, :without_protection => true)
+    @session = Memento::Session.create({:user => @user})
   end
 
   it "should belong to session" do
-    Memento::State.new({:session => @session}, :without_protection => true).session.should eql(@session)
+    Memento::State.new({:session => @session}).session.should eql(@session)
   end
 
   it "should require session" do
@@ -18,32 +18,21 @@ describe Memento::State do
 
   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"}, :without_protection => true).errors[:action_type].should eql(["is not included in the list"])
+    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}, :without_protection => true).record.should eql(@user)
-    Memento::State.new({:record => @session}, :without_protection => true).record.should eql(@session)
+    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
 
-  it "should disallow all mass assignment" do
-    Memento::State.accessible_attributes.deny?("id").should eql(true)
-    Memento::State.accessible_attributes.deny?("created_at").should eql(true)
-    Memento::State.accessible_attributes.deny?("updated_at").should eql(true)
-    Memento::State.accessible_attributes.deny?("session_id").should eql(true)
-    Memento::State.accessible_attributes.deny?("session").should eql(true)
-    Memento::State.accessible_attributes.deny?("record_id").should eql(true)
-    Memento::State.accessible_attributes.deny?("record_type").should eql(true)
-    Memento::State.accessible_attributes.deny?("record").should eql(true)
-  end
-
   describe "valid State" do
     before do
-      @state = @session.states.create!({:action_type => "destroy", :record => @project = Project.create(:name => "A")}, :without_protection => true )
+      @state = @session.states.create!({:action_type => "destroy", :record => @project = Project.create(:name => "A")} )
     end
 
     it "should give back Memento::Result on undo" do

data/spec/spec_helper.rb

@@ -1,10 +1,13 @@
 require 'active_support'
+require 'active_support/time'
 require 'active_record'
 require 'action_controller'
 require 'rspec'
 
+I18n.enforce_available_locales = false
+
 # Initialize time_zones from rails
-Time.zone_default = (Time.respond_to?(:find_zone!) && Time.find_zone!("Berlin")) || Time.__send__(:get_zone, 'Berlin') || raise("Err")
+Time.zone = "Berlin"
 ActiveRecord::Base.time_zone_aware_attributes = true
 ActiveRecord::Base.default_timezone = :utc
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: memento
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Yolk Sebastian Munz & Julia Soergel GbR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2014-04-07 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.5
 - !ruby/object:Gem::Dependency