rails_admin 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17f479765c10aa74200405742f1387eea769ee8
-  data.tar.gz: b4efbfa19a87163d641b50aa4771b5eddddaa336
+  metadata.gz: 304c4e0f0cb8e46bab128045cd480163e9b86e6e
+  data.tar.gz: e3a2a9e2c86f2227c0b8b9b3cdf955b4695154dd
 SHA512:
-  metadata.gz: 20351d651d98ba0ac84171a0812b19394f5e2853598ae92a23069e979cea27b99161acfc9792621eb4da947539dc3d687371ad27832086f41740e77b6fe020c4
-  data.tar.gz: e00d12b32c662017293acff322855a9c6f5a479c151990664df3eac5568c6367c84fa4e908f6c5b3ebb6204b6bf78199ac22f304a01ca4bc4e291605e5df3e27
+  metadata.gz: 1d489cc488adace10d7645b530f303e81cf96f981fddda20a01b9ff93e3b36678b23fe1ddd277d99a606c3ddec57c61851ebbace6d2e1515d7f36db97b49153a
+  data.tar.gz: 7bfe657ca2eb9c41646736d33985adcc02fb1184689e0f69320f4a9fc838c15fb139f43872570be8752021a9387a077bd87d88acbd39458c9df027250a7cdd77

data/lib/rails_admin/engine.rb

@@ -43,7 +43,8 @@ module RailsAdmin
       Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |f| load f }
     end
 
-    initializer 'RailsAdmin check for required middlewares', after: :build_middleware_stack do |app|
+    # Check for required middlewares, can be missing in Rails API mode
+    config.after_initialize do |app|
       has_session_store = app.config.middleware.to_a.any? { |m| m.klass.try(:<=, ActionDispatch::Session::AbstractStore) } || ::Rails.version < '5.0'
       loaded = app.config.middleware.to_a.map(&:name)
       required = %w(ActionDispatch::Cookies ActionDispatch::Flash Rack::MethodOverride)

data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb

@@ -37,6 +37,16 @@ module RailsAdmin
           created_at: :created_at,
           message: :event,
         }.freeze
+        E_VERSION_MODEL_NOT_SET = <<-EOS.strip_heredoc.freeze
+          Please set up PaperTrail's version model explicitly.
+
+              config.audit_with :paper_trail, 'User', 'PaperTrail::Version'
+
+          If you have configured a model to use a custom version class
+          (https://github.com/paper-trail-gem/paper_trail#6a-custom-version-classes)
+          that configuration will take precedence over what you specify in
+          `audit_with`.
+        EOS
 
         def self.setup
           raise('PaperTrail not found') unless defined?(::PaperTrail)
@@ -59,7 +69,7 @@ module RailsAdmin
           begin
             @version_class = version_class.to_s.constantize
           rescue NameError
-            raise "Please set up Papertrail's version model explicitly. Ex: config.audit_with :paper_trail, 'User', 'PaperTrail::Version'"
+            raise E_VERSION_MODEL_NOT_SET
           end
         end
 
@@ -91,6 +101,7 @@ module RailsAdmin
 
       protected
 
+        # - model - a RailsAdmin::AbstractModel
         def listing_for_model_or_object(model, object, query, sort, sort_reverse, all, page, per_page)
           if sort.present?
             sort = COLUMN_MAPPING[sort.to_sym]
@@ -99,11 +110,10 @@ module RailsAdmin
             sort_reverse = 'true'
           end
 
-          model_name = model.model.name
-
+          ar_model = model.model
           current_page = page.presence || '1'
 
-          versions = version_class_for(model_name).where item_type: model_name
+          versions = version_class_for(ar_model).where item_type: ar_model.name
           versions = versions.where item_id: object.id if object
           versions = versions.where('event LIKE ?', "%#{query}%") if query.present?
           versions = versions.order(sort_reverse == 'true' ? "#{sort} DESC" : sort)
@@ -116,12 +126,14 @@ module RailsAdmin
           paginated_proxies
         end
 
-        def version_class_for(model_name)
-          klass = model_name.constantize.
-                  try(:version_class_name).
-                  try(:constantize)
-
-          klass || @version_class
+        # PT can be configured to use [custom version
+        # classes](https://github.com/paper-trail-gem/paper_trail#6a-custom-version-classes)
+        #
+        # ```ruby
+        # has_paper_trail class_name: 'MyVersion'
+        # ```
+        def version_class_for(model)
+          model.paper_trail_options[:class_name].try(:constantize) || @version_class
         end
       end
     end

data/lib/rails_admin/version.rb

@@ -2,7 +2,7 @@ module RailsAdmin
   class Version
     MAJOR = 1
     MINOR = 4
-    PATCH = 1
+    PATCH = 2
     PRE = nil
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-19 00:00:00.000000000 Z
+date: 2018-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder