rails_cache_it 0.0.1 → 0.0.2

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.swp
 .bundle
 .config
 .yardoc

data/README.md

@@ -1,6 +1,6 @@
 # RailsCacheIt
 
-Help you cache with ActiveRecord.
+Help you easy to cache with ActiveRecord.
 
 Only support Rails program.
 
@@ -28,6 +28,10 @@ Only work on Relation now(it means you can't use it with #first #last etc..).
 
 ###expires
 
+`User.limit(50).cache_it expires_in: 5.minutes`
+
+or use block
+
 `User.limit(50).cache_it{ User.count}`
 
 when block.call != pre_block.call
@@ -39,7 +43,7 @@ view [AvtiveSupport::Cache::Store#fetch](http://api.rubyonrails.org/classes/Acti
 
 ###set default options
 
-`RailsCacheIt.default_options.merge(options)`
+`RailsCacheIt.default_options.merge!(options)`
 
 ## Contributing
 

data/lib/rails_cache_it.rb

@@ -4,14 +4,9 @@ require "rails_cache_it/relation_extension"
 module RailsCacheIt
   extend ActiveSupport::Concern
 
-  @_cache_it = {}
   @_default_options = {}
 
   class << self
-    def cache_it
-      @_cache_it
-    end
-
     def default_options
       @_default_options
     end

data/lib/rails_cache_it/relation_extension.rb

@@ -11,13 +11,14 @@ module RailsCacheIt
       if options
         cache_name = to_sql
         blk =  options.delete :blk
-        if blk && (RailsCacheIt.cache_it[cache_name] != (new_result = blk.call))
-          RailsCacheIt.cache_it[cache_name] = new_result
-          Rails.cache.delete cache_name
-        end
-        Rails.cache.fetch(cache_name, options) do
-          self.to_a_without_cache_it
+        blk_val = blk && blk.call
+        result, pre_val = Rails.cache.fetch(cache_name, options)
+        if result.nil? || (blk_val != pre_val)
+          result, _ = Rails.cache.fetch cache_name, options.merge(force: true) do
+            [self.to_a_without_cache_it, blk_val]
+          end
         end
+        result
       else
         self.to_a_without_cache_it
       end

data/lib/rails_cache_it/version.rb

@@ -1,3 +1,3 @@
 module RailsCacheIt
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/rails_cache_it.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = RailsCacheIt::VERSION
   spec.authors       = ["jjy"]
   spec.email         = ["jjyruby@gmail.com"]
-  spec.description   = %q{a db cache implement based on ActiveRecord}
-  spec.summary       = %q{help you cache with ActiveRecord simpler}
+  spec.description   = %q{lightweight Rails AR cache implement, very simple and easy to use }
+  spec.summary       = %q{Model.where(xx: xx).cache_it... it's all ok!}
   spec.homepage      = "http://github.com/jjyr/rails_cache_it"
   spec.license       = "MIT"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_cache_it
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,7 +43,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: a db cache implement based on ActiveRecord
+description: ! 'lightweight Rails AR cache implement, very simple and easy to use '
 email:
 - jjyruby@gmail.com
 executables: []
@@ -83,5 +83,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: help you cache with ActiveRecord simpler
+summary: ! 'Model.where(xx: xx).cache_it... it''s all ok!'
 test_files: []