configurable_engine 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6818d2942967d86bf45d1e1c65cb13308baa2895
-  data.tar.gz: d8980df6e210571c7ed06b799ac4eb61b36986be
+  metadata.gz: 42b345dc60ccd203b5e50caa3a5c626d3db7b850
+  data.tar.gz: f5cdc2bbefe5017c78db8ccb644da9daa7db638b
 SHA512:
-  metadata.gz: 671f136a982caff40684be36d236506fd2621eb2eba35d35f16f3b771a5b00eac9f21967ca2a12d1982bc731c83d06a8c7dbef9dcca2ea7b943c58ccf9498c7d
-  data.tar.gz: 3c5a422c4cc0ef2304f80f9d8cf7cbf8136075079cdecae88c96a4b3a063e7607043f1a31b27fda6c1b1640b478da8d098fc718341bb23f4e9d6f92126c8e4b3
+  metadata.gz: 42b929c5021f20fa1eac5d5499007d077dad5148ab7928d2d2afc1cfdb7088011053c903faa2bba52842c7b4d85584ad175d366f0c64765f9c0d4e25e7c86e61
+  data.tar.gz: 943f8e63591d88a8d21d9cd964bea594218999a2513f62027af6da1afb01bb400a862cc5ad05ad777765391b96e4f7aab221beea090b721dc9a56d69fbd25f74

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### v0.4.7 - November 4, 2014
+**bug fix**
+Configurable broke for users using cacheing.
+
 ### v0.4.6 - October 28, 2014
 **cleanup**
 When using Configurable with cache, destroying a configurable instance erases it from cache

data/app/models/configurable.rb

@@ -29,20 +29,40 @@ class Configurable < ActiveRecord::Base
     end
   end
 
+  def self.cache_key(key)
+    "configurable_engine:#{key}"
+  end
+
   def self.[](key)
     return parse_value key, defaults[key][:default] unless table_exists?
 
-    config = if ConfigurableEngine::Engine.config.use_cache
-      Rails.cache.fetch("configurable_engine:#{key}") {
-        find_by_name(key)
-      }
-    else
-      find_by_name(key)
+    value, found = [false, false]
+    database_finder = -> do
+      config = find_by_name(key)
+      found = !!config
+      value = config.try(:value)
     end
 
-    return parse_value key, defaults[key][:default] unless config
 
-    config.value
+    if ConfigurableEngine::Engine.config.use_cache
+      found = Rails.cache.exist?(cache_key(key))
+      if found
+        value = Rails.cache.fetch(cache_key(key))
+      else
+        database_finder.call
+        if found
+          Rails.cache.store cache_key(key), value
+        end
+      end
+    else
+      database_finder.call
+    end
+
+    if found
+      value
+    else
+      parse_value key, defaults[key][:default]
+    end
   end
 
   def value
@@ -122,6 +142,6 @@ class Configurable < ActiveRecord::Base
   end
 
   def invalidate_cache
-    Rails.cache.delete("configurable_engine:#{self.name}")
+    Rails.cache.delete(Configurable.cache_key self.name)
   end
 end

data/lib/configurable_engine/version.rb

@@ -1,3 +1,3 @@
 module ConfigurableEngine
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configurable_engine
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Paul Campbell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails