acts_as_archival 0.5.1 → 0.5.2

data/.gitignore

@@ -7,4 +7,5 @@ test/aaa_test_app/vendor/bundle
 *.bkp
 *.gem
 Gemfile.lock
-pkg/*
+pkg/*
+.DS_Store

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changes!
 
+## 0.5.2
+* More changes to support Rails 4
+* fix scoping combinations with relations for Rails 4
+* BREAKING CHANGE (possibly): removed the scope constants, so if you were using them, you should stop
+
 ## 0.5.1
 * update to use .table_name for archived scope
 

data/lib/acts_as_archival/version.rb

@@ -1,3 +1,3 @@
 module ActsAsArchival
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/expected_behavior/acts_as_archival.rb

@@ -2,9 +2,6 @@ module ExpectedBehavior
   module ActsAsArchival
     require 'digest/md5'
 
-    ARCHIVED_CONDITIONS = lambda { |zelf| %Q{#{zelf.table_name}.archived_at IS NOT NULL AND #{zelf.table_name}.archive_number IS NOT NULL} }
-    UNARCHIVED_CONDITIONS = { :archived_at => nil, :archive_number => nil }
-
     MissingArchivalColumnError = Class.new(ActiveRecord::ActiveRecordError) unless defined?(MissingArchivalColumnError) == 'constant' && MissingArchivalColumnError.class == Class
     CouldNotArchiveError = Class.new(ActiveRecord::ActiveRecordError) unless defined?(CouldNotArchiveError) == 'constant' && CouldNotArchiveError.class == Class
     CouldNotUnarchiveError = Class.new(ActiveRecord::ActiveRecordError) unless defined?(CouldNotUnarchiveError) == 'constant' && CouldNotUnarchiveError.class == Class
@@ -21,9 +18,9 @@ module ExpectedBehavior
           before_validation :raise_if_not_archival
           validate :readonly_when_archived if options[:readonly_when_archived]
 
-          scope :archived, :conditions => ARCHIVED_CONDITIONS.call(self)
-          scope :unarchived, :conditions => UNARCHIVED_CONDITIONS
-          scope :archived_from_archive_number, lambda { |head_archive_number| {:conditions => ['archived_at IS NOT NULL AND archive_number = ?', head_archive_number] } }
+          scope :archived, lambda { where %Q{#{self.table_name}.archived_at IS NOT NULL AND #{self.table_name}.archive_number IS NOT NULL} }
+          scope :unarchived, lambda { where(:archived_at => nil, :archive_number => nil) }
+          scope :archived_from_archive_number, lambda { |head_archive_number| where(['archived_at IS NOT NULL AND archive_number = ?', head_archive_number]) }
 
           callbacks = ['archive','unarchive']
           define_callbacks *[callbacks, {:terminator => 'result == false'}].flatten
@@ -86,15 +83,15 @@ module ExpectedBehavior
       def unarchive(head_archive_number=nil)
         self.class.transaction do
           begin
-            run_callbacks :unarchive, :before
-            if self.archived?
-              head_archive_number ||= self.archive_number
-              self.archived_at = nil
-              self.archive_number = nil
-              self.save!
-              self.unarchive_associations(head_archive_number)
+            run_callbacks :unarchive do
+              if self.archived?
+                head_archive_number ||= self.archive_number
+                self.archived_at = nil
+                self.archive_number = nil
+                self.save!
+                self.unarchive_associations(head_archive_number)
+              end
             end
-            run_callbacks :unarchive, :after
             return true
           rescue => e
             ActiveRecord::Base.logger.try(:debug, e.message)
@@ -130,13 +127,13 @@ module ExpectedBehavior
       def act_on_a_related_archival(klass, key_name, id, head_archive_number, options={})
         return if options.length == 0 || (!options[:archive] && !options[:unarchive])
         if options[:archive]
-          klass.unarchived.find(:all, :conditions => ["#{key_name} = ?", id]).each do |related_record|
+          klass.unarchived.where(["#{key_name} = ?", id]).each do |related_record|
             unless related_record.archive(head_archive_number)
               raise ActiveRecord::Rollback
             end
           end
         else
-          klass.archived.find(:all, :conditions => ["#{key_name} = ? AND archive_number = ?", id, head_archive_number]).each do |related_record|
+          klass.archived.where(["#{key_name} = ? AND archive_number = ?", id, head_archive_number]).each do |related_record|
             unless related_record.unarchive(head_archive_number)
               raise ActiveRecord::Rollback
             end

data/test/ambiguous_table_test.rb

@@ -3,10 +3,10 @@ require_relative "test_helper"
 class AmbiguousTableTest < ActiveSupport::TestCase
   # test against the problem fixed in http://github.com/DarkTatka/acts_as_archival/commit/63d0a2532a15d7a6ab41d081e1591108a5ea9b37
   test "no ambiguous table problem" do
-    archival = Archival.create!(:name => "TEST")
+    archival = Archival.create!
     child = archival.archivals.create!
     child.archive
 
-    assert_equal 1, Archival.unarchived.count(:joins => :archivals)
+    assert_equal 1, Archival.unarchived.joins(:archivals).count
   end
 end

data/test/basic_test.rb

@@ -40,8 +40,8 @@ class BasicTest < ActiveSupport::TestCase
     archival.archive
     sleep(0.001)
     after = DateTime.now
-
-    assert_between before, after, archival.archived_at.to_datetime
+    assert before < archival.archived_at.to_datetime
+    assert after  > archival.archived_at.to_datetime
   end
 
   test "archive sets the archive number to the md5 hexdigest for the model and id that is archived" do

data/test/fixtures/archival.rb

@@ -12,4 +12,6 @@ class Archival < ActiveRecord::Base
   has_many :plains,             :dependent => :destroy
   has_many :polys,              :dependent => :destroy, :as => :archiveable
   has_many :independent_archivals
+
+  scope :bobs, lambda { where(:name => ["Bob", "Bobby", "Robert"]) }
 end

data/test/mass_attribute_test.rb

@@ -1,18 +1,20 @@
 require_relative "test_helper"
 
 class MassAttributeTest < ActiveSupport::TestCase
-  test "archive works when attr_accessible present" do
-    archival = MassAttributeProtected.create(:color => "pink")
-    archival.archive
+  if $require_mass_protection
+    test "archive works when attr_accessible present" do
+      archival = MassAttributeProtected.create(:color => "pink")
+      archival.archive
 
-    assert archival.reload.archived?
-  end
+      assert archival.reload.archived?
+    end
 
-  test "unarchive works when attr_accessible present" do
-    archival = MassAttributeProtected.create(:color => "pink")
-    archival.archive
-    archival.unarchive
+    test "unarchive works when attr_accessible present" do
+      archival = MassAttributeProtected.create(:color => "pink")
+      archival.archive
+      archival.unarchive
 
-    assert_not archival.reload.archived?
+      assert_not archival.reload.archived?
+    end
   end
 end

data/test/scope_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class ActsAsArchivalTest < ActiveSupport::TestCase
+class ScopeTest < ActiveSupport::TestCase
   test "simple unarchived scope" do
     Archival.create!
     Archival.create!
@@ -52,4 +52,27 @@ class ActsAsArchivalTest < ActiveSupport::TestCase
     assert_equal "SELECT `legacy`.* FROM `legacy`  WHERE (legacy.archived_at IS NOT NULL AND legacy.archive_number IS NOT NULL)", ArchivalTableName.archived.to_sql
     assert_equal "SELECT `legacy`.* FROM `legacy`  WHERE `legacy`.`archived_at` IS NULL AND `legacy`.`archive_number` IS NULL", ArchivalTableName.unarchived.to_sql
   end
+
+  test "combines with other scope properly" do
+    Archival.create!(:name => "Robert")
+    Archival.create!(:name => "Bobby")
+    Archival.create!(:name => "Sue")
+    Archival.create!(:name => "Bob").archive
+    assert_equal 3, Archival.bobs.count
+    assert_equal 3, Archival.unarchived.count
+    assert_equal 2, Archival.bobs.unarchived.count
+    assert_equal 2, Archival.unarchived.bobs.count
+    assert_equal 1, Archival.bobs.archived.count
+    assert_equal 1, Archival.archived.bobs.count
+  end
+
+  test "scopes combine with relations correctly" do
+    parent = Archival.create!
+    parent.archivals.create!
+    parent.archivals.create!
+    parent.archivals.create!.archive
+    assert_equal 3, parent.archivals.count
+    assert_equal 1, parent.archivals.archived.count
+    assert_equal 2, parent.archivals.unarchived.count
+  end
 end

data/test/test_helper.rb

@@ -1,9 +1,11 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require "bundler/setup"
 require "test/unit"
+
 require "active_record"
 require "assertions"
 require "database_cleaner"
+
 require "acts_as_archival"
 
 def prepare_for_tests
@@ -43,19 +45,21 @@ def require_test_classes
     inflect.irregular "poly", "polys"
   end
 
-  [:archival,
+  fixtures = [:archival,
    :archival_kid,
    :archival_grandkid,
    :archival_table_name,
    :exploder,
    :independent_archival,
-   :mass_attribute_protected,
+   :plain,
    :missing_archived_at,
    :missing_archive_number,
    :plain,
    :poly,
-   :readonly_when_archived
-  ].each {|test_class_file| require_relative "fixtures/#{test_class_file}"}
+   :readonly_when_archived]
+  $require_mass_protection = ActiveModel.constants.include?(:MassAssignmentSecurity)
+  fixtures << :mass_attribute_protected if $require_mass_protection
+  fixtures.each {|test_class_file| require_relative "fixtures/#{test_class_file}"}
 end
 
 prepare_for_tests

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_archival
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors: