rails_admin_settings 1.4.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29fd0a6b9da6e78369f829515f98217818eee87ca05f4dfc6223265f8f1f177d
-  data.tar.gz: bd6b04c0cdc0ba33004138e24d7ab082e020cffaa61b2efa4f28c1168ee8cd6b
+  metadata.gz: 5f1f9843ee528e7a9264626370073c5d5300c830fec7f1fd5098cce75e7982d6
+  data.tar.gz: 3b260282a0c0d4504d88123287111b45774eab05ca84352b8539af271b00268d
 SHA512:
-  metadata.gz: a46ecf577c6f31320bf286d48a280717ae2a199e71fbd379edd11b18eda0a364b806e247485d26660e54836254c46f4b22a44f59722d46c5fac8cdc26129f6dc
-  data.tar.gz: 1fc1c269cbfea981a88305204ed5b12ec9d00bd631b9687e1b42c516cddc5c5de63e91e9149bfe5c909b5965689cad12c05e5873a1206f6c7d41f17e7785bb18
+  metadata.gz: dc1a6ec975b5f6e802dafe7345bd9753478d3cddcd4e25a93b9501482304db19a8e59bc681c30ffaf0d30d1415493f9af5db7643a3e3e4b3160ded5ba79782be
+  data.tar.gz: 7061025abfd54dcbf409e7215d171474f7e1f5068eea1ce704b80038f58a4f4e5dc0252211efbe74816858a95e7bf94f9dbe20c9812946fa508ef98c8613a85b

data/.gitignore

@@ -16,3 +16,4 @@ test/version_tmp
 tmp
 .idea
 /uploads
+/public/uploads

data/.rakeTasks

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/.travis.yml

@@ -14,8 +14,10 @@ env:
   matrix:
     - "UPLOADS=paperclip"
     - "UPLOADS=carrierwave"
+    - "UPLOADS=shrine"
     - "RAILS=1 UPLOADS=paperclip"
     - "RAILS=1 UPLOADS=carrierwave"
+    - "RAILS=1 UPLOADS=shrine"
 
 gemfile:
   - gemfiles/mongoid-6.0.gemfile

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.6.0 (2020-06-11)
+
+Add shrine file uploads
+
+## 1.5.0 (2018-06-09)
+
+Add float type
+
 ## 1.4.1 (2018-03-07)
 
 Fix activerecord + paperclip uploads

data/Gemfile.lock

@@ -1,193 +1,269 @@
 PATH
   remote: .
   specs:
-    rails_admin_settings (1.4.1)
+    rails_admin_settings (1.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.5)
-      actionpack (= 5.1.5)
+    actioncable (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.5)
-      actionview (= 5.1.5)
-      activesupport (= 5.1.5)
-      rack (~> 2.0)
+    actionpack (6.1.3.1)
+      actionview (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.5)
-      activesupport (= 5.1.5)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.3.1)
+      activesupport (= 6.1.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.5)
-      activesupport (= 5.1.5)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.3.1)
+      activesupport (= 6.1.3.1)
       globalid (>= 0.3.6)
-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
-      arel (~> 8.0)
-    activesupport (5.1.5)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activerecord (6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activestorage (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (8.0.0)
-    bson (4.3.0)
-    builder (3.2.3)
-    carrierwave (1.2.2)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
-    carrierwave-mongoid (1.0.0)
-      carrierwave (>= 0.8, < 1.3)
-      mongoid (>= 3.0, < 7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    bson (4.12.0)
+    builder (3.2.4)
+    carrierwave (2.2.1)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      marcel (~> 1.0.0)
+      mini_mime (>= 0.1.3)
+      ssrf_filter (~> 1.0)
+    carrierwave-mongoid (1.3.0)
+      carrierwave (>= 0.8, < 3)
+      mongoid (>= 3.0, < 8.0)
       mongoid-grid_fs (>= 1.3, < 3.0)
     climate_control (0.2.0)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    database_cleaner (1.6.2)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    erubi (1.7.1)
-    factory_bot (4.8.2)
-      activesupport (>= 3.0.0)
-    geocoder (1.4.6)
-    globalid (0.4.1)
+    concurrent-ruby (1.1.8)
+    content_disposition (1.0.0)
+    crass (1.0.6)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    down (5.2.0)
+      addressable (~> 2.5)
+    erubi (1.10.0)
+    factory_bot (6.1.0)
+      activesupport (>= 5.0.0)
+    ffi (1.15.0)
+    geocoder (1.6.6)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.9.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    loofah (2.2.0)
+    image_processing (1.12.1)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    method_source (0.9.0)
-    mime-types (3.1)
+    marcel (1.0.1)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mimemagic (0.3.2)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    mongo (2.5.1)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (6.3.0)
-      activemodel (~> 5.1)
-      mongo (>= 2.5.0, < 3.0.0)
+    mime-types-data (3.2021.0225)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    mini_magick (4.11.0)
+    mini_mime (1.0.3)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
+    mongo (2.14.0)
+      bson (>= 4.8.2, < 5.0.0)
+    mongoid (7.2.2)
+      activemodel (>= 5.1, < 6.2)
+      mongo (>= 2.10.5, < 3.0.0)
     mongoid-compatibility (0.5.1)
       activesupport
       mongoid (>= 2.0)
-    mongoid-grid_fs (2.3.0)
+    mongoid-grid_fs (2.4.0)
       mime-types (>= 1.0, < 4.0)
-      mongoid (>= 3.0, < 7.0)
+      mongoid (>= 3.0, < 8.0)
     mongoid-paperclip (0.0.11)
       mongoid
       paperclip (>= 2.3.6, != 4.3.0)
-    mongoid-rspec (4.0.0)
+    mongoid-rspec (4.1.0)
       activesupport (>= 3.0.0)
-      mongoid (>= 2.0)
-      mongoid-compatibility
-      rspec (~> 3.3)
-    nio4r (2.2.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    nokogumbo (1.5.0)
-      nokogiri
-    paperclip (5.2.1)
+      mongoid (>= 3.1)
+      mongoid-compatibility (>= 0.5.1)
+      rspec-core (~> 3.3)
+      rspec-expectations (~> 3.3)
+      rspec-mocks (~> 3.3)
+    nio4r (2.5.7)
+    nokogiri (1.11.3)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogumbo (2.0.5)
+      nokogiri (~> 1.8, >= 1.8.4)
+    paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
-      cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.2)
-    rack (2.0.4)
-    rack-test (0.8.3)
+      terrapin (~> 0.6.0)
+    parallel (1.20.1)
+    parser (3.0.1.0)
+      ast (~> 2.4.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.5)
-      actioncable (= 5.1.5)
-      actionmailer (= 5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
-      activemodel (= 5.1.5)
-      activerecord (= 5.1.5)
-      activesupport (= 5.1.5)
-      bundler (>= 1.3.0)
-      railties (= 5.1.5)
+    rails (6.1.3.1)
+      actioncable (= 6.1.3.1)
+      actionmailbox (= 6.1.3.1)
+      actionmailer (= 6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actiontext (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.3.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.1.5)
-      actionpack (= 5.1.5)
-      activesupport (= 5.1.5)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+      thor (~> 1.0)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    russian_phone (0.6.0)
-    safe_yaml (1.0.4)
-    sanitize (4.6.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.12.1)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby-vips (2.1.0)
+      ffi (~> 1.12)
+    russian_phone (0.7.0)
+    safe_yaml (1.0.5)
+    sanitize (5.2.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sprockets (3.7.1)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
+    shrine (3.3.0)
+      content_disposition (~> 1.0)
+      down (~> 5.1)
+    shrine-mongoid (1.0.0)
+      mongoid (>= 5.0)
+      shrine (>= 3.0.0.beta3, < 4)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    ssrf_filter (1.0.7)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
     validates_email_format_of (1.6.3)
       i18n
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -199,19 +275,23 @@ DEPENDENCIES
   database_cleaner
   factory_bot
   geocoder
-  mongoid (~> 6.3)
+  image_processing
+  mini_magick
+  mongoid (~> 7.2.2)
   mongoid-paperclip
   mongoid-rspec
-  pry
   rails
   rails_admin_settings!
   rake
   rspec
+  rubocop-rspec
   russian_phone
   safe_yaml
   sanitize
+  shrine (~> 3.0)
+  shrine-mongoid (~> 1.0)
   simplecov
   validates_email_format_of
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/README.md

@@ -1,7 +1,11 @@
 # RailsAdminSettings
 
+Master repository has moved to gitlab, all new code will be there:
+
+https://gitlab.com/rocket-science/rails_admin_settings
+
+
 [![Build Status](https://secure.travis-ci.org/rs-pro/rails_admin_settings.png?branch=master)](http://travis-ci.org/rs-pro/rails_admin_settings)
-[![Dependency Status](https://gemnasium.com/rs-pro/rails_admin_settings.svg)](https://gemnasium.com/rs-pro/rails_admin_settings)
 [![Gem Version](https://badge.fury.io/rb/rails_admin_settings.svg)](https://badge.fury.io/rb/rails_admin_settings)
 [![security](https://hakiri.io/github/rs-pro/rails_admin_settings/master.svg)](https://hakiri.io/github/rs-pro/rails_admin_settings/master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/de00cbec10559ebd2b4b/maintainability)](https://codeclimate.com/github/rs-pro/rails_admin_settings/maintainability)

data/app/models/rails_admin_settings/setting.rb

@@ -7,7 +7,6 @@ end
 
 module RailsAdminSettings
   class Setting
-    #binding.pry
     if RailsAdminSettings.mongoid?
       include RailsAdminSettings::Mongoid
     end

data/app/views/rails_admin/main/_setting_value.html.haml

@@ -1,4 +1,4 @@
-- if ['string', 'integer', 'phone', 'email', 'address', 'url', 'domain'].include?(@object.type)
+- if ['string', 'integer', 'float', 'phone', 'email', 'address', 'url', 'domain'].include?(@object.type)
   = form.text_field :raw, :value => field.value
 - if @object.type == 'boolean'
   = form.check_box :raw, {:value => field.value}, 'true', 'false'
@@ -8,7 +8,6 @@
   = form.text_area :raw, :value => field.value, :rows => 10, :cols => 80
 - elsif @object.type == 'code' || @object.type == 'sanitize_code'
   :ruby
-    #binding.pry
     js_data = {
       csspath: asset_path('ckeditor/plugins/codemirror/css/codemirror.min.css'),
       jspath: asset_path('ckeditor/plugins/codemirror/js/codemirror.min.js'),

data/lib/generators/rails_admin_settings/templates/migration.rb

@@ -15,6 +15,9 @@ class CreateRailsAdminSettings < ActiveRecord::Migration[5.0]
         t.attachment :file
       elsif defined?(CarrierWave)
         t.string :file
+      elsif defined?(Shrine)
+        t.text :file_data
+
       end
       t.timestamps
     end

data/lib/rails_admin_settings/determine_mime_type.rb

@@ -0,0 +1,193 @@
+# frozen_string_literal: true
+
+class Shrine
+  module Plugins
+    # Documentation can be found on https://shrinerb.com/docs/plugins/determine_mime_type
+    module DetermineMimeType
+      LOG_SUBSCRIBER = -> (event) do
+        Shrine.logger.info "MIME Type (#{event.duration}ms) – #{{
+            io:       event[:io].class,
+            uploader: event[:uploader],
+        }.inspect}"
+      end
+
+      def self.configure(uploader, log_subscriber: LOG_SUBSCRIBER, **opts)
+        uploader.opts[:determine_mime_type] ||= { analyzer: :file, analyzer_options: {} }
+        uploader.opts[:determine_mime_type].merge!(opts)
+
+        # instrumentation plugin integration
+        uploader.subscribe(:mime_type, &log_subscriber) if uploader.respond_to?(:subscribe)
+      end
+
+      module ClassMethods
+        # Determines the MIME type of the IO object by calling the specified
+        # analyzer.
+        def determine_mime_type(io)
+          analyzer = opts[:determine_mime_type][:analyzer]
+
+          analyzer = mime_type_analyzer(analyzer) if analyzer.is_a?(Symbol)
+          args     = if analyzer.is_a?(Proc)
+                       [io, mime_type_analyzers].take(analyzer.arity.abs)
+                     else
+                       [io, opts[:determine_mime_type][:analyzer_options]]
+                     end
+
+          mime_type = instrument_mime_type(io) { analyzer.call(*args) }
+          io.rewind
+
+          mime_type
+        end
+        alias mime_type determine_mime_type
+
+        # Returns a hash of built-in MIME type analyzers, where keys are
+        # analyzer names and values are `#call`-able objects which accepts the
+        # IO object.
+        def mime_type_analyzers
+          @mime_type_analyzers ||= MimeTypeAnalyzer::SUPPORTED_TOOLS.inject({}) do |hash, tool|
+            hash.merge!(tool => mime_type_analyzer(tool))
+          end
+        end
+
+        # Returns callable mime type analyzer object.
+        def mime_type_analyzer(name)
+          MimeTypeAnalyzer.new(name)
+        end
+
+        private
+
+        # Sends a `mime_type.shrine` event for instrumentation plugin.
+        def instrument_mime_type(io, &block)
+          return yield unless respond_to?(:instrument)
+
+          instrument(:mime_type, io: io, &block)
+        end
+      end
+
+      module InstanceMethods
+        private
+
+        # Calls the configured MIME type analyzer.
+        def extract_mime_type(io)
+          self.class.determine_mime_type(io)
+        end
+      end
+
+      class MimeTypeAnalyzer
+        SUPPORTED_TOOLS = [:fastimage, :file, :filemagic, :mimemagic, :marcel, :mime_types, :mini_mime, :content_type]
+        MAGIC_NUMBER    = 256 * 1024
+
+        def initialize(tool)
+          raise Error, "unknown mime type analyzer #{tool.inspect}, supported analyzers are: #{SUPPORTED_TOOLS.join(",")}" unless SUPPORTED_TOOLS.include?(tool)
+
+          @tool = tool
+        end
+
+        def call(io, options = {})
+          mime_type = send(:"extract_with_#{@tool}", io, options)
+          io.rewind
+
+          mime_type
+        end
+
+        private
+
+        def extract_with_file(io, options)
+          require "open3"
+
+          return nil if io.eof? # file command returns "application/x-empty" for empty files
+
+          Open3.popen3(*%W[file --mime-type --brief -]) do |stdin, stdout, stderr, thread|
+            begin
+              IO.copy_stream(io, stdin.binmode)
+            rescue Errno::EPIPE
+            end
+            stdin.close
+
+            status = thread.value
+
+            raise Error, "file command failed to spawn: #{stderr.read}" if status.nil?
+            raise Error, "file command failed: #{stderr.read}" unless status.success?
+
+            $stderr.print(stderr.read)
+
+            output = stdout.read.strip
+
+            raise Error, "file command failed: #{output}" if output.include?("cannot open")
+
+            output
+          end
+        rescue Errno::ENOENT
+          raise Error, "file command-line tool is not installed"
+        end
+
+        def extract_with_fastimage(io, options)
+          require "fastimage"
+
+          type = FastImage.type(io)
+          "image/#{type}" if type
+        end
+
+        def extract_with_filemagic(io, options)
+          require "filemagic"
+
+          return nil if io.eof? # FileMagic returns "application/x-empty" for empty files
+
+          FileMagic.open(FileMagic::MAGIC_MIME_TYPE) do |filemagic|
+            filemagic.buffer(io.read(MAGIC_NUMBER))
+          end
+        end
+
+        def extract_with_mimemagic(io, options)
+          require "mimemagic"
+
+          mime = MimeMagic.by_magic(io)
+          mime&.type
+        end
+
+        def extract_with_marcel(io, options)
+          require "marcel"
+
+          return nil if io.eof? # marcel returns "application/octet-stream" for empty files
+
+          filename = (options[:filename_fallback] ? extract_filename(io) : nil)
+          Marcel::MimeType.for(io, name: filename)
+        end
+
+        def extract_with_mime_types(io, options)
+          require "mime/types"
+
+          if filename = extract_filename(io)
+            mime_type = MIME::Types.of(filename).first
+            mime_type&.content_type
+          end
+        end
+
+        def extract_with_mini_mime(io, options)
+          require "mini_mime"
+
+          if filename = extract_filename(io)
+            info = MiniMime.lookup_by_filename(filename)
+            info&.content_type
+          end
+        end
+
+        def extract_with_content_type(io, options)
+          if io.respond_to?(:content_type) && io.content_type
+            io.content_type.split(";").first
+          end
+        end
+
+        def extract_filename(io)
+          if io.respond_to?(:original_filename)
+            io.original_filename
+          elsif io.respond_to?(:path)
+            File.basename(io.path)
+          end
+        end
+      end
+
+    end
+
+    register_plugin(:determine_mime_type, DetermineMimeType)
+  end
+end

data/lib/rails_admin_settings/kinds.rb

@@ -4,6 +4,7 @@ module RailsAdminSettings
       'string',
       'text',
       'integer',
+      'float',
       'boolean',
       'html',
       'code',

data/lib/rails_admin_settings/processing.rb

@@ -10,7 +10,7 @@ module RailsAdminSettings
     end
 
     def text_kind?
-      (RailsAdminSettings.kinds - ['phone', 'phones', 'integer', 'yaml', 'json', 'boolean']).include? kind
+      (RailsAdminSettings.kinds - ['phone', 'phones', 'integer', 'float', 'yaml', 'json', 'boolean']).include? kind
     end
 
     def upload_kind?
@@ -31,10 +31,14 @@ module RailsAdminSettings
 
     def value
       if upload_kind?
-        if file?
-          file.url
+        unless defined?(Shrine)
+          if file?
+            file.url
+          else
+            nil
+          end
         else
-          nil
+          file.url if file.present?
         end
       elsif raw.blank? || disabled?
         default_value
@@ -54,7 +58,8 @@ module RailsAdminSettings
     end
 
     def to_s
-      if yaml_kind? || json_kind? || phone_kind? || integer_kind?
+      if yaml_kind? || json_kind? || phone_kind? || integer_kind? || float_kind?
+
         raw
       else
         value
@@ -94,6 +99,8 @@ module RailsAdminSettings
         ''
       elsif integer_kind?
         0
+      elsif float_kind?
+        0
       elsif yaml_kind?
         nil
       elsif json_kind?
@@ -181,6 +188,8 @@ module RailsAdminSettings
         process_text
       elsif integer_kind?
         raw.to_i
+      elsif float_kind?
+        raw.to_f
       elsif yaml_kind?
         load_yaml
       elsif json_kind?

data/lib/rails_admin_settings/rails_admin_config.rb

@@ -4,7 +4,6 @@ module RailsAdminSettings
       if base.respond_to?(:rails_admin)
         base.rails_admin do
           navigation_label I18n.t('admin.settings.label')
-
           list do
             if Object.const_defined?('RailsAdminToggleable')
               field :enabled, :toggle
@@ -16,10 +15,18 @@ module RailsAdminSettings
             field :name
             field :raw do
               pretty_value do
-                if bindings[:object].file_kind?
-                  "<a href='#{CGI::escapeHTML(bindings[:object].file.url)}'>#{CGI::escapeHTML(bindings[:object].to_path)}</a>".html_safe
-                elsif bindings[:object].image_kind?
-                  "<a href='#{CGI::escapeHTML(bindings[:object].file.url)}'><img src='#{CGI::escapeHTML(bindings[:object].file.url)}' /></a>".html_safe
+                if bindings[:object].file_kind? and !defined?(Shrine) and bindings[:object].to_path.present?
+                  if bindings[:object].file.url.blank?
+                    "-"
+                  else
+                    "<a href='#{CGI::escapeHTML(bindings[:object].file.url)}'>#{CGI::escapeHTML(bindings[:object].to_path)}</a>".html_safe
+                  end
+                elsif bindings[:object].image_kind? and !defined?(Shrine) and !bindings[:object].file.nil?
+                  if bindings[:object].file.url.blank?
+                    "-"
+                  else
+                    "<a href='#{CGI::escapeHTML(bindings[:object].file.url)}'><img src='#{CGI::escapeHTML(bindings[:object].file.url)}' /></a>".html_safe
+                  end
                 else
                   value
                 end

data/lib/rails_admin_settings/settings.rb

@@ -39,6 +39,8 @@ class Settings < BasicObject
 
     def table_exists?
       RailsAdminSettings.mongoid? || RailsAdminSettings::Setting.table_exists?
+    rescue ActiveRecord::NoDatabaseError
+      false
     end
 
     def unload!

data/lib/rails_admin_settings/storage/shrine_uploader.rb

@@ -0,0 +1,14 @@
+module RailsAdminSettings
+  module Uploads
+    class ShrineUploader < Shrine
+        plugin :determine_mime_type
+        plugin :validation_helpers
+        plugin :mongoid if RailsAdminSettings.mongoid?
+        Attacher.validate do
+          validate_mime_type_inclusion %w[image/jpeg image/gif image/png]
+          validate_max_size 2.megabytes
+        end
+      end
+
+    end
+  end

data/lib/rails_admin_settings/uploads.rb

@@ -1,6 +1,7 @@
 module RailsAdminSettings
   module Uploads
     autoload :CarrierWaveUploader, "rails_admin_settings/storage/carrier_wave_uploader"
+    autoload :ShrineUploader, "rails_admin_settings/storage/shrine_uploader"
 
     def self.paperclip_options
       if defined?(Rails)
@@ -37,6 +38,16 @@ module RailsAdminSettings
         end
         Settings.file_uploads_supported = true
         Settings.file_uploads_engine = :paperclip
+      elsif RailsAdminSettings.active_record? && defined?(Shrine)
+        Settings.file_uploads_supported = true
+        Settings.file_uploads_engine = :shrine
+        base.send(:include, ShrineUploader::Attachment(:file))
+      elsif RailsAdminSettings.mongoid? && ::Mongoid.const_defined?('Shrine')
+        base.send(:include, ::Mongoid::Document)
+        base.send(:include, ShrineUploader::Attachment(:file))
+        base.field(:file_data, type: String)
+        Settings.file_uploads_supported = true
+        Settings.file_uploads_engine = :shrine
       else
         # puts "[rails_admin_settings] Uploads disabled"
       end

data/lib/rails_admin_settings/validation.rb

@@ -9,6 +9,7 @@ module RailsAdminSettings
         base.validates_uniqueness_of :key, scope: :ns
         base.validates_inclusion_of :kind, in: RailsAdminSettings.kinds
         base.validates_numericality_of :raw, if: :integer_kind?
+        base.validates_numericality_of :raw, if: :float_kind?
 
         add_validators(base)
       end
@@ -31,7 +32,7 @@ module RailsAdminSettings
       def add_file_validator(base)
         base.validate if: :file_kind? do
           unless Settings.file_uploads_supported
-            raise '[rails_admin_settings] File kind requires either CarrierWave or Paperclip. Check that rails_admin_settings is below them in Gemfile'
+            raise '[rails_admin_settings] File kind requires either CarrierWave or Paperclip or Shrine. Check that rails_admin_settings is below them in Gemfile'
           end
         end
       end

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "1.4.1"
+  VERSION = "1.7.0"
 end

data/rails_admin_settings.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["glebtv@gmail.com"]
   spec.description   = %q{Mongoid / ActiveRecord + RailsAdmin App Settings management}
   spec.summary       = %q{}
-  spec.homepage      = "https://github.com/rs-pro/rails_admin_settings"
+  spec.homepage      = "https://gitlab.com/rocket-science/rails_admin_settings"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_development_dependency "mongoid", '~> 6.3'
+  spec.add_development_dependency "mongoid", '~> 7.2.2'
   spec.add_development_dependency "rails"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
@@ -36,5 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "addressable"
   spec.add_development_dependency "carrierwave-mongoid"
   spec.add_development_dependency "mongoid-paperclip"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rubocop-rspec"
+  spec.add_development_dependency 'image_processing'
+  spec.add_development_dependency "mini_magick"
+  spec.add_development_dependency "shrine", "~> 3.0"
+  spec.add_development_dependency "shrine-mongoid", "~> 1.0"
 end

data/spec/factories/setting.rb

@@ -3,6 +3,6 @@
 FactoryBot.define do
   factory :setting, class: RailsAdminSettings::Setting do
     sequence(:key){|n| "setting_#{n}" }
-    raw "Контент 1"
+    raw { "Контент 1" }
   end
 end

data/spec/shrine_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+
+describe "Uploads" do
+  if Settings.file_uploads_engine != :shrine
+    pending "shrine not detected, skipped. To run use UPLOADS=shrine rspec"
+  else
+    before :each do
+      f = "#{File.dirname(__FILE__)}/../uploads/1024x768.gif"
+      if File.file?(f)
+        File.unlink(f)
+      end
+    end
+    it 'supports file kind' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), kind: 'file')
+      expect(Settings.get(:file).file.metadata["filename"]).to eq '1024x768.gif'
+      expect(Settings.get(:file).file.metadata["size"]).to eq 4357
+      expect(Settings.get(:file).file.metadata["mime_type"]).to eq "image/gif"
+      expect(Settings.get(:file).file.id.split(".").last).to eq "gif"
+      expect(Settings.file.split("/").second + "/" + Settings.file.split("/").last.split(".").last).to eq "uploads/gif"
+      expect(File.exists?("public/uploads/#{Settings.get(:file).file.id}")).to be_truthy
+    end
+    it 'supports image kind' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), kind: 'image')
+      expect(Settings.get(:file).file.metadata["filename"]).to eq '1024x768.gif'
+      expect(Settings.get(:file).file.metadata["size"]).to eq 4357
+      expect(Settings.get(:file).file.metadata["mime_type"]).to eq "image/gif"
+      expect(Settings.get(:file).file.id.split(".").last).to eq "gif"
+      expect(Settings.file.split("/").second + "/" + Settings.file.split("/").last.split(".").last).to eq "uploads/gif"
+      expect(File.exists?("public/uploads/#{Settings.get(:file).file.id}")).to be_truthy
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'rubygems'
 require 'simplecov'
 SimpleCov.start
 
-require 'pry'
 require 'bundler/setup'
 require 'active_support'
 require 'active_support/core_ext'
@@ -18,7 +17,6 @@ require 'database_cleaner'
 require 'factory_bot'
 require 'mongoid-rspec'
 
-p ENV["UPLOADS"]
 if ENV['UPLOADS'] == 'paperclip'
   require "mongoid-paperclip"
 end
@@ -30,6 +28,22 @@ if ENV['UPLOADS'] == 'carrierwave'
     end
   end
 end
+if ENV['UPLOADS'] == 'shrine'
+  require "shrine"
+  require "shrine/storage/file_system"
+  Shrine.storages = {
+      cache: Shrine::Storage::FileSystem.new("public", prefix: "uploads/cache"), # temporary
+      store: Shrine::Storage::FileSystem.new("public", prefix: "uploads"),       # permanent
+  }
+
+  if ENV['ACTIVERECORD']
+    Shrine.plugin :activerecord
+  end
+  Shrine.plugin :cached_attachment_data # for retaining the cached file across form redisplays
+  Shrine.plugin :restore_cached_data # re-extract metadata when attaching a cached file
+end
+
+
 
 I18n.enforce_available_locales = true
 I18n.load_path << File.join(File.dirname(__FILE__), "..", "config", "locales", "en.yml")

data/spec/types_spec.rb

@@ -23,6 +23,13 @@ describe 'Settings kind' do
     expect(Settings.testint2).to eq 5
   end
 
+  it 'float' do
+    expect(Settings.get(:testfloat, kind: 'float').value).to eq 0
+    expect(Settings.get(:testfloat, default: 5.2, kind: 'float').value).to eq 0
+    expect(Settings.get(:testfloat2, default: 5.5, kind: 'float').value).to eq 5.5
+    expect(Settings.testfloat2).to eq 5.5
+  end
+
   it 'does yaml' do
     Settings.set(:data, '[one, two, three]', kind: 'yaml')
     expect(Settings.get(:data).raw).to eq '[one, two, three]'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Gleb Tv
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.3'
+        version: 7.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.3'
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -262,6 +262,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shrine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: shrine-mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Mongoid / ActiveRecord + RailsAdmin App Settings management
 email:
 - glebtv@gmail.com
@@ -270,7 +326,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rakeTasks"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -288,6 +346,7 @@ files:
 - lib/generators/rails_admin_settings/migration_generator.rb
 - lib/generators/rails_admin_settings/templates/migration.rb
 - lib/rails_admin_settings.rb
+- lib/rails_admin_settings/determine_mime_type.rb
 - lib/rails_admin_settings/dumper.rb
 - lib/rails_admin_settings/engine.rb
 - lib/rails_admin_settings/fallback.rb
@@ -300,6 +359,7 @@ files:
 - lib/rails_admin_settings/require_helpers.rb
 - lib/rails_admin_settings/settings.rb
 - lib/rails_admin_settings/storage/carrier_wave_uploader.rb
+- lib/rails_admin_settings/storage/shrine_uploader.rb
 - lib/rails_admin_settings/tasks.rb
 - lib/rails_admin_settings/uploads.rb
 - lib/rails_admin_settings/validation.rb
@@ -318,6 +378,7 @@ files:
 - spec/namespaced_spec.rb
 - spec/paperclip_spec.rb
 - spec/settings_spec.rb
+- spec/shrine_spec.rb
 - spec/spec_helper.rb
 - spec/support/1024x768.gif
 - spec/support/database_cleaner.rb
@@ -326,11 +387,11 @@ files:
 - spec/support/mongoid.rb
 - spec/support/mongoid.yml
 - spec/types_spec.rb
-homepage: https://github.com/rs-pro/rails_admin_settings
+homepage: https://gitlab.com/rocket-science/rails_admin_settings
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -345,9 +406,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: ''
 test_files:
@@ -363,6 +423,7 @@ test_files:
 - spec/namespaced_spec.rb
 - spec/paperclip_spec.rb
 - spec/settings_spec.rb
+- spec/shrine_spec.rb
 - spec/spec_helper.rb
 - spec/support/1024x768.gif
 - spec/support/database_cleaner.rb