volt-repo_cache 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e67fb69f5462671adbe6c70c7d88ff76156bc7
-  data.tar.gz: b7dacb4047656a539f2cc858f5ae88f955185d0a
+  metadata.gz: a949a402c250f1b85f04ae00b100102eefe77430
+  data.tar.gz: 077842b65264bfabbe797622dadba64fe8a8fe52
 SHA512:
-  metadata.gz: a6438cc77fd305a203677d88ae2805a538fcebb3c672ea1a8e4ad735c1631f191557ca47a4102508692a3786c5e8584c19b94d11637cdf3de6714fb9038b7257
-  data.tar.gz: de00eae7965eb73757fcd19154fab9c8159e345355ecbef617d2af9091158c9ae061f5bfeec206a45887c9a428dfd9933e0e7147edc847cacaa117ead803f748
+  metadata.gz: 2b1f68d6c457986e0b63fbcd3b0ba5fa4a3e43167e8a80f9d2ce33ba64b71f6ac4bf90eb3d7fd7908ca240ce20c66a9a6c88b10f06975b5eca108b6269dd3ddd
+  data.tar.gz: 987d529e193352b8b77d53240f2ce334f32477eb99c28284633e0e8837a240d61ab562de5fe9417647dc9e15dcae410fc947f38f913cdd47da24e11caeb768ac

data/lib/volt/repo_cache/association.rb

@@ -92,6 +92,15 @@ module Volt
         @local_collection = @foreign_collection = @reciprocal = nil
       end
 
+      def __debug(level, file, line, method, msg = nil)
+         s = "#{file}[#{line}]:#{self.class.name}##{method}: #{msg}"
+         if RUBY_PLATFORM == 'opal'
+           Volt.logger.debug s
+         else
+           puts s
+         end
+       end
+
     end
   end
 end

data/lib/volt/repo_cache/collection.rb

@@ -52,10 +52,14 @@ module Volt
           # models are removed from @marked_from_destruction as
           # they are flushed, so we need a copy of them to enumerate
           @marked_for_destruction.values.dup.each do |e|
+            # __debug __method__, __LINE__, "@marked_for_destruction calling #{e.class}:#{e.id}.flush!"
             promises << e.flush!
+            # __debug __method__, __LINE__, "@marked_for_destruction called #{e.class}:#{e.id}.flush!"
           end
           each do |e|
+            # __debug __method__, __LINE__, "each calling #{e.class}:#{e.id}.flush!"
             promises << e.flush!
+            # __debug __method__, __LINE__, "each called #{e.class}:#{e.id}.flush!"
           end
         end
         Promise.when(*promises)
@@ -114,14 +118,16 @@ module Volt
         end
         @marked_for_destruction[model.id] = model
         __remove__(model, error_if_absent: true)
+        @cached_ids.delete(model.id)
       end
 
       # Called by RepoCache::Model#__destroy__.
       # Remove model from marked_for_destruction bucket.
       # Don't worry if we can't find it.
       def destroyed(model)
-        @cached_ids.delete(model.id)
-        @marked_for_destruction.delete(model.id)
+        # __debug __method__, __LINE__, "#{model.class}.id=#{model.id}"
+        result = @marked_for_destruction.delete(model.id)
+        # __debug __method__, __LINE__, "@marked_for_destruction.delete(#{model.id}) => #{result}"
       end
 
       # Collection is being notified (probably by super/self)
@@ -197,7 +203,7 @@ module Volt
           raise ArgumentError, "#{model} must be a #{model_class_name}"
         end
         if model.cached?
-          __debug __method__, __LINE__, "id=#{model.id} model.cached?=#{model.cached?}"
+          # __debug __method__, __LINE__, "id=#{model.id} model.cached?=#{model.cached?}"
           raise TypeError, "model.id #{model.id} already in cache"
         end
         @cached_ids << model.id
@@ -232,7 +238,7 @@ module Volt
       end
 
       def __debug(method, line, msg = nil)
-         s = "{__FILE__}[#{line}]:#{self.class.name}##{method}: #{msg}"
+         s = "#{__FILE__}[#{line}]:#{self.class.name}##{method}: #{msg}"
          if RUBY_PLATFORM == 'opal'
            Volt.logger.debug s
          else

data/lib/volt/repo_cache/model.rb

@@ -191,15 +191,16 @@ module Volt
             fail_if_read_only(__method__)
             if @cache__marked_for_destruction
               # debug_model __method__, __LINE__, "marked for destruction so call destroy on #{to_h}"
-              __destroy__
+              @cache__marked_for_destruction = false
+              Promise.when(__destroy__, flush_associations)
             else
               if dirty?
-                debug_model __method__, __LINE__, "@cache__stored=#{@cache__stored} dirty?=#{dirty?} to_h=#{to_h}"
+                # debug_model __method__, __LINE__, "@cache__stored=#{@cache__stored} dirty?=#{dirty?} to_h=#{to_h}"
                 if stored?
                   # debug_model __method__, __LINE__,"dirty: #{self.class.name}::#{self.id}"
                   __save__
                 else
-                  debug_model __method__, __LINE__, "<< to repo: #{self.class.name}::#{self.to_h}"
+                  # debug_model __method__, __LINE__, "<< to repo: #{self.class.name}::#{self.to_h}"
                   @cache__stored = true
                   @cache__collection.repo_collection << self
                   # TODO: big problem! once new model saved it should become buffer in cache!
@@ -339,23 +340,24 @@ module Volt
         # MESSAGE_BUS is on and there's another connection
         # (e.g. console) running.
         # Returns a promise with destroyed model proxy as value.
+        # TODO: destroy any has_many association
         def model.__destroy__
           # debug_model __method__, __LINE__
           fail_if_read_only(__method__)
-          # debug_model __method__, __LINE__
+          debug_model __method__, __LINE__
           promise = if stored?
             destroy(caller: self)
           else
             Promise.value(self)
           end
-          # debug_model __method__, __LINE__
-          promise.then do |m|
-            # debug_model __method__, __LINE__, "destroy promise resolved to #{m}"
+          debug_model __method__, __LINE__
+          promise.then do |result|
+            debug_model __method__, __LINE__, "destroy promise result => #{result}"
             @cache__collection.destroyed(self)
             uncache
             self
           end.fail do |errors|
-            # debug_model __method__, __LINE__, "destroy failed => #{errors}"
+            debug_model __method__, __LINE__, "destroy failed => #{errors}"
             errors
           end
         end
@@ -666,6 +668,7 @@ module Volt
                 # debug_model __method__, __LINE__
               end
             end
+            @cache__collection.flush!
           end
         end
         model.singleton_class.send(:private, :mark_associations_for_destruction)

data/lib/volt/repo_cache/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module RepoCache
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt-repo_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Colin Gunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies: []
 description: Cache multiple collections or query based subsets from any Volt repository.
   Provides faster and simpler client-side processing. Reduces the burden of promise