kasket 0.7.6 → 0.7.7

data/lib/kasket.rb

@@ -14,7 +14,7 @@ module Kasket
   class Version
     MAJOR = 0
     MINOR = 7
-    PATCH = 6
+    PATCH = 7
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 

data/lib/kasket/configuration_mixin.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require "digest/md5"
 
 module Kasket
   autoload :ReadMixin, 'kasket/read_mixin'
@@ -29,13 +30,19 @@ module Kasket
     end
 
     def kasket_key_for(attribute_value_pairs)
-      kasket_key_prefix + attribute_value_pairs.map do |attribute, value|
+      key = attribute_value_pairs.map do |attribute, value|
         if (column = columns_hash[attribute.to_s]) && column.number?
           value = convert_number_column_value(value)
         end
-        
+
         attribute.to_s + '=' + connection.quote(value, column)
       end.join('/')
+
+      if key.size > (250 - kasket_key_prefix.size) || key =~ /\s/
+        key = Digest::MD5.hexdigest(key)
+      end
+
+      kasket_key_prefix + key
     end
 
     def convert_number_column_value(value)

data/test/cache_expiry_test.rb

@@ -27,7 +27,7 @@ class CacheExpiryTest < ActiveSupport::TestCase
     end
 
     should "be removed from cache when updated" do
-      @post.title = "new title"
+      @post.title = "new_title"
       @post.save
       assert_nil(Rails.cache.read(@post.kasket_key))
     end
@@ -36,12 +36,12 @@ class CacheExpiryTest < ActiveSupport::TestCase
       Rails.cache.expects(:delete).with(Post.kasket_key_prefix + "id=#{@post.id}")
       Rails.cache.expects(:delete).with(Post.kasket_key_prefix + "title='#{@post.title}'")
       Rails.cache.expects(:delete).with(Post.kasket_key_prefix + "title='#{@post.title}'/first")
-      Rails.cache.expects(:delete).with(Post.kasket_key_prefix + "title='new title'")
-      Rails.cache.expects(:delete).with(Post.kasket_key_prefix + "title='new title'/first")
+      Rails.cache.expects(:delete).with(Post.kasket_key_prefix + "title='new_title'")
+      Rails.cache.expects(:delete).with(Post.kasket_key_prefix + "title='new_title'/first")
       Rails.cache.expects(:delete).with(Post.kasket_key_prefix + "blog_id=#{@post.blog_id}/id=#{@post.id}")
       Rails.cache.expects(:delete).never
 
-      @post.title = "new title"
+      @post.title = "new_title"
       @post.save
     end
 

data/test/configuration_mixin_test.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
+require "digest/md5"
 
 class ConfigurationMixinTest < ActiveSupport::TestCase
   
@@ -10,7 +11,19 @@ class ConfigurationMixinTest < ActiveSupport::TestCase
       
       assert_equal expected_cache_key, Post.kasket_key_for(query_attributes)
     end
-    
+
+    should "not generate keys longer that 255" do
+      very_large_number = (1..999).to_a.join
+      query_attributes  = [ [:blog_id, very_large_number] ]
+      
+      assert(Post.kasket_key_for(query_attributes).size < 255)
+    end
+
+    should "not generate keys with spaces" do
+      query_attributes = [ [:title, 'this key has speces'] ]
+      
+      assert(!(Post.kasket_key_for(query_attributes) =~ /\s/))
+    end
   end
   
 end

data/test/fixtures/posts.yml

@@ -1,15 +1,15 @@
 no_comments:
   blog: a_blog
-  title: This post has no comments
+  title: no_comments
 
 has_two_comments:
   blog: a_blog
-  title: This post has a few comments
+  title: few_comments
 
 on_other_blog:
   blog: other_blog
-  title: This post has no comments
+  title: no_comments
 
 has_many_comments:
   blog: a_blog
-  title: A shit load of comments on this one
+  title: many_comments

data/test/parser_test.rb

@@ -81,7 +81,7 @@ class ParserTest < ActiveSupport::TestCase
       should "include all indexed attributes" do
         assert_match(/id=1$/, @parser.parse('SELECT * FROM `posts` WHERE (id = 1)')[:key])
         assert_match(/blog_id=2\/id=1$/, @parser.parse('SELECT * FROM `posts` WHERE (id = 1 AND blog_id = 2)')[:key])
-        assert_match(/id=1\/title='world''s best title'$/, @parser.parse("SELECT * FROM `posts` WHERE (id = 1 AND title = 'world\\'s best title')")[:key])
+        assert_match(/id=1\/title='title'$/, @parser.parse("SELECT * FROM `posts` WHERE (id = 1 AND title = 'title')")[:key])
       end
 
       context "when limit 1" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: kasket
 version: !ruby/object:Gem::Version 
-  version: 0.7.6
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -10,59 +15,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 +01:00
+date: 2010-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: temping
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id005
 description: puts a cap on your queries
 email: mick@staugaard.com
 executables: []
@@ -111,18 +132,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A write back caching layer on active record