reactive-record 0.7.25 → 0.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f84ff0051d07fb7ba4f4f6b1dde0abd213b78a4a
-  data.tar.gz: a240b046e3f35e36d583180c85b2c968500f909c
+  metadata.gz: 2c15527bb6caf4a10ea5a096502f28922b327ed1
+  data.tar.gz: 57eaf2bda747f35a7d73f6c6921686c5e2e62097
 SHA512:
-  metadata.gz: d534356c70ce1ed16e29bfdfc9badf5bb43a43a5d257dfde769899ee47bd6a17b2627a46e689f6eba468d19d141587f644982b3b68faf79fad5162e2837cff17
-  data.tar.gz: bb3e9292acf24f4359eca6f3fc59ad18408c6419a8af65338e077530f9e753918ffc23d3f475011c5670a74dd067664953d256ab740f852f2c08936a61f590c7
+  metadata.gz: 53444409324a592f76f37a56c4164ee4f52f88df2b9912060a3e0d2807e0020d42a490650a2d9b45d2e4d12c727336bddb79e3a1c59c23d0d93dfdaf884f4a45
+  data.tar.gz: 68b8f20350a595919c8ef0ecae9a57b029512e27077467d0bf8b5f9bfd26a573ffda5a286c1f3a604fe6b5a303ba96c555341777b849ea24eb1e76f8685bc799

data/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -179,6 +179,13 @@ module ReactiveRecord
       end
     end
 
+    class << self
+
+      attr_reader :pending_fetches
+      attr_reader :last_fetch_at
+
+    end
+
     def self.schedule_fetch
       @fetch_scheduled ||= after(0.01) do
         if @pending_fetches.count > 0  # during testing we might reset the context while there are pending fetches otherwise this would never normally happen
@@ -257,13 +264,13 @@ module ReactiveRecord
             if association = record.model.reflect_on_association(attribute)
               if association.collection?
                 value.each { |assoc| add_new_association.call record, attribute, assoc.backing_record }
-              elsif value
+              elsif !value.nil?
                 add_new_association.call record, attribute, value.backing_record
               else
                 output_attributes[attribute] = nil
               end
             elsif aggregation = record.model.reflect_on_aggregation(attribute) and (aggregation.klass < ActiveRecord::Base)
-              add_new_association.call record, attribute, value.backing_record
+              add_new_association.call record, attribute, value.backing_record unless value.nil?
             elsif aggregation
               new_value = aggregation.serialize(value)
               output_attributes[attribute] = new_value if record.changed?(attribute) or new_value != aggregation.serialize(record.synced_attributes[attribute])
@@ -373,7 +380,13 @@ module ReactiveRecord
           model = Object.const_get(model_to_save[:model])
           id = attributes.delete(model.primary_key) if model.respond_to? :primary_key # if we are saving existing model primary key value will be present
           vector = model_to_save[:vector]
-          vector[0] = vector[0].constantize
+          vector = [vector[0].constantize] + vector[1..-1].collect do |method|
+            if method.is_a?(Array) and method.first == "find_by_id"
+              ["find", method.last]
+            else
+              method
+            end
+          end
           reactive_records[model_to_save[:id]] = vectors[vector] = record = find_record(model, id, vector, save)
           if record and record.respond_to?(:id) and record.id
             # we have an already exising activerecord model

data/lib/reactive_record/active_record/reactive_record/while_loading.rb

@@ -25,6 +25,18 @@ module ReactiveRecord
     @loads_pending = true
   end
 
+  def self.check_loads_pending
+    if @loads_pending
+      if Base.pending_fetches.count > 0
+        true
+      else  # this happens when for example loading foo.x results in somebody looking at foo.y while foo.y is still being loaded
+        ReactiveRecord::WhileLoading.loaded_at Base.last_fetch_at
+        ReactiveRecord::WhileLoading.quiet!
+        false
+      end
+    end
+  end
+
   def self.run_blocks_to_load(failure = nil)
     if @blocks_to_load
       blocks_to_load = @blocks_to_load
@@ -34,7 +46,7 @@ module ReactiveRecord
         @load_stack << @loads_pending
         @loads_pending = nil
         result = promise_and_block.last.call(failure)
-        if @loads_pending and !failure
+        if check_loads_pending and !failure
           @blocks_to_load << promise_and_block
         else
           promise_and_block.first.resolve result

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.25"
+  VERSION = "0.7.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.25
+  version: 0.7.26
 platform: ruby
 authors:
 - Mitch VanDuyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails