kasket 0.7.2 → 0.7.3

data/Rakefile

@@ -14,8 +14,9 @@ begin
     gem.authors = ["Mick Staugaard", "Eric Chapweske"]
     gem.add_dependency('activerecord', '>= 2.3.4')
     gem.add_dependency('activesupport', '>= 2.3.4')
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "shoulda", ">= 0"
     gem.add_development_dependency "mocha", ">= 0"
+    gem.add_development_dependency "temping", ">= 1.3.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/lib/kasket.rb

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

data/lib/kasket/configuration_mixin.rb

@@ -30,13 +30,11 @@ module Kasket
 
     def kasket_key_for(attribute_value_pairs)
       kasket_key_prefix + attribute_value_pairs.map do |attribute, value|
-        if value.nil?
-          attribute.to_s + '='
-        elsif (column = columns_hash[attribute.to_s]) && column.number?
-          attribute.to_s + '=' + convert_number_column_value(value.to_s)
-        else
-          attribute.to_s + '=' + connection.quote(value.to_s)
+        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('/')
     end
 

data/lib/kasket/read_mixin.rb

@@ -11,6 +11,7 @@ module Kasket
       sql = sanitize_sql(sql)
       query = kasket_parser.parse(sql) if use_kasket?
       if query && has_kasket_index_on?(query[:index])
+
         if value = Rails.cache.read(query[:key])
           Array.wrap(value).collect! { |record| instantiate(record.dup) }
         else

data/test/configuration_mixin_test.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/helper'
+
+class ConfigurationMixinTest < ActiveSupport::TestCase
+  
+  context "Generating cache keys" do
+    
+    should "not choke on empty numeric attributes" do      
+      expected_cache_key = "kasket-#{Kasket::Version::STRING}/posts/version=3558/blog_id=NULL"
+      query_attributes   = [ [:blog_id, ''] ]
+      
+      assert_equal expected_cache_key, Post.kasket_key_for(query_attributes)
+    end
+    
+  end
+  
+end

data/test/helper.rb

@@ -6,12 +6,6 @@ require 'active_support'
 require 'active_record'
 require 'active_record/fixtures'
 
-ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.establish_connection('test')
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-
-load(File.dirname(__FILE__) + "/schema.rb")
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'kasket'
@@ -53,25 +47,4 @@ module Rails
   end
 end
 
-class Comment < ActiveRecord::Base
-  belongs_to :post
-end
-
-class Post < ActiveRecord::Base
-  belongs_to :blog
-  has_many :comments
-
-  has_kasket
-  has_kasket_on :title
-  has_kasket_on :blog_id, :id
-
-  def make_dirty!
-    self.updated_at = Time.now
-    self.connection.execute("UPDATE posts SET updated_at = '#{updated_at.utc.to_s(:db)}' WHERE id = #{id}")
-  end
-  kasket_dirty_methods :make_dirty!
-end
-
-class Blog < ActiveRecord::Base
-  has_many :posts
-end
+require 'test_models'

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='world''s best title'$/, @parser.parse("SELECT * FROM `posts` WHERE (id = 1 AND title = 'world\\'s best title')")[:key])
       end
 
       context "when limit 1" do

data/test/test_models.rb

@@ -0,0 +1,45 @@
+require 'temping'
+include Temping
+
+create_model :comment do
+  with_columns do |t|
+    t.text     "body"
+    t.integer  "post_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  belongs_to :post
+end
+
+create_model :post do
+  with_columns do |t|
+    t.string   "title"
+    t.integer  "blog_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  belongs_to :blog
+  has_many :comments
+
+  has_kasket
+  has_kasket_on :title
+  has_kasket_on :blog_id, :id
+
+  def make_dirty!
+    self.updated_at = Time.now
+    self.connection.execute("UPDATE posts SET updated_at = '#{updated_at.utc.to_s(:db)}' WHERE id = #{id}")
+  end
+  kasket_dirty_methods :make_dirty!
+end
+
+create_model :blog do
+  with_columns do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  has_many :posts
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kasket
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +01:00
+date: 2010-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
         version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -53,6 +53,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: temping
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.0
+    version: 
 description: puts a cap on your queries
 email: mick@staugaard.com
 executables: []
@@ -77,6 +87,7 @@ files:
 - lib/kasket/reload_association_mixin.rb
 - lib/kasket/write_mixin.rb
 - test/cache_expiry_test.rb
+- test/configuration_mixin_test.rb
 - test/database.yml
 - test/dirty_test.rb
 - test/find_one_test.rb
@@ -87,7 +98,7 @@ files:
 - test/helper.rb
 - test/parser_test.rb
 - test/read_mixin_test.rb
-- test/schema.rb
+- test/test_models.rb
 has_rdoc: true
 homepage: http://github.com/staugaard/kasket
 licenses: []
@@ -118,10 +129,11 @@ specification_version: 3
 summary: A write back caching layer on active record
 test_files: 
 - test/cache_expiry_test.rb
+- test/configuration_mixin_test.rb
 - test/dirty_test.rb
 - test/find_one_test.rb
 - test/find_some_test.rb
 - test/helper.rb
 - test/parser_test.rb
 - test/read_mixin_test.rb
-- test/schema.rb
+- test/test_models.rb

data/test/schema.rb

@@ -1,34 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file,
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 1) do
-
-  create_table "comments", :force => true do |t|
-    t.text     "body"
-    t.integer  "post_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "posts", :force => true do |t|
-    t.string   "title"
-    t.integer  "blog_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "blogs", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-end