settler 1.2.1 → 1.2.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Reinier de Lange
+Copyright (c) 2011 Reinier de Lange
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -194,4 +194,4 @@ When you require this class in your application, you can easily use your typecas
 
 == Copyright
 
-Copyright (c) 2010 Reinier de Lange. See LICENSE for details.
+Copyright (c) 2011 Reinier de Lange. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/default_scope_patch.rb

@@ -1,3 +1,5 @@
+# Allows us to pass a lambda to default_scope. Without this, a query can be done on the database on load time, causing an
+# error when the database connection hasn't been established yet.
 module ActiveRecord
   class Base
     class << self

data/lib/setting.rb

@@ -7,7 +7,7 @@ class Setting < ActiveRecord::Base
   self.rails3 = defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 3  
 
   attr_readonly   :key
-  attr_protected  :editable, :deletable, :deleted  
+  attr_accessible :key, :alt, :value
   
   validates_presence_of :key  
   validate :setting_validations
@@ -70,6 +70,10 @@ class Setting < ActiveRecord::Base
     end
   end
   
+  # Overrides the delete methods to ensure the default scope is not passed in the query
+  def delete;           Setting.without_default_scope{ super } end  
+  def self.delete_all;  Setting.without_default_scope{ super } end    
+  
   # Resets this setting to the default stored in the settler configuration
   def reset!
     defaults = Settler.config[self.key]
@@ -77,6 +81,7 @@ class Setting < ActiveRecord::Base
     self.value = defaults['value']
     self.editable = defaults['editable']
     self.deletable = defaults['deletable']    
+    self.deleted = false    
     rails3 ? save(:validate => false) : save(false)
   end
   
@@ -95,9 +100,9 @@ private
   # Performs instance validations as defined in the settler configuration.
   def setting_validations
     if errors.empty?
-      errors.add(:value, I18n.t(:blank, :scope => 'activerecord.errors.messages')) if validators['presence'] && ['1','true',true].include?(validators['presence']) && self.value.nil?
-      errors.add(:value, I18n.t(:inclusion, :scope => 'activerecord.errors.messages')) if valid_values && !valid_values.include?(self.value)
-      errors.add(:value, I18n.t(:invalid, :scope => 'activerecord.errors.messages')) if validators['format'] && !(Regexp.new(validators['format']) =~ self.value)
+      errors.add(:value, :blank) if validators['presence'] && ['1','true',true].include?(validators['presence']) && self.value.nil?
+      errors.add(:value, :inclusion) if valid_values && !valid_values.include?(self.value)
+      errors.add(:value, :invalid) if validators['format'] && !(Regexp.new(validators['format']) =~ self.value)
     end
   end
   

data/lib/settler.rb

@@ -1,8 +1,8 @@
 require 'yaml'
 require 'erb'
 require 'hash_extension'
-require 'setting'
 require 'type_casters'
+require 'setting'
 
 # Settler loads and manages application wide settings and provides an interface for retrieving settings. The Settler
 # object cannot be instantiated; all functionality is available on class level.
@@ -20,10 +20,11 @@ class Settler
       self.config = config[namespace] if namespace
       self.config.each do  |key, attributes| 
         Setting.without_default_scope do 
-          Setting.find_or_create_by_key(attributes.only(:alt, :value).merge(:key => key)) do |s|
+          setting = Setting.find_or_create_by_key(attributes.only(:alt, :value).merge(:key => key)) do |s|
              s.editable = attributes['editable']
              s.deletable = attributes['deletable']
           end
+          p "[Settler] Validation failed for setting '#{setting.key}': #{setting.errors.full_messages.to_sentence}" if !setting.valid?
         end 
       end
       Setting.all.each{ |s| key = s.key; Settler.class.send(:define_method, key){ Setting.find_by_key(key) } }

data/settler.gemspec

@@ -1,63 +1,54 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{settler}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]
-  s.date = %q{2011-02-24}
+  s.date = %q{2011-07-27}
   s.description = %q{This gem is a combination of the Squeegy's rails-settings and Binarylogic's settingslogic gem, meaning it reads its configuration from a YAML file, but stores all settings in the database as well for on the fly changes.}
   s.email = %q{r.j.delange@nedforce.nl}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "generators/settler/settler_generator.rb",
-     "generators/settler/templates/migration.rb",
-     "generators/settler/templates/settler.yml",
-     "init.rb",
-     "lib/default_scope_patch.rb",
-     "lib/generators/settler/USAGE",
-     "lib/generators/settler/settler_generator.rb",
-     "lib/generators/settler/templates/migration.rb",
-     "lib/generators/settler/templates/settler.yml",
-     "lib/hash_extension.rb",
-     "lib/setting.rb",
-     "lib/settler.rb",
-     "lib/type_casters.rb",
-     "settler.gemspec",
-     "test/custom_typecaster.rb",
-     "test/database.yml",
-     "test/helper.rb",
-     "test/schema.rb",
-     "test/settler.yml",
-     "test/test_settler.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "generators/settler/settler_generator.rb",
+    "generators/settler/templates/migration.rb",
+    "generators/settler/templates/settler.yml",
+    "init.rb",
+    "lib/default_scope_patch.rb",
+    "lib/generators/settler/USAGE",
+    "lib/generators/settler/settler_generator.rb",
+    "lib/generators/settler/templates/migration.rb",
+    "lib/generators/settler/templates/settler.yml",
+    "lib/hash_extension.rb",
+    "lib/setting.rb",
+    "lib/settler.rb",
+    "lib/type_casters.rb",
+    "settler.gemspec",
+    "test/custom_typecaster.rb",
+    "test/database.yml",
+    "test/helper.rb",
+    "test/schema.rb",
+    "test/settler.yml",
+    "test/test_settler.rb"
   ]
   s.homepage = %q{http://github.com/moiristo/settler}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Settler manages global application settings in Rails}
-  s.test_files = [
-    "test/custom_typecaster.rb",
-     "test/helper.rb",
-     "test/schema.rb",
-     "test/test_settler.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/test_settler.rb

@@ -23,8 +23,12 @@ class TestSettler < Test::Unit::TestCase
   end
   
   def test_should_not_create_instance
-    assert_raise NoMethodError do 
-      Settler.new
+    if RUBY_VERSION.starts_with?("1.9")
+      assert_nil Settler.new
+    else      
+      assert_raise NoMethodError do
+        Settler.new
+      end
     end
   end
   
@@ -51,6 +55,24 @@ class TestSettler < Test::Unit::TestCase
     assert_nil Settler.search_algorithm
   end
   
+  def test_should_delete_destroyed_setting
+    deletable_setting = Settler.search_algorithm
+    assert deletable_setting.destroy
+    deletable_setting.delete
+    assert Setting.deleted.empty?
+    Settler.load!
+    assert Settler.search_algorithm.present?
+  end  
+
+  def test_should_delete_all_destroyed_setting
+    deletable_setting = Settler.search_algorithm
+    assert deletable_setting.destroy
+    Setting.delete_all
+    assert Setting.deleted.empty?
+    Settler.load!
+    assert Settler.search_algorithm.present?
+  end    
+  
   def test_should_not_update_uneditable_setting
     uneditable_setting = Settler.search_algorithm
     assert !uneditable_setting.update_attributes(:value => 'sphinx')
@@ -143,4 +165,12 @@ class TestSettler < Test::Unit::TestCase
     assert uneditable_setting.deletable?    
   end  
   
+  def test_should_undelete_when_resetting
+    deleted_setting = Settler.search_algorithm
+    assert deleted_setting.destroy
+    assert Setting.deleted.include?(deleted_setting)
+    deleted_setting.reset!
+    assert !Setting.deleted.include?(deleted_setting)    
+  end
+  
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: settler
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
+  prerelease: 
+  version: 1.2.2
 platform: ruby
 authors: 
 - Reinier de Lange
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +01:00
+date: 2011-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +25,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -60,8 +54,8 @@ homepage: http://github.com/moiristo/settler
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -69,28 +63,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Settler manages global application settings in Rails
-test_files: 
-- test/custom_typecaster.rb
-- test/helper.rb
-- test/schema.rb
-- test/test_settler.rb
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC