ab_admin 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e4cff3af876fcd7ea0ee9a0a340b10ceb31d22c2a3728910692c0048c8f0e6c
-  data.tar.gz: 7c66e65f59261910436f0c4d18cf069e1f94e42cec845c39bb5d7ee07de434e5
+  metadata.gz: fb0ea0be238f876e8ef98daa6bbebf85f46894948f62a69bbe21bdd5536b3762
+  data.tar.gz: 62dc60a35278dc9adad7bc59fcd2ff0a4be46e7db4c67768c21875ca3751ed70
 SHA512:
-  metadata.gz: 0c5926ca259601ec0369db9588748dc3c6b34fca63816ea9ef2adda4a238f45eb26f2f215d2337a38fe7a5061e870e0bdae466dcd46b5f51c7b0f2118e3e9084
-  data.tar.gz: 8ecd6b3078af74eee5d0135eb8fe1764d27f2dbd623c6e0f663d5e9b8e4e808323e968e6c87955e4f4f0c9ad7431743307b364a22a870fda1874b5a3fd9942e3
+  metadata.gz: e35c066aa098cf2d947c25a2c6712a8c5c587af84bfd7f55034128db4b8aec66f731e987baa690c7f39326c5f27b30ec77ec6a0c4b41c57ac8c6321a14d91d8b
+  data.tar.gz: af7a163e88da0ff71562a7f497eb8914fe6394508be6c4b9a0c733994cd5f8807ba5d32596241924754a42f6c1a327059418a126dcf7204648bf971ad1d46718

data/README.md

@@ -6,7 +6,7 @@ Simple and real-life tested Rails::Engine admin interface based on slim, bootstr
 
 Add this line to your application's Gemfile:
 
-    gem 'simple_slug'
+    gem 'ab_admin'
 
 And then execute:
 
@@ -14,7 +14,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install simple_slug
+    $ gem install ab_admin
 
 Run generators
 

data/app/assets/javascripts/ab_admin/components/in_place_edit.js.coffee

@@ -45,7 +45,7 @@ window.initInPlaceEditable = ->
         if response && $(this).data().options?.accept == 'script'
           $.globalEval(response.responseText)
       datetimepicker:
-        format: "dd.mm.yyyy hh:ii"
+        format: "yyyy-mm-dd hh:ii"
         autoclose: true
         todayBtn: true
         language: I18n.locale

data/app/assets/javascripts/ab_admin/core/batch_actions.js.coffee

@@ -42,7 +42,7 @@ $ ->
       $form.append($idsInputs)
       $form.append($extraData)
       $form.submit()
-      $.fancybox.close()
+      bootbox.hideAll() if window.bootbox?
       $extraData?.remove()
       $idsInputs.remove()
 
@@ -63,11 +63,15 @@ $ ->
         $form = $($el.data('form'))
         unless $form.find('.js-batch_form_submit').length
           $form.append("<div class='btn btn-primary js-batch_form_submit' data-form=#{$el.data('form')} data-action=#{$el.data('action')}><i class='icon-ok icon-white'></i></div>")
-          $form.append("<div class='btn' onclick='$.fancybox.close()'><i class='icon-remove'></i></div>")
-        $.fancybox($form)
+          $form.append("<div class='btn js-batch_form_cancel'><i class='icon-remove'></i></div>")
+        bootbox.dialog({message: $form.show(), className: 'batch-action-form'})
       else
         submitBatch(this)
 
+    $(document).on 'click', '.js-batch_form_cancel', (e) ->
+      e.preventDefault()
+      bootbox.hideAll() if window.bootbox?
+
     $(document).on 'click', '.js-batch_form_submit', (e) ->
       e.preventDefault()
       submitBatch(this, $($(this).data('form')).find('input,textarea,select').clone())

data/app/controllers/admin/assets_controller.rb

@@ -34,7 +34,7 @@ class Admin::AssetsController < ApplicationController
   end
 
   def batch_update
-    Asset.update(params[:data].keys, params[:data].values)
+    Asset.update(params[:data].keys, params[:data].values.map{ _1.permit(*permitted_assets_attributes) })
     @assets = Asset.find(params[:data].keys)
   end
 
@@ -53,7 +53,11 @@ class Admin::AssetsController < ApplicationController
   protected
 
   def permitted_params
-    params[:asset].try!(:permit, :data, :is_main, :original_name, :human_filename, *Asset.all_translated_attribute_names)
+    params[:asset].try!(:permit, :data, *permitted_assets_attributes)
+  end
+
+  def permitted_assets_attributes
+    [:is_main, :original_name, :human_filename, *Asset.all_translated_attribute_names.map(&:to_sym)]
   end
 
   def find_asset

data/config/routes.rb

@@ -4,29 +4,49 @@ Rails.application.routes.draw do
     get 'dashboards', as: 'dashboards'
 
     resources :structures do
-      post :batch, :rebuild, on: :collection
+      collection do
+        post :batch
+        post :rebuild
+      end
       resource :static_page
     end
 
     resources :users do
-      post :batch, on: :collection
-      post :activate, :suspend, on: :member
+      collection do
+        post :batch
+      end
+      member do
+        post :activate
+        post :suspend
+      end
     end
 
     resources :assets, only: [:create, :destroy] do
-      post :rotate, :main, :crop, on: :member
-      post :sort, on: :collection
-      get :batch_edit, on: :collection
-      post :batch_update, on: :collection
+      member do
+        post :rotate
+        post :main
+        post :crop
+      end
+      collection do
+        post :sort
+        get :batch_edit
+        post :batch_update
+      end
     end
 
     resource :settings, only: [:edit, :update] do
-      post :cache_clear, on: :collection
+      collection do
+        post :cache_clear
+      end
     end
 
     resource :locators do
-      post :prepare, :reload, :import, on: :collection
-      get :export, on: :collection
+      collection do
+        post :prepare
+        post :reload
+        post :import
+        get :export
+      end
     end
 
     resources :admin_comments

data/lib/ab_admin/carrierwave/base_uploader.rb

@@ -10,6 +10,8 @@ module AbAdmin
       class_attribute :human_filenames
       self.human_filenames = true
 
+      CACHE_ID_REGEXP = /\A(?:\d+[-_]){4}/.freeze
+
       attr_accessor :internal_identifier
 
       before :cache, :save_original_name
@@ -28,6 +30,12 @@ module AbAdmin
         "#{[human_part, secure_token].compact.join('_')}#{extension}"
       end
 
+      def identifier
+        raw = super
+        return raw unless raw.is_a?(String) && raw.match?(CACHE_ID_REGEXP)
+        raw.sub(CACHE_ID_REGEXP, '')
+      end
+
       def full_filename(*)
         return filename unless version_name
         base = "#{version_filename_part}#{version_extension}"
@@ -35,8 +43,26 @@ module AbAdmin
         [human_part, base].compact.join('_')
       end
 
-      def human_part
-        normalize_filename(model.send("#{mounted_as}_file_name").to_s.strip.remove(/\.\w+$/)).remove(secure_token).chomp('_').presence
+      def human_part(index = nil)
+        raw = model.public_send("#{mounted_as}_file_name").to_s.strip
+        raw = strip_extension(raw)
+        raw = strip_cache_id(raw)
+        normalized = normalize_filename(raw)
+        normalized = normalized.remove(secure_token).chomp('_')
+        normalized = strip_index(normalized) if index
+        [normalized, index].compact.join('_')
+      end
+
+      def strip_cache_id(name)
+        name.remove(CACHE_ID_REGEXP)
+      end
+
+      def strip_extension(name)
+        name.remove(/\.\w+$/)
+      end
+
+      def strip_index(name)
+        name.remove(/_\d{3}$/)
       end
 
       def extension
@@ -74,7 +100,8 @@ module AbAdmin
       end
 
       def save_original_name(file)
-        model.original_name ||= file.original_filename if file.respond_to?(:original_filename)
+        return unless file.respond_to?(:original_filename)
+        model.original_name ||= strip_cache_id(file.original_filename.to_s)
       end
 
       def model_filename(base_filename, record)
@@ -87,7 +114,7 @@ module AbAdmin
       def normalize_filename(raw_filename)
         I18n.transliterate(raw_filename.unicode_normalize).parameterize(separator: '_').gsub(/[\-_]+/, '_').downcase
       end
-
+      
       def rename_via_move(new_filename)
         dir = File.dirname(path)
         old_names = versions.values.unshift(self).map(&:full_filename)

data/lib/ab_admin/concerns/utilities.rb

@@ -94,7 +94,7 @@ module AbAdmin
         end
 
         def all_columns_names
-          ActiveSupport::Deprecation.warn('#all_columns_names is deprecated without replacement')
+          AbAdmin.deprecator.warn('#all_columns_names is deprecated without replacement')
           if translates?
             column_names + all_translated_attribute_names + translated_attribute_names.map(&:to_s)
           else

data/lib/ab_admin/core_ext/array.rb

@@ -12,7 +12,7 @@ class Array
   end
 
   def without!(*values)
-    ActiveSupport::Deprecation.warn('Array#without! is deprecated without replacement')
+    AbAdmin.deprecator.warn('Array#without! is deprecated without replacement')
     values.flatten.each { |value| self.delete(value) }
     self
   end
@@ -21,7 +21,9 @@ class Array
     (other - self).empty?
   end
 
-  def intersect?(other)
-    !(self & other).empty?
+  unless method_defined?(:intersect?)
+    def intersect?(other)
+      !(self & other).empty?
+    end
   end
 end

data/lib/ab_admin/core_ext/hash.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/deep_transform_values'
+
 class Hash
   def reverse_deep_merge!(other_hash)
     other_hash.each_pair do |k, v|
@@ -18,15 +20,17 @@ class Hash
     self
   end
 
-  def deep_transform_values!(&block)
-    self.each_key do |key|
-      if self[key].is_a?(Hash)
-        self[key] = self[key].deep_transform_values!(&block)
-      else
-        self[key] = block.call(self[key])
+  unless method_defined?(:deep_transform_values!)
+    def deep_transform_values!(&block)
+      self.each_key do |key|
+        if self[key].is_a?(Hash)
+          self[key] = self[key].deep_transform_values!(&block)
+        else
+          self[key] = block.call(self[key])
+        end
       end
+      self
     end
-    self
   end
 
   def clear_values

data/lib/ab_admin/core_ext/string.rb

@@ -6,8 +6,8 @@ end
 
 unless ''.respond_to?(:each)
   String.class_eval do
-    def each &block
-      self.lines &block
+    def each(&block)
+      self.lines(&block)
     end
   end
 end

data/lib/ab_admin/engine.rb

@@ -2,6 +2,10 @@ module AbAdmin
   class Engine < ::Rails::Engine
     engine_name 'ab_admin'
 
+    initializer 'ab_admin.deprecator', before: :load_environment_config do |app|
+      app.deprecators[:ab_admin] = AbAdmin.deprecator if app.respond_to?(:deprecators)
+    end
+
     initializer 'ab_admin.assets_precompile', group: :all do |app|
       app.config.assets.precompile += AbAdmin.assets
     end

data/lib/ab_admin/models/asset.rb

@@ -113,7 +113,7 @@ module AbAdmin
       end
 
       def rename!(name=nil)
-        normalized_name = name ? data.normalize_filename(name) : rand(9999)
+        normalized_name = name ? data.normalize_filename(name) : data.human_part(SecureRandom.random_number(100..999))
         return if normalized_name.blank?
         data.rename_via_move normalized_name
       end

data/lib/ab_admin/models/settings.rb

@@ -25,7 +25,7 @@ module AbAdmin
 
       module ClassMethods
         def load_config
-          ActiveSupport::Deprecation.warn('`Settings.load_config` is deprecated, use `Settings.data` instead')
+          AbAdmin.deprecator.warn('`Settings.load_config` is deprecated, use `Settings.data` instead')
           data
         end
 

data/lib/ab_admin/models/track.rb

@@ -9,8 +9,8 @@ module AbAdmin
         belongs_to :owner, class_name: 'User'
         belongs_to :user, class_name: 'User'
 
-        serialize :parameters, Hash
-        serialize :trackable_changes, Hash
+        serialize :parameters, coder: YAML, type: Hash
+        serialize :trackable_changes, coder: YAML, type: Hash
 
         before_create :make_trackable, if: :trackable
 

data/lib/ab_admin/models/type_model.rb

@@ -32,7 +32,7 @@ module AbAdmin
         end
 
         def legal?(value)
-          ActiveSupport::Deprecation.warn('legal? is deprecated, use valid? instead')
+          AbAdmin.deprecator.warn('legal? is deprecated, use valid? instead')
           valid?(value)
         end
 

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.10.0'
+  VERSION = '0.12.0'
 end

data/lib/ab_admin/views/admin_helpers.rb

@@ -49,24 +49,23 @@ module AbAdmin
           end
         end
 
-        unless opts[:type]
-          if opts[:source]
-            opts[:type] = 'select'
+        if opts[:source]
+          opts[:type] ||= 'select'
+        else
+          case attr.to_s
+          when /_at$/
+            opts[:type] ||= 'date'
+            opts[:title] ||= html_title
+            opts[:value] ||= item[attr].try! { _1.to_fs(:db).split.first.html_safe }
+          when /^is_/
+            opts[:type] ||= 'select'
+            opts[:source] ||= { 1 => 'yes', 0 => 'no' }
+            opts[:value] ||= item[attr] ? 1 : 0
+            opts[:title] ||= item[attr] ? 'yes' : 'no'
+          when /description|body|content/
+            opts[:type] ||= 'textarea'
           else
-            case attr.to_s
-              when /_at$/
-                opts[:type] ||= 'date'
-                opts[:title] ||= html_title
-              when /^is_/
-                opts[:type] ||= 'select'
-                opts[:source] ||= {1 => 'yes', 0 => 'no'}
-                opts[:value] ||= item[attr] ? 1 : 0
-                opts[:title] ||= item[attr] ? 'yes' : 'no'
-              when /description|body|content/
-                opts[:type] ||= 'textarea'
-              else
-                opts[:type] ||= 'text'
-            end
+            opts[:type] ||= 'text'
           end
         end
 

data/lib/ab_admin/views/form_builder.rb

@@ -73,7 +73,7 @@ module AbAdmin
       end
 
       def disable_not_accessible_for(roles)
-        ActiveSupport::Deprecation.warn('#disable_not_accessible_for is deprecated without replacement')
+        AbAdmin.deprecator.warn('#disable_not_accessible_for is deprecated without replacement')
         @disable_not_accessible_for = roles
       end
 

data/lib/ab_admin.rb

@@ -2,6 +2,13 @@ require 'inherited_resources'
 require 'rack-pjax'
 require 'cancan'
 
+# Rack 3.x removed Rack::Utils::HeaderHash in favor of Rack::Headers.
+# rack-pjax (1.1.0) still references HeaderHash, so we restore the constant
+# for compatibility. See https://github.com/eval/rack-pjax/issues/
+if defined?(Rack::Headers) && !defined?(Rack::Utils::HeaderHash)
+  Rack::Utils::HeaderHash = Rack::Headers
+end
+
 require 'ab_admin/version'
 require 'ab_admin/core_ext'
 require 'ab_admin/engine'
@@ -212,6 +219,10 @@ module AbAdmin
   def self.setup
     yield self
   end
+
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new(VERSION, 'AbAdmin')
+  end
 end
 
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ab_admin
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Alex Leschenko
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.7
+        version: 8.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.7
+        version: 8.1.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +111,16 @@ dependencies:
   name: simple_slug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -651,7 +650,6 @@ files:
 homepage: https://github.com/leschenko/ab_admin
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -666,8 +664,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Simple and real-life tested Rails::Engine admin interface based on slim,
   bootstrap, inherited_resources, simple_form, device, cancan