record_cache 0.9.10 → 0.9.12

data/VERSION

@@ -1 +1 @@
-0.9.10
+0.9.12

data/lib/record_cache.rb

@@ -68,10 +68,22 @@ module RecordCache
         opts = args.last
         if opts.is_a?(Hash) and opts.keys == [:conditions]
           # Try to match the SQL.
-          if opts[:conditions] =~ /^"?#{table_name}"?.(\w*) = (\d*)$/
+          if opts[:conditions].kind_of?(Hash)
+            field = nil
+            value = nil
+            if opts[:conditions].keys.size == 1
+              opts[:conditions].each {|f,v| field, value = f,v}
+            end
+          elsif opts[:conditions] =~ /^(?:"?#{table_name}"?\.)?"?(\w+)"? = (?:(\d+)|'(\w+)')$/i
+            field, value = $1, ($3 || $2)
+          elsif opts[:conditions] =~ /^(?:"?#{table_name}"?\.)?"?(\w+)"? IN \(([\d,]*)\)$/i
             field, value = $1, $2
+            value = value.split(',')
+          end
+
+          if field and value
             index = cached_index("by_#{field}")
-            return index.find_by_field([value], self, args.first) if index
+            return index.find_by_field([value].flatten, self, args.first) if index
           end
         end
       elsif not args.last.is_a?(Hash)
@@ -264,3 +276,11 @@ module RecordCache
 end
 
 ActiveRecord::Base.send(:extend,  RecordCache::ActiveRecordExtension)
+
+unless defined?(PGconn) and PGconn.respond_to?(:quote_ident)
+  class PGconn
+    def self.quote_ident(name)
+      %("#{name}")
+    end
+  end
+end

data/lib/record_cache/index.rb

@@ -3,16 +3,16 @@ module RecordCache
     include Deferrable
 
     attr_reader :model_class, :index_field, :fields, :order_by, :limit, :expiry, :name, :prefix
-    
+
     NULL = 'NULL'
-    
+
     def initialize(opts)
       raise ':by => index_field required for cache'       if opts[:by].nil?
       raise 'explicit name or prefix required with scope' if opts[:scope] and opts[:name].nil? and opts[:prefix].nil?
 
-      @auto_name     = opts[:name].nil?      
+      @auto_name     = opts[:name].nil?
       @write_ahead   = opts[:write_ahead]
-      @cache         = opts[:cache] || CACHE
+      @cache         = opts[:cache].kind_of?(Symbol) ? Memcache.pool[opts[:cache]] : (opts[:cache] || CACHE)
       @expiry        = opts[:expiry]
       @model_class   = opts[:class]
       @set_class     = opts[:set_class] || "#{@model_class}Set"
@@ -41,7 +41,7 @@ module RecordCache
     def full_record?
       fields.empty?
     end
-    
+
     def includes_id?
       full_record? or fields.include?('id')
     end
@@ -53,11 +53,11 @@ module RecordCache
     def namespace
       "#{model_class.name}_#{model_class.version}_#{RecordCache.version}:#{name}" << ( full_record? ? '' : ":#{fields.join(',')}" )
     end
-    
+
     def fields_hash
       if @fields_hash.nil?
         if full_record?
-          @fields_hash ||= model_class.column_names.hash
+          @fields_hash ||= model_class.column_names.sort.hash
         else
           @fields_hash ||= fields.collect {|field| field.to_s}.hash
         end
@@ -74,9 +74,9 @@ module RecordCache
         return [] if expects_array
         raise ActiveRecord::RecordNotFound, "Couldn't find #{model_class} without an ID"
       end
-      
+
       records_by_id = get_records(ids)
-   
+
       models = ids.collect do |id|
         records = records_by_id[id]
         model   = records.instantiate_first(model_class, full_record?) if records
@@ -91,14 +91,14 @@ module RecordCache
         raise ActiveRecord::RecordNotFound, "Couldn't find #{model_class} with ID #{id}" unless model
         model
       end
-      
+
       if models.size == 1 and not expects_array
         models.first
-      else 
+      else
         models
       end
     end
-    
+
     def find_by_field(keys, model_class, type)
       keys = [keys] if not keys.kind_of?(Array)
       keys = stringify(keys)
@@ -131,7 +131,7 @@ module RecordCache
         raw_records
       end
     end
-    
+
     def field_lookup(keys, model_class, field, flag = nil)
       keys = [*keys]
       keys = stringify(keys)
