archival_record 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4b5a4d0030a23027b25b835935225c690a2d5badb2c80e1d37a145fd583e55c
-  data.tar.gz: 4a2e5a720bdab5cf97297cc66d9289f1beeced5d6c632d5c969816467a9928a4
+  metadata.gz: de698cb4c6c28dbc975343cbb8c64040423a401fe1963486e4d43feacdaf70fd
+  data.tar.gz: 423dc258212a7b8ff4fb78a6acc29bc979846820c50263859e0d9d2a9e634c81
 SHA512:
-  metadata.gz: a989cbb3679373d79edec6e55f8393ba1c32ea8ee4cdea237b848a867208d436127cfb7465d50344c2fa45a05bb32917d2acd8282d010523c721fd3b7731285c
-  data.tar.gz: 4cefa4eac2f34e69c40029979760173db1c1d24852b3db8368e077fb60a78a592597d876f4ebc4875c4312f81bea55cab6b39cadce0fc05ecdee586951e678d4
+  metadata.gz: a24054ef6cd9fc3ed12233e10e11fa194e26f72499534925bdd4d4bad05b9245bb994763ba6b449b7100e48dda00ce30de641b51f9d6a797697fba2805335f84
+  data.tar.gz: 3dab3e39d40c31fcfe60129b8eb9a3fb420be3ece65c18a7bfa3da367026b9c44ecee1e4b721ea71bd28cc85920308d427d391ddab10e2a0a82e1e2203e9ff30

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.1 - June 10, 2024
+* a few more tidying items like fixing up some raw sql in a query to be arel
+* changing a logging method to use error instead of debug so it surfaces more easily
+
 ## 3.0.0 - June 10, 2024
 * **BREAKING CHANGE** Drop support for rails 5 - see `rails__4.x-and-5.x` branch for relevant code
 * **BREAKING CHANGE** Drop support for Ruby 2.x

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    archival_record (3.0.0)
+    archival_record (3.0.1)
       activerecord (>= 6.0)
 
 GEM

data/README.md

@@ -20,13 +20,13 @@ Gemfile:
 
 `gem "archival_record"`
 
-Any models you want to be archival should have the columns `archive_number` (String) and `archived_at` (DateTime).
+Any models you want to be archival should have the columns `archive_number` (`String`) and `archived_at` (`DateTime`).
 
 i.e. `rails g migration AddArchivalRecordToPost archive_number archived_at:datetime`
 
 Any dependent-destroy ArchivalRecord model associated to an ArchivalRecord model will be archived with its parent.
 
-_If you're stuck on Rails 4.0x/3x/2x, check out the older tags/branches, which are no longer in active development._
+_If you're stuck on Rails 5x/4x/3x/2x, check out the older tags/branches, which are no longer in active development._
 
 ## Example
 

data/archival_record.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
                   "Elijah Miller"]
   gem.email    = ["joel.meador+archival_record@gmail.com"]
   gem.homepage = "https://gitlab.com/joelmeador/archival_record/"
-  gem.licenses = ['MIT']
+  gem.licenses = ["MIT"]
 
   gem.files = `git ls-files`.split("\n")
   gem.require_paths = ["lib"]

data/lib/archival_record/version.rb

@@ -1,5 +1,5 @@
 module ArchivalRecord
 
-  VERSION = "3.0.0".freeze
+  VERSION = "3.0.1".freeze
 
 end

data/lib/archival_record_core/archival_record.rb

@@ -55,9 +55,13 @@ module ArchivalRecordCore
       private def setup_scopes
         scope :archived, -> { where.not(archived_at: nil).where.not(archive_number: nil) }
         scope :unarchived, -> { where(archived_at: nil, archive_number: nil) }
-        scope :archived_from_archive_number, (lambda do |head_archive_number|
-          where(["archived_at IS NOT NULL AND archive_number = ?", head_archive_number])
-        end)
+        scope :archived_from_archive_number,
+              (lambda do |head_archive_number|
+                 table = arel_table
+                 archive_at_check = table[:archived_at].not_eq(nil)
+                 archive_number_check = table[:archive_number].eq(head_archive_number)
+                 where(archive_at_check.and(archive_number_check))
+               end)
       end
 
       private def setup_callbacks
@@ -166,8 +170,8 @@ module ArchivalRecordCore
       end
 
       private def handle_archival_action_exception(exception)
-        ActiveRecord::Base.logger.try(:debug, exception.message)
-        ActiveRecord::Base.logger.try(:debug, exception.backtrace)
+        ActiveRecord::Base.logger.try(:error, exception.message)
+        ActiveRecord::Base.logger.try(:error, exception.backtrace)
         raise(ActiveRecord::Rollback)
       end
 

data/test/bogus_relation_test.rb

@@ -0,0 +1,22 @@
+require_relative "test_helper"
+
+class BogusRelationTest < ActiveSupport::TestCase
+
+  test "does not successfully archive" do
+    archival = BogusRelation.create!
+    stub(ActiveRecord::Base.logger).error(
+      satisfy do |arg|
+        if arg.is_a?(String)
+          arg == "SQLite3::SQLException: no such column: bogus_relations.bogus_relation_id"
+        elsif arg.is_a?(Array)
+          arg.join.match?(%r{gems/activerecord}) # this is gonna be in the stack trace somewhere
+        else
+          raise "unexpected logging"
+        end
+      end
+    )
+    assert_not archival.archive!
+    assert_not archival.reload.archived?
+  end
+
+end

