cache_associations 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c9f69129b50855b9f24bd5d22e9b1cbc3a2258
-  data.tar.gz: 383ec8b76bfe25a25bae015bb690c55b450fc4eb
+  metadata.gz: f1dc1a88461b8ab8e50a2f7123a8940380b43b83
+  data.tar.gz: c3e7a07d8abff7fe53c1f8fdf3e602bf7b2b3f10
 SHA512:
-  metadata.gz: e19b8231d349d5d6560fd2229474db3981909acabcaab381b6f736aaedec8a546467b1bf6979001d172258ec3210808ad45c3740c4861780936074ec45d5df62
-  data.tar.gz: df928e1a5a1a2f9265db2177282bd9587fd70576fec7dfa43cb1fb067efc0ae9823af0028eb3f83012416503e5dba94d1606129514cdb6ce2d0127c274672bfc
+  metadata.gz: 42c3e4fef24eb6b6d85bbe56ce6b0f408b14659c000ed47164c056cc7d8753e3e37d81b6fe2818e205d9d2b94e44603f049b2011089d5a81bc0acc3caca29e17
+  data.tar.gz: 1b00a1c669f913857b32e734252b79afcf1e1abc72d2a6f24eea9c3007a0d98364d02e0757df35e7047ef0438ac0a09c55a45c3b68913aa450f29f5e575c3012

data/cache_associations.gemspec

@@ -30,6 +30,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.0"
+
   spec.add_dependency "rails", ">= 4.2"
 
   spec.add_development_dependency "bundler", "~> 1.15"

data/lib/cache_associations/version.rb

@@ -1,3 +1,3 @@
 module CacheAssociations
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/cache_associations.rb

@@ -10,10 +10,11 @@ module CacheAssociations
       unless reflection = reflect_on_association(name)
         raise UndefinedAssociationError, "Undefined asscociation #{name}"
       end
+      cache_association_names[name.to_sym] = cache_name_block
       options = Rails.cache.options.merge(options)
 
       define_method("cached_#{name}") do |*args, &block|
-        cache_name = cache_name_block.nil? ? [self.class.name, id, name, updated_at.to_i] : instance_exec(&cache_name_block)
+        cache_name = cache_name_block.nil? ? default_cache_name(name) : instance_exec(&cache_name_block)
         cache = Rails.cache.fetch(cache_name, **options) do
           break instance_exec(*args, &block) if !block.nil?
 
@@ -33,5 +34,45 @@ module CacheAssociations
         cache
       end
     end
+
+    def has_cache_association?(name)
+      cache_association_names.has_key?(name.to_sym)
+    end
+
+    def custom_cache_name?(name)
+      !!cache_association_names[name.to_sym]
+    end
+
+    def cache_name_block(name)
+      cache_association_names[name.to_sym]
+    end
+
+    private
+
+    def cache_association_names
+      @cache_association_names ||= {}
+    end
+  end
+
+  def cache_association_name(name)
+    if !!cache_name_block = self.class.cache_name_block(name)
+      instance_exec(&cache_name_block)
+    elsif self.class.has_cache_association?(name)
+      default_cache_name(name)
+    else
+      nil
+    end
+  end
+
+  def clear_caching_on_association(name)
+    return nil if !!cache_name = cache_association_name(name)
+
+    Rails.cache.delete(cache_name)
+  end
+
+  private
+
+  def default_cache_name(name)
+    [self.class.name, id, name.to_s, updated_at.to_i]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache_associations
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Fuxin Hao
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="