@@ -158,8 +158,10 @@ module RecordCache
         field_by_index
       end
     end
-    
+
     def invalidate(*keys)
+      return if model_class.record_cache_config[:disable_write]
+
       keys = stringify(keys)
       cache.in_namespace(namespace) do
         keys.each do |key|
@@ -178,7 +180,7 @@ module RecordCache
     def invalidate_from_conditions(conditions)
       invalidate_from_conditions_lambda(conditions).call
     end
-    
+
     def invalidate_model(model)
       attribute     = model.send(index_field)
       attribute_was = model.attr_was(index_field)
@@ -202,7 +204,7 @@ module RecordCache
         end
       end
     end
-        
+
     def scope_query
       @scope_query[:type] ||= model_class.to_s if sub_class?
       @scope_query
@@ -220,7 +222,7 @@ module RecordCache
     def self.enable_db
       @@disable_db = false
     end
-       
+
     def find_method_name(type)
       if name =~ /(^|_)by_/
         if type == :first
@@ -239,7 +241,7 @@ module RecordCache
         end
       end
     end
-    
+
     def cached_set(id)
       # Used for debugging. Gives you the RecordCache::Set that is currently in the cache.
       id = stringify([id]).first
@@ -253,7 +255,7 @@ module RecordCache
     MAX_FETCH = 1000
     def get_records(keys)
       cache.in_namespace(namespace) do
-        opts = { 
+        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},
@@ -298,9 +300,11 @@ module RecordCache
     end
 
     def remove_from_cache(model)
+      return if model_class.record_cache_config[:disable_write]
+
       record = model.attributes
-      key    = model.attr_was(index_field)
-      
+      key    = model.attr_was(index_field) || NULL
+
       now_and_later do
         cache.in_namespace(namespace) do
           cache.with_lock(key) do
@@ -314,10 +318,12 @@ module RecordCache
     end
 
     def add_to_cache(model)
+      return if model_class.record_cache_config[:disable_write]
+
       record = model_to_record(model)
       return unless record
-      key = record[index_field].to_s
-      
+      key = record[index_field] || NULL
+
       now_and_later do
         cache.in_namespace(namespace) do
           cache.with_lock(key) do
@@ -345,11 +351,11 @@ module RecordCache
       end
       @select_fields
     end
-    
+
     def base_class?
       @base_class ||= single_table_inheritance? and model_class == model_class.base_class
     end
-    
+
     def sub_class?
       @sub_class ||= single_table_inheritance? and model_class != model_class.base_class
     end
@@ -361,20 +367,20 @@ module RecordCache
     def quote_index_value(value)
       model_class.quote_value(value, index_column)
     end
-    
+
     def index_column
       @index_column ||= model_class.columns_hash[index_field]
     end
-        
+
     def table_name
       model_class.table_name
     end
-        
+
     def stringify(keys)
       keys.compact! if disallow_null?
       keys.collect {|key| key.nil? ? NULL : key.to_s}.uniq
     end
-    
+
     def db
       RecordCache.db(model_class)
     end

data/record_cache.gemspec

@@ -1,50 +1,48 @@
 # 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{record_cache}
-  s.version = "0.9.10"
+  s.version = "0.9.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Balthrop"]
-  s.date = %q{2010-05-01}
+  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"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "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"
+    "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.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  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"
+    "test/test_helper.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<after_commit>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<deferrable>, [">= 0.1.0"])
       s.add_runtime_dependency(%q<memcache>, [">= 1.0.0"])

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'test/unit'
 require 'rubygems'
 require 'shoulda'
 require 'mocha'
+require 'pp'
 
 $LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 ['cache_version', 'model_set', 'memcache', 'deferrable'].each do |dir|
@@ -21,7 +22,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: record_cache
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  hash: 35
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 12
+  version: 0.9.12
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,59 +15,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 -07:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: after_commit
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: deferrable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: memcache
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: cache_version
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  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 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 description: Active Record caching and indexing in memcache
 email: code@justinbalthrop.com
 executables: []
@@ -72,7 +108,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -89,26 +124,32 @@ homepage: http://github.com/ninjudd/record_cache
 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.3.7
 signing_key: 
 specification_version: 3
 summary: Active Record caching and indexing in memcache. An alternative to cache_fu

data/.gitignore

@@ -1 +0,0 @@
-pkg