kasket 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2a4548deae3c98ad894dbd54829ca55c5fcd0fa
-  data.tar.gz: 3f746fed7e8508b8d169974c9e660d35f1be92d2
+  metadata.gz: 25efa3724a0e5b5d6b1bf69dba58de2afd6bb000
+  data.tar.gz: cb0b2b1b91897768971e7bfcc0299ff30254644a
 SHA512:
-  metadata.gz: eb3b6225c51e1f02c72d9fe1af8c093ee5c6ae512ad127beae372e016b5ab08072db0020ad9059e0c1c46cb1362b12a36d78eb07da1af460e2a3e7d6e5bab291
-  data.tar.gz: d3f7df44370ca505b8c686d9a7d00534c7e6b8dd8e5d08ab30fd64080949486827239084915916d04c428cbeef01235c2189041cb450cd0756506b54bdb341ba
+  metadata.gz: 4b2ae0752068653cf1edaa1f17dc8ca7aee2c6d840f564134e743968fc849e72db1da4d56e2b9f626f2782a94a5702873fee87e409828c75fd88c97577ffb1c9
+  data.tar.gz: 7e7b93830ad115b0c70fc29d442b1f2479adeee06326a06b7d6c106118af5e92afa717be3b3ab0638bf3bcb86dec1d3647379eb48ee30a4f7e9c5116d14ec34f

data/README.rdoc

@@ -94,10 +94,6 @@ We have only used and tested Kasket on MySql.
 
 Let us know if you find any.
 
-== Requirements
-
-* ActiveRecord 2.3.x
-
 == Isn't this what Cache Money does?
 
 Absolutely, but cache money does so much more.

data/lib/kasket.rb

@@ -9,7 +9,6 @@ module Kasket
   autoload :DirtyMixin,             'kasket/dirty_mixin'
   autoload :QueryParser,            'kasket/query_parser'
   autoload :ConfigurationMixin,     'kasket/configuration_mixin'
-  autoload :ReloadAssociationMixin, 'kasket/reload_association_mixin'
   autoload :Query,                  'kasket/query'
   autoload :Visitor,                'kasket/visitor'
   autoload :SelectManagerMixin,     'kasket/select_manager_mixin'
@@ -30,11 +29,6 @@ module Kasket
       ActiveRecord::Relation.send(:include, Kasket::RelationMixin)
       Arel::SelectManager.send(:include, Kasket::SelectManagerMixin)
     end
-
-    if options[:assoliations_reload_hack]
-      ActiveRecord::Associations::BelongsToAssociation.send(:include, Kasket::ReloadAssociationMixin)
-      ActiveRecord::Associations::HasOneThroughAssociation.send(:include, Kasket::ReloadAssociationMixin)
-    end
   end
 
   def self.cache_store=(options)
@@ -44,10 +38,4 @@ module Kasket
   def self.cache
     @cache_store ||= Rails.cache
   end
-
-  def clear_local
-    if Kasket.cache.respond_to?(:with_local_cache)
-      Kasket.cache.send(:local_cache).try(:clear)
-    end
-  end
 end

data/lib/kasket/configuration_mixin.rb

@@ -66,8 +66,8 @@ module Kasket
     end
 
     def has_kasket_on(*args)
-      attributes = args.sort! { |x, y| x.to_s <=> y.to_s }
-      if attributes != [:id] && !kasket_indices.include?([:id])
+      attributes = args.sort_by!(&:to_s)
+      if attributes != [:id] && !has_kasket_index_on?([:id])
         has_kasket_on(:id)
       end
 
@@ -79,7 +79,14 @@ module Kasket
       extend ReadMixin unless methods.map(&:to_sym).include?(:find_by_sql_with_kasket)
     end
 
+    def kasket_expires_in(time)
+      @kasket_ttl = time
+    end
+
+    attr_reader :kasket_ttl
+
     private
+
     def quoted_value_for_column(value, column)
       if column
         casted_value = if column.respond_to?(:type_cast_for_database)

data/lib/kasket/dirty_mixin.rb

@@ -2,13 +2,14 @@ module Kasket
   module DirtyMixin
     def kasket_dirty_methods(*method_names)
       method_names.each do |method|
-        unless method_defined?("without_kasket_update_#{method}")
-          alias_method("without_kasket_update_#{method}", method)
-          define_method(method) do |*args|
-            result = send("without_kasket_update_#{method}", *args)
-            clear_kasket_indices
-            result
-          end
+        without = "without_kasket_update_#{method}"
+        return if method_defined? without
+
+        alias_method without, method
+        define_method method do |*args, &block|
+          result = send(without, *args, &block)
+          clear_kasket_indices
+          result
         end
       end
     end

