rails_admin_settings 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 354ac1ea3f414693cec277ee8f2d92295d9ca5b1
-  data.tar.gz: 6f4ecafee55ac66d6215ad25ea400a685195b674
+SHA256:
+  metadata.gz: 2c3a2cc5a5dd0c4e77f1e05ef1447698edde1ba25344fc2e5baea2dc7c686427
+  data.tar.gz: 753783ad33100ef2d26891da3ecb909768f2b4c9e86242d1fedd44b388ee02ec
 SHA512:
-  metadata.gz: 0e0ed9a6c11e4ee88b669ed7982d98095e56d5880fab2f26abcd51d6cdf6dfb75b71c66f9ab3c3651f5cf54fe615c2626a6b6197bdb3607fb937798187acd4e3
-  data.tar.gz: 588d5ed55e2f5800ee23f0b3003f89c87d9de04c279c32ade06f933e9e7f6b4fbf661c203c232feb28d8f5940d27f19a0415ccee2fac5d3a6c395f6ad37ba436
+  metadata.gz: b8b2f3ac4d7218bd0840aba1965f499f5b56d4a0bb0f30a1e36cdb3ac411ab19e620cfc7c769989d66eab63fd7efd06c1a7356e21e1a3bd96e5f441ebd492ad0
+  data.tar.gz: 306df770d677bee42028699ded628aed3339aad936837383aefa2257cfe79badbdcbcfde7c618f745dd692b2d4a1d78c2254c2622f5dcca2f3596194f98a2f78

data/.travis.yml

@@ -6,12 +6,15 @@ notifications:
 
 rvm:
   - 2.3.3
+  - 2.5.0
 
 env:
   - "UPLOADS=paperclip"
   - "UPLOADS=carrierwave"
+  - "RAILS=1 UPLOADS=paperclip"
+  - "RAILS=1 UPLOADS=carrierwave"
 
 gemfile:
   - gemfiles/mongoid-6.0.gemfile
-  - gemfiles/mongoid-6.1.gemfile
+  - gemfiles/mongoid-6.3.gemfile
 

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.4.0
+
+Add new kinds
+
+strip_tags (uses strip_tags rails helper)
+simple_format (uses simple_format rails helper)
+simple_format_raw (does NOT sanitize (allows ANY javascript) - uses simple_format rails helper with sanitize: false)
+json
+
+Use Psych.safe_load for yaml if available
+
 ## 1.3.1
 
 add pt-BR locale (thanks @prem-prakash)

data/Gemfile.lock

@@ -1,190 +1,193 @@
 PATH
   remote: .
   specs:
-    rails_admin_settings (1.3.2)
+    rails_admin_settings (1.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.1)
-      actionpack (= 5.1.1)
+    actioncable (5.1.5)
+      actionpack (= 5.1.5)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
+    actionmailer (5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.1)
-      actionview (= 5.1.1)
-      activesupport (= 5.1.1)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.1)
-      activesupport (= 5.1.1)
+    activejob (5.1.5)
+      activesupport (= 5.1.5)
       globalid (>= 0.3.6)
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    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.1)
+    activesupport (5.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     arel (8.0.0)
-    bson (4.2.1)
+    bson (4.3.0)
     builder (3.2.3)
-    carrierwave (0.11.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
+    carrierwave (1.2.2)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-      mimemagic (>= 0.3.0)
-    carrierwave-mongoid (0.10.0)
-      carrierwave (>= 0.8.0, < 0.12.0)
+    carrierwave-mongoid (1.0.0)
+      carrierwave (>= 0.8, < 1.3)
       mongoid (>= 3.0, < 7.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.1)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
-    crass (1.0.2)
-    database_cleaner (1.6.1)
+    crass (1.0.3)
+    database_cleaner (1.6.2)
     diff-lcs (1.3)
     docile (1.1.5)
-    erubi (1.6.0)
-    factory_girl (4.8.0)
+    erubi (1.7.1)
+    factory_bot (4.8.2)
       activesupport (>= 3.0.0)
-    geocoder (1.4.4)
-    globalid (0.4.0)
+    geocoder (1.4.6)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (0.8.4)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     json (2.1.0)
-    loofah (2.0.3)
+    loofah (2.2.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_portile2 (2.2.0)
-    minitest (5.10.2)
-    mongo (2.4.2)
-      bson (>= 4.2.1, < 5.0.0)
-    mongoid (6.2.0)
+    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.4.1, < 3.0.0)
+      mongo (>= 2.5.0, < 3.0.0)
+    mongoid-compatibility (0.5.1)
+      activesupport
+      mongoid (>= 2.0)
     mongoid-grid_fs (2.3.0)
       mime-types (>= 1.0, < 4.0)
       mongoid (>= 3.0, < 7.0)
     mongoid-paperclip (0.0.11)
       mongoid
       paperclip (>= 2.3.6, != 4.3.0)
-    mongoid-rspec (1.10.0)
-      mongoid (>= 3.0.1)
-      rake
-      rspec (>= 2.14)
-    nio4r (2.1.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    nokogumbo (1.4.13)
+    mongoid-rspec (4.0.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.1.0)
+    paperclip (5.2.1)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.1)
-      actioncable (= 5.1.1)
-      actionmailer (= 5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
-      activemodel (= 5.1.1)
-      activerecord (= 5.1.1)
-      activesupport (= 5.1.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.1)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    rack (2.0.4)
+    rack-test (0.8.3)
+      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)
       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.1)
-      actionpack (= 5.1.1)
-      activesupport (= 5.1.1)
+    railties (5.1.5)
+      actionpack (= 5.1.5)
+      activesupport (= 5.1.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     russian_phone (0.6.0)
     safe_yaml (1.0.4)
-    sanitize (4.5.0)
+    sanitize (4.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4.1)
-    simplecov (0.14.1)
+      nokogumbo (~> 1.4)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
+    simplecov-html (0.10.2)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.19.4)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)
       i18n
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -194,9 +197,9 @@ DEPENDENCIES
   bundler
   carrierwave-mongoid
   database_cleaner
