staugaard-magic_cache_keys 0.5.0 → 0.6.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :patch: 0
 :major: 0
-:minor: 5
+:minor: 6

data/lib/magic_cache_keys.rb

@@ -26,11 +26,19 @@ module ActiveRecord
     
     class << self
       def cache_key(options = {})
-        order = options.delete(:order) || scope(:find, :order)
-        opts = {:select => "MD5(CONCAT(GROUP_CONCAT(CONV(#{quoted_table_name}.#{connection.quote_column_name(primary_key)},10,36)#{ ' ORDER BY ' + order unless order.blank?}), MAX(#{table_name}.updated_at))) as cached_key"}.reverse_merge(options)
-        
         connection.execute('SET group_concat_max_len = 1048576')
-        "#{model_name.cache_key}/#{connection.select_value(construct_finder_sql(opts)) || 'empty'}"
+        if options[:conditions] && options[:conditions].is_a?(String) && options[:conditions].strip.upcase.starts_with?('SELECT')
+          hash_sql = options[:conditions].sub(/SELECT (\/\*.*?\*\/ )?(.*)\bFROM\b/im) { "SELECT #{cache_key_select} FROM" }
+        else
+          options[:select] = cache_key_select(options.delete(:order) || scope(:find, :order))
+          hash_sql = construct_finder_sql(options)
+        end
+        
+        "#{model_name.cache_key}/#{connection.select_value(hash_sql) || 'empty'}"
+      end
+      
+      def cache_key_select(order = nil)
+        "MD5(CONCAT(GROUP_CONCAT(CONV(#{quoted_table_name}.#{connection.quote_column_name(primary_key)},10,36)#{ ' ORDER BY ' + order unless order.blank?}), MAX(#{quoted_table_name}.#{connection.quote_column_name('updated_at')}))) as cached_key"
       end
 
       def has_many_with_cache_key(association_id, options = {}, &extension)

data/test/magic_cache_keys_test.rb

@@ -16,6 +16,7 @@ class Blog < ActiveRecord::Base
   has_many :posts_orderd1, :class_name => 'Post', :order => 'title DESC'
   has_many :posts_orderd2, :class_name => 'Post', :order => 'title ASC'
   has_many :posts_conditioned, :class_name => 'Post', :conditions => {:title => 'This post has a few comments'}
+  has_many :posts_by_sql, :class_name => "Post", :finder_sql => 'SELECT * FROM posts WHERE blog_id = #{id}'
 end
 
 class MagicCacheKeysTest < ActiveSupport::TestCase
@@ -112,4 +113,11 @@ class MagicCacheKeysTest < ActiveSupport::TestCase
     key2 = blogs(:a_blog).cache_key(:posts, :posts_orderd1)
     assert_equal(key1, key2)
   end
+  
+  test "has_many associations with finder_sql generates a cache key" do
+    key1 = blogs(:a_blog).posts_by_sql.cache_key
+    assert_not_nil(key1)
+    key2 = blogs(:a_blog).posts.cache_key
+    assert_equal(key1, key2)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: staugaard-magic_cache_keys
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Mick Staugaard