rails_admin_settings 0.3.4 → 0.3.6

data/README.md

@@ -31,6 +31,7 @@ Add this line to your application's Gemfile:
 - Put it after validates_email_format_of to get built-in support
 - Put it after geocoder to get built-in support
 - Put it after carrierwave / paperclip to get built-in support
+- Put it after addressable to get built-in support
 
 And then execute:
 
@@ -69,6 +70,9 @@ Supported types:
     email (requires validates_email_format_of)
     address (requires geocoder)
     file (requires paperclip or carrierwave)
+    url (requires addressable)
+    domain (requires addressable)
+
 
 Strings and html support following replacement patterns:
 

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

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

data/lib/rails_admin_settings/processing.rb

@@ -1,7 +1,7 @@
 module RailsAdminSettings
   module Processing
     def text_type?
-      ['string', 'html', 'sanitized', 'email', 'address'].include? type
+      ['string', 'html', 'sanitized', 'email', 'address', 'url', 'domain'].include? type
     end
 
     def html_type?
@@ -36,6 +36,14 @@ module RailsAdminSettings
       '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/require_helpers.rb

@@ -51,6 +51,16 @@ module RailsAdminSettings
         raise e
       end
     end
+
+    def require_addressable
+      begin
+        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"
+        raise e
+      end
+    end
   end
 end
 

data/lib/rails_admin_settings/settings.rb

@@ -53,7 +53,7 @@ class Settings
       end
 
       if @@settings[key].nil?
-        @@settings[key] = RailsAdminSettings::Setting.create(options.merge(key: key, raw: value))
+        write_to_database(key, options.merge(key: key, raw: value))
       else
         @@settings[key].update_attributes!(options.merge(raw: value))
         @@settings[key]
@@ -97,19 +97,42 @@ class Settings
     def save_default(key, value, options = {})
       load!
       options.merge!(default: value)
-      create_setting(key, options) if @@settings[key].nil?
+      if @@settings[key].nil?
+        create_setting(key, options)
+      else
+        @@settings[key]
+      end
     end
 
     def create_setting(key, options = {})
       load!
       options.symbolize_keys!
       options[:raw] = options.delete(:default)
-      @@settings[key] = RailsAdminSettings::Setting.create!(options.merge(key: key)) if @@settings[key].nil?
+      if @@settings[key].nil?
+        write_to_database(key, options.merge(key: key))
+      else
+        @@settings[key]
+      end
     end
 
     # to satisfy rspec
     def to_ary
       ['Settings']
     end
+
+    def write_to_database(key, options)
+      begin
+        @@settings[key] = RailsAdminSettings::Setting.create!(options)
+      rescue Mongoid::Errors::Validations => e
+        if @@settings[key].errors[:key].any?
+          @@settings[key] = RailsAdminSettings::Setting.where(key: key).first
+          @@settings[key].update_attributes!(options)
+        end
+
+        if @@settings[key].nil?
+          @@settings[key] = RailsAdminSettings::Setting.new(options)
+        end
+      end
+    end
   end
 end

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']
+    ['string', 'integer', 'html', 'sanitized', 'yaml', 'phone', 'email', 'address', 'file', 'url', 'domain']
   end
 end

data/lib/rails_admin_settings/validation.rb

@@ -33,6 +33,17 @@ module RailsAdminSettings
         end
       end
 
+      base.before_validation if: :url_type? 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
+        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, default: [])

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.3.4"
+  VERSION = "0.3.6"
 end

data/rails_admin_settings.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sanitize", "~> 2.0.3"
   spec.add_development_dependency "validates_email_format_of", "~> 1.5.3"
   spec.add_development_dependency "geocoder", "~> 1.1.6"
+  spec.add_development_dependency "addressable", "~> 2.3.3"
 end

data/spec/advanced_usage_spec.rb

@@ -63,4 +63,10 @@ describe 'Settings advanced usage' do
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -219,6 +219,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.6
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
 description: Mongoid / RailsAdmin App Settings management
 email:
 - glebtv@gmail.com
@@ -273,7 +289,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 126914792518638842
+      hash: 759672937259672322
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -282,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 126914792518638842
+      hash: 759672937259672322
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25