-  factory_girl
+  factory_bot
   geocoder
-  mongoid (~> 6.1)
+  mongoid (~> 6.3)
   mongoid-paperclip
   mongoid-rspec
   pry
@@ -211,4 +214,4 @@ DEPENDENCIES
   validates_email_format_of
 
 BUNDLED WITH
-   1.15.1
+   1.16.1

data/README.md

@@ -57,7 +57,7 @@ Or install it yourself as:
 
 ## Advanced Usage
 
-    Settings.content_block_1(kind: 'html', default: 'test')
+    Settings.content_block_1(kind: 'html', default: 'test', label: "Test Value")
     Settings.data(kind: 'yaml')
     Settings.data = [1, 2, 3]
 
@@ -95,23 +95,41 @@ Supported types:
     text (textarea)
     boolean (checkbox)
     color (uses built-in RailsAdmin color picker)
-    html (supports Rich, glebtv-ckeditor, ckeditor, but does not require any of them)
-    sanitized (requires sanitize -- sanitizes HTML before saving to DB [Warning: uses RELAXED config!])
+    html (does NOT sanitize (allows ANY javascript) - for trusted admin, supports Rich, glebtv-ckeditor, ckeditor, but does not require any of them)
+    code (does NOT sanitize (allows ANY javascript) - shows as codemirror, requires glebtv-ckeditor for codemirror)
+    sanitized (requires sanitize gem -- sanitizes HTML before saving to DB [Warning: uses RELAXED config!])
     integer (stored as string)
     yaml (requires safe_yaml)
     phone (requires russian_phone)
+    phones (requires russian_phone - multiple phones)
     email (requires validates_email_format_of)
     address (requires geocoder)
     file (requires paperclip or carrierwave)
     url (requires addressable)
     domain (requires addressable)
+    sanitize (uses rails sanitize helper with default settings, shows as html)
+    sanitize_code (uses rails sanitize helper with default settings, shows as codemirror textarea, can provide custom scrubber, defaults to Rails::Html::WhiteListSanitizer)
+    strip_tags (uses strip_tags rails helper)
+    simple_format (uses simple_format rails helper)
+    simple_format_raw (does NOT sanitize (allows ANY javascript) - uses simple_format rails helper with sanitize: false)
+    json
 
+#### Sanitize settings
+
+Sanitizer can be changed like this:
+```
+RalsAdminSettings.scrubber = Rails::Html::WhiteListSanitizer.new
+```
+defaults to Rails::Html::WhiteListSanitizer
 
 Strings and html support following replacement patterns:
 
     {{year}} -> current year
     {{year|2013}} -> 2013 in 2013, 2013-2014 in 2014, etc
 
+Sanitized types sanitize before storing to DB and not on display for performance.
+Simple format types are stored in db as-is.
+
 ## Usage with Rails Admin
 
 Rails admin management for settings is supported out of the box

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

@@ -4,9 +4,9 @@
   = form.check_box :raw, {:value => field.value}, 'true', 'false'
 - if @object.type == 'color'
   = form.text_field :raw, :value => field.value, 'data-color' => true, style: "background-color: ##{field.value}"
-- elsif %w(text yaml phones).include?( @object.type )
+- elsif %w(text simple_format simple_format_raw strip_tags yaml json phones).include?( @object.type )
   = form.text_area :raw, :value => field.value, :rows => 10, :cols => 80
-- elsif @object.type == 'code'
+- elsif @object.type == 'code' || @object.type == 'sanitize_code'
   :ruby
     #binding.pry
     js_data = {
@@ -24,7 +24,7 @@
     }
 
   = form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: 'codemirror', options: js_data.to_json }).reverse_merge({ value: field.form_value })
-- elsif @object.type == 'html' || @object.type == 'sanitized'
+- elsif @object.type == 'html' || @object.type == 'sanitized' || @object.type == 'sanitize'
   - if form.respond_to?(:cktext_area)
     = javascript_include_tag "ckeditor/init"
     = form.cktext_area :raw, :value => field.value, :rows => 10, :cols => 80

data/config/locales/en.yml

@@ -7,6 +7,7 @@ en:
       phones_invalid: "Incorrect phone: %{phones}"
       email_invalid: Incorrect email
       yaml_invalid: Incorrect YAML
+      json_invalid: Incorrect JSON
       color_invalid: Incorrect color
   mongoid: &mongoid
     models:

data/config/locales/pt-BR.yml

@@ -7,6 +7,7 @@ pt-BR:
       phones_invalid: "Telefone incorreto: %{phones}"
       email_invalid: Email incorreto
       yaml_invalid: YAML incorreto
+      json_invalid: JSON incorreto
       color_invalid: Cor incorreta
   mongoid: &mongoid
     models:

data/config/locales/ru.yml

@@ -7,6 +7,7 @@ ru:
       phones_invalid: "Неверный телефонный номер: %{phones}"
       email_invalid: Неверный email
       yaml_invalid: Неверный синтаксис YAML
+      json_invalid: Неверный синтаксис JSON
       color_invalid: Неверный цвет
   mongoid: &mongoid
     models:

data/gemfiles/{mongoid-6.1.gemfile → mongoid-6.3.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "mongoid", "~> 6.1.0"
+gem "mongoid", "~> 6.3.0"
 
 gemspec path: "../"

data/lib/rails_admin_settings.rb

@@ -1,6 +1,11 @@
 require "rails_admin_settings/version"
 
 module RailsAdminSettings
+  if defined?(Rails) && defined?(Rails::Html) && defined?(Rails::Html::WhiteListSanitizer)
+    @@scrubber = Rails::Html::WhiteListSanitizer.new
+  end
+  cattr_accessor :scrubber
+
   class << self
     def orm
       if defined?(::Mongoid)

data/lib/rails_admin_settings/kinds.rb

@@ -17,7 +17,13 @@ module RailsAdminSettings
       'image',
       'url',
       'domain',
-      'color'
+      'color',
+      'strip_tags',
+      'sanitize',
+      'sanitize_code',
+      'simple_format',
+      'simple_format_raw',
+      'json',
     ]
   end
 

data/lib/rails_admin_settings/processing.rb

@@ -10,7 +10,7 @@ module RailsAdminSettings
     end
 
     def text_kind?
-      (RailsAdminSettings.kinds - ['phone', 'phones', 'integer', 'yaml', 'boolean']).include? kind
+      (RailsAdminSettings.kinds - ['phone', 'phones', 'integer', 'yaml', 'json', 'boolean']).include? kind
     end
 
     def upload_kind?
@@ -18,8 +18,13 @@ module RailsAdminSettings
     end
 
     def html_kind?
-      ['html', 'code', 'sanitized'].include? kind
+      ['html', 'code', 'sanitize', 'sanitize_code', 'strip_tags', 'simple_format', 'simple_format_raw', 'sanitized'].include? kind
     end
+
+    def preprocessed_kind?
+      ['sanitize', 'sanitize_code', 'strip_tags', 'simple_format', 'simple_format_raw', 'sanitized'].include? kind
+    end
+
     alias_method :text_type?, :text_kind?
     alias_method :upload_type?, :upload_kind?
     alias_method :html_type?, :html_kind?
@@ -49,7 +54,7 @@ module RailsAdminSettings
     end
 
     def to_s
-      if yaml_kind? || phone_kind? || integer_kind?
+      if yaml_kind? || json_kind? || phone_kind? || integer_kind?
         raw
       else
         value
@@ -58,9 +63,27 @@ module RailsAdminSettings
 
     private
 
-    def sanitize_value
-      require_sanitize do
-        self.raw = Sanitize.clean(value, Sanitize::Config::RELAXED)
+    def preprocess_value
+      case kind
+        # just to raise error if not in rails
+        when 'simple_format'
+          require_rails do
+          end
+        when 'simple_format_raw'
+          require_rails do
+          end
+        when 'strip_tags'
+          require_rails do
+            self.raw = ActionController::Base.helpers.strip_tags(raw)
+          end
+        when 'sanitize', 'sanitize_code'
+          require_rails do
+            self.raw = RailsAdminSettings.scrubber.sanitize(raw)
+          end
+        when 'sanitized'
+          require_sanitize do
+            self.raw = Sanitize.clean(value, Sanitize::Config::RELAXED)
+          end
       end
     end
 
@@ -72,10 +95,11 @@ module RailsAdminSettings
       elsif integer_kind?
         0
       elsif yaml_kind?
+        nil
+      elsif json_kind?
+        nil
       elsif boolean_kind?
         false
-      elsif yaml_type?
-        nil
       elsif phone_kind?
         require_russian_phone do
           RussianPhone::Number.new('')
@@ -97,6 +121,20 @@ module RailsAdminSettings
       end
     end
 
+    def process_html_types(text)
+      case kind
+        when 'simple_format'
+          require_rails do
+            text = ActionController::Base.helpers.simple_format(text)
+          end
+        when 'simple_format_raw'
+          require_rails do
+            text = ActionController::Base.helpers.simple_format(text, {}, sanitize: false)
+          end
+      end
+      text
+    end
+
     def process_text
       text = raw.dup
       text.gsub!('{{year}}', Time.now.strftime('%Y'))
@@ -107,6 +145,7 @@ module RailsAdminSettings
           "#{$1}-#{Time.now.strftime('%Y')}"
         end
       end
+      text = process_html_types(text)
       text = text.html_safe if html_kind?
       text
     end
@@ -124,11 +163,19 @@ module RailsAdminSettings
     end
 
     def load_yaml
-      require_safe_yaml do
-        YAML.safe_load(raw)
+      if defined?(Psych) && Psych.respond_to?(:safe_load)
+        Psych.safe_load(raw)
+      else
+        require_safe_yaml do
+          YAML.safe_load(raw)
+        end
       end
     end
 
+    def load_json
+      JSON.load(raw)
+    end
+
     def processed_value
       if text_kind?
         process_text
@@ -136,6 +183,8 @@ module RailsAdminSettings
         raw.to_i
       elsif yaml_kind?
         load_yaml
+      elsif json_kind?
+        load_json
       elsif boolean_kind?
         raw == 'true'
       elsif phone_kind?

data/lib/rails_admin_settings/require_helpers.rb

@@ -1,4 +1,13 @@
 module RailsAdminSettings
+  class NoRailsError  < StandardError
+    def initialize(message)
+      @message = message
+    end
+    def to_s
+      @message
+    end
+  end
+
   module RequireHelpers
     private
 
@@ -32,6 +41,17 @@ module RailsAdminSettings
       end
     end
 
+    def require_rails
+      if defined?(Rails) &&
+          defined?(ActionController) &&
+          defined?(ActionController::Base) &&
+          !RailsAdminSettings.scrubber.nil?
+        yield
+      else
+        raise NoRailsError.new("[rails_admin_settings] sanitize, simple_format and strip_tags types require Rails, please add this gem after Rails in your Gemfile")
+      end
+    end
+
     def require_validates_email_format_of
       begin
         require 'validates_email_format_of'

data/lib/rails_admin_settings/settings.rb

@@ -56,7 +56,7 @@ class Settings < BasicObject
     end
 
     def root_file_path
-      if Object.const_defined?('Rails')
+      if defined?(Rails)
         Rails.root
       else
         Pathname.new(File.dirname(__FILE__)).join('../..')
@@ -66,7 +66,11 @@ class Settings < BasicObject
     def apply_defaults!(file, verbose = false)
       if File.file?(file)
         puts "[settings] Loading from #{file}" if verbose
-        yaml = YAML.load(File.read(file), safe: true)
+        if defined?(Psych) && Psych.respond_to?(:safe_load)
+          yaml = Psych.safe_load(File.read(file))
+        else
+          yaml = YAML.load(File.read(file), safe: true)
+        end
         yaml.each_pair do |namespace, vals|
           vals.symbolize_keys!
           n = ns(namespace)

data/lib/rails_admin_settings/storage/{carrierwave.rb → carrier_wave_uploader.rb}

@@ -1,9 +1,9 @@
 module RailsAdminSettings
   module Uploads
-    class CarrierWave < CarrierWave::Uploader::Base
+    class CarrierWaveUploader < CarrierWave::Uploader::Base
       def extension_white_list
         %w(jpg jpeg gif png tiff psd ai txt rtf doc docx xls xlsx ppt pptx odt odx zip rar 7z pdf)
       end
     end
   end
-end
+end

data/lib/rails_admin_settings/tasks.rb

@@ -21,7 +21,7 @@ namespace :settings do
     RailsAdminSettings::Dumper.dump(path)
     puts "dumped settings to #{path}"
   end
-  
+
   desc "Load settings from config/settings.yml without overwriting current values"
   task :load => ['settings:require'] do
     Settings.apply_defaults!(Rails.root.join("config/settings.#{Rails.env.to_s}.yml"), true)

data/lib/rails_admin_settings/uploads.rb

@@ -1,12 +1,21 @@
 module RailsAdminSettings
   module Uploads
-    autoload :CarrierWave, "rails_admin_settings/storage/carrierwave"
+    autoload :CarrierWaveUploader, "rails_admin_settings/storage/carrier_wave_uploader"
+
+    def self.paperclip_options
+      if defined?(Rails)
+        {}
+      else
+        {path: "#{File.dirname(__FILE__)}/../../uploads/:filename", url: '/uploads/:filename'}
+      end
+    end
+
     def self.included(base)
       # carrierwave
       if base.respond_to?(:mount_uploader)
         # puts "[rails_admin_settings] CarrierWave detected"
         # base.field(:file, type: String)
-        base.mount_uploader(:file, RailsAdminSettings::Uploads::CarrierWave)
+        base.mount_uploader(:file, RailsAdminSettings::Uploads::CarrierWaveUploader)
         Settings.file_uploads_supported = true
         Settings.file_uploads_engine = :carrierwave
       # mongoid-paperclip
@@ -14,11 +23,7 @@ module RailsAdminSettings
         base.send(:include, ::Mongoid::Paperclip)
         # puts "[rails_admin_settings] PaperClip detected"
         base.field(:file, type: String)
-        if defined?(Rails)
-          base.has_mongoid_attached_file(:file)
-        else
-          base.has_mongoid_attached_file(:file, path: "#{File.dirname(__FILE__)}/../../uploads/:filename", url: '/uploads/:filename')
-        end
+        base.has_mongoid_attached_file(:file, self.paperclip_options)
         if base.respond_to?(:do_not_validate_attachment_file_type)
           base.do_not_validate_attachment_file_type :file
         end
@@ -26,11 +31,7 @@ module RailsAdminSettings
         Settings.file_uploads_supported = true
         Settings.file_uploads_engine = :paperclip
       elsif RailsAdminSettings.active_record? && defined?(Paperclip)
-        if defined?(Rails)
-          base.has_attached_file(:file)
-        else
-          base.has_attached_file(:file, path: "#{File.dirname(__FILE__)}/../../uploads/:filename", url: '/uploads/:filename')
-        end
+        base.has_mongoid_attached_file(:file, self.paperclip_options)
         if base.respond_to?(:do_not_validate_attachment_file_type)
           base.do_not_validate_attachment_file_type :file
         end

data/lib/rails_admin_settings/validation.rb

@@ -4,7 +4,7 @@ module RailsAdminSettings
       base.before_validation do
         self.raw = default_serializable_value if raw.blank?
       end
-      base.before_validation :sanitize_value, if: :sanitized_kind?
+      base.before_validation :preprocess_value, if: :preprocessed_kind?
       base.validates_uniqueness_of :key, scope: :ns
       base.validates_inclusion_of :kind, in: RailsAdminSettings.kinds
       base.validates_numericality_of :raw, if: :integer_kind?
@@ -79,6 +79,16 @@ module RailsAdminSettings
           end
         end
       end
+
+      base.validate if: :json_kind? do
+        unless raw.blank?
+          begin
+            JSON.load(raw)
+          rescue JSON::ParserError => e
+            errors.add(:raw, I18n.t('admin.settings.json_invalid'))
+          end
+        end
+      end
     end
   end
 end

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/rails_admin_settings.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_development_dependency "mongoid", '~> 6.1'
+  spec.add_development_dependency "mongoid", '~> 6.3'
   spec.add_development_dependency "rails"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "mongoid-rspec"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "database_cleaner"
-  spec.add_development_dependency "factory_girl"
+  spec.add_development_dependency "factory_bot"
   spec.add_development_dependency "safe_yaml"
   spec.add_development_dependency "russian_phone"
   spec.add_development_dependency "sanitize"

data/spec/defaults_spec.rb

@@ -52,12 +52,12 @@ describe 'Settings loading defaults' do
     expect(Settings.ns(:main).footer).to eq 'test <b></b>'
     expect(Settings.footer).to eq 'zzz'
 
-    Settings.ns(:main).phone.should eq '906 1111111'
-    Settings.ns(:main).true_setting.should be true
-    Settings.ns(:main).false_setting.should be false
-    Settings.ns(:other).footer.should eq 'zzz'
-    Settings.ns(:main).footer.should eq 'test <b></b>'
-    Settings.footer.should eq 'zzz'
+    expect(Settings.ns(:main).phone).to eq '906 1111111'
+    expect(Settings.ns(:main).true_setting).to be true
+    expect(Settings.ns(:main).false_setting).to be false
+    expect(Settings.ns(:other).footer).to eq 'zzz'
+    expect(Settings.ns(:main).footer).to eq 'test <b></b>'
+    expect(Settings.footer).to eq 'zzz'
 
     expect(Settings.ns(:etc, fallback: :main).phone).to eq '906 1111111'
     expect(Settings.ns(:etc, fallback: :main).footer).to eq 'test <b></b>'

data/spec/factories/setting.rb

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

data/spec/label_spec.rb

@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 describe 'Settings label' do
-  
   it "should have label" do
     label = "E-Mail"
     Settings.email(label: label, default: "my@mail.ru")
@@ -14,5 +13,4 @@ describe 'Settings label' do
     Settings.email(default: "my@mail.ru")
     expect(Settings.get(:email).name).to eq('email')
   end
-
 end

data/spec/migration_spec.rb

@@ -11,10 +11,10 @@ describe 'Migrating from old versions' do
       coll.insert({enabled: true, key: 'test', raw: '9060000000', type: 'phone'})
     end
     RailsAdminSettings.migrate!
-    RailsAdminSettings::Setting.first.key.should eq 'test'
-    RailsAdminSettings::Setting.first.raw.should eq '9060000000'
-    RailsAdminSettings::Setting.first.ns.should eq 'main'
-    RailsAdminSettings::Setting.first.kind.should eq 'phone'
+    expect(RailsAdminSettings::Setting.first.key).to eq 'test'
+    expect(RailsAdminSettings::Setting.first.raw).to eq '9060000000'
+    expect(RailsAdminSettings::Setting.first.ns).to eq 'main'
+    expect(RailsAdminSettings::Setting.first.kind).to eq 'phone'
   end
 end
 

data/spec/model_spec.rb

@@ -6,40 +6,100 @@ describe RailsAdminSettings::Setting do
   it { is_expected.to have_fields(:enabled, :key, :kind, :raw) }
 
   it "correctly return content when enabled" do
-    setting = FactoryGirl.create(:setting)
+    setting = FactoryBot.create(:setting)
     expect(setting.to_s).to eq "Контент 1"
   end
 
   it "return empty string when disabled" do
-    setting = FactoryGirl.create(:setting, enabled: false)
+    setting = FactoryBot.create(:setting, enabled: false)
     expect(setting.to_s).to eq ""
   end
 
   it "correctly process {{year}}" do
-    setting = FactoryGirl.create(:setting, raw: '© {{year}} company')
+    setting = FactoryBot.create(:setting, raw: '© {{year}} company')
     expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company"
   end
 
   it "correctly process {{year|2010}}" do
-    setting = FactoryGirl.create(:setting, raw: '© {{year|2010}} company')
+    setting = FactoryBot.create(:setting, raw: '© {{year|2010}} company')
     expect(setting.val).to eq "© 2010-#{Time.now.strftime('%Y')} company"
   end
 
   it "correctly process {{year|current_year}}" do
-    setting = FactoryGirl.create(:setting, raw: '© {{year|' + Time.now.strftime('%Y') + '}} company')
+    setting = FactoryBot.create(:setting, raw: '© {{year|' + Time.now.strftime('%Y') + '}} company')
     expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company"
     expect(setting.val.class.name).not_to eq "ActiveSupport::SafeBuffer"
   end
 
   it 'return html_safe string when in html mode' do
-    setting = FactoryGirl.create(:setting, raw: '© {{year}} company', kind: 'html')
+    setting = FactoryBot.create(:setting, raw: '© {{year}} company', kind: 'html')
     expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company"
     expect(setting.val.class.name).to eq "ActiveSupport::SafeBuffer"
   end
 
   it 'sanitize html when in sanitized mode' do
