kasket 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce801eb80f7eda453f07735fd934423d4fb925ca
-  data.tar.gz: 5815830b14132e65b2f0395dfb5eef1a1fcaa344
+  metadata.gz: 8fd8b1112932a3d14ed1e43ab61ad826ba02c5f0
+  data.tar.gz: 997f6891f0df65c1299a3d0da4f1e990a0c6a0fc
 SHA512:
-  metadata.gz: 89cbd7cb351b9e25af6b5f02afe1715e0c5a56556303161ee00846a1e087822eec8ca591d67a9e63dea6e80bbcae15cec901195567dd1c1cb800fa960a4fb017
-  data.tar.gz: 5bf55e25bfbe743cc1dc6a1236cda1afc1cc3df0b34513acbc99d3f15973593fcf11a639e306f02beecfa6add59f665277dd774167293910888d07906a74710c
+  metadata.gz: 9eb57e261693839d9b4d81060fadf64737f528c8d37adcc3d3f98459e2947832dbcc3ac96379c2775cde2486731ccf5f1a3178a9ac49e376f93574154a1f7b90
+  data.tar.gz: 19c1289828483003fb8a979969aee6198ac4cbdbe47452b82cbbaa15dee26280c31f7a91559994afa4b856f960fce4411daa1ba9297bac265d6092f347173d32

data/lib/kasket.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'active_record'
 require 'active_support'
 
@@ -16,8 +15,6 @@ module Kasket
   autoload :SelectManagerMixin,     'kasket/select_manager_mixin'
   autoload :RelationMixin,          'kasket/relation_mixin'
 
-  AR30 = (ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0)
-
   CONFIGURATION = {:max_collection_size => 100}
 
   module_function
@@ -36,9 +33,6 @@ module Kasket
 
     if options[:assoliations_reload_hack]
       ActiveRecord::Associations::BelongsToAssociation.send(:include, Kasket::ReloadAssociationMixin)
-      if ActiveRecord::VERSION::MAJOR == 2 || AR30
-        ActiveRecord::Associations::BelongsToPolymorphicAssociation.send(:include, Kasket::ReloadAssociationMixin)
-      end
       ActiveRecord::Associations::HasOneThroughAssociation.send(:include, Kasket::ReloadAssociationMixin)
     end
   end

data/lib/kasket/configuration_mixin.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'active_support'
 require "digest/md5"
 

data/lib/kasket/dirty_mixin.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Kasket
   module DirtyMixin
     def kasket_dirty_methods(*method_names)

data/lib/kasket/query_parser.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Kasket
   class QueryParser
     # Examples:
@@ -11,11 +10,7 @@ module Kasket
 
     def initialize(model_class)
       @model_class = model_class
