record_cache 0.9.12 → 1.0.0

data/.gitignore

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

data/.rbenv-gemsets

@@ -0,0 +1 @@
+record_cache

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/README.rdoc

@@ -24,13 +24,15 @@ direct SQL will not.
 
 == Install:
 
-  sudo gem install record_cache -s http://gemcutter.org
+  gem install record_cache
 
 == Dependencies:
 
 * {after_commit}[http://github.com/freelancing-god/after_commit]
 * {memcache}[http://github.com/ninjudd/memcache]
 
+RecordCache is confirmed to work with Rails 2.3.9. It does not currently work with Rails 3.
+
 == License:
 
 Copyright (c) 2009 Justin Balthrop, Geni.com; Published under The MIT License, see LICENSE

data/Rakefile

@@ -1,49 +1,10 @@
-require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "record_cache"
-    s.summary = %Q{Active Record caching and indexing in memcache. An alternative to cache_fu}
-    s.email = "code@justinbalthrop.com"
-    s.homepage = "http://github.com/ninjudd/record_cache"
-    s.description = "Active Record caching and indexing in memcache"
-    s.authors = ["Justin Balthrop"]
-    s.add_dependency('after_commit', '>= 1.0.0')
-    s.add_dependency('deferrable', '>= 0.1.0')
-    s.add_dependency('memcache', '>= 1.0.0')
-    s.add_dependency('cache_version', '>= 0.9.4')
-    s.add_dependency('activerecord', '>= 2.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    = 'record_cache'
-  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.12
+1.0.0

data/lib/record_cache/index.rb

@@ -1,3 +1,5 @@
+require 'digest'
+
 module RecordCache
   class Index
     include Deferrable
@@ -26,6 +28,10 @@ module RecordCache
       @scope_query   = opts[:scope] || {}
     end
 
+    def to_s
+      "<RecordCache::Index #{@model_class} by #{@index_field} (#{@name})>"
+    end
+
     def cache
       if RecordCache.config[:thread_safe]
         Thread.current[:record_cache] ||= @cache.clone
@@ -51,16 +57,15 @@ module RecordCache
     end
 
     def namespace
-      "#{model_class.name}_#{model_class.version}_#{RecordCache.version}:#{name}" << ( full_record? ? '' : ":#{fields.join(',')}" )
+      "#{model_class.name}_#{model_class.version}_#{RecordCache.version}_#{fields_hash}:#{name}"
     end
 
     def fields_hash
       if @fields_hash.nil?
-        if full_record?
-          @fields_hash ||= model_class.column_names.sort.hash
-        else
-          @fields_hash ||= fields.collect {|field| field.to_s}.hash
-        end
+        fields = full_record? ? model_class.column_names : self.fields
+        md5 = Digest::MD5::new
+        md5 << fields.sort.join(',')
+        @fields_hash = md5.hexdigest
       end
       @fields_hash
     end
@@ -182,7 +187,7 @@ module RecordCache
     end
 
     def invalidate_model(model)
-      attribute     = model.send(index_field)
+      attribute     = model.read_attribute(index_field)
       attribute_was = model.attr_was(index_field)
       if scope.match_previous?(model)
         if write_ahead?
@@ -258,7 +263,6 @@ module RecordCache
         opts = {
           :expiry        => expiry,
           :disable_write => model_class.record_cache_config[:disable_write],
-          :validation    => lambda {|key, record_set| record_set and record_set.fields_hash == fields_hash},
         }
         cache.get_some(keys, opts) do |keys_to_fetch|
           raise 'db access is disabled' if @@disable_db
@@ -275,7 +279,11 @@ module RecordCache
 
             db.select_all(sql).each do |record|
               key = record[index_field] || NULL
-              fetched_records[key] << record
+              if fetched_records[key]
+                fetched_records[key] << record
+              else
+                raise "no records found in #{self} for #{key.inspect}. existing keys: #{fetched_records.keys.inspect}"
+              end
             end
           end
           fetched_records
@@ -378,7 +386,10 @@ module RecordCache
 
     def stringify(keys)
       keys.compact! if disallow_null?
-      keys.collect {|key| key.nil? ? NULL : key.to_s}.uniq
+      keys.collect do |key|
+        key = key.nil? ? NULL : key.to_s
+        index_column.number? ? key.strip : key
+      end.uniq
     end
 
     def db

data/lib/record_cache.rb

@@ -1,6 +1,6 @@
-require 'rubygems'
 require 'memcache'
 require 'active_record'
+require 'after_commit'
 require 'cache_version'
 require 'deferrable'
 
@@ -53,7 +53,11 @@ module RecordCache
 
     def attr_was(attr)
       attr = attr.to_s
-      ['id', 'type'].include?(attr) ? send(attr) : send(:attribute_was, attr)
+      if ['id', 'type'].include?(attr) or not attribute_changed?(attr)
+        read_attribute(attr)
+      else
+        changed_attributes[attr]
+      end
     end
   end
 
@@ -107,6 +111,14 @@ module RecordCache
       end
     end
 
+    def id_field
+      connection.quote_column_name(primary_key)
+    end
+
+    def id_column
+      columns_hash[primary_key]
+    end
+
     def invalidate_from_conditions(conditions, flag = nil)
       if conditions.nil?
         # Just invalidate all indexes.
@@ -116,12 +128,12 @@ module RecordCache
       end
 
       # Freeze ids to avoid race conditions.
-      sql = "SELECT id FROM #{table_name} "
+      sql = "SELECT #{id_field} FROM #{table_name} "
       self.send(:add_conditions!, sql, conditions, self.send(:scope, :find))
       ids = RecordCache.db(self).select_values(sql)
 
       return if ids.empty?
-      conditions = "id IN (#{ids.join(',')})"
+      conditions = "#{id_field} IN (#{ids.collect {|id| quote_value(id, id_column)}.join(',')})"
 
       if block_given?
         # Capture the ids to invalidate in lambdas.

data/record_cache.gemspec

@@ -1,66 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- 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{record_cache}
-  s.version = "0.9.12"
+Gem::Specification.new do |gem|
+  gem.name          = "record_cache"
+  gem.version       = IO.read('VERSION')
+  gem.authors       = ["Justin Balthrop"]
+  gem.email         = ["git@justinbalthrop.com"]
+  gem.description   = %q{Active Record caching and indexing in memcache.}
+  gem.summary       = gem.description
+  gem.homepage      = "https://github.com/ninjudd/record_cache"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Justin Balthrop"]
-  s.date = %q{2011-03-21}
-  s.description = %q{Active Record caching and indexing in memcache}
-  s.email = %q{code@justinbalthrop.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/record_cache.rb",
-    "lib/record_cache/index.rb",
-    "lib/record_cache/scope.rb",
-    "lib/record_cache/set.rb",
-    "record_cache.gemspec",
-    "test/record_cache_test.rb",
-    "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/ninjudd/record_cache}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Active Record caching and indexing in memcache. An alternative to cache_fu}
-  s.test_files = [
-    "test/record_cache_test.rb",
-    "test/test_helper.rb"
-  ]
+  gem.add_development_dependency 'shoulda', '3.0.1'
+  gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'rsolr'
+  gem.add_development_dependency 'json'
+  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 'after_commit',  '>= 1.0.0'
+  gem.add_dependency 'deferrable',    '>= 0.1.0'
+  gem.add_dependency 'memcache',      '>= 1.0.0'
+  gem.add_dependency 'cache_version', '>= 0.9.4'
+  gem.add_dependency 'activerecord',  '~> 2.3.9'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<after_commit>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<deferrable>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<memcache>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<cache_version>, [">= 0.9.4"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
-    else
-      s.add_dependency(%q<after_commit>, [">= 1.0.0"])
-      s.add_dependency(%q<deferrable>, [">= 0.1.0"])
-      s.add_dependency(%q<memcache>, [">= 1.0.0"])
-      s.add_dependency(%q<cache_version>, [">= 0.9.4"])
-      s.add_dependency(%q<activerecord>, [">= 2.0.0"])
-    end
-  else
-    s.add_dependency(%q<after_commit>, [">= 1.0.0"])
-    s.add_dependency(%q<deferrable>, [">= 0.1.0"])
-    s.add_dependency(%q<memcache>, [">= 1.0.0"])
-    s.add_dependency(%q<cache_version>, [">= 0.9.4"])
-    s.add_dependency(%q<activerecord>, [">= 2.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/test/record_cache_test.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 RecordCache::Set.source_tracking = true
 
-class CreateTables < ActiveRecord::Migration 
+class CreateTables < ActiveRecord::Migration
   def self.up
     down
     create_table :pets do |t|
@@ -64,14 +64,19 @@ class RecordCacheTest < Test::Unit::TestCase
       CreateTables.up
       CacheVersionMigration.up
     end
-    
+
     teardown do
       system('killall memcached')
       CreateTables.down
       CacheVersionMigration.down
       RecordCache::Index.enable_db
     end
-    
+
+    should 'find_by_id with space' do
+      dog = Dog.create(:name => 'Frankie')
+      assert Pet.find_by_id("#{dog.id} ")
+    end
+
     should 'create field lookup functions' do
       dog   = Breed.new(:name => 'pitbull retriever')
       cat   = Breed.new(:name => 'house cat')
@@ -79,16 +84,16 @@ class RecordCacheTest < Test::Unit::TestCase
       daisy = Dog.create(:name => 'Daisy', :breed => dog)
 
       expected = {dog.id => daisy.id, cat.id => willy.id}
-      assert_equal expected, Pet.id_by_breed_id([dog.id, cat.id, 100, 101])      
+      assert_equal expected, Pet.id_by_breed_id([dog.id, cat.id, 100, 101])
     end
-    
+
     should 'return cached values without accessing the database' do
       color = Color.new(:name => 'black & white')
       dog   = Breed.new(:name => 'pitbull retriever')
       cat   = Breed.new(:name => 'house cat')
       daisy = Dog.create(:name => 'Daisy', :color => color, :breed => dog)
       willy = Cat.create(:name => 'Willy', :color => color, :breed => cat)
-      
+
       Pet.find(daisy.id, willy.id)
       Dog.find_all_by_color_id(color.id)
       Dog.find_all_by_breed_id(dog.id)
@@ -121,7 +126,7 @@ class RecordCacheTest < Test::Unit::TestCase
       breed2 = Breed.new(:name => 'pitbull terrier')
       daisy = Dog.create(:name => 'Daisy', :color => color1, :breed => breed1)
       sammy = Dog.create(:name => 'Sammy', :color => color1, :breed => breed2)
-      
+
       Dog.find(daisy.id, sammy.id)
       Dog.find_all_by_color_id(color1.id)
       Dog.find_all_by_breed_id([breed1.id, breed2.id])
@@ -152,7 +157,7 @@ class RecordCacheTest < Test::Unit::TestCase
     should 'create raw find methods' do
       daisy = Dog.create(:name => 'Daisy')
       sammy = Dog.create(:name => 'Sammy')
-      
+
       Dog.find(daisy.id, sammy.id)
       RecordCache::Index.disable_db
 
@@ -166,7 +171,7 @@ class RecordCacheTest < Test::Unit::TestCase
       breed2 = Breed.new(:name => 'pitbull terrier')
       daisy = Dog.create(:name => 'Daisy', :color => color, :breed => breed1, :sex => 'f')
       sammy = Dog.create(:name => 'Sammy', :color => color, :breed => breed2, :sex => 'm')
-      
+
       assert_equal [sammy],        Dog.find_all_male_by_color_id(color.id)
       assert_equal [daisy],        Dog.find_all_female_by_color_id(color.id)
       assert_equal [daisy, sammy], Dog.find_all_colors(color.id)
@@ -184,22 +189,22 @@ class RecordCacheTest < Test::Unit::TestCase
       end
       assert_equal 6, count
     end
-    
+
     should 'invalidate indexes on save' do
       b_w   = Color.new(:name => 'black & white')
       brown = Color.new(:name => 'brown')
       breed = Breed.new(:name => 'mutt')
       daisy = Dog.create(:name => 'Daisy', :color => b_w, :breed => breed, :sex => 'f')
-      
+
       assert_equal daisy, Dog.find_by_color_id(b_w.id)
-      
+
       daisy.name  = 'Molly'
       daisy.color = brown
       daisy.save
-      
+
       assert_equal 'Molly', daisy.name
       assert_equal brown.id, daisy.color_id
-      
+
       assert_equal daisy, Dog.find_by_color_id(brown.id)
       assert_equal nil,   Dog.find_by_color_id(b_w.id)
     end

data/test/test_helper.rb

@@ -1,20 +1,11 @@
 require 'test/unit'
 require 'rubygems'
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 require 'pp'
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
-['cache_version', 'model_set', 'memcache', 'deferrable'].each do |dir|
-  $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../#{dir}/lib"
-end
-
 require 'record_cache'
 
-['lib/after_commit', 'lib/after_commit/active_record', 'lib/after_commit/connection_adapters', 'init'].each do |file|
-  require File.dirname(__FILE__) + "/../../after_commit/#{file}"
-end
-
 class Test::Unit::TestCase
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: record_cache
 version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
+  - 1
+  - 0
   - 0
-  - 9
-  - 12
-  version: 0.9.12
+  version: 1.0.0
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -15,13 +15,99 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -07:00
+date: 2013-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: after_commit
+  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: rsolr
+  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: json
+  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: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: activerecord-postgresql-adapter
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: after_commit
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,11 +119,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: deferrable
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +135,11 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: memcache
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +151,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: cache_version
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,33 +167,37 @@ dependencies:
         - 4
         version: 0.9.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 17
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 3
+        - 9
+        version: 2.3.9
   type: :runtime
-  version_requirements: *id005
-description: Active Record caching and indexing in memcache
-email: code@justinbalthrop.com
+  version_requirements: *id011
+description: Active Record caching and indexing in memcache.
+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
@@ -120,7 +210,7 @@ files:
 - test/record_cache_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/ninjudd/record_cache
+homepage: https://github.com/ninjudd/record_cache
 licenses: []
 
 post_install_message: 
@@ -149,10 +239,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Active Record caching and indexing in memcache. An alternative to cache_fu
+summary: Active Record caching and indexing in memcache.
 test_files: 
 - test/record_cache_test.rb
 - test/test_helper.rb