fullstack-cms 0.3.39 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.3.39
+0.4.1

data/app/helpers/settings_helper.rb

@@ -1,19 +1,13 @@
 module SettingsHelper
-
-  # eg.
-  # setting("blog/per_page", 20, :kind => :integer) 
-  def setting(namespaced_key, *args)
-    namespace_separator = "/"
-    
-    opts = args.extract_options!
-    value = args.first
-    namespaced_key = namespaced_key.to_s
-    group, key =  namespaced_key.include?(namespace_separator) ? namespaced_key.split(namespace_separator) : [nil, namespaced_key]
-    
-    s = Setting.global("#{key}", :autocreate => false, :default => value, :group => group, :options => opts[:options], :locale => ((Fullstack::Cms.localized == false || opts[:locale] == false) ? nil : I18n.locale.to_s))
-   
+  
+  #
+  # setting( 'footer/heading', Settings.app.title )
+  #
+  
+  def setting(*args)
+    Setting.get(*args)
   end
-    
+  
   alias :get_setting :setting
   
 end

data/app/models/setting.rb

@@ -47,34 +47,22 @@ class Setting < ActiveRecord::Base
     self.send("#{setting_kind}_value")
   end
 
-  # examples
-  #
-  # Setting.get("contacts/registrant", :default => "[ none ]")
-  # Setting.get( :registrant, :group => :contacts ) 
-  # Setting.get( "address", :of => @user )
-  
-  def self.get(key, opts = {})
-      key = key.to_s
-      gk  = key.split("/")
 
-      group = nil
-      if gk.size == 1
-        group = opts.delete(:group)
-        key = gk.first
-      else
-        group, key = gk
+  def self.get(*args)
+    cached_settings = Rails.cache.read('fullstack-settings-cache')
+    
+    unless cached_settings
+      cached_settings = {}
+      Setting.where("locale = ? OR locale IS NULL", I18n.locale.to_s).all.each do |setting|
+        g = setting.group == "global" ? nil : setting.group
+        k = [g, setting.key].compact.join('/')
+        cached_settings[k] = setting.value if setting.value
       end
-      
-      default = opts.delete(:default)
-      settable = opts.delete(:of)
-      settable_id = settable.try(:id)
-      
-      query = opts.dup
-      query.merge!({:key => key})
-      query.merge!({:group => group}) if group
-      query.merge!({:settable_id => settable_id})
-            
-      self.where(query).first.try(:value) || default
+
+      Rails.cache.write('fullstack-settings-cache', cached_settings)
+    end
+    
+    cached_settings.fetch(*(args[0..1]))
   end
   
   # using Setting.get is simpler, expecially if you don't want 'autocreate' feature
@@ -119,9 +107,9 @@ class Setting < ActiveRecord::Base
   field :options, :text
   serialize :options, Hash
   
-  # after_initialize do |record|
-  #   record.options ||= {}
-  # end
-    
+  after_save do
+    Rails.cache.delete('fullstack-settings-cache')
+  end
+  
 end
 

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.3.39"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2013-01-29"
+  s.date = "2013-02-18"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.39
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack-admin
@@ -294,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3795468678033357356
+      hash: 2565561884556814372
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: