activerecord-import 1.7.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aeed63fcbc9ad647ab901931265d2765baf5d0e5a1e9d2cf2c68af32dd5e1be
-  data.tar.gz: 47480cc7244aada4bc69ba28043e8ab85ae1cece4420db4453400425a5773126
+  metadata.gz: 021d7d0d5b653ef01a5ab1aa23b72cca6f46abc65040014ad02fa790976f0189
+  data.tar.gz: a5440146848bc1bfee194681b9bf53f928150936c3c992eaec1299fec2e7c1bb
 SHA512:
-  metadata.gz: 5f6b5749dd6ce81784f7016c6227a6d0f5047c59a45beb13616853a89599ac507241012a92c3e4f9996c7a465d4d926e0e8d1183af1854f7a0c8a05e2e59219f
-  data.tar.gz: 72b00e7a5c61af3923b618ebe0d96f945a7af145f38ec5312962220b925e1dfc918da6028bb48d8ff7842c32584b34b06cec8fd8288dbb83212ca035f7a16c08
+  metadata.gz: 460961724684bc286a63ff0880ee8279a5a1528cd02ebd28e4694b8d7c39c22f19183f929ecd525de57a5069bf45218428aae47fd96ea5782e7b51a85aee0e1f
+  data.tar.gz: b864f8eb6fc2a074497761813f29aca981ec23daa7ae12164f1b34a08bbad6175025e6a551575ef2f53f7521f13d15de02eccb24f36c2e18dcdb04fdf77e53a7

data/.github/workflows/test.yaml

@@ -36,6 +36,8 @@ jobs:
         ruby:
           - 3.3
         env:
+          - AR_VERSION: '7.2'
+            RUBYOPT: --enable-frozen-string-literal
           - AR_VERSION: '7.1'
             RUBYOPT: --enable-frozen-string-literal
           - AR_VERSION: '7.0'
@@ -43,6 +45,9 @@ jobs:
           - AR_VERSION: 6.1
             RUBYOPT: --enable-frozen-string-literal
         include:
+          - ruby: 3.2
+            env:
+              AR_VERSION: '7.2'
           - ruby: 3.2
             env:
               AR_VERSION: '7.1'
@@ -85,15 +90,6 @@ jobs:
           - ruby: 2.6
             env:
               AR_VERSION: 5.2
-          - ruby: 2.6
-            env:
-              AR_VERSION: 5.1
-          - ruby: 2.4
-            env:
-              AR_VERSION: '5.0'
-          - ruby: 2.4
-            env:
-              AR_VERSION: 4.2
     runs-on: ubuntu-latest
     env:
       AR_VERSION: ${{ matrix.env.AR_VERSION }}
@@ -145,7 +141,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.0
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rubocop

data/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 3.0.x
+
 Metrics/AbcSize:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Changes in 1.8.1
+
+### Fixes
+
+* Further update for ActiveRecord 7.2 compatibility when running validations. Thanks to @denisahearn  via \##847.
+
+## Changes in 1.8.0
+
+### New Features
+
+* Add support for ActiveRecord 7.2 via \##845.
+
 ## Changes in 1.7.0
 
 ### New Features

data/activerecord-import.gemspec

@@ -10,6 +10,10 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/zdennis/activerecord-import"
   gem.license       = "MIT"
 
+  gem.metadata = {
+    "changelog_uri" => "https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md"
+  }
+
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/benchmarks/lib/cli_parser.rb

@@ -10,7 +10,7 @@ require 'ostruct'
 # * t - the table types to test. ie: myisam, innodb, memory, temporary, etc.
 #
 module BenchmarkOptionParser
-  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options."
+  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options.".freeze
 
   def self.print_banner
     puts BANNER

data/gemfiles/7.2.gemfile

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+gem 'activerecord', '~> 7.2.0'

data/lib/activerecord-import/import.rb

@@ -62,6 +62,7 @@ module ActiveRecord::Import # :nodoc:
         if @validate_callbacks.respond_to?(:chain, true)
           @validate_callbacks.send(:chain).tap do |chain|
             callback.instance_variable_set(:@filter, filter)
+            callback.instance_variable_set(:@compiled, nil)
             chain[i] = callback
           end
         else
@@ -93,7 +94,7 @@ module ActiveRecord::Import # :nodoc:
             env = ActiveSupport::Callbacks::Filters::Environment.new(model, false, nil)
             if runner.respond_to?(:call) # ActiveRecord < 5.1
               runner.call(env)
-            else # ActiveRecord 5.1
+            else # ActiveRecord >= 5.1
               # Note that this is a gross simplification of ActiveSupport::Callbacks#run_callbacks.
               # It's technically possible for there to exist an "around" callback in the
               # :validate chain, but this would be an aberration, since Rails doesn't define
@@ -106,7 +107,8 @@ module ActiveRecord::Import # :nodoc:
               # no real-world use case for it.
               raise "The :validate callback chain contains an 'around' callback, which is unsupported" unless runner.final?
               runner.invoke_before(env)
-              runner.invoke_after(env)
+              # Ensure a truthy value is returned. ActiveRecord < 7.2 always returned an array.
+              runner.invoke_after(env) || []
             end
           elsif @validate_callbacks.method(:compile).arity == 0 # ActiveRecord = 4.0
             model.instance_eval @validate_callbacks.compile

data/lib/activerecord-import/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Import
-    VERSION = "1.7.0"
+    VERSION = "1.8.1"
   end
 end

data/test/models/topic.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Topic < ActiveRecord::Base
-  if ENV['AR_VERSION'].to_i >= 6.0
+  if ENV['AR_VERSION'].to_f >= 6.0
     self.ignored_columns = [:priority]
   end
   alias_attribute :name, :title

data/test/models/widget.rb

@@ -19,8 +19,15 @@ class Widget < ActiveRecord::Base
 
   default_scope -> { where(active: true) }
 
-  serialize :data, Hash
-  serialize :json_data, JSON
+  if ENV['AR_VERSION'].to_f >= 7.1
+    serialize :data, coder: YAML
+    serialize :json_data, coder: JSON
+    serialize :custom_data, coder: CustomCoder.new
+  else
+    serialize :data, Hash
+    serialize :json_data, JSON
+    serialize :custom_data, CustomCoder.new
+  end
+
   serialize :unspecified_data
-  serialize :custom_data, CustomCoder.new
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Zach Dennis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -78,6 +78,7 @@ files:
 - gemfiles/6.1.gemfile
 - gemfiles/7.0.gemfile
 - gemfiles/7.1.gemfile
+- gemfiles/7.2.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
@@ -184,8 +185,9 @@ files:
 homepage: https://github.com/zdennis/activerecord-import
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,8 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.9
+signing_key:
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord
 test_files: