kasket 3.0.0 → 3.1.0

data/lib/kasket/configuration_mixin.rb

@@ -23,7 +23,11 @@ module Kasket
     end
 
     def kasket_key_prefix
-      @kasket_key_prefix ||= "kasket-#{Kasket::Version::PROTOCOL}/#{table_name}/version=#{column_names.join.sum}/"
+      @kasket_key_prefix ||= "kasket-#{Kasket::Version::PROTOCOL}/#{kasket_activerecord_version}/#{table_name}/version=#{column_names.join.sum}/"
+    end
+
+    def kasket_activerecord_version
+      "R#{ActiveRecord::VERSION::MAJOR}#{ActiveRecord::VERSION::MINOR}"
     end
 
     def kasket_key_for(attribute_value_pairs)

data/lib/kasket/version.rb

@@ -2,7 +2,7 @@
 module Kasket
   class Version
     MAJOR = 3
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     PROTOCOL = 3

data/test/configuration_mixin_test.rb

@@ -2,11 +2,9 @@ require File.expand_path("helper", File.dirname(__FILE__))
 require "digest/md5"
 
 class ConfigurationMixinTest < ActiveSupport::TestCase
-
   context "Generating cache keys" do
-
     should "not choke on empty numeric attributes" do
-      expected_cache_key = "kasket-#{Kasket::Version::PROTOCOL}/posts/version=#{POST_VERSION}/blog_id=null"
+      expected_cache_key = "#{Post.kasket_key_prefix}blog_id=null"
       query_attributes   = [ [:blog_id, ''] ]
 
       assert_equal expected_cache_key, Post.kasket_key_for(query_attributes)
@@ -27,9 +25,13 @@ class ConfigurationMixinTest < ActiveSupport::TestCase
 
     should "downcase string attributes" do
       query_attributes = [ [:title, 'ThIs'] ]
-      expected_cache_key = "kasket-#{Kasket::Version::PROTOCOL}/posts/version=#{POST_VERSION}/title='this'"
+      expected_cache_key = "#{Post.kasket_key_prefix}title='this'"
 
       assert_equal expected_cache_key, Post.kasket_key_for(query_attributes)
     end
+
+    should "build correct prefix" do
+      assert_equal "kasket-#{Kasket::Version::PROTOCOL}/R#{ActiveRecord::VERSION::MAJOR}#{ActiveRecord::VERSION::MINOR}/posts/version=#{POST_VERSION}/", Post.kasket_key_prefix
+    end
   end
 end

data/test/parser_test.rb

@@ -118,7 +118,7 @@ class ParserTest < ActiveSupport::TestCase
     context "key generation" do
       should "include the table name and version" do
         kasket_query = parse(:conditions => {:id => 1})
-        assert_match(/^kasket-#{Kasket::Version::PROTOCOL}\/posts\/version=#{POST_VERSION}\//, kasket_query[:key])
+        assert_match(/^kasket-#{Kasket::Version::PROTOCOL}\/R#{ActiveRecord::VERSION::MAJOR}#{ActiveRecord::VERSION::MINOR}\/posts\/version=#{POST_VERSION}\//, kasket_query[:key])
       end
 
       should "include all indexed attributes" do

data/test/read_mixin_test.rb

@@ -1,7 +1,6 @@
 require File.expand_path("helper", File.dirname(__FILE__))
 
 class ReadMixinTest < ActiveSupport::TestCase
-
   context "find by sql with kasket" do
     setup do
       @post_database_result = { 'id' => 1, 'title' => 'Hello' }
@@ -20,25 +19,25 @@ class ReadMixinTest < ActiveSupport::TestCase
     end
 
     should "read results" do
-      Kasket.cache.write("kasket-#{Kasket::Version::PROTOCOL}/posts/version=#{POST_VERSION}/id=1", @post_database_result)
+      Kasket.cache.write("#{Post.kasket_key_prefix}id=1", @post_database_result)
       assert_equal @post_records, Post.find_by_sql('SELECT * FROM `posts` WHERE (id = 1)')
     end
 
     should "support sql with ?" do
-      Kasket.cache.write("kasket-#{Kasket::Version::PROTOCOL}/posts/version=#{POST_VERSION}/id=1", @post_database_result)
+      Kasket.cache.write("#{Post.kasket_key_prefix}id=1", @post_database_result)
       assert_equal @post_records, Post.find_by_sql(['SELECT * FROM `posts` WHERE (id = ?)', 1])
     end
 
     should "store results in kasket" do
       Post.find_by_sql('SELECT * FROM `posts` WHERE (id = 1)')
 
-      assert_equal @post_database_result, Kasket.cache.read("kasket-#{Kasket::Version::PROTOCOL}/posts/version=#{POST_VERSION}/id=1")
+      assert_equal @post_database_result, Kasket.cache.read("#{Post.kasket_key_prefix}id=1")
     end
 
     should "store multiple records in cache" do
       Comment.find_by_sql('SELECT * FROM `comments` WHERE (post_id = 1)')
-      stored_value = Kasket.cache.read("kasket-#{Kasket::Version::PROTOCOL}/comments/version=#{COMMENT_VERSION}/post_id=1")
-      assert_equal(["kasket-#{Kasket::Version::PROTOCOL}/comments/version=#{COMMENT_VERSION}/id=1", "kasket-#{Kasket::Version::PROTOCOL}/comments/version=#{COMMENT_VERSION}/id=2"], stored_value)
+      stored_value = Kasket.cache.read("#{Comment.kasket_key_prefix}post_id=1")
+      assert_equal(["#{Comment.kasket_key_prefix}id=1", "#{Comment.kasket_key_prefix}id=2"], stored_value)
       assert_equal(@comment_database_result, stored_value.map {|key| Kasket.cache.read(key)})
 
       Comment.expects(:find_by_sql_without_kasket).never
@@ -48,7 +47,7 @@ class ReadMixinTest < ActiveSupport::TestCase
 
     context "modifying results" do
       setup do
-        Kasket.cache.write("kasket-#{Kasket::Version::PROTOCOL}/posts/version=#{POST_VERSION}/id=1", {'id' => 1, 'title' => "asd"})
+        Kasket.cache.write("#{Post.kasket_key_prefix}id=1", {'id' => 1, 'title' => "asd"})
         @sql = 'SELECT * FROM `posts` WHERE (id = 1)'
         @record = Post.find_by_sql(@sql).first
         assert_equal "asd", @record.title # read from cache ?

data/test/visitor_test.rb

@@ -8,7 +8,7 @@ class VisitorTest < ActiveSupport::TestCase
           :attributes=>[[:id, "1"]],
           :from=>"posts",
           :index=>[:id],
-          :key=>"kasket-#{Kasket::Version::PROTOCOL}/posts/version=#{POST_VERSION}/id=1"
+          :key=>"#{Post.kasket_key_prefix}id=1"
         }
         assert_equal expected, Post.where(:id => 1).to_kasket_query
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2318002147869765262
+      hash: 3156155160128101763
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,10 +193,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2318002147869765262
+      hash: 3156155160128101763
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A write back caching layer on active record