data/lib/kasket/read_mixin.rb

@@ -49,36 +49,28 @@ module Kasket
 
     protected
 
-      def missing_records_from_db(missing_keys)
-        return {} if missing_keys.empty?
+    def missing_records_from_db(missing_keys)
+      return {} if missing_keys.empty?
 
-        id_key_map = Hash[missing_keys.map{|key| [key.split('=').last.to_i, key] }]
+      id_key_map = Hash[missing_keys.map{|key| [key.split('=').last.to_i, key] }]
 
-        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
-
-      def store_in_kasket(key, records)
-        if records.size == 1
-          if records.first.kasket_cacheable?
-            Kasket.cache.write(key, records.first.attributes_before_type_cast.dup)
-          end
-        elsif records.empty?
-          ActiveRecord::Base.logger.info("[KASKET] would have stored an empty resultset") if ActiveRecord::Base.logger
-        elsif records.size <= Kasket::CONFIGURATION[:max_collection_size]
-          if records.all?(&:kasket_cacheable?)
-            instance_keys = records.map do |record|
-              instance_key = kasket_key_for_id(record.id)
-              Kasket.cache.write(instance_key, record.attributes_before_type_cast.dup)
-              instance_key
-            end
+      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
 
-            Kasket.cache.write(key, instance_keys) if key.is_a?(String)
-          end
+    def store_in_kasket(key, records)
+      if records.size == 1
+        records.first.store_in_kasket(key)
+      elsif records.empty?
+        ActiveRecord::Base.logger.info("[KASKET] would have stored an empty resultset") if ActiveRecord::Base.logger
+      elsif records.size <= Kasket::CONFIGURATION[:max_collection_size]
+        if records.all?(&:kasket_cacheable?)
+          instance_keys = records.map(&:store_in_kasket)
+          Kasket.cache.write(key, instance_keys)
         end
-        records
       end
-
+      records
+    end
   end
 end

data/lib/kasket/version.rb

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

data/lib/kasket/write_mixin.rb

@@ -29,9 +29,11 @@ module Kasket
         true
       end
 
-      def store_in_kasket
-        if kasket_cacheable? && kasket_key
-          Kasket.cache.write(kasket_key, @attributes.to_h.dup)
+      def store_in_kasket(key = kasket_key)
+        if kasket_cacheable? && key
+          options = { expires_in: self.class.kasket_ttl } if self.class.kasket_ttl
+          Kasket.cache.write(key, attributes_before_type_cast.dup, options)
+          key
         end
       end
 
@@ -62,9 +64,15 @@ module Kasket
         end
       end
 
-      def reload_with_kasket_clearing(*args)
-        Kasket.clear_local
-        reload_without_kasket_clearing(*args)
+      def reload(*args)
+        clear_kasket_indices
+        super
+      end
+
+      def update_column(*args)
+        result = super
+        clear_kasket_indices
+        result
       end
     end
 
@@ -80,9 +88,6 @@ module Kasket
       model_class.after_touch :clear_kasket_indices
       model_class.after_destroy :clear_kasket_indices
 
-      model_class.alias_method_chain :reload, :kasket_clearing
-
-
       class << model_class
         alias_method_chain :transaction, :kasket_disabled
         alias_method_chain :update_counters, :kasket_clearing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -129,6 +129,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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'
 description: puts a cap on your queries
 email:
 - mick@zendesk.com
@@ -144,7 +158,6 @@ files:
 - lib/kasket/query_parser.rb
 - lib/kasket/read_mixin.rb
 - lib/kasket/relation_mixin.rb
-- lib/kasket/reload_association_mixin.rb
 - lib/kasket/select_manager_mixin.rb
 - lib/kasket/version.rb
 - lib/kasket/visitor.rb
@@ -169,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A write back caching layer on active record

data/lib/kasket/reload_association_mixin.rb

@@ -1,18 +0,0 @@
-module Kasket
-  module ReloadAssociationMixin
-    def reload_with_kasket_clearing(*args)
-      if loaded?
-        Kasket.clear_local if target.class.include?(WriteMixin)
-      else
-        target_class = (reflection.options[:polymorphic] ? (respond_to?(:klass) ? klass : association_class) : reflection.klass)
-        Kasket.clear_local if target_class && target_class.include?(WriteMixin)
-      end
-
-      reload_without_kasket_clearing(*args)
-    end
-
-    def self.included(base)
-      base.alias_method_chain :reload, :kasket_clearing
-    end
-  end
-end