rails_admin_settings 0.3.9 → 0.4.0

data/README.md

@@ -65,6 +65,7 @@ Supported types:
 
     string (input)
     text (textarea)
+    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!])
     integer (stored as string)

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

@@ -1,5 +1,7 @@
 - if ['string', 'integer', 'phone', 'email', 'address', 'url', 'domain'].include?(@object.type)
   = form.text_field :raw, :value => field.value
+- if @object.type == 'color'
+  = form.text_field :raw, :value => field.value, 'data-color' => true
 - elsif @object.type == 'text' || @object.type == 'yaml'
   = form.text_area :raw, :value => field.value, :rows => 10, :cols => 80
 - elsif @object.type == 'html'

data/config/locales/en.rails_admin_settings.yml

@@ -6,6 +6,7 @@ ru:
       phone_invalid: Incorrect phone
       email_invalid: Incorrect email
       yaml_invalid: Incorrect YAML
+      color_invalid: Incorrect color
   mongoid:
     models:
       rails_admin_settings/setting: Settings

data/config/locales/ru.rails_admin_settings.yml

@@ -6,6 +6,7 @@ ru:
       phone_invalid: Неверный телефонный номер
       email_invalid: Неверный email
       yaml_invalid: Неверный синтаксис YAML
+      color_invalid: Неверный цвет
   mongoid:
     models:
       rails_admin_settings/setting: Настройки

data/lib/rails_admin_settings/hex_color_validator.rb

@@ -0,0 +1,11 @@
+module RailsAdminSettings
+  class HexColorValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      record.errors[attribute] << (options[:message] || I18n.t('admin.settings.invalid_color')) unless value.blank? || self.class.matches?(value)
+    end
+    def self.matches?(value)
+      return false unless value
+      /^(?:[0-9a-f]{3})(?:[0-9a-f]{3})?$/i.match(value).nil? ? false : true
+    end
+  end
+end

data/lib/rails_admin_settings/processing.rb

@@ -1,49 +1,19 @@
 module RailsAdminSettings
   module Processing
+    RailsAdminSettings.types.each do |dtype|
+      define_method "#{dtype}_type?" do
+        dtype == type
+      end
+    end
+
     def text_type?
-      ['string', 'html', 'sanitized', 'email', 'address', 'url', 'domain'].include? type
+      (RailsAdminSettings.types - ['phone', 'integer', 'yaml']).include? type
     end
 
     def html_type?
       ['html', 'sanitized'].include? type
     end
 
-    def integer_type?
-      'integer' == type
-    end
-
-    def yaml_type?
-      'yaml' == type
-    end
-
-    def email_type?
-      'email' == type
-    end
-
-    def phone_type?
-      'phone' == type
-    end
-
-    def address_type?
-      'address' == type
-    end
-
-    def sanitized_type?
-      'sanitized' == type
-    end
-
-    def file_type?
-      'file' == type
-    end
-
-    def url_type?
-      'url' == type
-    end
-
-    def domain_type?
-      'domain' == type
-    end
-
     def value
       if file_type?
         file.url

data/lib/rails_admin_settings/types.rb

@@ -1,5 +1,5 @@
 module RailsAdminSettings
   def self.types
-    ['string', 'integer', 'html', 'sanitized', 'yaml', 'phone', 'email', 'address', 'file', 'url', 'domain']
+    ['string', 'integer', 'html', 'sanitized', 'yaml', 'phone', 'email', 'address', 'file', 'url', 'domain', 'color']
   end
 end

data/lib/rails_admin_settings/validation.rb

@@ -52,6 +52,10 @@ module RailsAdminSettings
         base.after_validation(:geocode, if: :address_type?)
       end
 
+      base.validate if: :color_type? do
+        base.validates_with(RailsAdminSettings::HexColorValidator, attributes: :raw)
+      end
+
       base.validate if: :yaml_type? do
         require_safe_yaml do
           unless raw.blank?

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/lib/rails_admin_settings.rb

@@ -4,11 +4,12 @@ module RailsAdminSettings
   class PersistenceException < Exception
   end
 
-  autoload :Processing,       "rails_admin_settings/processing"
-  autoload :Validation,       "rails_admin_settings/validation"
-  autoload :RequireHelpers,   "rails_admin_settings/require_helpers"
-  autoload :RailsAdminConfig, "rails_admin_settings/rails_admin_config"
-  autoload :Uploads,          "rails_admin_settings/uploads"
+  autoload :Processing,        "rails_admin_settings/processing"
+  autoload :Validation,        "rails_admin_settings/validation"
+  autoload :RequireHelpers,    "rails_admin_settings/require_helpers"
+  autoload :RailsAdminConfig,  "rails_admin_settings/rails_admin_config"
+  autoload :Uploads,           "rails_admin_settings/uploads"
+  autoload :HexColorValidator, "rails_admin_settings/hex_color_validator"
 end
 
 require "rails_admin_settings/types"

data/spec/advanced_usage_spec.rb

@@ -8,65 +8,4 @@ describe 'Settings advanced usage' do
     s.should eq 'test@example.com'
     Settings.get(:email).to_s.should eq 'test@example.com'
   end
-
-  it 'support html mode' do
-    Settings.get(:email, type: 'html', default: 'test@example.com').to_s.should eq 'test@example.com'
-  end
-
-  it 'support integer mode' do
-    Settings.get(:testint, type: 'integer').value.should eq 0
-    Settings.get(:testint, default: 5, type: 'integer').value.should eq 0
-    Settings.get(:testint2, default: 5, type: 'integer').value.should eq 5
-    Settings.testint2.should eq 5
-  end
-
-  it 'support yaml mode' do
-    Settings.get(:test_yml, type: 'yaml').value.should be_nil
-    Settings.get(:test_yml_2, default: '[t1, t2, t3]', type: 'yaml').value.should eq ['t1', 't2', 't3']
-    Settings.test_yml_2.should eq ['t1', 't2', 't3']
-  end
-
-  it 'should have sensible defaults' do
-    s = Settings.get(:test_sett)
-    s.should_not be_nil
-    s.type.should eq 'string'
-    s.raw.should eq ''
-    s.value.should eq ''
-  end
-
-  it 'should support yaml type' do
-    Settings.set(:data, '[one, two, three]', type: 'yaml')
-    Settings.get(:data).raw.should eq '[one, two, three]'
-    Settings.data.should eq ['one', 'two', 'three']
-  end
-
-  it 'should support phone type' do
-    Settings.set(:tphone, '906 111 11 11', type: 'phone')
-    Settings.get(:tphone).val.class.name.should eq 'RussianPhone::Number'
-    Settings.tphone.class.name.should eq 'RussianPhone::Number'
-    Settings.tphone.should eq '906 111 11 11'
-
-    Settings.get(:tphone).val.city.should eq '906'
-    Settings.get(:tphone).val.formatted_subscriber.should eq '111-11-11'
-  end
-
-  it 'should set defaults for phone type' do
-    Settings.dphone(type: 'phone')
-
-    Settings.dphone.formatted_area.should eq ''
-    Settings.dphone.formatted_subscriber.should eq ''
-  end
-
-  it 'should validate emails with email type' do
-    Settings.eml(type: 'email')
-    expect { Settings.eml = '1' }.to raise_error
-    Settings.eml = 'test@example.com'
-    Settings.eml.should eq 'test@example.com'
-  end
-
-  it 'should process urls with url type' do
-    Settings.url(type: 'url')
-    Settings.url = 'test.ru'
-    Settings.url.should eq 'http://test.ru'
-  end
 end

data/spec/types_spec.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe 'Settings advanced usage' do
+  it 'support html type' do
+    Settings.get(:email, type: 'html', default: 'test@example.com').to_s.should eq 'test@example.com'
+  end
+
+  it 'support integer type' do
+    Settings.get(:testint, type: 'integer').value.should eq 0
+    Settings.get(:testint, default: 5, type: 'integer').value.should eq 0
+    Settings.get(:testint2, default: 5, type: 'integer').value.should eq 5
+    Settings.testint2.should eq 5
+  end
+
+  it 'supports yaml type' do
+    Settings.set(:data, '[one, two, three]', type: 'yaml')
+    Settings.get(:data).raw.should eq '[one, two, three]'
+    Settings.data.should eq ['one', 'two', 'three']
+  end
+
+  it 'supports phone type' do
+    Settings.set(:tphone, '906 111 11 11', type: 'phone')
+    Settings.get(:tphone).val.class.name.should eq 'RussianPhone::Number'
+    Settings.tphone.class.name.should eq 'RussianPhone::Number'
+    Settings.tphone.should eq '906 111 11 11'
+    Settings.get(:tphone).phone_type?.should be_true
+    Settings.get(:tphone).val.city.should eq '906'
+    Settings.get(:tphone).val.formatted_subscriber.should eq '111-11-11'
+  end
+
+  it 'sets defaults for phone type' do
+    Settings.dphone(type: 'phone')
+    Settings.get(:dphone).phone_type?.should be_true
+    Settings.dphone.formatted_area.should eq ''
+    Settings.dphone.formatted_subscriber.should eq ''
+  end
+
+  it 'validates emails with email type' do
+    Settings.eml(type: 'email')
+    Settings.get(:eml).email_type?.should be_true
+    expect { Settings.eml = '1' }.to raise_error
+    Settings.eml = 'test@example.com'
+    Settings.eml.should eq 'test@example.com'
+  end
+
+  it 'processes urls with url type' do
+    Settings.url(type: 'url')
+    Settings.get(:url).url_type?.should be_true
+    Settings.get(:url).color_type?.should be_false
+    Settings.url = 'test.ru'
+    Settings.url.should eq 'http://test.ru'
+  end
+
+  it 'supports color type' do
+    Settings.col(type: 'color')
+    Settings.get(:col).color_type?.should be_true
+    expect { Settings.col = 'test'}.to raise_error
+    Settings.col = 'ffffff'
+    Settings.col.should eq 'ffffff'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -256,6 +256,7 @@ files:
 - config/locales/ru.rails_admin_settings.yml
 - lib/rails_admin_settings.rb
 - lib/rails_admin_settings/engine.rb
+- lib/rails_admin_settings/hex_color_validator.rb
 - lib/rails_admin_settings/processing.rb
 - lib/rails_admin_settings/rails_admin_config.rb
 - lib/rails_admin_settings/require_helpers.rb
@@ -275,6 +276,7 @@ files:
 - spec/support/database_cleaner.rb
 - spec/support/mongoid.rb
 - spec/support/mongoid.yml
+- spec/types_spec.rb
 homepage: https://github.com/rs-pro/rails_admin_settings
 licenses:
 - MIT
@@ -290,7 +292,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2779903626978757826
+      hash: -3328257958509862173
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -299,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2779903626978757826
+      hash: -3328257958509862173
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -316,3 +318,4 @@ test_files:
 - spec/support/database_cleaner.rb
 - spec/support/mongoid.rb
 - spec/support/mongoid.yml
+- spec/types_spec.rb