-      @supported_query_pattern = if AR30
-        /^select\s+(?:`#{@model_class.table_name}`.)?\* from (?:`|")#{@model_class.table_name}(?:`|") where (.*?)\s*$/i
-      else
-        /^select \* from (?:`|")#{@model_class.table_name}(?:`|") where \((.*)\)(|\s+limit 1)\s*$/i
-      end
+      @supported_query_pattern = /^select \* from (?:`|")#{@model_class.table_name}(?:`|") where \((.*)\)(|\s+limit 1)\s*$/i
       @table_and_column_pattern = /(?:(?:`|")?#{@model_class.table_name}(?:`|")?\.)?(?:`|")?([a-zA-Z]\w*)(?:`|")?/ # Matches: `users`.id, `users`.`id`, users.id, id
       @key_eq_value_pattern = /^[\(\s]*#{@table_and_column_pattern}\s+(=|IN)\s+#{VALUE}[\)\s]*$/ # Matches: KEY = VALUE, (KEY = VALUE), ()(KEY = VALUE))
     end
@@ -23,14 +18,6 @@ module Kasket
     def parse(sql)
       if match = @supported_query_pattern.match(sql)
         where, limit = match[1], match[2]
-        if AR30
-          return if where =~ / (order by|group by|join|having) /i
-          if where =~ /limit \d+\s*$/i
-            # limit is harder to find in rails 3.0 since where does not use surrounding braces
-            return unless where =~ /(.*?)(\s+limit 1)\s*$/i
-            where, limit = $1, $2
-          end
-        end
 
         query = Hash.new
         query[:attributes] = sorted_attribute_value_pairs(where)

data/lib/kasket/read_mixin.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Kasket
   module ReadMixin
 
@@ -55,7 +54,7 @@ module Kasket
 
         id_key_map = Hash[missing_keys.map{|key| [key.split('=').last.to_i, key] }]
 
-        found = without_kasket { find_all_by_id(id_key_map.keys) }
+        found = without_kasket { where(:id => id_key_map.keys).to_a }
         found.each(&:store_in_kasket)
         Hash[found.map{|record| [id_key_map[record.id], record] }]
       end

data/lib/kasket/reload_association_mixin.rb

@@ -1,12 +1,10 @@
-# -*- encoding: utf-8 -*-
 module Kasket
   module ReloadAssociationMixin
     def reload_with_kasket_clearing(*args)
       if loaded?
         Kasket.clear_local if target.class.include?(WriteMixin)
       else
-        refl = (ActiveRecord::VERSION::MAJOR == 2 || AR30) ? proxy_reflection : reflection
-        target_class = (refl.options[:polymorphic] ? (respond_to?(:klass) ? klass : association_class) : refl.klass)
+        target_class = (reflection.options[:polymorphic] ? (respond_to?(:klass) ? klass : association_class) : reflection.klass)
         Kasket.clear_local if target_class && target_class.include?(WriteMixin)
       end
 

data/lib/kasket/version.rb

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
 module Kasket
   class Version
     MAJOR = 3
-    MINOR = 1
-    PATCH = 5
+    MINOR = 2
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     PROTOCOL = 4
   end

data/lib/kasket/visitor.rb

@@ -24,8 +24,8 @@ module Kasket
       @model_class.columns_hash[name.to_s]
     end
 
-    def visit_Arel_Nodes_SelectStatement(node)
-      return :unsupported if !AR30 && node.with
+    def visit_Arel_Nodes_SelectStatement(node, *_)
+      return :unsupported if node.with
       return :unsupported if node.offset
       return :unsupported if node.lock
       return :unsupported if node.orders.any?
@@ -42,11 +42,11 @@ module Kasket
       query
     end
 
-    def visit_Arel_Nodes_SelectCore(node)
+    def visit_Arel_Nodes_SelectCore(node, *_)
       return :unsupported if node.groups.any?
       return :unsupported if node.having
-      return :unsupported if !AR30 && node.set_quantifier
-      return :unsupported if !AR30 && (!node.source || node.source.empty?)
+      return :unsupported if node.set_quantifier
+      return :unsupported if (!node.source || node.source.empty?)
       return :unsupported if node.projections.size != 1
 
       select = node.projections[0]
@@ -60,45 +60,45 @@ module Kasket
       parts.include?(:unsupported) ? :unsupported : parts
     end
 
-    def visit_Arel_Nodes_Limit(node)
+    def visit_Arel_Nodes_Limit(node, *_)
       {:limit => node.value.to_i}
     end
 
-    def visit_Arel_Nodes_JoinSource(node)
+    def visit_Arel_Nodes_JoinSource(node, *_)
       return :unsupported if !node.left || node.right.any?
       return :unsupported if !node.left.is_a?(Arel::Table)
       visit(node.left)
     end
 
-    def visit_Arel_Table(node)
+    def visit_Arel_Table(node, *_)
       {:from => node.name}
     end
 
-    def visit_Arel_Nodes_And(node)
+    def visit_Arel_Nodes_And(node, *_)
       attributes = node.children.map { |child| visit(child) }
       return :unsupported if attributes.include?(:unsupported)
       attributes.sort! { |pair1, pair2| pair1[0].to_s <=> pair2[0].to_s }
       { :attributes => attributes }
     end
 
-    def visit_Arel_Nodes_In(node)
+    def visit_Arel_Nodes_In(node, *_)
       left = visit(node.left)
       return :unsupported if left != :id
 
       [left, visit(node.right)]
     end
 
-    def visit_Arel_Nodes_Equality(node)
+    def visit_Arel_Nodes_Equality(node, *_)
       right = node.right
       [visit(node.left), right ? visit(right) : nil]
     end
 
-    def visit_Arel_Attributes_Attribute(node)
+    def visit_Arel_Attributes_Attribute(node, *_)
       self.last_column = column_for(node.name)
       node.name.to_sym
     end
 
-    def literal(node)
+    def literal(node, *_)
       if node == '?'
         column, value = @binds.shift
         value.to_s
@@ -108,11 +108,11 @@ module Kasket
     end
 
     # only gets used on 1.8.7
-    def visit_Arel_Nodes_BindParam(x)
+    def visit_Arel_Nodes_BindParam(x, *_)
       @binds.shift[1]
     end
 
-    def visit_Array(node)
+    def visit_Array(node, *_)
       node.map {|value| quoted(value) }
     end
 

data/lib/kasket/write_mixin.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Kasket
   module WriteMixin
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,112 +9,126 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.6
-    - - <
+        version: '3.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.6
-    - - <
+        version: '3.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-rg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: puts a cap on your queries
 email:
 - mick@zendesk.com
@@ -123,6 +137,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.rdoc
+- lib/kasket.rb
 - lib/kasket/configuration_mixin.rb
 - lib/kasket/dirty_mixin.rb
 - lib/kasket/query_parser.rb
@@ -133,27 +149,6 @@ files:
 - lib/kasket/version.rb
 - lib/kasket/visitor.rb
 - lib/kasket/write_mixin.rb
-- lib/kasket.rb
-- README.rdoc
-- test/cache_expiry_test.rb
-- test/cacheable_test.rb
-- test/configuration_mixin_test.rb
-- test/database.yml
-- test/dirty_test.rb
-- test/find_one_test.rb
-- test/find_some_test.rb
-- test/fixtures/authors.yml
-- test/fixtures/blogs.yml
-- test/fixtures/comments.yml
-- test/fixtures/posts.yml
-- test/helper.rb
-- test/parser_test.rb
-- test/read_mixin_test.rb
-- test/reload_test.rb
-- test/schema.rb
-- test/test_models.rb
-- test/transaction_test.rb
-- test/visitor_test.rb
 homepage: http://github.com/zendesk/kasket
 licenses:
 - Apache License Version 2.0
@@ -164,37 +159,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A write back caching layer on active record
-test_files:
-- test/cache_expiry_test.rb
-- test/cacheable_test.rb
-- test/configuration_mixin_test.rb
-- test/database.yml
-- test/dirty_test.rb
-- test/find_one_test.rb
-- test/find_some_test.rb
-- test/fixtures/authors.yml
-- test/fixtures/blogs.yml
-- test/fixtures/comments.yml
-- test/fixtures/posts.yml
-- test/helper.rb
-- test/parser_test.rb
-- test/read_mixin_test.rb
-- test/reload_test.rb
-- test/schema.rb
-- test/test_models.rb
-- test/transaction_test.rb
-- test/visitor_test.rb
+test_files: []