arid_cache 1.0.3 → 1.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arid_cache (1.0.2)
+    arid_cache (1.0.3)
       will_paginate
 
 GEM

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/arid_cache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arid_cache}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karl Varga"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2010-10-29}
   s.description = %q{AridCache makes caching easy and effective.  AridCache supports caching on all your model named scopes, class methods and instance methods right out of the box.  AridCache prevents caching logic from cluttering your models and clarifies your logic by making explicit calls to cached result sets.
 AridCache is designed for handling large, expensive ActiveRecord collections but is equally useful for caching anything else as well.
 }
@@ -34,7 +34,8 @@ AridCache is designed for handling large, expensive ActiveRecord collections but
      "lib/arid_cache/helpers.rb",
      "lib/arid_cache/store.rb",
      "rails/init.rb",
-     "spec/arid_cache_spec.rb",
+     "spec/arid_cache/arid_cache_spec.rb",
+     "spec/arid_cache/cache_proxy_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/support/ar_query.rb",
@@ -60,7 +61,8 @@ AridCache is designed for handling large, expensive ActiveRecord collections but
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Automates efficient caching of your ActiveRecord collections, gives you counts for free and supports pagination.}
   s.test_files = [
-    "spec/arid_cache_spec.rb",
+    "spec/arid_cache/arid_cache_spec.rb",
+     "spec/arid_cache/cache_proxy_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/ar_query.rb",
      "spec/support/custom_methods.rb",

data/lib/arid_cache/cache_proxy.rb

@@ -312,13 +312,19 @@ module AridCache
       #
       # TODO: is it quicker to sort in memory?
       def preserve_order(ids)
+        column = if self.klass.respond_to?(:table_name)
+          ::ActiveRecord::Base.connection.quote_table_name(self.klass.table_name) + '.id'
+        else
+          "id"
+        end
+
         if ids.empty?
           nil
         elsif ::ActiveRecord::Base.is_mysql_adapter?
-          "FIELD(id,#{ids.join(',')})"
+          "FIELD(#{column},#{ids.join(',')})"
         else
           order = ''
-          ids.each_index { |i| order << "WHEN id=#{ids[i]} THEN #{i+1} " }
+          ids.each_index { |i| order << "WHEN #{column}=#{ids[i]} THEN #{i+1} " }
           "CASE " + order + " END"
         end
       end

data/spec/{arid_cache_spec.rb → arid_cache/arid_cache_spec.rb}

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
-describe "AridCache" do
+describe AridCache do
   describe 'results' do
     before :each do
       Company.destroy_all

data/spec/arid_cache/cache_proxy_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe AridCache::CacheProxy do
+  describe 'id in order clause' do
+    before :each do
+      @proxy = AridCache::CacheProxy.new(Company, 'dummy-key', {})
+    end
+    
+    it "should be prefixed by the table name" do
+      ::ActiveRecord::Base.stubs(:is_mysql_adapter?).returns(true)
+      @proxy.send(:preserve_order, [1,2,3]).should =~ %r[#{Company.table_name}]
+    end
+    
+    it "should be prefixed by the table name" do
+      ::ActiveRecord::Base.stubs(:is_mysql_adapter?).returns(false)
+      @proxy.send(:preserve_order, [1,2,3]).should =~ %r[#{Company.table_name}]
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arid_cache
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Karl Varga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -07:00
+date: 2010-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,8 @@ files:
 - lib/arid_cache/helpers.rb
 - lib/arid_cache/store.rb
 - rails/init.rb
-- spec/arid_cache_spec.rb
+- spec/arid_cache/arid_cache_spec.rb
+- spec/arid_cache/cache_proxy_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/ar_query.rb
@@ -156,7 +157,8 @@ signing_key:
 specification_version: 3
 summary: Automates efficient caching of your ActiveRecord collections, gives you counts for free and supports pagination.
 test_files: 
-- spec/arid_cache_spec.rb
+- spec/arid_cache/arid_cache_spec.rb
+- spec/arid_cache/cache_proxy_spec.rb
 - spec/spec_helper.rb
 - spec/support/ar_query.rb
 - spec/support/custom_methods.rb