simple_cacheable 1.2.0 → 1.2.1

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-head

data/cacheable.gemspec

@@ -15,6 +15,7 @@ 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/version.rb

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

data/lib/cacheable.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Cacheable
   def self.included(base)
     base.class_eval do
@@ -100,7 +102,7 @@ module Cacheable
         end
 
         def attribute_cache_key(attribute, value)
-          "#{name.tableize}/attribute/#{attribute}/#{value}"
+          "#{name.tableize}/attribute/#{attribute}/#{URI.escape(value)}"
         end
       end
     end

data/spec/cacheable_spec.rb

@@ -18,12 +18,12 @@ describe Cacheable do
 
   context "with_key" do
     it "should not cache key" do
-      cache.data["users/#{@user.id}"].should be_nil
+      Rails.cache.read("users/#{@user.id}").should be_nil
     end
 
     it "should cache by User#id" do
       User.find_cached(@user.id).should == @user
-      cache.data["users/#{@user.id}"].should == @user
+      Rails.cache.read("users/#{@user.id}").should == @user
     end
 
     it "should get cached by User#id multiple times" do
@@ -34,28 +34,33 @@ describe Cacheable do
 
   context "with_attribute" do
     it "should not cache User.find_by_login" do
-      cache.data["users/attribute/login/flyerhzm"].should be_nil
+      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
-      cache.data["users/attribute/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
   end
 
   context "with_method" do
     it "should not cache User.last_post" do
-      cache.data["users/#{@user.id}/method/last_post"].should be_nil
+      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
-      cache.data["users/#{@user.id}/method/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
@@ -67,12 +72,12 @@ describe Cacheable do
   context "with_association" do
     context "belongs_to" do
       it "should not cache association" do
-        cache.data["users/#{@user.id}"].should be_nil
+        Rails.cache.read("users/#{@user.id}").should be_nil
       end
 
       it "should cache Post#user" do
         @post1.cached_user.should == @user
-        cache.data["users/#{@user.id}"].should == @user
+        Rails.cache.read("users/#{@user.id}").should == @user
       end
 
       it "should cache Post#user multiple times" do
@@ -81,20 +86,20 @@ describe Cacheable do
       end
 
       it "should cache Comment#commentable with polymorphic" do
-        cache.data["posts/#{@post1.id}"].should be_nil
+        Rails.cache.read("posts/#{@post1.id}").should be_nil
         @comment1.cached_commentable.should == @post1
-        cache.data["posts/#{@post1.id}"].should == @post1
+        Rails.cache.read("posts/#{@post1.id}").should == @post1
       end
     end
 
     context "has_many" do
       it "should not cache associations" do
-        cache.data["users/#{@user.id}/association/posts"].should be_nil
+        Rails.cache.read("users/#{@user.id}/association/posts").should be_nil
       end
 
       it "should cache User#posts" do
         @user.cached_posts.should == [@post1, @post2]
-        cache.data["users/#{@user.id}/association/posts"].should == [@post1, @post2]
+        Rails.cache.read("users/#{@user.id}/association/posts").should == [@post1, @post2]
       end
 
       it "should cache User#posts multiple times" do
@@ -105,12 +110,12 @@ describe Cacheable do
 
     context "has_many with polymorphic" do
       it "should not cache associations" do
-        cache.data["posts/#{@post1.id}/association/comments"].should be_nil
+        Rails.cache.read("posts/#{@post1.id}/association/comments").should be_nil
       end
 
       it "should cache Post#comments" do
         @post1.cached_comments.should == [@comment1, @comment2]
-        cache.data["posts/#{@post1.id}/association/comments"].should == [@comment1, @comment2]
+        Rails.cache.read("posts/#{@post1.id}/association/comments").should == [@comment1, @comment2]
       end
 
       it "should cache Post#comments multiple times" do
@@ -121,12 +126,12 @@ describe Cacheable do
 
     context "has_one" do
       it "should not cache associations" do
-        cache.data["users/#{@user.id}/association/account"].should be_nil
+        Rails.cache.read("users/#{@user.id}/association/account").should be_nil
       end
 
       it "should cache User#posts" do
         @user.cached_account.should == @account
-        cache.data["users/#{@user.id}/association/account"].should == @account
+        Rails.cache.read("users/#{@user.id}/association/account").should == @account
       end
 
       it "should cache User#posts multiple times" do
@@ -139,44 +144,44 @@ describe Cacheable do
   context "expire_model_cache" do
     it "should delete with_key cache" do
       user = User.find_cached(@user.id)
-      cache.data["users/#{user.id}"].should_not be_nil
+      Rails.cache.read("users/#{user.id}").should_not be_nil
       user.expire_model_cache
-      cache.data["users/#{user.id}"].should be_nil
+      Rails.cache.read("users/#{user.id}").should be_nil
     end
 
     it "should delete with_attribute cache" do
       user = User.find_cached_by_login("flyerhzm")
-      cache.data["users/attribute/login/flyerhzm"].should == @user
+      Rails.cache.read("users/attribute/login/flyerhzm").should == @user
       @user.expire_model_cache
-      cache.data["users/attribute/login/flyerhzm"].should be_nil
+      Rails.cache.read("users/attribute/login/flyerhzm").should be_nil
     end
 
     it "should delete with_method cache" do
       @user.cached_last_post
-      cache.data["users/#{@user.id}/method/last_post"].should_not be_nil
+      Rails.cache.read("users/#{@user.id}/method/last_post").should_not be_nil
       @user.expire_model_cache
-      cache.data["users/#{@user.id}/method/last_post"].should be_nil
+      Rails.cache.read("users/#{@user.id}/method/last_post").should be_nil
     end
 
     it "should delete has_many with_association cache" do
       @user.cached_posts
-      cache.data["users/#{@user.id}/association/posts"].should_not be_nil
+      Rails.cache.read("users/#{@user.id}/association/posts").should_not be_nil
       @post1.save
-      cache.data["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
       @post1.cached_comments
-      cache.data["posts/#{@post1.id}/association/comments"].should_not be_nil
+      Rails.cache.read("posts/#{@post1.id}/association/comments").should_not be_nil
       @comment1.save
-      cache.data["posts/#{@post1.id}/association/comments"].should be_nil
+      Rails.cache.read("posts/#{@post1.id}/association/comments").should be_nil
     end
 
     it "should delete has_one with_association cache" do
       @user.cached_account
-      cache.data["users/#{@user.id}/association/account"].should_not be_nil
+      Rails.cache.read("users/#{@user.id}/association/account").should_not be_nil
       @account.save
-      cache.data["users/#{@user.id}/association/account"].should be_nil
+      Rails.cache.read("users/#{@user.id}/association/account").should be_nil
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'rails'
 require 'active_record'
 require 'rspec'
 require 'mocha_standalone'
+require 'memcached'
 
 require 'cacheable'
 
@@ -16,42 +17,10 @@ $LOAD_PATH.unshift(MODELS)
 
 Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file) }
 
-class TestCache
-  attr_reader :data
-
-  def initialize
-    @data = {}
-  end
-
-  def fetch(key, &block)
-    if read(key)
-      read(key)
-    else
-      write(key, block.call)
-    end
-  end
-
-  def read(key)
-    @data[key]
-  end
-
-  def write(key, value)
-    @data[key] = value
-  end
-
-  def delete(key)
-    @data.delete key
-  end
-
-  def clear
-    @data.clear
-  end
-end
-
 module Rails
   class <<self
     def cache
-      @cache ||= TestCache.new
+      @cache ||= Memcached::Rails.new
     end
   end
 end
@@ -59,6 +28,9 @@ end
 RSpec.configure do |config|
   config.mock_with :mocha
 
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+
   config.before :all do
     ::ActiveRecord::Schema.define(:version => 1) do
       create_table :users do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_cacheable
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,22 @@ 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
@@ -69,6 +85,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -95,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1878933439133819997
+      hash: 2779579293480982592
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1878933439133819997
+      hash: 2779579293480982592
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24