rails_admin_settings 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f4a6d638790edb61cd1358853722b1eb789075
-  data.tar.gz: 4b8a2fafd0001aa1650d717928881ea9a42925af
+  metadata.gz: 5ea98edd6e8bad6c86e500d5dffd7fb55588fcd4
+  data.tar.gz: a5b9d884b4d4b5f7deeac4f3e46dc135e521721e
 SHA512:
-  metadata.gz: 9588e91ced7869531182fe9d538e2503e72c8caa04cc9840a074bef36459d4e3affb2beca44b16329d4ebb534abb870ef15ea6264db3e0e14645658605f0fd0d
-  data.tar.gz: 155e36af8661493120d3ed439f4c35129733cf69faaf7017832395bb5d7f4b25605094d2323837753b96de06e06177514a89a77cfe8d97e59d352cc784da5a5f
+  metadata.gz: 6e4348c966b49d6252543f12d00090bafcf302a98b8a456aa4776c6dc401aed384dcc93b9f5be4a47c67a01d18b0eeb22597142b6b7d54731ab2dffa44c3548c
+  data.tar.gz: 378f2c80f910a6a73f25a4e70aebee49a4a812a5f315dfd20cb68003c8cd03ed1960c4aff8c82006b8b4bc22ae2849d1cad83ad2e8ae404b394468a5a8f1a148

data/.travis.yml

@@ -8,7 +8,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-19mode
   - jruby-20mode
   
 env:
@@ -16,6 +15,5 @@ env:
   - "UPLOADS=carrierwave"
 
 gemfile:
-  - Gemfile
   - gemfiles/mongoid-3.1.gemfile
   - gemfiles/mongoid-4.0.gemfile

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

@@ -2,7 +2,7 @@
   = form.text_field :raw, :value => field.value
 - if @object.type == 'color'
   = form.text_field :raw, :value => field.value, 'data-color' => true, style: "background-color: ##{field.value}"
-- elsif @object.type == 'text' || @object.type == 'yaml'
+- elsif %w(text yaml phones).include?( @object.type )
   = form.text_area :raw, :value => field.value, :rows => 10, :cols => 80
 - elsif @object.type == 'html'
   - if form.respond_to?(:cktext_area)

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
       label: 'Settings'
       no_ckeditor_detected: CKEditor not found — showing as text input
       phone_invalid: Incorrect phone
+      phones_invalid: "Incorrect phone: %{phones}"
       email_invalid: Incorrect email
       yaml_invalid: Incorrect YAML
       color_invalid: Incorrect color

data/config/locales/ru.yml

@@ -4,6 +4,7 @@ ru:
       label: 'Настройки'
       no_ckeditor_detected: CKEditor не обнаружен — отображаю настройку как текстовое поле
       phone_invalid: Неверный телефонный номер
+      phones_invalid: "Неверный телефонный номер: %{phones}"
       email_invalid: Неверный email
       yaml_invalid: Неверный синтаксис YAML
       color_invalid: Неверный цвет

data/lib/rails_admin_settings/processing.rb

@@ -7,7 +7,7 @@ module RailsAdminSettings
     end
 
     def text_type?
-      (RailsAdminSettings.types - ['phone', 'integer', 'yaml']).include? type
+      (RailsAdminSettings.types - ['phone', 'phones', 'integer', 'yaml']).include? type
     end
 
     def upload_type?
@@ -71,11 +71,21 @@ module RailsAdminSettings
         require_russian_phone do
           RussianPhone::Number.new('')
         end
+      elsif phones_type?
+        []
       else
         nil
       end
     end
 
+    def default_serializable_value
+      if phones_type?
+        ''
+      else
+        default_value
+      end
+    end
+
     def process_text
       text = raw.dup
       text.gsub!('{{year}}', Time.now.strftime('%Y'))
@@ -96,6 +106,12 @@ module RailsAdminSettings
       end
     end
 
+    def load_phones
+      require_russian_phone do
+        raw.gsub("\r", '').split("\n").map{|i| RussianPhone::Number.new(i)}
+      end
+    end
+
     def load_yaml
       require_safe_yaml do
         YAML.safe_load(raw)
@@ -111,6 +127,8 @@ module RailsAdminSettings
         load_yaml
       elsif phone_type?
         load_phone
+      elsif phones_type?
+        load_phones
       elsif file_type?
         file.url
       else

data/lib/rails_admin_settings/types.rb

@@ -7,6 +7,7 @@ module RailsAdminSettings
       'sanitized',
       'yaml',
       'phone',
+      'phones',
       'email',
       'address',
       'file',

data/lib/rails_admin_settings/validation.rb

@@ -2,7 +2,7 @@ module RailsAdminSettings
   module Validation
     def self.included(base)
       base.before_validation do
-        self.raw = default_value if raw.blank?
+        self.raw = default_serializable_value if raw.blank?
       end
       base.before_validation :sanitize_value, if: :sanitized_type?
       base.validates_uniqueness_of :key, scope: :ns
@@ -15,6 +15,18 @@ module RailsAdminSettings
         end
       end
 
+      base.validate if: :phones_type? do
+        require_russian_phone do
+          unless raw.blank?
+            invalid_phones = raw.gsub("\r", '').split("\n").inject([]) do |memo, value|
+              memo << value unless RussianPhone::Number.new(value).valid?
+              memo
+            end
+            errors.add(:raw, I18n.t('admin.settings.phones_invalid', phones: invalid_phones * ', ')) unless invalid_phones.empty?
+          end
+        end
+      end
+
       base.validate if: :email_type? do
         require_validates_email_format_of do
           errors.add(:raw, I18n.t('admin.settings.email_invalid')) unless raw.blank? || ValidatesEmailFormatOf.validate_email_format(raw).nil?

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/spec/types_spec.rb

@@ -30,6 +30,19 @@ describe 'Settings types' do
     Settings.get(:tphone).val.formatted_subscriber.should eq '111-11-11'
   end
 
+  it 'supports phones type' do
+    Settings.set(:tphone, ['906 111 11 11', '907 111 11 11'] * "\n", type: 'phones')
+    Settings.get(:tphone).val.class.name.should eq 'Array'
+    Settings.tphone.class.name.should eq 'Array'
+    Settings.get(:tphone).val.first.class.name.should eq 'RussianPhone::Number'
+    Settings.tphone.first.class.name.should eq 'RussianPhone::Number'
+    Settings.tphone.first.should eq '906 111 11 11'
+    Settings.get(:tphone).phones_type?.should be_true
+    Settings.get(:tphone).val.first.city.should eq '906'
+    Settings.get(:tphone).val.last.city.should eq '907'
+    Settings.get(:tphone).val.first.formatted_subscriber.should eq '111-11-11'
+  end
+
   it 'defaults for phone' do
     Settings.dphone(type: 'phone')
     Settings.get(:dphone).phone_type?.should be_true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -271,7 +271,6 @@ files:
 - config/locales/ru.yml
 - gemfiles/mongoid-3.1.gemfile
 - gemfiles/mongoid-4.0.gemfile
-- gemfiles/mongoid-4.0.gemfile.lock
 - lib/rails_admin_settings.rb
 - lib/rails_admin_settings/dumper.rb
 - lib/rails_admin_settings/engine.rb

data/gemfiles/mongoid-4.0.gemfile.lock

@@ -1,130 +0,0 @@
-GIT
-  remote: git://github.com/mongoid/mongoid.git
-  revision: 151e2a937f08a3f2a45082bf0d84e4ba2ddaf2be
-  branch: master
-  specs:
-    mongoid (4.0.0.alpha2)
-      activemodel (>= 4.0.0)
-      moped (~> 2.0.beta5)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-
-PATH
-  remote: /data/rails_admin_settings
-  specs:
-    rails_admin_settings (0.6.1)
-      mongoid (>= 3.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    atomic (1.1.14)
-    bson (2.1.0)
-    builder (3.1.4)
-    carrierwave (0.9.0)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
-    cocaine (0.5.3)
-      climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.0)
-    connection_pool (1.2.0)
-    database_cleaner (1.2.0)
-    diff-lcs (1.2.5)
-    docile (1.1.1)
-    factory_girl (4.3.0)
-      activesupport (>= 3.0.0)
-    geocoder (1.1.9)
-    glebtv-carrierwave-mongoid (0.6.5)
-      carrierwave (>= 0.8.0, < 0.10.0)
-      mongoid (>= 3.0, < 5.0)
-      mongoid (>= 3.0, < 5.0)
-    glebtv-mongoid-paperclip (0.1.0)
-      paperclip (>= 2.3.6)
-    i18n (0.6.9)
-    json (1.8.1)
-    method_source (0.8.2)
-    mime-types (2.0)
-    mini_portile (0.5.2)
-    minitest (4.7.5)
-    mongoid-rspec (1.10.0)
-      mongoid (>= 3.0.1)
-      rake
-      rspec (>= 2.14)
-    moped (2.0.0.beta5)
-      bson (~> 2.1)
-      connection_pool (~> 1.2)
-      optionable (~> 0.2.0)
-    multi_json (1.8.4)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    optionable (0.2.0)
-    origin (2.1.0)
-    paperclip (3.5.2)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.5.3)
-      mime-types
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.1.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    russian_phone (0.3.5)
-      mongoid (>= 3.0.0)
-    safe_yaml (1.0.1)
-    sanitize (2.0.6)
-      nokogiri (>= 1.4.4)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.4.7)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
-    validates_email_format_of (1.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  addressable (~> 2.3.3)
-  bundler
-  database_cleaner (~> 1.2.0)
-  factory_girl (~> 4.3.0)
-  geocoder (~> 1.1.6)
-  glebtv-carrierwave-mongoid
-  glebtv-mongoid-paperclip
-  mongoid!
-  mongoid-rspec (~> 1.10.0)
-  pry
-  rails_admin_settings!
-  rake (~> 10.1.1)
-  rspec (~> 2.14.1)
-  russian_phone (~> 0.3.2)
-  safe_yaml (~> 1.0.0)
-  sanitize (~> 2.0.3)
-  simplecov (~> 0.8.2)
-  validates_email_format_of (~> 1.5.3)