data/test/fixtures/bogus_relation.rb

@@ -0,0 +1,6 @@
+class BogusRelation < ApplicationRecord
+
+  archival_record
+  has_many :bogus_relations, dependent: :destroy
+
+end

data/test/schema.rb

@@ -115,4 +115,9 @@ ActiveRecord::Schema.define(version: 1) do
     t.column :archive_number, :string
     t.column :archived_at, :datetime
   end
+
+  create_table :bogus_relations, force: true do |t|
+    t.column :archive_number, :string
+    t.column :archived_at, :datetime
+  end
 end

data/test/scope_test.rb

@@ -50,14 +50,8 @@ class ScopeTest < ActiveSupport::TestCase
   end
 
   test "table_name is set to 'legacy'" do
-    archived_sql =
-      if ActiveRecord.version >= Gem::Version.new("5.2.0")
-        'SELECT "legacy".* FROM "legacy" ' \
-          'WHERE "legacy"."archived_at" IS NOT NULL AND "legacy"."archive_number" IS NOT NULL'
-      else
-        'SELECT "legacy".* FROM "legacy" ' \
-          'WHERE ("legacy"."archived_at" IS NOT NULL) AND ("legacy"."archive_number" IS NOT NULL)'
-      end
+    archived_sql = 'SELECT "legacy".* FROM "legacy" ' \
+                   'WHERE "legacy"."archived_at" IS NOT NULL AND "legacy"."archive_number" IS NOT NULL'
     unarchived_sql = 'SELECT "legacy".* FROM "legacy" ' \
                      'WHERE "legacy"."archived_at" IS NULL AND "legacy"."archive_number" IS NULL'
     assert_equal archived_sql, ArchivalTableName.archived.to_sql

data/test/test_helper.rb

@@ -50,34 +50,28 @@ def create_test_tables
   load(schema_file) if File.exist?(schema_file)
 end
 
-BASE_FIXTURE_CLASSES = %I[
+FIXTURE_CLASSES = %I[
   another_polys_holder
+  application_record
+  application_record_row
   archival
-  archival_kid
   archival_grandkid
+  archival_kid
   archival_table_name
+  bogus_relation
+  callback_archival
+  deprecated_warning_archival
+  explicit_act_on_dependents_archival
   exploder
+  ignorable_dependent
+  ignore_dependents_archival
   independent_archival
-  missing_archived_at
   missing_archive_number
+  missing_archived_at
+  nonignorable_dependent
   plain
   poly
   readonly_when_archived
-  deprecated_warning_archival
-  ignore_dependents_archival
-  ignorable_dependent
-  explicit_act_on_dependents_archival
-  nonignorable_dependent
-].freeze
-
-RAILS_4_FIXTURE_CLASSES = %I[
-  callback_archival4
-].freeze
-
-RAILS_5_FIXTURE_CLASSES = %I[
-  application_record
-  application_record_row
-  callback_archival5
 ].freeze
 
 def require_test_classes
@@ -85,14 +79,7 @@ def require_test_classes
     inflect.irregular "poly", "polys"
   end
 
-  fixtures = if ActiveRecord::VERSION::MAJOR >= 4
-               RAILS_5_FIXTURE_CLASSES
-             else
-               RAILS_4_FIXTURE_CLASSES
-             end
-
-  fixtures += BASE_FIXTURE_CLASSES
-  fixtures.each { |test_class_file| require_relative "fixtures/#{test_class_file}" }
+  FIXTURE_CLASSES.each { |test_class_file| require_relative "fixtures/#{test_class_file}" }
 end
 
 prepare_for_tests

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archival_record
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Joel Meador
@@ -195,6 +195,7 @@ files:
 - test/archive_dependents_option_test.rb
 - test/associations_test.rb
 - test/basic_test.rb
+- test/bogus_relation_test.rb
 - test/callbacks_test.rb
 - test/column_test.rb
 - test/deep_nesting_test.rb
@@ -206,8 +207,8 @@ files:
 - test/fixtures/archival_grandkid.rb
 - test/fixtures/archival_kid.rb
 - test/fixtures/archival_table_name.rb
-- test/fixtures/callback_archival4.rb
-- test/fixtures/callback_archival5.rb
+- test/fixtures/bogus_relation.rb
+- test/fixtures/callback_archival.rb
 - test/fixtures/deprecated_warning_archival.rb
 - test/fixtures/explicit_act_on_dependents_archival.rb
 - test/fixtures/exploder.rb

data/test/fixtures/callback_archival4.rb

@@ -1,19 +0,0 @@
-class CallbackArchival4 < ActiveRecord::Base
-
-  archival_record
-
-  attr_accessor :set_this_value,
-                :pass_callback
-
-  before_archive :set_value,
-                 :conditional_callback_passer
-
-  private def set_value
-    self.settable_field = set_this_value
-  end
-
-  private def conditional_callback_passer
-    pass_callback || pass_callback.nil?
-  end
-
-end