covercache 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67fd5cda6532ead49dccc9024d97ba5c18f30c4c
-  data.tar.gz: 4e6cddd4883669b1b1049b8774bee0610b8674e2
+  metadata.gz: cd4db05a4c6363e98a948daeb16b2968cded4169
+  data.tar.gz: c3fc3a7e634958920502b7ff6971e919a0ddbb84
 SHA512:
-  metadata.gz: 1309aea0cf020fca3b156c1343c96aa157b3c9353432104bcce6bb18787bfa5e99be01b47b9764a038d7e342db70f7e21b66177d423d1ab1ed74eb6eab69c041
-  data.tar.gz: 5de15c9308b8b980dc5e2876531299bc252098d38793f0997f9beacba8dca54758ebec17e26f3280015b48d27b3f83ff2705ce68a297811c0e6cefa8d5b318f7
+  metadata.gz: 2a2a4d9e1289249fae1b850db1dc2d09b30520a923bb45da804a2db93f1c99b434b88cea512dbb4f27c1989cf84c5d1199544fc2dc036d6de92b36a08131d810
+  data.tar.gz: b08f824c1445ca69f4d1c8b6a818dd3537f86c5ad9ef9884b898498eed1aba22f40903e601ac142e708f6c34c9362a0ed3d05cdea402a95f275050f4af56eed0

data/covercache.gemspec

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'covercache/version'
@@ -21,12 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", '>= 3.2.0', '< 4'
   spec.add_dependency "activerecord", '>= 3.2.0', '< 4'
-
+  
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rails", '>= 3.2.0', '< 4'
   spec.add_development_dependency "rdoc"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3"
-  
 end

data/lib/covercache/version.rb

@@ -1,3 +1,3 @@
 module Covercache
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/covercache.rb

@@ -52,30 +52,27 @@ require 'active_record'
 #   Comments.cached_for_post_ids post_ids, cache_key: post_ids.hash
 # 
 module Covercache
-    
+  # General helper method (ex <tt>cache</tt> helper  in PackRat)
   def self.logger
     @logger ||=  rails_logger || default_logger
   end
-
+  
   def self.rails_logger
     (defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger) ||
     (defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER.respond_to?(:debug) && RAILS_DEFAULT_LOGGER)
   end
-
+  
   def self.default_logger
     require 'logger'
     l = Logger.new(STDOUT)
     l.level = Logger::DEBUG
     l
   end
-
+  
   def self.logger=(logger)
     @logger = logger
   end
   
-  
-  
-  # General helper method (ex <tt>cache</tt> helper  in PackRat)
   module Base    
     # Arguments:
     #     
@@ -103,36 +100,34 @@ module Covercache
     # 
     private
     def covercache(*keys, &block)
-      klass      = class_or_instance_class
-      options    = keys.extract_options!
-      cover_opts = options.extract! :debug, :without_auto_key
-      
-      # if :no_auto_cache_keys was set, we skip creating our own key
-      keys.prepend get_auto_cache_key(klass.name, caller) unless cover_opts[:without_auto_key]
+      options = keys.extract_options!
+      debug, without_auto_key = options.slice! :debug, :without_auto_key
       
-      keys.flatten!.select!{|i| i.present? }
+      keys.prepend get_auto_cache_key(caller) unless !!without_auto_key
+      keys.flatten!.compact!
 
