kasket 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c6bfa50affd0410b4118a393a9f058c54149bac
-  data.tar.gz: fec8fa3b11f35c364b9e5c26448830d0331a5082
+  metadata.gz: f991371eb51fc1fa71c6902a9f7521011eaad4a3
+  data.tar.gz: 585665215a4aad97c63f41395965e2f53397a18d
 SHA512:
-  metadata.gz: 65e2baa04a767f94209a508a4b853bd17dfc318803a3afbcd6fd650ede78ec65cc9510567d867d0a2e8ce416b9eb125d7578fff02bf6f5fbab701f2f1dc50202
-  data.tar.gz: 5523ee1be9feeaddf7b62276c01d1ba620d9e482cd814b39ac2e3b0348aaec1c37c3b52e92a122918450159bfece81daae341b921cf9637cd3f02ef0e3faeac6
+  metadata.gz: 56dd49026d082012079b32fb729e70228081333327026461c8b1a0a2e624ec4cb1cd0d8240800ffbc0f1cf76a8c4870b2d11fc15963afec4fa5d186de6eda8e7
+  data.tar.gz: 62c542fe0a7c6d867b685c8d46d0b021dfc4ee36bc004d207e735845f9bd15ced98f474d5e1ff99c6082efcabe05b5d1fefc72049f31b291af6549b1e9c3c7e2

data/lib/kasket/configuration_mixin.rb

@@ -37,7 +37,12 @@ module Kasket
         key = attribute_value_pairs.map do |attribute, value|
           column = columns_hash[attribute.to_s]
           value = nil if value.blank?
-          attribute.to_s + '=' + connection.quote(column.type_cast(value), column).downcase
+          quoted_value = if column
+            connection.quote(column.type_cast(value), column).downcase
+          else
+            value.to_s
+          end
+          attribute.to_s << '=' << quoted_value
         end.join('/')
 
         if key.size > (250 - kasket_key_prefix.size) || key =~ /\s/

data/lib/kasket/select_manager_mixin.rb

@@ -1,7 +1,11 @@
 module Kasket
   module SelectManagerMixin
     def to_kasket_query(klass, binds = [])
-      query = Kasket::Visitor.new(klass, binds).accept(ast)
+      begin
+        query = Kasket::Visitor.new(klass, binds).accept(ast)
+      rescue TypeError # unsupported object in ast
+        return nil
+      end
 
       return nil if query.nil? || query == :unsupported
       return nil if query[:attributes].blank?

data/lib/kasket/version.rb

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

data/lib/kasket/visitor.rb

@@ -126,15 +126,5 @@ module Kasket
     alias :visit_TrueClass             :literal
     alias :visit_FalseClass            :literal
     alias :visit_Arel_Nodes_SqlLiteral :literal
-
-    def method_missing(name, *args, &block)
-      return :unsupported if name.to_s.start_with?('visit_')
-      super
-    end
-
-    def respond_to?(name, include_private = false)
-      return super || name.to_s.start_with?('visit_')
-    end
-
   end
 end

data/test/configuration_mixin_test.rb

@@ -10,6 +10,13 @@ class ConfigurationMixinTest < ActiveSupport::TestCase
       assert_equal expected_cache_key, Post.kasket_key_for(query_attributes)
     end
 
+    should "not fail on unknown columns" do
+      expected_cache_key = "#{Post.kasket_key_prefix}does_not_exist=111"
+      query_attributes   = [ [:does_not_exist, '111'] ]
+
+      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] ]

data/test/helper.rb

@@ -14,10 +14,12 @@ end
 require 'test/unit'
 require 'mocha'
 require 'active_record'
+require "logger"
 
 raise "Must configure #time_zone_aware_attributes prior to models" if defined?(Post)
 ENV['TZ'] = 'utc'
 ActiveRecord::Base.time_zone_aware_attributes = true
+ActiveRecord::Base.logger = Logger.new(StringIO.new)
 
 require 'active_record/fixtures'
 

data/test/visitor_test.rb

@@ -1,5 +1,13 @@
 require File.expand_path("helper", File.dirname(__FILE__))
 
+module Nori
+  class StringWithAttributes < String
+  end
+
+  class Unknown
+  end
+end
+
 class VisitorTest < ActiveSupport::TestCase
   if arel?
     context Kasket::Visitor do
@@ -12,6 +20,20 @@ class VisitorTest < ActiveSupport::TestCase
         }
         assert_equal expected, Post.where(:id => 1).to_kasket_query
       end
+
+      should "build from Nori::StringWithAttributes" do
+        expected = {
+          :attributes=>[[:id, "1"]],
+          :from=>"posts",
+          :index=>[:id],
+          :key=>"#{Post.kasket_key_prefix}id=1"
+        }
+        assert_equal expected, Post.where(:id => Nori::StringWithAttributes.new("1")).to_kasket_query
+      end
+
+      should "notify on missing attribute" do
+        assert_equal nil, Post.where(:id => Nori::Unknown.new).to_kasket_query
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A write back caching layer on active record