fullstack-cms 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/app/models/setting.rb

@@ -48,21 +48,33 @@ class Setting < ActiveRecord::Base
   end
 
 
-  def self.get(*args)
+  def self.get(key, default = nil)
     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
+      Setting.all.each do |setting|
+        l = setting.locale
+        g = setting.group
         k = [g, setting.key].compact.join('/')
-        cached_settings[k] = setting.value if setting.value
+        cached_settings[l] ||= {}
+        cached_settings[l][k] = setting.value if setting.value
       end
 
       Rails.cache.write('fullstack-settings-cache', cached_settings)
     end
     
-    cached_settings.fetch(*(args[0..1]))
+    localized_settings    = cached_settings[I18n.locale.to_s] || {}
+    unlocalized_settings  = cached_settings[nil] || {}
+
+    key_segments = key.to_s.split("/")
+    if key_segments.size == 1
+      key_segments.unshift("global")
+    end
+    
+    key = key_segments.join("/")
+    
+    localized_settings[key] || unlocalized_settings[key] || default
   end
   
   # using Setting.get is simpler, expecially if you don't want 'autocreate' feature

data/fullstack-cms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -294,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2565561884556814372
+      hash: -4405423992718841812
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: