rails-settings-cached 0.2.4 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c8b23098050aa4759654409c3c89868a28f75053
+  data.tar.gz: 3aea3f6687a9248d88ff6512130a3646e53c7107
+SHA512:
+  metadata.gz: caf5df986fc15f69e417409c6617a3c40026e6d9383d82007970699860a3fcff6390cf6393fe200200256be373c79979c26560d7db1c8e6ba71cdae1be288d5b
+  data.tar.gz: a74798f521363fdf8a44a6bbae620b9fca61b56ce29553805416c23bdb5702d6bc15502f2bf5a1339e68fe9a1331e135721de46394c6d700f2782f003f1bbaa2

data/README.md

@@ -25,6 +25,14 @@ Generate your settings:
 $ rails g settings <settings_name>
 ```
 
+Note: If you migrating from gem `rails-settings` then make sure you have it in your model
+
+```ruby
+class Settings < RailsSettings::CachedSettings
+  ...
+end
+```
+
 Now just put that migration in the database with:
     
 ```bash
@@ -101,7 +109,7 @@ Setting.some_setting
 Init defualt value in database, this has indifferent with `Setting.defaults[:some_setting]`, this will **save the value into database**:
 
 ```ruby
-Setting.save_default(:some_key) = "123"
+Setting.save_default(:some_key, "123")
 Setting.where(:var => "some_key").count
 => 1
 Setting.some_key 

data/lib/generators/settings/templates/model.rb

@@ -1,3 +1,2 @@
 class <%= class_name %> < RailsSettings::CachedSettings
-	attr_accessible :var
 end

data/lib/rails-settings/cached_settings.rb

@@ -1,18 +1,17 @@
 module RailsSettings
-	class CachedSettings < Settings
+  class CachedSettings < Settings
     after_update :rewrite_cache    
     after_create :rewrite_cache
-		def rewrite_cache
-			Rails.cache.write("settings:#{self.var}", self.value)
-		end
+    def rewrite_cache
+      Rails.cache.write("settings:#{self.var}", self.value)
+    end
     
-   after_destroy { |record| Rails.cache.delete("settings:#{record.var}") }
+    after_destroy { |record| Rails.cache.delete("settings:#{record.var}") }
     
-
-		def self.[](var_name)
-			obj = Rails.cache.fetch("settings:#{var_name}") {
-				super(var_name)
-			}
+    def self.[](var_name)
+      obj = Rails.cache.fetch("settings:#{var_name}") {
+        super(var_name)
+      }
       obj || @@defaults[var_name.to_s]
     end    
     
@@ -21,5 +20,5 @@ module RailsSettings
         self.send("#{key}=",value)
       end
     end
-	end
-end
+  end
+end

data/lib/rails-settings/extend.rb

@@ -3,21 +3,29 @@ module RailsSettings
     extend ActiveSupport::Concern
     
     included do 
-      scope :with_settings, :joins => "JOIN settings ON (settings.thing_id = #{self.table_name}.#{self.primary_key} AND
-                                       settings.thing_type = '#{self.base_class.name}')",
-                            :select => "DISTINCT #{self.table_name}.*" 
+      scope :with_settings, -> {
+        joins("JOIN settings ON (settings.thing_id = #{self.table_name}.#{self.primary_key} AND
+                                               settings.thing_type = '#{self.base_class.name}')")
+        .select("DISTINCT #{self.table_name}.*")
+      } 
+                             
 
-      scope :with_settings_for, lambda { |var| { :joins => "JOIN settings ON (settings.thing_id = #{self.table_name}.#{self.primary_key} AND
-                                                             settings.thing_type = '#{self.base_class.name}') AND settings.var = '#{var}'" } }
+      scope :with_settings_for, -> (var) { 
+        joins("JOIN settings ON (settings.thing_id = #{self.table_name}.#{self.primary_key} AND
+              settings.thing_type = '#{self.base_class.name}') AND settings.var = '#{var}'") 
+      }
                                                                
-      scope :without_settings, :joins => "LEFT JOIN settings ON (settings.thing_id = #{self.table_name}.#{self.primary_key} AND
-                                                                 settings.thing_type = '#{self.base_class.name}')",
-                               :conditions => 'settings.id IS NULL'
+      scope :without_settings, -> {
+        joins("LEFT JOIN settings ON (settings.thing_id = #{self.table_name}.#{self.primary_key} AND settings.thing_type = '#{self.base_class.name}')")
+        .where("settings.id IS NULL")    
+      } 
                                      
-      scope :without_settings_for, lambda { |var| { :joins => "LEFT JOIN settings ON (settings.thing_id = #{self.table_name}.#{self.primary_key} AND
-                                                                                      settings.thing_type = '#{self.base_class.name}') AND
-                                                                                      settings.var = '#{var}'",
-                                                    :conditions => 'settings.id IS NULL' } }
+      scope :without_settings_for, -> (var) { 
+        where('settings.id IS NULL')
+        .joins("LEFT JOIN settings ON (settings.thing_id = #{self.table_name}.#{self.primary_key} AND
+               settings.thing_type = '#{self.base_class.name}') AND settings.var = '#{var}'")
+      }
+                                                                                    
     end
     
     def settings

data/lib/rails-settings/scoped_settings.rb

@@ -6,7 +6,7 @@ module RailsSettings
     end
     
     def self.thing_scoped
-      Settings.scoped_by_thing_type_and_thing_id(@object.class.base_class.to_s, @object.id)
+      unscoped.where(:thing_type => @object.class.base_class.to_s, :thing_id => @object.id)
     end
  
   end

data/lib/rails-settings/settings.rb

@@ -2,7 +2,7 @@ module RailsSettings
   class Settings < ActiveRecord::Base
 
     self.table_name = 'settings'
-    attr_accessible :var
+    # attr_accessible :var
 
     class SettingNotFound < RuntimeError; end
 
@@ -18,18 +18,15 @@ module RailsSettings
     def self.method_missing(method, *args)
       method_name = method.to_s
       super(method, *args)
-
     rescue NoMethodError
       #set a value for a variable
       if method_name =~ /=$/
         var_name = method_name.gsub('=', '')
         value = args.first
         self[var_name] = value
-
       #retrieve a value
       else
         self[method_name]
-
       end
     end
 
@@ -45,9 +42,11 @@ module RailsSettings
     end
 
     #retrieve all settings as a hash (optionally starting with a given namespace)
-    def self.all(starting_with=nil)
-      options = starting_with ? { :conditions => "var LIKE '#{starting_with}%'"} : {}
-      vars = thing_scoped.find(:all, {:select => 'var, value'}.merge(options))
+    def self.all(starting_with = nil)
+      vars = thing_scoped.select("var,value")
+      if starting_with
+        vars = vars.where("var LIKE '#{starting_with}%'")
+      end
 
       result = {}
       vars.each do |record|
@@ -55,7 +54,14 @@ module RailsSettings
       end
       result.with_indifferent_access
     end
-
+    
+    def self.where(sql = nil)
+      if sql
+        vars = thing_scoped.where(sql)
+      end
+      vars
+    end
+    
     #get a setting value by [] notation
     def self.[](var_name)
       if var = object(var_name)
@@ -105,9 +111,8 @@ module RailsSettings
     end
 
     def self.thing_scoped
-      self.scoped_by_thing_type_and_thing_id(nil, nil)
+      unscoped.where("thing_type is NULL and thing_id is NULL")
     end
 
-
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-settings-cached
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Squeegy
@@ -12,19 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70117799454600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0.beta1
   type: :runtime
   prerelease: false
-  version_requirements: *70117799454600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta1
 description: 
 email: huacnlee@gmail.com
 executables: []
@@ -42,27 +44,26 @@ files:
 - README.md
 homepage: https://github.com/huacnlee/rails-settings-cached
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This is imporved from rails-settings, added caching. Settings is a plugin
   that makes managing a table of global key, value pairs easy. Think of it like a
   global Hash stored in you database, that uses simple ActiveRecord like methods for