cachy 0.2.1 → 0.3.0

data/.travis.yml

@@ -0,0 +1,5 @@
+script: "bundle exec rake"
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,9 +1,7 @@
 source :rubygems
-
-gem 'mini_memory_store'
+gemspec
 
 group :development do
   gem 'rake'
   gem 'rspec', '~>2'
-  gem 'jeweler'
 end

data/Gemfile.lock

@@ -1,28 +1,28 @@
+PATH
+  remote: .
+  specs:
+    cachy (0.3.0)
+      mini_memory_store
+
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
+    diff-lcs (1.1.3)
     mini_memory_store (0.1.0)
-    rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rake (0.9.2.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jeweler
-  mini_memory_store
+  cachy!
   rake
   rspec (~> 2)

data/Rakefile

@@ -1,21 +1,22 @@
-task :default => :spec
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '--backtrace --color'
+require 'bundler/gem_tasks'
+
+task :default do
+  sh "rspec spec/"
 end
 
-begin
-  require 'jeweler'
-  project_name = 'cachy'
-  Jeweler::Tasks.new do |gem|
-    gem.name = project_name
-    gem.summary = "Caching library for projects that have many processes or many caches"
-    gem.email = "grosser.michael@gmail.com"
-    gem.homepage = "http://github.com/grosser/#{project_name}"
-    gem.authors = ["Michael Grosser"]
-  end
+# extracted from https://github.com/grosser/project_template
+rule /^version:bump:.*/ do |t|
+  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
+  index = ['major', 'minor','patch'].index(t.name.split(':').last)
+  file = 'lib/cachy/version.rb'
+
+  version_file = File.read(file)
+  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
+  version_parts[index] = version_parts[index].to_i + 1
+  version_parts[2] = 0 if index < 2 # remove patch for minor
+  version_parts[1] = 0 if index < 1 # remove minor for major
+  new_version = version_parts * '.'
+  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
 
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
 end

data/Readme.md

@@ -47,7 +47,7 @@ Expire all all caches of one kind when code inside the cache has been updated
     Cachy.cache(:a_key, :witout_locale=>true){ 'German' } == 'English'
 
 ####Caching results of other caches
-When inner cache is expired outer cache would normally still shows old results.  
+When inner cache is expired outer cache would normally still shows old results.<br/>
 --> expire outer cache when inner cache is expired.
 
     a = Cachy.cache(:a, :expires_in=>1.day){ expensive() }
@@ -62,7 +62,7 @@ In case they get to long for your caching backend, makes them short but unreadab
     Cachy.cache(:a_key, :hash_key=>true){ expensive } # per call
 
 #### Uses .cache_key when available
-E.g. ActiveRecord objects are stored in the key with their updated_at timestamp.  
+E.g. ActiveRecord objects are stored in the key with their updated_at timestamp.<br/>
 When they are updated the cache is automatically expired.
 
     Cachy.cache(:my_key, User.first){ expensive }
@@ -96,7 +96,7 @@ Use to cache e.g. Erb output
     <% end %>
 
 ###Cachy.cache_store
-No ActionController::Base.cache_store ?  
+No ActionController::Base.cache_store ?<br/>
 Give me something that responds to read/write(Rails style) or []/store([Moneta](http://github.com/wycats/moneta/tree/master)) or get/set(Memcached)
     Cachy.cache_store = some_cache
 
@@ -117,6 +117,8 @@ Authors
 ###Contributors
  - [mindreframer](http://www.simplewebapp.de/roman)
 
-[Michael Grosser](http://grosser.it)  
-grosser.michael@gmail.com  
-Hereby placed under public domain, do what you want, just do not hold me accountable...
+[Michael Grosser](http://grosser.it)<br/>
+michael@grosser.it<br/>
+License: MIT<br/>
+[![Build Status](https://secure.travis-ci.org/grosser/cachy.png)](http://travis-ci.org/grosser/cachy)
+

data/cachy.gemspec

@@ -1,72 +1,13 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+name = "cachy"
+require "#{name}/version"
 
-Gem::Specification.new do |s|
-  s.name = %q{cachy}
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+Gem::Specification.new name, Cachy::VERSION do |s|
+  s.summary = "Caching library for projects that have many processes or many caches"
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-06-17}
-  s.email = %q{grosser.michael@gmail.com}
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "Rakefile",
-    "Readme.md",
-    "VERSION",
-    "cachy.gemspec",
-    "lib/cachy.rb",
-    "lib/cachy/memcache_timeout_protection.rb",
-    "lib/cachy/memcached_wrapper.rb",
-    "lib/cachy/moneta_wrapper.rb",
-    "lib/cachy/redis_wrapper.rb",
-    "lib/cachy/wrapper.rb",
-    "spec/cachy/memcache_timeout_protection_spec.rb",
-    "spec/cachy/memcached_wrapper_spec.rb",
-    "spec/cachy/moneta_wrapper_spec.rb",
-    "spec/cachy/redis_wrapper_spec.rb",
-    "spec/cachy_spec.rb",
-    "spec/mem_cache.rb",
-    "spec/spec_helper.rb",
-    "spec/test_cache.rb"
-  ]
-  s.homepage = %q{http://github.com/grosser/cachy}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Caching library for projects that have many processes or many caches}
-  s.test_files = [
-    "spec/cachy/memcache_timeout_protection_spec.rb",
-    "spec/cachy/memcached_wrapper_spec.rb",
-    "spec/cachy/moneta_wrapper_spec.rb",
-    "spec/cachy/redis_wrapper_spec.rb",
-    "spec/cachy_spec.rb",
-    "spec/mem_cache.rb",
-    "spec/spec_helper.rb",
-    "spec/test_cache.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mini_memory_store>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<mini_memory_store>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mini_memory_store>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  s.email = "michael@grosser.it"
+  s.homepage = "http://github.com/grosser/#{name}"
+  s.files = `git ls-files`.split("\n")
+  s.license = "MIT"
+  s.add_runtime_dependency "mini_memory_store"
 end
-

data/lib/cachy.rb

@@ -1,6 +1,6 @@
 require 'mini_memory_store'
 
-class Cachy
+module Cachy
   WHILE_RUNNING_TIMEOUT = 5*60 #seconds
   KEY_VERSION_TIMEOUT = 30 #seconds
   HEALTH_CHECK_KEY = 'cachy_healthy'
@@ -29,7 +29,7 @@ class Cachy
     cache_store.write key, result, options
     result
   end
-  
+
   def self.cache_if(cond, *args, &block)
     if cond
       cache(*args, &block)
@@ -118,6 +118,8 @@ class Cachy
   def self.cache_store=(cache)
     @cache_store = wrap_cache(cache)
     @cache_store.write HEALTH_CHECK_KEY, 'yes'
+    @key_versions_cache_store = nil
+    memory_store.clear
   end
 
   def self.cache_store

data/lib/cachy/version.rb

@@ -0,0 +1,3 @@
+module Cachy
+  Version = VERSION = '0.3.0'
+end

data/spec/cachy/memcache_timeout_protection_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/spec_helper'
-require 'spec/mem_cache'
+require 'spec_helper'
+require './spec/mem_cache'
 require 'cachy/memcache_timeout_protection'
 
 describe "MemCache timeout protection" do
@@ -18,14 +18,14 @@ describe "MemCache timeout protection" do
   end
 
   it "catches timeout errors" do
-    MemCache.read_error_callback = lambda{}
+    MemCache.read_error_callback = lambda{|x|}
     simulate_timeout
     cache.get('x').should == nil
     cache.read_error_occurred.should == true
   end
 
   it "resets error_occurred to false after successful get" do
-    MemCache.read_error_callback = lambda{}
+    MemCache.read_error_callback = lambda{|x|}
     simulate_timeout
     cache.get('x').should == nil
     cache.stub!(:stubable_cache_get).and_return 1
@@ -42,9 +42,9 @@ describe "MemCache timeout protection" do
   end
 
   it "calls the callback" do
-    MemCache.read_error_callback = lambda{ 1 }
+    MemCache.read_error_callback = lambda{|x| 1 }
     simulate_timeout
     cache.get('x').should == 1
     cache.read_error_occurred.should == true
   end
-end
+end

data/spec/cachy/memcached_wrapper_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/spec_helper'
-require 'spec/mem_cache'
+require 'spec_helper'
+require './spec/mem_cache'
 
 describe "Cachy::MemcachedWrapper" do
   before :all do
@@ -34,4 +34,4 @@ describe "Cachy::MemcachedWrapper" do
     @cache.should_receive(:delete).with('x_v1')
     Cachy.expire(:x)
   end
-end
+end

data/spec/cachy/moneta_wrapper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 class TestMoneta
   def initialize
@@ -56,4 +56,4 @@ describe "Cachy::MonetaWrapper" do
     @cache.should_receive(:delete).with('x_v1')
     Cachy.expire(:x)
   end
-end
+end

data/spec/cachy/redis_wrapper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 class TestRedis
   def self.to_s
@@ -30,6 +30,8 @@ class TestRedis
 end
 
 describe "Cachy::RedisWrapper" do
+  let(:yaml_ending) { RUBY_VERSION > '1.9' ? "\n...\n" : "\n" }
+
   before :all do
     @cache = TestRedis.new
     Cachy.cache_store = @cache
@@ -49,13 +51,13 @@ describe "Cachy::RedisWrapper" do
   end
 
   it "can cache without expires" do
-    @cache.should_receive(:set).with('x_v1', "--- SUCCESS\n")
+    @cache.should_receive(:set).with('x_v1', "--- SUCCESS#{yaml_ending}")
     @cache.should_not_receive(:expire)
     Cachy.cache(:x){ 'SUCCESS' }.should == 'SUCCESS'
   end
 
   it "can cache with expires" do
-    @cache.should_receive(:set).with('x_v1', "--- SUCCESS\n")
+    @cache.should_receive(:set).with('x_v1', "--- SUCCESS#{yaml_ending}")
     @cache.should_receive(:expire).with('x_v1', 1)
     Cachy.cache(:x, :expires_in=>1){ 'SUCCESS' }.should == 'SUCCESS'
   end
@@ -64,4 +66,4 @@ describe "Cachy::RedisWrapper" do
     @cache.should_receive(:del).with('x_v1')
     Cachy.expire(:x)
   end
-end
+end

data/spec/cachy_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Cachy do
   before do
@@ -49,7 +49,7 @@ describe Cachy do
       Cachy.cache(:x){ true }.should == true
     end
   end
-  
+
   describe :cache_if do
     it "should not call the cache command if condition is wrong" do
       Cachy.should_not_receive(:cache)
@@ -57,14 +57,14 @@ describe Cachy do
         "asd"
       end
     end
-    
+
     it "should call cache command if condition is true" do
       Cachy.should_receive(:cache)
       Cachy.cache_if(true, :x) do
         "asd"
       end
     end
-    
+
     it "should pass params correctly" do
       Cachy.should_receive(:cache).with(:x, {:y => 1}, :expires_in => 3)
       Cachy.cache_if(true, :x, {:y => 1}, :expires_in => 3) do
@@ -357,6 +357,14 @@ describe Cachy do
       Cachy.increment_key :x
       Cachy.key_versions.should == {:x => 2}
     end
+
+    it "invalidates the cached key_versions_cache_store when a new cache store is used" do
+      key_cache.write(Cachy::KEY_VERSIONS_KEY, :x => 1)
+      Cachy.key_versions_cache_store = key_cache
+      Cachy.key_versions.should == {:x => 1}
+      Cachy.cache_store = @cache
+      Cachy.key_versions.should == {}
+    end
   end
 
   describe :delete_key do

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
-require 'spec/test_cache'
+require './spec/test_cache'
 $LOAD_PATH << 'lib'
-require 'cachy'
+require 'cachy'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cachy
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 +02:00
-default_executable: 
+date: 2012-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,51 +31,8 @@ dependencies:
   type: :runtime
   name: mini_memory_store
   version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  name: rake
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
-  type: :development
-  name: rspec
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  name: jeweler
-  version_requirements: *id004
-  prerelease: false
 description: 
-email: grosser.michael@gmail.com
+email: michael@grosser.it
 executables: []
 
 extensions: []
@@ -83,17 +40,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - Readme.md
-- VERSION
 - cachy.gemspec
 - lib/cachy.rb
 - lib/cachy/memcache_timeout_protection.rb
 - lib/cachy/memcached_wrapper.rb
 - lib/cachy/moneta_wrapper.rb
 - lib/cachy/redis_wrapper.rb
+- lib/cachy/version.rb
 - lib/cachy/wrapper.rb
 - spec/cachy/memcache_timeout_protection_spec.rb
 - spec/cachy/memcached_wrapper_spec.rb
@@ -103,10 +61,9 @@ files:
 - spec/mem_cache.rb
 - spec/spec_helper.rb
 - spec/test_cache.rb
-has_rdoc: true
 homepage: http://github.com/grosser/cachy
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -133,16 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Caching library for projects that have many processes or many caches
-test_files: 
-- spec/cachy/memcache_timeout_protection_spec.rb
-- spec/cachy/memcached_wrapper_spec.rb
-- spec/cachy/moneta_wrapper_spec.rb
-- spec/cachy/redis_wrapper_spec.rb
-- spec/cachy_spec.rb
-- spec/mem_cache.rb
-- spec/spec_helper.rb
-- spec/test_cache.rb
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.2.1