simple_cacheable 1.3.2 → 1.3.3

data/spec/cacheable/types/method_cache_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Cacheable do
+  let(:cache) { Rails.cache }
+  let(:user)  { User.create(:login => 'flyerhzm') }
+
+  before :all do
+    @post1 = user.posts.create(:title => 'post1')
+    @post2 = user.posts.create(:title => 'post2')
+  end
+
+  before :each do
+    cache.clear
+    user.reload
+  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
+    end
+
+    it "should cache User#last_post" do
+      user.cached_last_post.should == user.last_post
+      Rails.cache.read("users/#{user.id}/method/last_post").should == user.last_post
+    end
+
+    it "should cache User#last_post multiple times" do
+      user.cached_last_post
+      user.cached_last_post.should == user.last_post
+    end
+  end
+
+end

data/spec/cacheable_spec.rb

@@ -2,302 +2,28 @@ require 'spec_helper'
 
 describe Cacheable do
   let(:cache) { Rails.cache }
+  let(:user)  { User.create(:login => 'flyerhzm') }
 
   before :all do
-    @user = User.create(:login => 'flyerhzm')
     @group1 = Group.create(name: "Ruby On Rails")
-    @account = @user.create_account(group: @group1)
-    @post1 = @user.posts.create(:title => 'post1')
-    @post2 = @user.posts.create(:title => 'post2')
+    @account = user.create_account(group: @group1)
+    @post1 = user.posts.create(:title => 'post1')
     @image1 = @post1.images.create
-    @image2 = @post1.images.create
     @comment1 = @post1.comments.create
-    @comment2 = @post1.comments.create
     @tag1 = @post1.tags.create(title: "Rails")
-    @tag2 = @post1.tags.create(title: "Caching")
   end
 
   before :each do
     cache.clear
+    user.reload
   end
 
