settings-goo 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/settings.rb

@@ -22,7 +22,8 @@ class Settings < ActiveRecord::Base
   end
     
   def self.[](key)
-    if setting = find_cached(key)
+    setting = find_cached(key)
+    if setting
       setting.value
     else
       nil
@@ -30,21 +31,19 @@ class Settings < ActiveRecord::Base
   end
   
   def self.[]=(key, val)
-    key = key.to_s
-    setting = Settings.find_by_key(key) || Settings.new(:key => key)
-    setting.value = val
-    setting.save
+    return nil if key.blank?
+    setting = Settings.find_key(key.to_s)
+    setting.update_attribute(:value, val) if setting
   end
   
   def self.keys
     Rails.cache.fetch("settings/settings.keys") {
-      self.find(:all, :select => 'key', :order => 'key ASC').map{|s| s.key.to_sym}
+      self.find(:all, :select => 'key', :order => 'key ASC').map{|setting| setting.key.to_sym}
     }
   end
   
   def self.remove(key)
-    key = key.to_s
-    setting = Settings.find_by_key(key)
+    setting = Settings.find_by_key(key.to_s)
     if setting
       setting.destroy
     else
@@ -52,9 +51,13 @@ class Settings < ActiveRecord::Base
     end
   end
 private
-  def self.find_cached(key)
+  def self.find_key(key)
     key = key.to_s
-    Rails.cache.fetch("settings/#{key}") { Settings.find_by_key(key) }
+    Settings.find_by_key(key) || Settings.new(:key => key)
+  end
+
+  def self.find_cached(key)
+    Rails.cache.fetch("settings/#{key}") { Settings.find_by_key(key.to_s) }
   end
   
   def clear_cache

data/settings-goo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{settings-goo}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Kilmer"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: settings-goo
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Chris Kilmer