rails-settings-cached 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80bfa0c52c2d8fe8b4535ff364b0d727476f9e5c
-  data.tar.gz: ca264291977f18ee792e52191e6415974263ca13
+  metadata.gz: 7fba2dd4d13c0c1a77876382d0207c0815a75d34
+  data.tar.gz: b1ccc3d46ba88211fd29952b0eabf020cef3acab
 SHA512:
-  metadata.gz: 88de4555fb37729d39d6f1f2f6868fac66399662c2d0139bb59783e07760cd6ca225c45ad2e1d42b10095be5bf8dbe6e356f2961347805ef7394045ce145ac3f
-  data.tar.gz: 4bdbfc25e039ac4b95baad02f27002a81710cd5ad0378b95f18ccab8583edeef080daba0697f149240c646783c9292ebdc98f5064093078e1587669d5875984a
+  metadata.gz: a0342009a9dc86b0f531583cb3de8137944641e8d667acb486b739f7b4bbb4bb611dd33511c7ef41fc6a77a72ea7b842d20f79ee8f3f915d7e9bc03d3c4d618e
+  data.tar.gz: 54a0558fee9b43f595801fbe84c40e6907ddc226eeeedbeed458dc466cf2bea35532d6603728cc4e6222948d68528cdc3dee46c26c5cf1dde0f43dca773585ad

data/lib/rails-settings-cached.rb

@@ -1,6 +1,6 @@
 require_relative 'rails-settings/settings'
-require_relative 'rails-settings/scoped_settings'
 require_relative 'rails-settings/cached_settings'
+require_relative 'rails-settings/scoped_settings'
 require_relative 'rails-settings/extend'
 
 class RailsSettings::Railtie < Rails::Railtie

data/lib/rails-settings/cached_settings.rb

@@ -1,17 +1,26 @@
 module RailsSettings
   class CachedSettings < Settings
     def rewrite_cache
-      Rails.cache.write("rails_settings_cached:#{var}", value)
+      Rails.cache.write(cache_key, value)
     end
 
     def expire_cache
-      Rails.cache.delete("rails_settings_cached:#{var}")
+      Rails.cache.delete(cache_key)
+    end
+
+    def cache_key
+      self.class.cache_key(var, thing)
     end
 
     class << self
+      def cache_key(var_name, scope_object)
+        scope = "rails_settings_cached:"
+        scope << "#{scope_object.class.base_class.to_s}-#{scope_object.id}:" if scope_object
+        scope << "#{var_name}"
+      end
+
       def [](var_name)
-        cache_key = "rails_settings_cached:#{var_name}"
-        obj = Rails.cache.read(cache_key)
+        obj = Rails.cache.read(cache_key(var_name, @object))
         obj = super(var_name) if obj.nil?
 
         return @@defaults[var_name.to_s] if obj.nil?

data/lib/rails-settings/scoped_settings.rb

@@ -1,5 +1,5 @@
 module RailsSettings
-  class ScopedSettings < Settings
+  class ScopedSettings < CachedSettings
     def self.for_thing(object)
       @object = object
       self

data/lib/rails-settings/settings.rb

@@ -7,6 +7,8 @@ module RailsSettings
     cattr_accessor :defaults
     @@defaults = {}.with_indifferent_access
 
+    belongs_to :thing, polymorphic: true
+
     # Support old plugin
     if defined?(SettingsDefaults::DEFAULTS)
       @@defaults = SettingsDefaults::DEFAULTS.with_indifferent_access

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-settings-cached
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Squeegy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails