rails_admin_settings 1.1.0.pre.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4128eb2cbea4bc24d3b020923ee7824fb69aee2a
-  data.tar.gz: 9399ca1e1706716eb39866ce3119edf27dbc5ddb
+  metadata.gz: eb8a82776828edcae4754e00c8a2d7784277f2a9
+  data.tar.gz: c791f863ecd37dd5b5acaf08f03f1f6033d03d5e
 SHA512:
-  metadata.gz: 97966ab422eafd14fe5cd2dad8f5b7f7de6f85252ff547365cf4f00f67a5cc755fb9ef3affd6123db4cd32778618a7df78cdd1f567c20ba020a9b4e938f97901
-  data.tar.gz: 87d9de27b98ee0516a4b5736e0e6fdd60eb777160507e24926efaa337fe3af94d70b3d8de80d1c2d4140297d55ff17cb49f03f84b760f2a567d7cc00d223d4b8
+  metadata.gz: a934c7c8621a822943165858158ba2fd0587e599aabe4833cd103082307f208edfb7aff16c10cac9a9443bca7386b34415a719c6af57740ead90a176d0f6e92f
+  data.tar.gz: 8478ac74537fa997bd0a2d34f46bd766a4e044eabdfba2ff1be3d4af8f4e2ec2808b009bee3daa55c95da07831f475bf40081c86486031e9f294e9c8627ceaa2

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.1.2
+
+- Add namespace tabs in rails_admin
+- Add code type with codemirror (requires glebtv-ckeditor)
+- Fixed Paperclip installation checking #6. Thx @tanelj
+- Add boolean data type #2. Thx @teonimesic
+
+## 1.1.0
+
+- Fix file type
+
+## 1.0.0
+
+- Support ActiveRecord
+
 ## 1.0.0.pre.1
 
 Disable auto migrate. To migrate from 0.8 run:
@@ -17,6 +32,10 @@ RailsAdminSettings.migrate!
 - Added ActiveRecord support
 - [!!!] Type renamed to Kind to avoid messing with AR STI column
 
+Rename it in all invocations, then run migrate DB with:
+
+    RailsAdminSettings.migrate!
+
 ## 0.6.0
 
 - Added namespaced settings

data/Gemfile.lock

@@ -1,50 +1,41 @@
 PATH
   remote: .
   specs:
-    rails_admin_settings (1.1.0.pre.1)
+    rails_admin_settings (1.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
+      mail (~> 2.5.4)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
-      globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
-      arel (~> 6.0)
-    activesupport (4.2.4)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.8)
-    arel (6.0.3)
-    bson (3.2.4)
-    builder (3.2.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
+      builder (~> 3.0.0)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    addressable (2.4.0)
+    arel (3.0.3)
+    builder (3.0.4)
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
@@ -52,129 +43,122 @@ GEM
       mime-types (>= 1.16)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
-    connection_pool (2.2.0)
     crass (1.0.2)
-    database_cleaner (1.5.0)
+    database_cleaner (1.5.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    geocoder (1.2.11)
+    geocoder (1.2.12)
     glebtv-carrierwave-mongoid (0.8.0)
       carrierwave (>= 0.8.0, < 0.11.0)
       mongoid (>= 3.0, < 5.0)
-    glebtv-mongoid-paperclip (0.3.0)
-      mongoid (>= 3.0, < 5.0)
-      paperclip (>= 3.4, != 4.3.0)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
+    glebtv-mongoid-paperclip (0.4.0)
+      mongoid (>= 3.0, < 6.0)
+      paperclip (~> 4.3.1)
+    hike (1.2.3)
     i18n (0.7.0)
+    journey (1.0.4)
     json (1.8.3)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     method_source (0.8.2)
-    mime-types (2.6.2)
+    mime-types (1.25.1)
     mimemagic (0.3.0)
-    mini_portile (0.6.2)
-    minitest (5.8.0)
-    mongoid (4.0.2)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    mongoid-rspec (2.2.0)
-      mongoid (~> 4.0.0)
+    mini_portile2 (2.0.0)
+    mongoid (3.1.7)
+      activemodel (~> 3.2)
+      moped (~> 1.4)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.29)
+    mongoid-rspec (1.13.0)
+      mongoid (~> 3.1)
       rake
       rspec (~> 3.1)
-    moped (2.0.7)
-      bson (~> 3.0)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    nokogumbo (1.4.1)
+    moped (1.5.3)
+    multi_json (1.11.2)
+    nokogiri (1.6.7)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogumbo (1.4.6)
       nokogiri
-    optionable (0.2.0)
-    origin (2.1.1)
-    paperclip (4.3.1)
+    origin (1.1.0)
+    paperclip (4.3.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
-    pry (0.10.1)
+    polyglot (0.3.5)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    rack (1.4.7)
+    rack-cache (1.5.1)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
+      bundler (~> 1.0)
+      railties (= 3.2.22)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     russian_phone (0.5.3)
     safe_yaml (1.0.4)
-    sanitize (4.0.0)
+    sanitize (4.0.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
-      nokogumbo (= 1.4.1)
-    simplecov (0.10.0)
+      nokogumbo (~> 1.4.1)
+    simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.3.4)
+    sprockets (2.2.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.46)
     validates_email_format_of (1.6.3)
       i18n
 

data/README.md

@@ -3,17 +3,9 @@
 [![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)
 
-## Since 1.0 AR is fully supported but not well tested yet.
+App settings editable via RailsAdmin with support for ActiveRecord and Mongoid.
 
-## 0.9.0 is not backwards-compatible with 0.8
-
-Type renamed to Kind to avoid messing with AR STI column
-
-Rename it in all invocations, then run migrate DB with: 
-
-    RailsAdminSettings.migrate!
-
-Also, active record is now supported in addition to mongoid.
+Supports images, files, html with or without sanitization, code with codemirror, etc.
 
 ## Features
 
@@ -68,7 +60,7 @@ Or install it yourself as:
     Settings.content_block_1(kind: 'html', default: 'test')
     Settings.data(kind: 'yaml')
     Settings.data = [1, 2, 3]
-    
+
     Settings.enabled?(:phone, kind: 'phone', default: '906 111-11-11') # also creates setting if it doesn't exist
     Settings.phone.area
     Settings.phone.subscriber
@@ -101,6 +93,7 @@ Supported types:
 
     string (input)
     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!])

data/app/models/rails_admin_settings/setting.rb

@@ -59,6 +59,14 @@ module RailsAdminSettings
       v
     end
 
+    # t = {_all: 'Все'}
+    ::RailsAdminSettings::Setting.pluck(:ns).uniq.each do |c|
+       s = "ns_#{c.gsub('-', '_')}".to_sym
+       scope s, -> { where(ns: c) }
+       # t[s] = c
+     end
+     # I18n.backend.store_translations(:ru, {admin: {scopes: {'rails_admin_settings/setting': t}}})
+
     if Object.const_defined?('RailsAdmin')
       include RailsAdminSettings::RailsAdminConfig
     else

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

@@ -1,10 +1,30 @@
 - if ['string', 'integer', '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'
 - 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 )
   = form.text_area :raw, :value => field.value, :rows => 10, :cols => 80
-- elsif @object.type == 'html'
+- elsif @object.type == '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'),
+      options:  {
+        mode: 'htmlmixed',
+        theme: 'monokai',
+        lineNumbers: true
+      },
+      locations: {
+        mode: asset_path('ckeditor/plugins/codemirror/js/codemirror.mode.htmlmixed.min.js'),
+        theme: asset_path('ckeditor/plugins/codemirror/theme/monokai.css')
+      }
+    }
+
+  = 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'
   - if form.respond_to?(:cktext_area)
     = javascript_include_tag "ckeditor/init"
     = form.cktext_area :raw, :value => field.value, :rows => 10, :cols => 80
@@ -19,4 +39,4 @@
   - else
     .alert.alert-error
       = t('admin.settings.no_ckeditor_detected')
-    = form.text_area :raw, :value => field.value, :rows => 10, :cols => 80
+    = form.text_area :raw, :value => field.value, :rows => 10, :cols => 80

data/lib/rails_admin_settings/kinds.rb

@@ -4,7 +4,9 @@ module RailsAdminSettings
       'string',
       'text',
       'integer',
+      'boolean',
       'html',
+      'code',
       'sanitized',
       'yaml',
       'phone',
@@ -22,4 +24,4 @@ module RailsAdminSettings
   def self.types
     self.kinds
   end
-end
+end

data/lib/rails_admin_settings/processing.rb

@@ -10,7 +10,7 @@ module RailsAdminSettings
     end
 
     def text_kind?
-      (RailsAdminSettings.kinds - ['phone', 'phones', 'integer', 'yaml']).include? kind
+      (RailsAdminSettings.kinds - ['phone', 'phones', 'integer', 'yaml', 'boolean']).include? kind
     end
 
     def upload_kind?
@@ -18,7 +18,7 @@ module RailsAdminSettings
     end
 
     def html_kind?
-      ['html', 'sanitized'].include? kind
+      ['html', 'code', 'sanitized'].include? kind
     end
     alias_method :text_type?, :text_kind?
     alias_method :upload_type?, :upload_kind?
@@ -72,6 +72,9 @@ module RailsAdminSettings
       elsif integer_kind?
         0
       elsif yaml_kind?
+      elsif boolean_kind?
+        false
+      elsif yaml_type?
         nil
       elsif phone_kind?
         require_russian_phone do
@@ -87,6 +90,8 @@ module RailsAdminSettings
     def default_serializable_value
       if phones_kind?
         ''
+      elsif boolean_type?
+        'false'
       else
         default_value
       end
@@ -131,6 +136,8 @@ module RailsAdminSettings
         raw.to_i
       elsif yaml_kind?
         load_yaml
+      elsif boolean_kind?
+        raw == 'true'
       elsif phone_kind?
         load_phone
       elsif phones_kind?

data/lib/rails_admin_settings/rails_admin_config.rb

@@ -25,6 +25,8 @@ module RailsAdminSettings
                 end
               end
             end
+            nss = ::RailsAdminSettings::Setting.pluck(:ns).uniq.map { |c| "ns_#{c.gsub('-', '_')}".to_sym }
+            scopes([nil] + nss)
           end
 
           edit do

data/lib/rails_admin_settings/uploads.rb

@@ -25,7 +25,7 @@ module RailsAdminSettings
 
         Settings.file_uploads_supported = true
         Settings.file_uploads_engine = :paperclip
-      elsif RailsAdminSettings.active_record? && defined?('Paperclip')
+      elsif RailsAdminSettings.active_record? && defined?(Paperclip)
         if defined?(Rails)
           base.has_attached_file(:file)
         else

data/lib/rails_admin_settings/version.rb

@@ -1,4 +1,3 @@
 module RailsAdminSettings
-  VERSION = "1.1.0.pre.1"
+  VERSION = "1.1.2"
 end
-

data/spec/defaults_spec.rb

@@ -46,11 +46,19 @@ describe 'Settings loading defaults' do
   it 'works with custom default namespace' do
     Settings.ns_default = 'other'
     Settings.ns_fallback = 'other'
+
     expect(Settings.ns(:main).phone).to eq '906 1111111'
     expect(Settings.ns(:other).footer).to eq 'zzz'
     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(:etc, fallback: :main).phone).to eq '906 1111111'
     expect(Settings.ns(:etc, fallback: :main).footer).to eq 'test <b></b>'
     expect(Settings.ns(:other, fallback: :main).footer).to eq 'zzz'

data/spec/support/defaults.yml

@@ -6,10 +6,18 @@ main:
   phone:
     kind: 'phone'
     value: '906 1111111'
-  
+
+  true_setting:
+    kind: 'boolean'
+    value: true
+
+  false_setting:
+    kind: 'boolean'
+    value: false
+
   disabled:
     enabled: false
-  
+
 other:
   footer:
     value: 'zzz'

data/spec/types_spec.rb

@@ -3,6 +3,15 @@
 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
+    Settings.set(:testbool3, true, kind: 'boolean')
+    Settings.testbool3.should be true
+  end
+
   it 'html' do
     expect(Settings.get(:email, kind: 'html', default: 'test@example.com').to_s).to eq 'test@example.com'
   end
@@ -76,4 +85,4 @@ describe 'Settings kind' do
       Settings.col = 'zzzzzz'
     }.to raise_error
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -347,12 +347,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: ''