rails_admin_settings 0.8.0 → 0.9.0.pre

data/lib/rails_admin_settings/require_helpers.rb

@@ -37,7 +37,7 @@ module RailsAdminSettings
         require 'validates_email_format_of'
         yield
       rescue LoadError => e
-        e.message << " [rails_admin_settings] Please add gem 'validates_email_format_of' to your Gemfile to use email type settings"
+        e.message << " [rails_admin_settings] Please add gem 'validates_email_format_of' to your Gemfile to use email kind settings"
         raise e
       end
     end
@@ -47,7 +47,7 @@ module RailsAdminSettings
         require 'geocoder'
         yield
       rescue LoadError => e
-        e.message << " [rails_admin_settings] Please add gem 'validates_email_format_of' to your Gemfile to use email type settings"
+        e.message << " [rails_admin_settings] Please add gem 'validates_email_format_of' to your Gemfile to use email kind settings"
         raise e
       end
     end
@@ -57,7 +57,7 @@ module RailsAdminSettings
         require 'addressable/uri'
         yield
       rescue LoadError => e
-        e.message << " [rails_admin_settings] Please add gem 'addressable' to your Gemfile to use url/domain type settings"
+        e.message << " [rails_admin_settings] Please add gem 'addressable' to your Gemfile to use url/domain kind settings"
         raise e
       end
     end

data/lib/rails_admin_settings/settings.rb

@@ -23,6 +23,9 @@ class Settings < BasicObject
       else
         name = name.to_s
       end
+      if options.key?(:type)
+        options[:kind] = options.delete(:type)
+      end
       @@mutex.synchronize do
         @@namespaces[name] ||= ::RailsAdminSettings::Namespaced.new(name.to_s)
       end
@@ -33,6 +36,10 @@ class Settings < BasicObject
       ns(nil, fallback: @@ns_fallback)
     end
 
+    def table_exists?
+      RailsAdminSettings::Setting.table_exists?
+    end
+
     def unload!
       @@mutex.synchronize do
         @@namespaces.values.map(&:unload!)

data/lib/rails_admin_settings/uploads.rb

@@ -1,7 +1,6 @@
 module RailsAdminSettings
   module Uploads
     autoload :CarrierWave, "rails_admin_settings/storage/carrierwave"
-
     def self.included(base)
       # carrierwave
       if base.respond_to?(:mount_uploader)
@@ -10,8 +9,8 @@ module RailsAdminSettings
         base.mount_uploader(:file, RailsAdminSettings::Uploads::CarrierWave)
         Settings.file_uploads_supported = true
         Settings.file_uploads_engine = :carrierwave
-      # paperclip
-      elsif Mongoid.const_defined?('Paperclip')
+      # mongoid-paperclip
+      elsif RailsAdminSettings.mongoid? && Mongoid.const_defined?('Paperclip')
         base.send(:include, Mongoid::Paperclip)
         # puts "[rails_admin_settings] PaperClip detected"
         base.field(:file, type: String)
@@ -24,6 +23,17 @@ module RailsAdminSettings
           base.do_not_validate_attachment_file_type :file
         end
 
+        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
+        if base.respond_to?(:do_not_validate_attachment_file_type)
+          base.do_not_validate_attachment_file_type :file
+        end
         Settings.file_uploads_supported = true
         Settings.file_uploads_engine = :paperclip
       else

data/lib/rails_admin_settings/validation.rb

@@ -4,18 +4,18 @@ module RailsAdminSettings
       base.before_validation do
         self.raw = default_serializable_value if raw.blank?
       end
-      base.before_validation :sanitize_value, if: :sanitized_type?
+      base.before_validation :sanitize_value, if: :sanitized_kind?
       base.validates_uniqueness_of :key, scope: :ns
-      base.validates_inclusion_of :type, in: RailsAdminSettings.types
-      base.validates_numericality_of :raw, if: :integer_type?
+      base.validates_inclusion_of :kind, in: RailsAdminSettings.kinds
+      base.validates_numericality_of :raw, if: :integer_kind?
 
-      base.validate if: :phone_type? do
+      base.validate if: :phone_kind? do
         require_russian_phone do
           errors.add(:raw, I18n.t('admin.settings.phone_invalid')) unless raw.blank? || RussianPhone::Number.new(raw).valid?
         end
       end
 
-      base.validate if: :phones_type? do
+      base.validate if: :phones_kind? do
         require_russian_phone do
           unless raw.blank?
             invalid_phones = raw.gsub("\r", '').split("\n").inject([]) do |memo, value|
@@ -27,46 +27,48 @@ module RailsAdminSettings
         end
       end
 
-      base.validate if: :email_type? do
+      base.validate if: :email_kind? 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?
         end
       end
 
-      base.validate if: :address_type? do
+      base.validate if: :address_kind? do
         require_geocoder do
-          # just raise error if we are trying to use address type without geocoder
+          # just raise error if we are trying to use address kind without geocoder
         end
       end
 
-      base.validate if: :file_type? do
+      base.validate if: :file_kind? do
         unless Settings.file_uploads_supported
-          raise '[rails_admin_settings] File type 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. Check that rails_admin_settings is below them in Gemfile'
         end
       end
 
-      base.before_validation if: :url_type? do
+      base.before_validation if: :url_kind? do
         require_addressable do
           self.raw = Addressable::URI.heuristic_parse(self.raw) unless self.raw.blank?
         end
       end
 
-      base.before_validation if: :domain_type? do
+      base.before_validation if: :domain_kind? do
         require_addressable do
           self.raw = Addressable::URI.heuristic_parse(self.raw).host unless self.raw.blank?
         end
       end
 
       if Object.const_defined?('Geocoder')
-        base.field(:coordinates, type: Array)
-        base.send(:include, Geocoder::Model::Mongoid)
+        if RailsAdminSettings.mongoid?
+          base.field(:coordinates, type: Array)
+          base.send(:include, Geocoder::Model::Mongoid)
+        end
         base.geocoded_by(:raw)
-        base.after_validation(:geocode, if: :address_type?)
+        base.after_validation(:geocode, if: :address_kind?)
       end
 
-      base.validates_with(RailsAdminSettings::HexColorValidator, attributes: :raw, if: :color_type?)
+      base.validates_with(RailsAdminSettings::HexColorValidator, attributes: :raw, if: :color_kind?)
 
-      base.validate if: :yaml_type? do
+      base.validate if: :yaml_kind? do
         require_safe_yaml do
           unless raw.blank?
             begin

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,4 @@
 module RailsAdminSettings
-  VERSION = "0.8.0"
+  VERSION = "0.9.0.pre"
 end
+

data/lib/rails_admin_settings.rb

@@ -1,9 +1,28 @@
 require "rails_admin_settings/version"
 
 module RailsAdminSettings
+  class << self
+    def orm
+      if defined?(::Mongoid)
+        :mongoid
+      else
+        :active_record
+      end
+    end
+
+    def mongoid?
+      orm == :mongoid
+    end
+
+    def active_record?
+      orm == :active_record
+    end
+  end
+
   class PersistenceException < Exception
   end
 
+  autoload :Mongoid,           "rails_admin_settings/mongoid"
   autoload :Fallback,          "rails_admin_settings/fallback"
   autoload :Namespaced,        "rails_admin_settings/namespaced"
   autoload :Processing,        "rails_admin_settings/processing"
@@ -14,17 +33,48 @@ module RailsAdminSettings
   autoload :HexColorValidator, "rails_admin_settings/hex_color_validator"
   autoload :Dumper,            "rails_admin_settings/dumper"
 
+  def self.migrate!
+    if RailsAdminSettings.mongoid?
+      RailsAdminSettings::Setting.where(:ns.exists => false).update_all(ns: 'main')
+      RailsAdminSettings::Setting.all.each do |s|
+        s.kind = s.read_attribute(:type) if !s.read_attribute(:type).blank? && s.kind != s.read_attribute(:type)
+        s.save! if s.changed?
+        s.unset(:type)
+      end
+    else
+      if Settings.table_exists?
+        RailsAdminSettings::Setting.where("ns IS NULL").update_all(ns: 'main')
+      end
+    end
+  end
+
   def self.track_history!
-    RailsAdminSettings::Setting.send(:include, ::Mongoid::History::Trackable)
-    RailsAdminSettings::Setting.send(:track_history, {track_create: true, track_destroy: true})
+    return false unless Settings.table_exists?
+
+    if mongoid?
+      if Mongoid.const_defined?('History')
+        RailsAdminSettings::Setting.send(:include, ::Mongoid::History::Trackable)
+        RailsAdminSettings::Setting.send(:track_history, {track_create: true, track_destroy: true})
+      else
+        puts "[rails_admin_settings] WARN unable to track_history: Mongoid::History not loaded!"
+      end
+      if Mongoid.const_defined?('Userstamp')
+        RailsAdminSettings::Setting.send(:include, ::Mongoid::Userstamp)
+      else
+        puts "[rails_admin_settings] WARN unable to track_history: Mongoid::Userstamp not loaded!"
+      end
+    elsif active_record?
+      if defined?(PaperTrail) && PaperTrail::Version.table_exists?
+        RailsAdminSettings::Setting.send(:has_paper_trail)
+      end
+    end
   end
 end
 
-require "rails_admin_settings/types"
+require "rails_admin_settings/kinds"
 require "rails_admin_settings/settings"
 
 if Object.const_defined?('Rails')
-  require "rails_admin_settings/railtie"
   require "rails_admin_settings/engine"
 else
   require File.dirname(__FILE__) + '/../app/models/rails_admin_settings/setting.rb'

data/rails_admin_settings.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = RailsAdminSettings::VERSION
   spec.authors       = ["Gleb Tv"]
   spec.email         = ["glebtv@gmail.com"]
-  spec.description   = %q{Mongoid / RailsAdmin App Settings management}
-  spec.summary       = %q{Setting for Rails app with mongoid and RailsAdmin}
+  spec.description   = %q{Mongoid / ActiveRecord + RailsAdmin App Settings management}
+  spec.summary       = %q{}
   spec.homepage      = "https://github.com/rs-pro/rails_admin_settings"
   spec.license       = "MIT"
 
@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "mongoid", [">= 3.0", "< 4.1"]
 
+  spec.add_development_dependency "mongoid", [">= 3.0", "< 4.1"]
+  spec.add_development_dependency "rails"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/carrierwave_spec.rb

@@ -10,8 +10,8 @@ describe "Uploads" do
         File.unlink(f)
       end
     end
-    it 'supports file type' do
-      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'file')
+    it 'supports file kind' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), kind: 'file')
 
       # because we're not inside Rails
       Settings.get(:file).file.root = '/'
@@ -21,8 +21,8 @@ describe "Uploads" do
       expect(File.exists?(Settings.root_file_path.join("uploads/1024x768.gif"))).to be_truthy
     end
 
-    it 'supports image type' do
-      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'image')
+    it 'supports image kind' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), kind: 'image')
 
       # because we're not inside Rails
       Settings.get(:file).file.root = '/'

data/spec/defaults_spec.rb

@@ -14,11 +14,11 @@ describe 'Settings loading defaults' do
 
   it 'sets value' do
     expect(Settings.footer).to eq 'test <b></b>'
-    expect(Settings.get(:footer).type).to eq 'html'
+    expect(Settings.get(:footer).kind).to eq 'html'
   end
 
-  it 'sets type' do
-    expect(Settings.get(:phone).phone_type?).to be_truthy
+  it 'sets kind' do
+    expect(Settings.get(:phone).phone_kind?).to be_truthy
     expect(Settings.get(:phone).val.city).to eq '906'
     expect(Settings.get(:phone).val.formatted_subscriber).to eq '111-11-11'
   end

data/spec/migration_spec.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe 'Migrating from old versions' do
+  it 'sets ns' do
+    RailsAdminSettings::Setting.collection.insert({enabled: true, key: 'test', raw: '9060000000', type: 'phone'})
+    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'
+  end
+end
+

data/spec/model_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe RailsAdminSettings::Setting do
-  it { is_expected.to have_fields(:enabled, :key, :type, :raw) }
+  it { is_expected.to have_fields(:enabled, :key, :kind, :raw) }
 
   it "correctly return content when enabled" do
     setting = FactoryGirl.create(:setting)
@@ -32,13 +32,13 @@ describe RailsAdminSettings::Setting do
   end
 
   it 'return html_safe string when in html mode' do
-    setting = FactoryGirl.create(:setting, raw: '© {{year}} company', type: 'html')
+    setting = FactoryGirl.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>', type: 'sanitized')
+    setting = FactoryGirl.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

data/spec/namespaced_spec.rb

@@ -24,17 +24,17 @@ describe 'Namespaced settings' do
     expect(Settings.ns(:other).test).to eq ''
   end
 
-  it 'sets type' do
+  it 'sets kind' do
     expect {
-      Settings.ns(:other).set(:phone, 'test', type: 'phone')
+      Settings.ns(:other).set(:phone, 'test', kind: 'phone')
     }.to raise_error
-    Settings.ns(:other).set(:phone, '906 111 11 11', type: 'phone')
-    expect(Settings.get(:phone, ns: 'other').phone_type?).to be_truthy
+    Settings.ns(:other).set(:phone, '906 111 11 11', kind: 'phone')
+    expect(Settings.get(:phone, ns: 'other').phone_kind?).to be_truthy
     expect(Settings.get(:phone, ns: 'other').val.city).to eq '906'
     expect(Settings.get(:phone, ns: 'other').val.formatted_subscriber).to eq '111-11-11'
 
     ns = Settings.ns(:other)
-    expect(ns.get(:phone).phone_type?).to be_truthy
+    expect(ns.get(:phone).phone_kind?).to be_truthy
     expect(ns.get(:phone).val.city).to eq '906'
     expect(ns.get(:phone).val.formatted_subscriber).to eq '111-11-11'
   end

data/spec/paperclip_spec.rb

@@ -12,8 +12,8 @@ describe "Uploads" do
         File.unlink(f)
       end
     end
-    it 'supports file type' do
-      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'file')
+    it 'supports file kind' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), kind: 'file')
       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?'
@@ -21,8 +21,8 @@ describe "Uploads" do
       expect(File.exists?("#{File.dirname(__FILE__)}/../uploads/1024x768.gif")).to be_truthy
     end
 
-    it 'supports image type' do
-      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), type: 'image')
+    it 'supports image kind' do
+      Settings.set('file', File.open("#{File.dirname(__FILE__)}/support/1024x768.gif"), kind: 'image')
       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?'

data/spec/settings_spec.rb

@@ -43,10 +43,10 @@ describe 'Settings' do
     expect(Settings.loaded).to eq false
   end
 
-  it 'should work with type and default' do
-    expect(Settings.phone(type: 'phone', default: '906 111 11 11')).to eq '+7 (906) 111-11-11'
+  it 'should work with kind and default' do
+    expect(Settings.phone(kind: 'phone', default: '906 111 11 11')).to eq '+7 (906) 111-11-11'
     Settings.phone = '906 222 22 22'
-    expect(Settings.phone(type: 'phone', default: '906 111 11 11')).to eq '+7 (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
@@ -60,16 +60,16 @@ describe 'Settings' do
     expect(Settings.loaded).to eq true
   end
 
-  it 'should support yaml type' do
-    Settings.tdata(type: 'yaml')
+  it 'should support yaml kind' do
+    Settings.tdata(kind: 'yaml')
     Settings.tdata = ['one', 'two', 'three']
     expect(YAML.safe_load(Settings.get(:tdata).raw)).to eq ['one', 'two', 'three']
     expect(Settings.tdata).to eq ['one', 'two', 'three']
   end
 
   it '#enabled? sets defaults' do
-    expect(Settings.enabled?(:phone, type: 'phone')).to eq true
-    expect(Settings.get(:phone).type).to eq 'phone'
+    expect(Settings.enabled?(:phone, kind: 'phone')).to eq true
+    expect(Settings.get(:phone).kind).to eq 'phone'
   end
 
 end

data/spec/spec_helper.rb

@@ -9,7 +9,11 @@ require 'pry'
 require 'bundler/setup'
 require 'active_support'
 require 'active_support/core_ext'
-require 'mongoid'
+
+unless ENV['ACTIVERECORD']
+  require 'mongoid'
+end
+
 require 'database_cleaner'
 require 'factory_girl'
 require 'mongoid-rspec'

data/spec/support/defaults.yml

@@ -1,10 +1,10 @@
 main:
   footer:
-    type: html
+    kind: html
     value: 'test <b></b>'
 
   phone:
-    type: 'phone'
+    kind: 'phone'
     value: '906 1111111'
   
   disabled:

data/spec/support/defaults_w_file.yml

@@ -1,10 +1,10 @@
 main:
   footer:
-    type: html
+    kind: html
     value: 'test <b></b>'
 
   phone:
-    type: 'phone'
+    kind: 'phone'
     value: '906 1111111'
   
   disabled:
@@ -15,5 +15,5 @@ other:
     value: 'zzz'
   
   img:
-    type: 'image'
+    kind: 'image'
     value: 'spec/support/1024x768.gif'

data/spec/types_spec.rb

@@ -2,73 +2,73 @@
 
 require 'spec_helper'
 
-describe 'Settings types' do
+describe 'Settings kind' do
   it 'html' do
-    expect(Settings.get(:email, type: 'html', default: 'test@example.com').to_s).to eq 'test@example.com'
+    expect(Settings.get(:email, kind: 'html', default: 'test@example.com').to_s).to eq 'test@example.com'
   end
 
   it 'integer' do
-    expect(Settings.get(:testint, type: 'integer').value).to eq 0
-    expect(Settings.get(:testint, default: 5, type: 'integer').value).to eq 0
-    expect(Settings.get(:testint2, default: 5, type: 'integer').value).to eq 5
+    expect(Settings.get(:testint, kind: 'integer').value).to eq 0
+    expect(Settings.get(:testint, default: 5, kind: 'integer').value).to eq 0
+    expect(Settings.get(:testint2, default: 5, kind: 'integer').value).to eq 5
     expect(Settings.testint2).to eq 5
   end
 
   it 'yaml' do
-    Settings.set(:data, '[one, two, three]', type: 'yaml')
+    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 'phone' do
-    Settings.set(:tphone, '906 111 11 11', type: 'phone')
+    Settings.set(:tphone, '906 111 11 11', kind: 'phone')
     expect(Settings.get(:tphone).val.class.name).to eq 'RussianPhone::Number'
     expect(Settings.tphone.class.name).to eq 'RussianPhone::Number'
     expect(Settings.tphone).to eq '906 111 11 11'
-    expect(Settings.get(:tphone).phone_type?).to be_truthy
+    expect(Settings.get(:tphone).phone_kind?).to be_truthy
     expect(Settings.get(:tphone).val.city).to eq '906'
     expect(Settings.get(:tphone).val.formatted_subscriber).to eq '111-11-11'
   end
 
-  it 'supports phones type' do
-    Settings.set(:tphone, ['906 111 11 11', '907 111 11 11'] * "\n", type: 'phones')
+  it 'supports phones kind' do
+    Settings.set(:tphone, ['906 111 11 11', '907 111 11 11'] * "\n", kind: 'phones')
     expect(Settings.get(:tphone).val.class.name).to eq 'Array'
     expect(Settings.tphone.class.name).to eq 'Array'
     expect(Settings.get(:tphone).val.first.class.name).to eq 'RussianPhone::Number'
     expect(Settings.tphone.first.class.name).to eq 'RussianPhone::Number'
     expect(Settings.tphone.first).to eq '906 111 11 11'
-    expect(Settings.get(:tphone).phones_type?).to be_truthy
+    expect(Settings.get(:tphone).phones_kind?).to be_truthy
     expect(Settings.get(:tphone).val.first.city).to eq '906'
     expect(Settings.get(:tphone).val.last.city).to eq '907'
     expect(Settings.get(:tphone).val.first.formatted_subscriber).to eq '111-11-11'
   end
 
   it 'defaults for phone' do
-    Settings.dphone(type: 'phone')
-    expect(Settings.get(:dphone).phone_type?).to be_truthy
+    Settings.dphone(kind: 'phone')
+    expect(Settings.get(:dphone).phone_kind?).to be_truthy
     expect(Settings.dphone.formatted_area).to eq ''
     expect(Settings.dphone.formatted_subscriber).to eq ''
   end
 
   it 'email validates' do
-    Settings.eml(type: 'email')
-    expect(Settings.get(:eml).email_type?).to be_truthy
+    Settings.eml(kind: 'email')
+    expect(Settings.get(:eml).email_kind?).to be_truthy
     expect { Settings.eml = '1' }.to raise_error
     Settings.eml = 'test@example.com'
     expect(Settings.eml).to eq 'test@example.com'
   end
 
   it 'url processing' do
-    Settings.url(type: 'url')
-    expect(Settings.get(:url).url_type?).to be_truthy
-    expect(Settings.get(:url).color_type?).to be_falsey
+    Settings.url(kind: 'url')
+    expect(Settings.get(:url).url_kind?).to be_truthy
+    expect(Settings.get(:url).color_kind?).to be_falsey
     Settings.url = 'test.ru'
     expect(Settings.url).to eq 'http://test.ru'
   end
 
   it 'color' do
-    Settings.col(type: 'color')
-    expect(Settings.get(:col).color_type?).to be_truthy
+    Settings.col(kind: 'color')
+    expect(Settings.get(:col).color_kind?).to be_truthy
     expect { Settings.col = 'test'}.to raise_error
     Settings.col = 'ffffff'
     expect(Settings.col).to eq 'ffffff'