-  context "with_key" do
-    it "should not cache key" do
-      Rails.cache.read("users/#{@user.id}").should be_nil
-    end
-
-    it "should cache by User#id" do
-      User.find_cached(@user.id).should == @user
-      Rails.cache.read("users/#{@user.id}").should == @user
-    end
-
-    it "should get cached by User#id multiple times" do
-      User.find_cached(@user.id)
-      User.find_cached(@user.id).should == @user
-    end
-  end
-
-  context "with_attribute" do
-    it "should not cache User.find_by_login" do
-      Rails.cache.read("users/attribute/login/flyerhzm").should be_nil
-    end
-
-    it "should cache by User.find_by_login" do
-      User.find_cached_by_login("flyerhzm").should == @user
-      Rails.cache.read("users/attribute/login/flyerhzm").should == @user
-    end
-
-    it "should get cached by User.find_by_login multiple times" do
-      User.find_cached_by_login("flyerhzm")
-      User.find_cached_by_login("flyerhzm").should == @user
-    end
-
-    it "should escape whitespace" 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
-    end
-
-    it "should cache User#last_post" do
-      @user.cached_last_post.should == @user.last_post
-      Rails.cache.read("users/#{@user.id}/method/last_post").should == @user.last_post
-    end
-
-    it "should cache User#last_post multiple times" do
-      @user.cached_last_post
-      @user.cached_last_post.should == @user.last_post
-    end
-  end
-
-  context "with_class_method" do
-    it "should not cache Post.default_post" do
-      Rails.cache.read("posts/class_method/default_post").should be_nil
-    end
-
-    it "should cache Post.default_post" do
-      Post.cached_default_post.should == @post1
-      Rails.cache.read("posts/class_method/default_post").should == @post1
-    end
-
-    it "should cache Post.default_post multiple times" do
-      Post.cached_default_post
-      Post.cached_default_post.should == @post1
-    end
-  end
-
-  context "with_association" do
-    context "belongs_to" do
-      it "should not cache association" do
-        Rails.cache.read("users/#{@user.id}").should be_nil
-      end
-
-      it "should cache Post#user" do
-        @post1.cached_user.should == @user
-        Rails.cache.read("users/#{@user.id}").should == @user
-      end
-
-      it "should cache Post#user multiple times" do
-        @post1.cached_user
-        @post1.cached_user.should == @user
-      end
-
-      it "should cache Comment#commentable with polymorphic" do
-        Rails.cache.read("posts/#{@post1.id}").should be_nil
-        @comment1.cached_commentable.should == @post1
-        Rails.cache.read("posts/#{@post1.id}").should == @post1
-      end
-    end
-
-    context "has_many" do
-      it "should not cache associations" do
-        Rails.cache.read("users/#{@user.id}/association/posts").should be_nil
-      end
-
-      it "should cache User#posts" do
-        @user.cached_posts.should == [@post1, @post2]
-        Rails.cache.read("users/#{@user.id}/association/posts").should == [@post1, @post2]
-      end
-
-      it "should cache User#posts multiple times" do
-        @user.cached_posts
-        @user.cached_posts.should == [@post1, @post2]
-      end
-    end
-
-    context "has_many with polymorphic" do
-      it "should not cache associations" do
-        Rails.cache.read("posts/#{@post1.id}/association/comments").should be_nil
-      end
-
-      it "should cache Post#comments" do
-        @post1.cached_comments.should == [@comment1, @comment2]
-        Rails.cache.read("posts/#{@post1.id}/association/comments").should == [@comment1, @comment2]
-      end
-
-      it "should cache Post#comments multiple times" do
-        @post1.cached_comments
-        @post1.cached_comments.should == [@comment1, @comment2]
-      end
-    end
-
-    context "has_one" do
-      it "should not cache associations" do
-        Rails.cache.read("users/#{@user.id}/association/account").should be_nil
-      end
-
-      it "should cache User#posts" do
-        @user.cached_account.should == @account
-        Rails.cache.read("users/#{@user.id}/association/account").should == @account
-      end
-
-      it "should cache User#posts multiple times" do
-        @user.cached_account
-        @user.cached_account.should == @account
-      end
-    end
-
-    context "has_many through" do
-      it "should not cache associations" do
-        Rails.cache.read("users/#{@user.id}/association/images").should be_nil
-      end
-
-      it "should cache User#images" do
-        @user.cached_images.should == [@image1, @image2]
-        Rails.cache.read("users/#{@user.id}/association/images").should == [@image1, @image2]
-      end
-
-      it "should cache User#images multiple times" do
-        @user.cached_images
-        @user.cached_images.should == [@image1, @image2]
-      end
-
-      context "expiry" do
-        it "should have the correct collection" do
-          @image3 = @post1.images.create
-          Rails.cache.read("users/#{@user.id}/association/images").should be_nil
-          @user.cached_images.should == [@image1, @image2, @image3]
-          Rails.cache.read("users/#{@user.id}/association/images").should == [@image1, @image2, @image3]
-        end
-      end
-    end
-
-    context "has_one through belongs_to" do
-      it "should not cache associations" do
-        Rails.cache.read("users/#{@user.id}/association/group").should be_nil
-      end
-
-      it "should cache User#group" do
-        @user.cached_group.should == @group1
-        Rails.cache.read("users/#{@user.id}/association/group").should == @group1
-      end
-
-      it "should cache User#group multiple times" do
-        @user.cached_group
-        @user.cached_group.should == @group1
-      end
-
-    end
-
-    context "has_and_belongs_to_many" do
-
-      it "should not cache associations off the bat" do
-        Rails.cache.read("posts/#{@post1.id}/association/tags").should be_nil
-      end
-
-      it "should cache Post#tags" do
-        @post1.cached_tags.should == [@tag1, @tag2]
-        Rails.cache.read("posts/#{@post1.id}/association/tags").should == [@tag1, @tag2]
-      end
-
-      it "should handle multiple requests" do
-        @post1.cached_tags
-        @post1.cached_tags.should == [@tag1, @tag2]
-      end
-
-      context "expiry" do
-        it "should have the correct collection" do
-          @tag3 = @post1.tags.create!(title: "Invalidation is hard")
-          Rails.cache.read("posts/#{@post1.id}/association/tags").should be_nil
-          @post1.cached_tags.should == [@tag1, @tag2, @tag3]
-          Rails.cache.read("posts/#{@post1.id}/association/tags").should == [@tag1, @tag2, @tag3]
-        end
-      end
-    end
-
-  end
-
-  context "expire_model_cache" do
-    it "should delete with_key cache" do
-      user = User.find_cached(@user.id)
-      Rails.cache.read("users/#{user.id}").should_not be_nil
-      user.expire_model_cache
-      Rails.cache.read("users/#{user.id}").should be_nil
-    end
-
-    it "should delete with_attribute cache" do
-      user = User.find_cached_by_login("flyerhzm")
-      Rails.cache.read("users/attribute/login/flyerhzm").should == @user
-      @user.expire_model_cache
-      Rails.cache.read("users/attribute/login/flyerhzm").should be_nil
-    end
-
-    it "should delete with_method cache" do
-      @user.cached_last_post
-      Rails.cache.read("users/#{@user.id}/method/last_post").should_not be_nil
-      @user.expire_model_cache
-      Rails.cache.read("users/#{@user.id}/method/last_post").should be_nil
-    end
-
-    it "should delete with_class_method cache" do
-      Post.cached_default_post
-      Rails.cache.read("posts/class_method/default_post").should_not be_nil
-      @post1.expire_model_cache
-      Rails.cache.read("posts/class_method/default_post").should be_nil
-    end
-
-    it "should delete associations cache" do
-      @user.cached_images
-      Rails.cache.read("users/#{@user.id}/association/images").should_not be_nil
-      @user.expire_model_cache
-      Rails.cache.read("users/#{@user.id}/association/images").should be_nil
-    end
-
-  end
-
-  context "object#save" do
+  context "Association Expires on Save" do
     it "should delete has_many with_association cache" do
-      @user.cached_posts
-      Rails.cache.read("users/#{@user.id}/association/posts").should_not be_nil
+      user.cached_posts
+      Rails.cache.read("users/#{user.id}/association/posts").should_not be_nil
       @post1.save
-      Rails.cache.read("users/#{@user.id}/association/posts").should be_nil
+      Rails.cache.read("users/#{user.id}/association/posts").should be_nil
     end
 
     it "should delete has_many with polymorphic with_association cache" do
@@ -308,17 +34,17 @@ describe Cacheable do
     end
 
     it "should delete has_many through with_association cache" do
-      @user.cached_images
-      Rails.cache.read("users/#{@user.id}/association/images").should_not be_nil
-      @image2.save
-      Rails.cache.read("users/#{@user.id}/association/images").should be_nil
+      user.cached_images
+      Rails.cache.read("users/#{user.id}/association/images").should_not be_nil
+      @image1.save
+      Rails.cache.read("users/#{user.id}/association/images").should be_nil
     end
 
     it "should delete has_one with_association cache" do
-      @user.cached_account
-      Rails.cache.read("users/#{@user.id}/association/account").should_not be_nil
+      user.cached_account
+      Rails.cache.read("users/#{user.id}/association/account").should_not be_nil
       @account.save
-      Rails.cache.read("users/#{@user.id}/association/account").should be_nil
+      Rails.cache.read("users/#{user.id}/association/account").should be_nil
     end
 
     it "should delete has_and_belongs_to_many with_association cache" do
@@ -330,9 +56,9 @@ describe Cacheable do
 
     it "should delete has_one through belongs_to with_association cache" do
       @group1.save
-      Rails.cache.read("users/#{@user.id}/association/group").should be_nil
-      @user.cached_group.should == @group1
-      Rails.cache.read("users/#{@user.id}/association/group").should == @group1
+      Rails.cache.read("users/#{user.id}/association/group").should be_nil
+      user.cached_group.should == @group1
+      Rails.cache.read("users/#{user.id}/association/group").should == @group1
     end
   end
 end

data/spec/models/post.rb

@@ -12,10 +12,19 @@ class Post < ActiveRecord::Base
     with_key
     with_attribute :user_id
     with_association :user, :comments, :images, :tags
-    with_class_method :default_post
+    with_class_method :default_post, :retrieve_with_user_id, :retrieve_with_both
   end
 
   def self.default_post
     Post.first
   end
+
+  def self.retrieve_with_user_id(user_id)
+    Post.find_by_user_id(user_id)
+  end
+
+  def self.retrieve_with_both(user_id, post_id)
+    Post.find(post_id) == Post.find_by_user_id(user_id)
+  end
+
 end

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ require 'rspec'
 require 'mocha/api'
 require 'memcached'
 require 'cacheable'
-require 'debugger'
 
 # MODELS = File.join(File.dirname(__FILE__), "models")
 # $LOAD_PATH.unshift(MODELS)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_cacheable
 version: !ruby/object:Gem::Version
-  version: 1.3.2
-  prerelease: 
+  version: 1.3.3
 platform: ruby
 authors:
 - Richard Huang
@@ -10,54 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: mocha
   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
@@ -70,14 +63,31 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
+- ChangeLog
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - cacheable.gemspec
 - lib/cacheable.rb
+- lib/cacheable/caches.rb
+- lib/cacheable/expiry.rb
+- lib/cacheable/keys.rb
+- lib/cacheable/types/association_cache.rb
+- lib/cacheable/types/attribute_cache.rb
+- lib/cacheable/types/class_method_cache.rb
+- lib/cacheable/types/key_cache.rb
+- lib/cacheable/types/method_cache.rb
 - lib/cacheable/version.rb
+- spec/cacheable/expiry_cache_spec.rb
+- spec/cacheable/types/association_cache_spec.rb
+- spec/cacheable/types/attribute_cache_spec.rb
+- spec/cacheable/types/class_method_cache_spec.rb
+- spec/cacheable/types/key_cache_spec.rb
+- spec/cacheable/types/method_cache_spec.rb
 - spec/cacheable_spec.rb
 - spec/models/account.rb
 - spec/models/comment.rb
@@ -89,29 +99,34 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/flyerhzm/simple-cacheable
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: a simple cache implementation based on activerecord
 test_files:
+- spec/cacheable/expiry_cache_spec.rb
+- spec/cacheable/types/association_cache_spec.rb
+- spec/cacheable/types/attribute_cache_spec.rb
+- spec/cacheable/types/class_method_cache_spec.rb
+- spec/cacheable/types/key_cache_spec.rb
+- spec/cacheable/types/method_cache_spec.rb
 - spec/cacheable_spec.rb
 - spec/models/account.rb
 - spec/models/comment.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm_gemset_create_on_use_flag=1
-rvm gemset use cacheable