cachy 0.1.7 → 0.2.0

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,28 @@
+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
+    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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  mini_memory_store
+  rake
+  rspec (~> 2)

data/Rakefile

@@ -1,6 +1,8 @@
 task :default => :spec
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color --backtrace']}
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--backtrace --color'
+end
 
 begin
   require 'jeweler'
@@ -16,4 +18,4 @@ begin
   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"
-end
+end

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/cachy.gemspec

@@ -1,60 +1,73 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{cachy}
-  s.version = "0.1.7"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-11-18}
+  s.date = %q{2010-12-22}
   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"
+    "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.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   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/memcache_timeout_protection_spec.rb",
-     "spec/cachy/redis_wrapper_spec.rb",
-     "spec/mem_cache.rb",
-     "spec/cachy_spec.rb",
-     "spec/test_cache.rb",
-     "spec/spec_helper.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
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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
 end
 

data/lib/cachy.rb

@@ -1,3 +1,5 @@
+require 'mini_memory_store'
+
 class Cachy
   WHILE_RUNNING_TIMEOUT = 5*60 #seconds
   KEY_VERSION_TIMEOUT = 30 #seconds
@@ -78,19 +80,12 @@ class Cachy
     expire(*args)
   end
 
-  # Fetch key_versions from cache every KEY_VERSION_TIMEOUT seconds,
-  # otherwise every .key call would result in an cache request
-  @@key_versions = {:versions=>{}, :last_set=>0}
   def self.key_versions
-    if key_versions_expired?
-      versions = read_versions
-      @@key_versions = {:versions=>versions, :last_set=>Time.now.to_i}
-    end
-    @@key_versions[:versions]
+    memory_store.cache{ read_versions }
   end
 
   def self.key_versions=(data)
-    @@key_versions[:last_set] = 0 #expire current key
+    memory_store.clear
     write_version(data)
   end
 
@@ -189,12 +184,6 @@ class Cachy
     cache_store.read(HEALTH_CHECK_KEY) == 'yes'
   end
 
-  # Do we need to fetch fresh key_versions from cache ?
-  def self.key_versions_expired?
-    key_versions_timeout = Time.now.to_i - KEY_VERSION_TIMEOUT
-    @@key_versions[:last_set] < key_versions_timeout
-  end
-
   # Temorarily store something else in the cache,
   # so that a often-called and slow cache-block is not run by
   # multiple processes in parallel
@@ -249,6 +238,10 @@ class Cachy
       {}
     end
   end
+
+  def self.memory_store
+    @memory_store ||= MiniMemoryStore.new(:expires_in => KEY_VERSION_TIMEOUT)
+  end
 end
 
 Cachy.cache_store = ActionController::Base.cache_store if defined? ActionController::Base

data/spec/cachy_spec.rb

@@ -4,9 +4,9 @@ describe Cachy do
   before do
     @cache = TestCache.new
     Cachy.cache_store = @cache
-    Cachy.class_eval "@@key_versions = {:versions=>{}, :last_set=>0}"
     @cache.write(Cachy::HEALTH_CHECK_KEY, 'yes')
     Cachy.send(:class_variable_set, '@@cache_error', false)
+    Cachy.send(:memory_store).clear
   end
 
   describe :cache do
@@ -263,21 +263,16 @@ describe Cachy do
     end
 
     it "reloads when keys have expired" do
-      Cachy.send :class_variable_set, "@@key_versions", {:versions=>{:xx=>2}, :last_set=>(Time.now.to_i - 60)}
+      Cachy.key_versions.should == {} # fills cache
       @cache.write Cachy::KEY_VERSIONS_KEY, {:xx=>1}
+      Cachy.send(:memory_store).clear
       Cachy.key_versions.should == {:xx=>1}
     end
 
-    it "does not reload when keys have not expired" do
-      Cachy.send :class_variable_set, "@@key_versions", {:versions=>{:xx=>2}, :last_set=>Time.now.to_i}
-      @cache.write Cachy::KEY_VERSIONS_KEY, {:xx=>1}
-      Cachy.key_versions.should == {:xx=>2}
-    end
-
     it "expires when key_versions is set" do
-      Cachy.send :class_variable_set, "@@key_versions", {:versions=>{:xx=>2}, :last_set=>Time.now.to_i}
-      Cachy.key_versions = {:xx=>1}
-      Cachy.key_versions[:xx].should == 1
+      Cachy.key_versions.should == {}
+      Cachy.key_versions = {:xx => 1}
+      Cachy.key_versions.should == {:xx => 1}
     end
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cachy
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 7
-  version: 0.1.7
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,10 +15,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +01:00
+date: 2010-12-22 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: mini_memory_store
+  prerelease: false
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  prerelease: false
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  name: rspec
+  prerelease: false
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
+  prerelease: false
+  type: :development
+  version_requirements: *id004
 description: 
 email: grosser.michael@gmail.com
 executables: []
@@ -27,6 +83,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
+- Gemfile.lock
 - Rakefile
 - Readme.md
 - VERSION
@@ -50,37 +108,41 @@ homepage: http://github.com/grosser/cachy
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 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/memcache_timeout_protection_spec.rb
 - spec/cachy/redis_wrapper_spec.rb
-- spec/mem_cache.rb
 - spec/cachy_spec.rb
-- spec/test_cache.rb
+- spec/mem_cache.rb
 - spec/spec_helper.rb
+- spec/test_cache.rb