cache_version 0.9.5 → 1.0.0

data/.gitignore

@@ -1 +1,3 @@
-pkg
+pkg
+*~
+Gemfile.lock

data/.rbenv-gemsets

@@ -0,0 +1 @@
+cache_version

data/.rbenv-version

@@ -0,0 +1 @@
+ree-1.8.7-2012.02

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://www.rubygems.org"
+
+gemspec

data/Rakefile

@@ -1,45 +1,10 @@
-require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "cache_version"
-    s.summary = %Q{Store the version of any class for cache invalidation}
-    s.email = "code@justinbalthrop.com"
-    s.homepage = "http://github.com/ninjudd/cache_version"
-    s.description = "Store the version of any class for cache invalidation"
-    s.authors = ["Justin Balthrop"]
-    s.add_dependency('memcache', '>= 1.0.0')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+require 'bundler/gem_tasks'
 
 Rake::TestTask.new do |t|
-  t.libs << 'lib'
+  t.libs = ['lib', 'test']
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
 
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'cache_version'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.libs << 'test'
-    t.test_files = FileList['test/**/*_test.rb']
-    t.verbose = true
-  end
-rescue LoadError
-end
-
 task :default => :test

data/VERSION

@@ -1 +1 @@
-0.9.5
+1.0.0

data/cache_version.gemspec

@@ -1,55 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = %q{cache_version}
-  s.version = "0.9.5"
+Gem::Specification.new do |gem|
+  gem.name          = "cache_version"
+  gem.version       = IO.read('VERSION')
+  gem.authors       = ["Justin Balthrop"]
+  gem.email         = ["git@justinbalthrop.com"]
+  gem.description   = %q{Store the version of any class for cache invalidation}
+  gem.summary       = gem.description
+  gem.homepage      = "https://github.com/ninjudd/model_set"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Justin Balthrop"]
-  s.date = %q{2009-11-20}
-  s.description = %q{Store the version of any class for cache invalidation}
-  s.email = %q{code@justinbalthrop.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "cache_version.gemspec",
-     "examples/sample_migration.rb",
-     "lib/cache_version.rb",
-     "test/cache_version_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/ninjudd/cache_version}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Store the version of any class for cache invalidation}
-  s.test_files = [
-    "test/cache_version_test.rb",
-     "test/test_helper.rb",
-     "examples/sample_migration.rb"
-  ]
+  gem.add_development_dependency 'shoulda', '3.0.1'
+  gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'activerecord-postgresql-adapter'
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  gem.add_dependency 'memcache',     '>= 1.3.0'
+  gem.add_dependency 'activerecord', '~> 2.3.9'
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<memcache>, [">= 1.0.0"])
-    else
-      s.add_dependency(%q<memcache>, [">= 1.0.0"])
-    end
-  else
-    s.add_dependency(%q<memcache>, [">= 1.0.0"])
-  end
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 end
-

data/lib/cache_version.rb

@@ -5,13 +5,10 @@ require 'active_record'
 module CacheVersion
   def self.db
     db = ActiveRecord::Base.connection
-    if defined?(DataFabric::ConnectionProxy) and db.kind_of?(DataFabric::ConnectionProxy)
-      db.send(:master)
-    else
-      db
-    end
+    db = db.send(:master) if defined?(DataFabric::ConnectionProxy) and db.kind_of?(DataFabric::ConnectionProxy)
+    db
   end
-  
+
   def self.cache
     CACHE
   end
@@ -19,19 +16,16 @@ module CacheVersion
   def self.get(key)
     key = key.to_s
     version_by_key[key] ||= CACHE.get_or_add(cache_key(key)) do
-      db.select_value("SELECT version FROM cache_versions WHERE key = '#{key}'").to_i
+      db.select_value("SELECT version FROM cache_versions WHERE #{key_column} = '#{key}'").to_i
     end
   end
 
   def self.increment(key)
-    key = key.to_s
-    if get(key) == 0
-      db.execute("INSERT INTO cache_versions (key, version) VALUES ('#{key}', 1)")
-    else
-      db.execute("UPDATE cache_versions SET version = version + 1 WHERE key = '#{key}'")
-    end
-    invalidate_cache(key)
-    get(key)
+    alter(key, 1, 'version + 1')
+  end
+
+  def self.set(key, value)
+    alter(key, value.to_i)
   end
 
   def self.invalidate_cache(key)
@@ -39,19 +33,49 @@ module CacheVersion
     cache.delete(cache_key(key))
     version_by_key.delete(key)
   end
-  
-  def self.clear_cache
-    @version_by_key = {}
+
+  def self.clear_cache(force = false)
+    if v = cache.get(vkey)
+      if force == true or @version.nil? or v > @version
+        @version = v
+        version_by_key.clear
+      end
+    else
+      @version = cache.get_or_add(vkey, Time.now.to_i)
+    end
   end
 
 private
+
+  def self.alter(key, init, update = init)
+    key = key.to_s
+
+    if get(key) == 0
+      db.execute("INSERT INTO cache_versions (#{key_column}, version) VALUES ('#{key}', #{init})")
+    else
+      db.execute("UPDATE cache_versions SET version = #{update} WHERE #{key_column} = '#{key}'")
+    end
+
+    cache.set(vkey, Time.now.to_i)
+    invalidate_cache(key)
+    get(key)
+  end
+
   def self.version_by_key
     @version_by_key ||= {}
-  end  
-    
+  end
+
   def self.cache_key(key)
     "v:#{key}"
   end
+
+  def self.vkey
+    "v:CacheVersion"
+  end
+
+  def self.key_column
+    @key_column ||= db.quote_column_name('key')
+  end
 end
 
 class Module
@@ -64,6 +88,11 @@ class Module
     key = [self, context].compact.join('_')
     CacheVersion.increment(key)
   end
+
+  def set_version(value, context = nil)
+    key = [self, context].compact.join('_')
+    CacheVersion.set(key, value)
+  end
 end
 
 class CacheVersionMigration < ActiveRecord::Migration

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 
 $LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../memcache/lib"
@@ -15,7 +15,7 @@ CACHE = Memcache.new(:servers => 'localhost')
 ActiveRecord::Base.establish_connection(
   :adapter  => "postgresql",
   :host     => "localhost",
-  :username => "postgres",
+  :username => `whoami`.chomp,
   :password => "",
   :database => "test"
 )

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cache_version
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  hash: 23
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,30 +15,113 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -08:00
+date: 2013-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord-postgresql-adapter
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: memcache
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 3
+        - 9
+        version: 2.3.9
+  type: :runtime
+  version_requirements: *id006
 description: Store the version of any class for cache invalidation
-email: code@justinbalthrop.com
+email: 
+- git@justinbalthrop.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- .rbenv-gemsets
+- .rbenv-version
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -43,34 +132,39 @@ files:
 - test/cache_version_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/ninjudd/cache_version
+homepage: https://github.com/ninjudd/model_set
 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"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Store the version of any class for cache invalidation
 test_files: 
 - test/cache_version_test.rb
 - test/test_helper.rb
-- examples/sample_migration.rb