Merge pull request #199 from activeadmin-plugins/gigorok-patch-1

rails v7.0 support

.github/workflows/test.yml

@@ -18,9 +18,12 @@ jobs:
           - '5.2.6'
           - '6.0.4'
           - '6.1.4'
+          - '7.0.0'
         exclude:
           - ruby_version: '3.0'
             rails_version: '5.2.6'
+          - ruby_version: '2.6'
+            rails_version: '7.0.0'
 
     name: Ruby ${{ matrix.ruby_version }} / Rails ${{ matrix.rails_version }}
 

lib/active_admin_import/import_result.rb

@@ -33,11 +33,21 @@ def failed_message(options = {})
       limit = options[:limit] || failed.count
       failed.first(limit).map do |record|
         errors = record.errors
-        failed_values = errors.keys.map do |key|
+        failed_values = attribute_names_for(errors).map do |key|
           key == :base ? nil : record.public_send(key)
         end
         errors.full_messages.zip(failed_values).map { |ms| ms.compact.join(' - ') }.join(', ')
       end.join(' ; ')
     end
+
+    private
+
+    def attribute_names_for(errors)
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('7.0')
+        errors.attribute_names
+      else
+        errors.keys
+      end
+    end
   end
 end