-    setting = FactoryGirl.create(:setting, raw: '&copy; {{year}} company <a href="javascript:alert()">test</a>', kind: 'sanitized')
+    setting = FactoryBot.create(:setting, raw: '&copy; {{year}} company <a href="javascript:alert()">test</a>', kind: 'sanitized')
     expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company <a>test</a>"
     expect(setting.val.class.name).to eq "ActiveSupport::SafeBuffer"
   end
-end
+
+  it 'sanitize html when in sanitize mode' do
+    if defined?(Rails)
+      setting = FactoryBot.create(:setting, raw: '&copy; {{year}} company <a href="javascript:alert()">test</a>', kind: 'sanitize')
+      expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company <a>test</a>"
+      expect(setting.val.class.name).to eq "ActiveSupport::SafeBuffer"
+    else
+      expect {
+        FactoryBot.create(:setting, raw: '&copy; {{year}} company <a href="javascript:alert()">test</a>', kind: 'sanitize')
+      }.to raise_error(RailsAdminSettings::NoRailsError)
+    end
+  end
+
+  it 'sanitize html when in sanitize_code mode' do
+    if defined?(Rails)
+      setting = FactoryBot.create(:setting, raw: '&copy; {{year}} company <a href="javascript:alert()">test</a>', kind: 'sanitize_code')
+      expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company <a>test</a>"
+      expect(setting.val.class.name).to eq "ActiveSupport::SafeBuffer"
+    else
+      expect {
+        FactoryBot.create(:setting, raw: '&copy; {{year}} company <a href="javascript:alert()">test</a>', kind: 'sanitize_code')
+      }.to raise_error(RailsAdminSettings::NoRailsError)
+    end
+  end
+
+  it 'remove html when in strip_tags mode' do
+    if defined?(Rails)
+      setting = FactoryBot.create(:setting, raw: '&copy; {{year}} company <a href="javascript:alert()">test</a>', kind: 'strip_tags')
+      expect(setting.val).to eq "© #{Time.now.strftime('%Y')} company test"
+      expect(setting.val.class.name).to eq "ActiveSupport::SafeBuffer"
+    else
+      expect {
+        FactoryBot.create(:setting, raw: '&copy; {{year}} company <a href="javascript:alert()">test</a>', kind: 'strip_tags')
+      }.to raise_error(RailsAdminSettings::NoRailsError)
+    end
+  end
+
+  it 'formats text and cleans html in simple_format mode' do
+    if defined?(Rails)
+      setting = FactoryBot.create(:setting, raw: "&copy; {{year}}\n\ncompany <a href='javascript:alert()'>test</a>", kind: 'simple_format')
+      expect(setting.val).to eq "<p>© #{Time.now.strftime('%Y')}</p>\n\n<p>company <a>test</a></p>"
+      expect(setting.val.class.name).to eq "ActiveSupport::SafeBuffer"
+    else
+      expect {
+        FactoryBot.create(:setting, raw: "&copy; {{year}}\n\ncompany <a href='javascript:alert()'>test</a>", kind: 'simple_format')
+      }.to raise_error(RailsAdminSettings::NoRailsError)
+    end
+  end
+
+  it 'formats text and DOESNT html in simple_format_raw mode' do
+    if defined?(Rails)
+      setting = FactoryBot.create(:setting, raw: "&copy; {{year}}\n\ncompany <a href='javascript:alert()'>test</a>", kind: 'simple_format_raw')
+      expect(setting.val).to eq "<p>&copy; #{Time.now.strftime('%Y')}</p>\n\n<p>company <a href='javascript:alert()'>test</a></p>"
+      expect(setting.val.class.name).to eq "ActiveSupport::SafeBuffer"
+    else
+      expect {
+        FactoryBot.create(:setting, raw: "&copy; {{year}}\n\ncompany <a href='javascript:alert()'>test</a>", kind: 'simple_format_raw')
+      }.to raise_error(RailsAdminSettings::NoRailsError)
+    end
+  end
+end

data/spec/paperclip_spec.rb

@@ -17,7 +17,6 @@ describe "Uploads" do
       expect(Settings.get(:file).file_file_name).to eq '1024x768.gif'
       expect(Settings.get(:file).file_file_size).to eq 4357
       expect(Settings.file[0..21]).to eq '/uploads/1024x768.gif?'
-
       expect(File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif")).to be_truthy
     end
 

data/spec/settings_spec.rb

@@ -48,7 +48,7 @@ describe 'Settings' do
     Settings.phone = '906 222 22 22'
     expect(Settings.phone(kind: 'phone', default: '906 111 11 11')).to eq '+7 (906) 222-22-22'
   end
-  
+
   it 'should properly store settings to DB' do
     Settings.unload!
     expect(Settings.loaded).to eq false

data/spec/spec_helper.rb

@@ -15,10 +15,13 @@ unless ENV['ACTIVERECORD']
 end
 
 require 'database_cleaner'
-require 'factory_girl'
+require 'factory_bot'
 require 'mongoid-rspec'
 
-require "mongoid-paperclip" if ENV['UPLOADS'] == 'paperclip'
+p ENV["UPLOADS"]
+if ENV['UPLOADS'] == 'paperclip'
+  require "mongoid-paperclip"
+end
 if ENV['UPLOADS'] == 'carrierwave'
   require "carrierwave/mongoid"
   CarrierWave.configure do |config|
@@ -35,8 +38,34 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each do |f|
   require f
 end
 
+if ENV['RAILS'] == '1'
+  require "active_model/railtie"
+  require "action_controller/railtie"
+  require "action_view/railtie"
+  module RAS
+    class Application < Rails::Application
+    end
+  end
+  # Initialize the Rails application.
+  Rails.application.initialize!
+end
+
 require 'rails_admin_settings'
 
+
+if ENV['UPLOADS'] == 'paperclip'
+  module RailsAdminSettings::Uploads
+    def self.paperclip_options
+      {path: "#{File.dirname(__FILE__)}/../uploads/:filename", url: '/uploads/:filename'}
+    end
+  end
+end
+
+
 Dir["#{File.dirname(__FILE__)}/factories/**/*.rb"].each do |f|
   require f
 end
+
+#RSpec.configure do |config|
+  #config.expect_with(:rspec) { |c| c.syntax = :should }
+#end

data/spec/types_spec.rb

@@ -4,12 +4,12 @@ require 'spec_helper'
 
 describe 'Settings kind' do
   it 'boolean' do
-    Settings.get(:testbool, kind: 'boolean').value.should be false
-    Settings.get(:testbool, default: true, kind: 'boolean').value.should be false
-    Settings.get(:testbool2, default: true, kind: 'boolean').value.should be true
-    Settings.testbool2.should be true
+    expect(Settings.get(:testbool, kind: 'boolean').value).to be(false)
+    expect(Settings.get(:testbool, default: true, kind: 'boolean').value).to be(false)
+    expect(Settings.get(:testbool2, default: true, kind: 'boolean').value).to be(true)
+    expect(Settings.testbool2).to be(true)
     Settings.set(:testbool3, true, kind: 'boolean')
-    Settings.testbool3.should be true
+    expect(Settings.testbool3).to be(true)
   end
 
   it 'html' do
@@ -23,12 +23,18 @@ describe 'Settings kind' do
     expect(Settings.testint2).to eq 5
   end
 
-  it 'yaml' do
+  it 'does yaml' do
     Settings.set(:data, '[one, two, three]', kind: 'yaml')
     expect(Settings.get(:data).raw).to eq '[one, two, three]'
     expect(Settings.data).to eq ['one', 'two', 'three']
   end
 
+  it 'does json' do
+    Settings.set(:data, '{"a": 1, "b": 2}', kind: 'json')
+    expect(Settings.get(:data).raw).to eq '{"a": 1, "b": 2}'
+    expect(Settings.data).to eq({"a" => 1, "b" => 2})
+  end
+
   it 'phone' do
     Settings.set(:tphone, '906 111 11 11', kind: 'phone')
     expect(Settings.get(:tphone).val.class.name).to eq 'RussianPhone::Number'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -286,7 +286,7 @@ files:
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
 - gemfiles/mongoid-6.0.gemfile
-- gemfiles/mongoid-6.1.gemfile
+- gemfiles/mongoid-6.3.gemfile
 - lib/generators/rails_admin_settings/migration_generator.rb
 - lib/generators/rails_admin_settings/templates/migration.rb
 - lib/rails_admin_settings.rb
@@ -301,11 +301,12 @@ files:
 - lib/rails_admin_settings/rails_admin_config.rb
 - lib/rails_admin_settings/require_helpers.rb
 - lib/rails_admin_settings/settings.rb
-- lib/rails_admin_settings/storage/carrierwave.rb
+- lib/rails_admin_settings/storage/carrier_wave_uploader.rb
 - lib/rails_admin_settings/tasks.rb
 - lib/rails_admin_settings/uploads.rb
 - lib/rails_admin_settings/validation.rb
 - lib/rails_admin_settings/version.rb
+- log/development.log
 - rails_admin_settings.gemspec
 - spec/advanced_usage_spec.rb
 - spec/carrierwave_spec.rb
@@ -347,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''