kasket 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70892c6d927d66172bfa651364fb0d83ab575b68
-  data.tar.gz: 16fc178ed0ba3aee24b4547ab87337f5d28260bb
+  metadata.gz: e08086b85cd83c48b921c9ecc8ea4699831d1f96
+  data.tar.gz: 9aa1ba1f4777aaac0a9a7043aff17910448c3c0e
 SHA512:
-  metadata.gz: 16844a7cdf3e9c8cdcd8612c33248372c3dcf30fde06607e06c9d021649e6a97810ab22bac1f8246f97015900b26992bf496fa5312c960e2988ea27d39358bbc
-  data.tar.gz: 541bb732c0356a8425637619fb097699a130a003e71a8068c36c592e212763bc08db3ac1fdac7f31aec2b15702cc9b1901ab4356f60eec894589685c611c3eb8
+  metadata.gz: 2cfcbb81078feba7b513eb161d5c1a7f4a9144261360c4a33f4263163ee2ffabee35f7638dc374f7cdedcf78f9770441d5dad95f7b578363919e990ce8f63583
+  data.tar.gz: 05c0e405329c695da87f967b7d30b14834f3f543a7a6b8d04b9ca6fb8758e6eb30dbf0918a22b037a051e478484bfb86f230c44aea43f588eeb9ea20687f8ad3

data/lib/kasket.rb

@@ -39,4 +39,19 @@ module Kasket
   def self.cache
     @cache_store ||= Rails.cache
   end
+
+  # Keys are the records being saved.
+  # Values are either the saved record, or nil if the record has been destroyed.
+  def self.pending_records
+    Thread.current[:kasket_pending_records]
+  end
+
+  def self.add_pending_record(record, destroyed = false)
+    Thread.current[:kasket_pending_records] ||= {}
+    Thread.current[:kasket_pending_records][record] = destroyed ? nil : record
+  end
+
+  def self.clear_pending_records
+    Thread.current[:kasket_pending_records] = nil
+  end
 end

data/lib/kasket/configuration_mixin.rb

@@ -6,15 +6,15 @@ module Kasket
   module ConfigurationMixin
 
     def without_kasket(&block)
-      old_value = Thread.current['kasket_disabled'] || false
-      Thread.current['kasket_disabled'] = true
+      old_value = Thread.current[:kasket_disabled] || false
+      Thread.current[:kasket_disabled] = true
       yield
     ensure
-      Thread.current['kasket_disabled'] = old_value
+      Thread.current[:kasket_disabled] = old_value
     end
 
     def use_kasket?
-      !Thread.current['kasket_disabled']
+      !Thread.current[:kasket_disabled]
     end
 
     def kasket_parser

data/lib/kasket/read_mixin.rb

@@ -24,9 +24,9 @@ module Kasket
         else
           if value = Kasket.cache.read(query[:key])
             if value.is_a?(Array)
-              find_by_sql_with_kasket_on_id_array(value)
+              filter_pending_records(find_by_sql_with_kasket_on_id_array(value))
             else
-              Array.wrap(value).collect { |record| instantiate(record.dup) }
+              filter_pending_records(Array.wrap(value).collect { |record| instantiate(record.dup) })
             end
           else
             store_in_kasket(query[:key], find_by_sql_without_kasket(*args))
@@ -49,6 +49,14 @@ module Kasket
 
     protected
 
+    def filter_pending_records(records)
+      if pending_records = Kasket.pending_records
+        records.map { |record| pending_records.fetch(record, record) }.compact
+      else
+        records
+      end
+    end
+
     def missing_records_from_db(missing_keys)
       return {} if missing_keys.empty?
 

data/lib/kasket/version.rb

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

data/lib/kasket/write_mixin.rb

@@ -87,6 +87,29 @@ module Kasket
         clear_kasket_indices
         result
       end
+
+      def kasket_after_commit_dummy
+        # This is here to force committed! to be invoked.
+      end
+
+      def kasket_after_save
+        Kasket.add_pending_record(self)
+      end
+
+      def kasket_after_destroy
+        Kasket.add_pending_record(self, destroyed = true)
+      end
+
+      def committed!(*)
+        Kasket.clear_pending_records
+        kasket_after_commit if persisted? || destroyed?
+        super
+      end
+
+      def rolledback!(*)
+        Kasket.clear_pending_records
+        super
+      end
     end
 
     def self.included(model_class)
@@ -97,7 +120,9 @@ module Kasket
         model_class.send(:alias_method, :kasket_cacheable?, :default_kasket_cacheable?)
       end
 
-      model_class.after_commit :kasket_after_commit
+      model_class.after_save :kasket_after_save
+      model_class.after_destroy :kasket_after_destroy
+      model_class.after_commit :kasket_after_commit_dummy
 
       if ActiveRecord::VERSION::MAJOR == 3 || (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 0)
         model_class.after_touch :kasket_after_commit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord