rails_admin_settings 0.3.6 → 0.3.7

data/lib/rails_admin_settings/processing.rb

@@ -54,6 +54,16 @@ module RailsAdminSettings
       end
     end
 
+    def blank?
+      if file_type?
+        file.url.nil?
+      elsif raw.blank? || disabled?
+        true
+      else
+        false
+      end
+    end
+
     def to_s
       if yaml_type? || phone_type? || integer_type?
         raw

data/lib/rails_admin_settings/settings.rb

@@ -1,5 +1,5 @@
 class Settings
-  cattr_accessor :file_uploads_supported, :file_uploads_engine
+  cattr_accessor :file_uploads_supported, :file_uploads_engine, :settings
   @@file_uploads_supported = false
   @@file_uploads_engine = false
 
@@ -32,6 +32,8 @@ class Settings
 
     # returns processed setting value
     def method_missing(key, *args)
+      key = key.to_s
+
       if key[-1] == '='
         key = key[0..-2]
         options = args[1] || {}
@@ -96,16 +98,22 @@ class Settings
 
     def save_default(key, value, options = {})
       load!
+      key = key.to_s
       options.merge!(default: value)
       if @@settings[key].nil?
-        create_setting(key, options)
+        create_setting(key, options).val
       else
-        @@settings[key]
+        if @@settings[key].blank?
+          set(key, value).val
+        else
+          @@settings[key].val
+        end
       end
     end
 
     def create_setting(key, options = {})
       load!
+      key = key.to_s
       options.symbolize_keys!
       options[:raw] = options.delete(:default)
       if @@settings[key].nil?
@@ -120,19 +128,45 @@ class Settings
       ['Settings']
     end
 
+    def destroy(key)
+      raise 'please call destroy! to delete setting'
+    end
+
+    def destroy_all
+      raise 'please call destroy_all! to delete all settings'
+    end
+
+    def destroy!(key)
+      load!
+      key = key.to_s
+      unless @@settings[key].nil?
+        @@settings[key].destroy
+        @@settings.delete(key)
+      end
+    end
+
+    def destroy_all!
+      RailsAdminSettings::Setting.destroy_all
+      unload!
+    end
+
+
     def write_to_database(key, options)
-      begin
-        @@settings[key] = RailsAdminSettings::Setting.create!(options)
-      rescue Mongoid::Errors::Validations => e
+      key = key.to_s
+      @@settings[key] = RailsAdminSettings::Setting.create(options)
+      unless @@settings[key].persisted?
         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)
+          if options[:raw].blank? && !@@settings[key].blank?
+            # do not update setting if it's not blank in DB and we want to make it blank
+          else
+            unless @@settings[key].update_attributes(options)
+              raise RailsAdminSettings::PersistenceException
+            end
+          end
         end
       end
+      @@settings[key]
     end
   end
 end

data/lib/rails_admin_settings/validation.rb

@@ -46,7 +46,7 @@ module RailsAdminSettings
       end
 
       if Object.const_defined?('Geocoder')
-        base.field(:coordinates, type: Array, default: [])
+        base.field(:coordinates, type: Array)
         base.send(:include, Geocoder::Model::Mongoid)
         base.geocoded_by(:raw)
         base.after_validation(:geocode, if: :address_type?)

data/lib/rails_admin_settings/version.rb

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

data/lib/rails_admin_settings.rb

@@ -1,6 +1,9 @@
 require "rails_admin_settings/version"
 
 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"

data/spec/advanced_usage_spec.rb

@@ -10,7 +10,7 @@ describe 'Settings advanced usage' do
   end
 
   it 'support html mode' do
-    Settings.get(:email, type: 'html').to_s.should eq 'test@example.com'
+    Settings.get(:email, type: 'html', default: 'test@example.com').to_s.should eq 'test@example.com'
   end
 
   it 'support integer mode' do

data/spec/database_trickery_spec.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+# this tests check how well rails_admin_settings handles settings disappearing from DB during execution
+# real usage: app specs with database_cleaner enabled
+describe Settings do
+
+  it "should handle settings disappearing from DB" do
+    email = "my@mail.ru"
+    email2 = "my2@mail.ru"
+    Settings.email = email
+    Settings.email.should == email
+    RailsAdminSettings::Setting.destroy_all
+    # settings are still cached
+    Settings.email.should == email
+
+    Settings.email = email2
+    Settings.email.should == email2
+  end
+
+  it "should handle settings appearing from DB" do
+    Settings.tst2.should == ''
+    RailsAdminSettings::Setting.create(key: 'tst', raw: 'tst')
+    # settings are still cached, but when we try to create a setting it sees updated value in DB
+    Settings.tst.should == 'tst'
+  end
+
+  it "should handle settings appearing in DB" do
+    RailsAdminSettings::Setting.create(key: 'tst', raw: 'tst')
+
+    Settings.tst = 'str'
+    Settings.tst.should == 'str'
+  end
+
+  it "#destroy_all!" do
+    Settings.tst = 'str'
+    expect { Settings.destroy_all }.to raise_exception
+    Settings.destroy_all!
+    Settings.tst.should == ''
+  end
+  it "#destroy!" do
+    Settings.tst = 'str'
+    Settings.tst2 = 'str2'
+    expect { Settings.destroy(:tst) }.to raise_exception
+    Settings.destroy!(:tst)
+    Settings.tst.should == ''
+    Settings.tst2.should == 'str2'
+  end
+end

data/spec/settings_spec.rb

@@ -5,12 +5,16 @@ require 'spec_helper'
 describe Settings do
 
   it "should works as RailsSettings" do
+    Settings.destroy_all!
+
     email = "my@mail.ru"
     Settings.email = email
     Settings.email.should == email
   end
 
   it "should save default" do
+    Settings.destroy_all!
+
     email = "my@mail.ru"
     email2 = "my2@mail.ru"
     Settings.save_default(:email, email)

data/spec/support/database_cleaner.rb

@@ -4,6 +4,7 @@ RSpec.configure do |config|
   end
   config.after :each do
     DatabaseCleaner.clean
+    Settings.destroy_all!
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -267,6 +267,7 @@ files:
 - lib/rails_admin_settings/version.rb
 - rails_admin_settings.gemspec
 - spec/advanced_usage_spec.rb
+- spec/database_trickery_spec.rb
 - spec/factories/setting.rb
 - spec/model_spec.rb
 - spec/settings_spec.rb
@@ -289,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 759672937259672322
+      hash: -2837920607569123901
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -298,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 759672937259672322
+      hash: -2837920607569123901
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -307,6 +308,7 @@ specification_version: 3
 summary: Setting for Rails app with mongoid and RailsAdmin
 test_files:
 - spec/advanced_usage_spec.rb
+- spec/database_trickery_spec.rb
 - spec/factories/setting.rb
 - spec/model_spec.rb
 - spec/settings_spec.rb