simple_cacheable 1.2.1 → 1.3.0

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
-  - jruby-head
+  - jruby-19mode
+env: DB=sqlite
+service:
+  - memcached

data/Gemfile

@@ -5,9 +5,11 @@ gemspec
 
 platforms :ruby do
   gem "sqlite3-ruby"
+  gem "memcached"
 end
 
 platforms :jruby do
   gem "activerecord-jdbc-adapter"
   gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-memcached"
 end

data/Rakefile

@@ -1,2 +1,8 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/cacheable.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.add_dependency("rails", ">= 3.0.0")
   s.add_development_dependency("rspec")
   s.add_development_dependency("mocha")
-  s.add_development_dependency("memcached")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/cacheable.rb

@@ -28,6 +28,8 @@ module Cacheable
 
           class_eval <<-EOF
             after_commit :expire_attribute_cache, :on => :update
+            after_commit :expire_all_attribute_cache, :on => :update
+
           EOF
 
           attributes.each do |attribute|
@@ -39,6 +41,14 @@ module Cacheable
                   self.find_by_#{attribute}(value)
                 end
               end
+
+              def self.find_cached_all_by_#{attribute}(value)
+                self.cached_indices["#{attribute}"] ||= []
+                self.cached_indices["#{attribute}"] << value
+                Rails.cache.fetch all_attribute_cache_key("#{attribute}", value) do
+                  self.find_all_by_#{attribute}(value)
+                end
+              end
             EOF
           end
         end
@@ -102,7 +112,11 @@ module Cacheable
         end
 
         def attribute_cache_key(attribute, value)
-          "#{name.tableize}/attribute/#{attribute}/#{URI.escape(value)}"
+          "#{name.tableize}/attribute/#{attribute}/#{URI.escape(value.to_s)}"
+        end
+
+        def all_attribute_cache_key(attribute, value)
+          "#{name.tableize}/attribute/#{attribute}/all/#{URI.escape(value.to_s)}"
         end
       end
     end
@@ -125,6 +139,13 @@ module Cacheable
     end
   end
 
+  def expire_all_attribute_cache
+    self.class.cached_indices.each do |attribute, values|
+      value = self.send(attribute)
+      Rails.cache.delete self.class.all_attribute_cache_key(attribute, value)
+    end
+  end
+
   def expire_method_cache
     self.class.cached_methods.each do |meth|
       Rails.cache.delete method_cache_key(meth)

data/lib/cacheable/version.rb

@@ -1,3 +1,3 @@
 module Cacheable
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/spec/cacheable_spec.rb

@@ -51,8 +51,31 @@ describe Cacheable do
       new_user = User.create(:login => "user space")
       User.find_cached_by_login("user space").should == new_user
     end
+
+    it "should handle fixed numbers" do
+      Post.find_cached_by_user_id(@user.id).should == @post1
+      Rails.cache.read("posts/attribute/user_id/#{@user.id}").should == @post1
+    end
+
+    context "find_all" do
+      it "should not cache Post.find_all_by_user_id" do
+        Rails.cache.read("posts/attribute/user_id/all/#{@user.id}").should be_nil
+      end
+
+      it "should cache by Post.find_cached_all_by_user_id" do
+        Post.find_cached_all_by_user_id(@user.id).should == [@post1, @post2]
+        Rails.cache.read("posts/attribute/user_id/all/#{@user.id}").should == [@post1, @post2]
+      end
+
+      it "should get cached by Post.find_cached_all_by_user_id multiple times" do
+        Post.find_cached_all_by_user_id(@user.id)
+        Post.find_cached_all_by_user_id(@user.id).should == [@post1, @post2]
+      end
+
+    end
   end
 
+
   context "with_method" do
     it "should not cache User.last_post" do
       Rails.cache.read("users/#{@user.id}/method/last_post").should be_nil

data/spec/models/post.rb

@@ -6,6 +6,7 @@ class Post < ActiveRecord::Base
 
   model_cache do
     with_key
+    with_attribute :user_id
     with_association :user, :comments
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_cacheable
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-25 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: memcached
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: a simple cache implementation based on activerecord
 email:
 - flyerhzm@gmail.com
@@ -112,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2779579293480982592
+      hash: 3153492415612619050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2779579293480982592
+      hash: 3153492415612619050
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24