-      if !!cover_opts[:debug]
-        Covercache.logger.debug keys.inspect
-      end
-      # puts caller.inspect if !!cover_opts[:debug],
+      Covercache.logger.debug %([covercache] #{get_class_name} class generate cache key: #{keys.inspect}) if !!debug
       
       Rails.cache.fetch keys, options do
-        klass.covercache_keys |= [ keys.join('/') ]
-        Covercache.logger.debug(klass.covercache_keys.inspect) if !!cover_opts[:debug]
+        push_covercache_key keys.join('/')
         block.call
       end
     end
     
-    def get_auto_cache_key(class_name, _caller)
+    def push_covercache_key(key)
+      self.covercache_keys << key
+      self.covercache_keys.uniq!
+    end
+    
+    def get_auto_cache_key(_caller)
       caller_method = _caller.map {|c| c[/`([^']*)'/, 1] }.detect {|m| !m.start_with?('block') }
-      keys = [class_name, covercache_model_digest, caller_method].compact
-      keys << cache_key if self.respond_to?(:cache_key)
+      keys = [get_class_name, covercache_model_digest, caller_method]
+      keys << cache_key if respond_to?(:cache_key)
       keys
     end
     
-    def class_or_instance_class
-      self.is_a?(Class) ? self : self.class
+    def get_class_name
+      self.instance_of?(Class) ? self.name : self.class.name
     end
     
     def extract_cache_key(*args)
@@ -140,8 +135,6 @@ module Covercache
     end
   end
   
-  
-  
   # == Defining Helper
   # 
   module DefiningHelper    
@@ -161,14 +154,14 @@ module Covercache
       options = args.extract_options!
       options[:is_class_method] = true
       args << options
-      self.send :define_cached, method, *Array(args << options), &block
+      self.send :define_cached, method, *Array.wrap(args), &block
     end
     
     private
     def covercache_define_wrapper(original_method, file, line, is_class_method = false)
       method = "#{'self.' if is_class_method}cached_#{ original_method }"
       
-      class_eval <<-EOS, file, line - 2
+      class_eval <<-EOT, __FILE__, __LINE__ - 2
         def #{method}(*args, &block)                                          # def cached_example(*args, &block)
           options = Array(#{method}_data[:args]) + extract_cache_key(*args)   #   options = Array(cached_example_data[:args]) + extract_cache_key(*args)
           covercache *options, #{method}_data[:opts] do                       #   covercache *options, cached_example_data[:opts] do
@@ -179,8 +172,8 @@ module Covercache
               self.send :#{original_method}, *args, &block                    #       self.send :example, *args, &block
             end                                                               #     end
           end                                                                 #   end
-        end                                                                   # end
-      EOS
+        end                                                                   # env
+      EOT
     end
     
     def covercache_method_arguments(method, *args, &block)
@@ -189,7 +182,7 @@ module Covercache
     end
     
     def organize_cached_method_data(*args, &block)
-      Hash[%w{args opts block}.map { |key| [key, (args.shift || block)] }].to_options
+      x = Hash[%w{args opts block}.map { |key| [key, (args.shift || block)] }].to_options
     end
   end
   
@@ -199,15 +192,16 @@ module Covercache
   module ModelConcern
     extend ActiveSupport::Concern
 
-    included do
-      %w(keys model_source model_digest).each do |key, value|
-        class_attribute :"covercache_#{key}"
-        self.send(:"covercache_#{key}=", value) if value.present?
+    included do      
+      cattr_accessor :covercache_keys do 
+        []
       end
-              
-      self.covercache_keys ||= []
-      self.covercache_model_source ||= @covercache_caller_source #Where.is_class self, of: 'app/models'
-
+      
+      cattr_accessor :covercache_model_source do
+        @covercache_caller_source
+      end
+      
+      cattr_accessor :covercache_model_digest
       generate_model_digest!
       
       after_commit :covercache_flush_cache!
@@ -219,7 +213,7 @@ module Covercache
     # Support class methods
     module ClassMethods
       def generate_model_digest
-        return unless covercache_model_source?
+        return unless covercache_model_source.present?
         file = File.read self.covercache_model_source
         Digest::MD5.hexdigest(file)
       rescue
@@ -246,20 +240,17 @@ module Covercache
     end
   end
   
-  
-  # == Injecting
-  # 
-  module Inject
-    def covers_with_cache
-      caller_source = caller.first[/[^:]+/]
+  # module CoversWithCache
+  # add Covercache supporting to model
+  def covers_with_cache
+    caller_source = caller.first[/[^:]+/]
     
-      class_eval do
-        @covercache_caller_source = caller_source
-        include Covercache::ModelConcern
-        extend  Covercache::DefiningHelper
-      end
+    class_eval do
+      @covercache_caller_source = caller_source
+      include Covercache::ModelConcern
+      extend  Covercache::DefiningHelper
     end
   end
 end
 
-ActiveRecord::Base.extend Covercache::Inject
+ActiveRecord::Base.extend Covercache

data/spec/libs/covercache_spec.rb

@@ -16,7 +16,7 @@ describe "covercache" do
     Post.covercache_model_digest.should be_an(String)
   end
   
-  it 'should respounds to instance method defined by define_cached' do
+  it "should respounds to instance method defined by define_cached" do
     comment = Comment.last
     comment.cached_post.should == comment.post
   end
@@ -52,4 +52,12 @@ describe "covercache" do
     Comment.covercache_keys.should be_an(Array) 
     Comment.covercache_keys.count.should > 0
   end
+  
+  it 'it should clean storage' do
+    Comment.find(1).covercache_flush_cache!
+    comments = Comment.cached_for_post(1, cache_key: 1)
+    pp Comment.covercache_keys
+    Comment.covercache_keys.should be_an(Array)
+    Comment.covercache_keys.count.should == 1
+  end
 end

data/spec/spec_helper.rb

@@ -16,14 +16,9 @@ ActiveRecord::Base.establish_connection adapter: "sqlite3",
                                         database: File.expand_path("../covercache.sqlite3", __FILE__)
 
 class Rails
+  RAILS_CACHE = ActiveSupport::Cache::MemoryStore.new
   def self.cache
-    Rails::Cache
-  end
-end
-
-class Rails::Cache
-  def self.fetch(*options, &block)
-    block.call
+    RAILS_CACHE
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covercache
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Tõnis Simo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport