covercache 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODZlNWEzMGI1MTNkYjY1ZjE0M2NlZWM4ZTYxNTVkMTc3M2I2MzkxZg==
-  data.tar.gz: !binary |-
-    ZGNmZGI2N2M3NWZiOWRlZGI3MDliYjkyZGI5OGNmNGI1MTNmMWQ5NA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MjBmOWZkNmNhYmFlN2U1ZmFhYmFhYTI3NmQ0ZGQ3OWZiZTI3NDQyNjVjOTA3
-    M2I4ZjZjOWVjMWFlMDU0MjRlMTcyZTQ3NTg2ZjNiNWUzNmM4YTRjYmNjMDRk
-    Y2Q4YThmYzQ4Zjk3MDlkYTNkOTAxYjdmNmIwZjY1ODBlZWE1YmQ=
-  data.tar.gz: !binary |-
-    YzI4ODI0OWZkZDI2ZTAzZTMyMWE1MDMxOGI4ZDZhZThlZGJjNTNkOTY1MjVi
-    Njg1ZDJjMTA1NTMxYWIxOTQ0ZmRhYzU4MmVmZjNmNGRmZWRhOWQ5YmNmNjhk
-    OGNhZGE0ZTE5MTYwMzRhNWNiZGEwODdlYmU0YWUwY2RkYWM3YzA=
+SHA1:
+  metadata.gz: 67fd5cda6532ead49dccc9024d97ba5c18f30c4c
+  data.tar.gz: 4e6cddd4883669b1b1049b8774bee0610b8674e2
+SHA512:
+  metadata.gz: 1309aea0cf020fca3b156c1343c96aa157b3c9353432104bcce6bb18787bfa5e99be01b47b9764a038d7e342db70f7e21b66177d423d1ab1ed74eb6eab69c041
+  data.tar.gz: 5de15c9308b8b980dc5e2876531299bc252098d38793f0997f9beacba8dca54758ebec17e26f3280015b48d27b3f83ff2705ce68a297811c0e6cefa8d5b318f7

data/Rakefile

@@ -1,18 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-# require 'rake/testtask'
-# Rake::TestTask.new(:test) do |test|
-#   test.libs << 'lib' << 'spec'
-#   test.pattern = 'spec/**/*_spec.rb'
-#   test.verbose = true
-# end
-# 
-# require 'rdoc/task'
-# Rake::RDocTask.new do |rdoc|
-#   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-# 
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title = "covercashe #{version}"
-#   rdoc.rdoc_files.include('README*')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test => :spec

data/covercache.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# encoding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'covercache/version'
@@ -18,13 +19,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  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"
+  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"
   
-  spec.add_dependency "activesupport", "~> 3.0"
-  spec.add_dependency "activerecord", "~> 3.0"
 end

data/lib/covercache/version.rb

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

data/lib/covercache.rb

@@ -52,6 +52,29 @@ require 'active_record'
 #   Comments.cached_for_post_ids post_ids, cache_key: post_ids.hash
 # 
 module Covercache
+    
+  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:
@@ -87,25 +110,25 @@ module Covercache
       # 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]
       
-      keys.flatten!
+      keys.flatten!.select!{|i| i.present? }
 
       if !!cover_opts[:debug]
-        puts keys.inspect
-        Rails.logger.info keys
+        Covercache.logger.debug keys.inspect
       end
       # puts caller.inspect if !!cover_opts[:debug],
       
       Rails.cache.fetch keys, options do
         klass.covercache_keys |= [ keys.join('/') ]
-        puts klass.covercache_keys.inspect if !!cover_opts[:debug]
+        Covercache.logger.debug(klass.covercache_keys.inspect) if !!cover_opts[:debug]
         block.call
       end
     end
     
     def get_auto_cache_key(class_name, _caller)
       caller_method = _caller.map {|c| c[/`([^']*)'/, 1] }.detect {|m| !m.start_with?('block') }
-      puts caller_method.inspect
-      [ class_name, covercache_model_digest, caller_method, (cache_key if self.respond_to?(:cache_key?)) ].compact
+      keys = [class_name, covercache_model_digest, caller_method].compact
+      keys << cache_key if self.respond_to?(:cache_key)
+      keys
     end
     
     def class_or_instance_class
@@ -117,6 +140,8 @@ module Covercache
     end
   end
   
+  
+  
   # == Defining Helper
   # 
   module DefiningHelper    
@@ -145,7 +170,7 @@ module Covercache
       
       class_eval <<-EOS, 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_from(*args)
+          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
             cache_block = #{method}_data[:block]                              #     cache_block = cached_example_data[:block]
             if cache_block.present?                                           #     if cache_block.present?
@@ -154,7 +179,7 @@ module Covercache
               self.send :#{original_method}, *args, &block                    #       self.send :example, *args, &block
             end                                                               #     end
           end                                                                 #   end
-        end                                                                   # env
+        end                                                                   # end
       EOS
     end
     
@@ -221,17 +246,20 @@ module Covercache
     end
   end
   
-  # module CoversWithCache
-  # add Covercache supporting to model
-  def covers_with_cache
-    caller_source = caller.first[/[^:]+/]
+  
+  # == Injecting
+  # 
+  module Inject
+    def covers_with_cache
+      caller_source = caller.first[/[^:]+/]
     
-    class_eval do
-      @covercache_caller_source = caller_source
-      include Covercache::ModelConcern
-      extend  Covercache::DefiningHelper
+      class_eval do
+        @covercache_caller_source = caller_source
+        include Covercache::ModelConcern
+        extend  Covercache::DefiningHelper
+      end
     end
   end
 end
 
-ActiveRecord::Base.extend Covercache #::CoversWithCache
+ActiveRecord::Base.extend Covercache::Inject

data/spec/libs/covercache_spec.rb

@@ -5,39 +5,51 @@ describe "covercache" do
   it 'should respond to covers_with_cache' do
     Post.should respond_to(:covers_with_cache)
   end
+  
   it 'should have covercache_model_source attribute' do
     pp Post.covercache_model_source
     Post.covercache_model_source.should be_an(String)
   end
+  
   it 'should have covercache_model_digest attribute' do
     pp Post.covercache_model_digest
     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
+  
   it "should respounds to class method defined by define_cached" do
-    comments = Comment.cached_for_post(1)
+    comments = Comment.cached_for_post(1, cache_key: 1)
+    comments2 = Comment.cached_for_post(2, cache_key: 2)
     Post.find(1).comments.should == comments
+    Post.find(2).comments.should == comments2
   end
+  
   it 'should return the same digest for class and instance' do
     post1 = Post.find(1)
     pp post1.covercache_model_digest
     Post.covercache_model_digest.should == post1.covercache_model_digest
   end
+  
   it 'should return the same values with or without cache' do
     test = Post.find(1)
     pp test.inspect
     pp test.cached_comments.inspect
     test.cached_comments.count.should == test.comments.count
   end
-  it 'post should have class keys storage' do
+  
+  it 'post should have non-empty class keys storage' do
     pp Post.covercache_keys
     Post.covercache_keys.should be_an(Array)
+    Post.covercache_keys.count.should > 0
   end
-  it 'comments should have class keys storage' do
+  
+  it 'comments should non-empty have class keys storage' do
     pp Comment.covercache_keys
-    Comment.covercache_keys.should be_an(Array)
+    Comment.covercache_keys.should be_an(Array) 
+    Comment.covercache_keys.count.should > 0
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require 'rubygems'
 require 'covercache'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -8,6 +8,7 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
+
 require 'rspec'
 require 'rspec/autorun'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covercache
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tõnis Simo
@@ -9,120 +9,138 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Helper method to simplify Rails caching, based on PackRat
 email:
 - anton.estum@gmail.com
@@ -152,17 +170,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Rails cache helper based on PackRat gem
@@ -170,3 +188,4 @@ test_files:
 - spec/covercache.sqlite3
 - spec/libs/covercache_spec.rb
 - spec/spec_helper.rb
+has_rdoc: