reactive-record 0.7.39 → 0.7.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38627e5aff47130857117db10b665d62df420ddd
-  data.tar.gz: d5f8d93a888c7ac27a7032f020ca784553b1dceb
+  metadata.gz: 4bb0f789a2d04f7a3256763e9f6df888a030bd36
+  data.tar.gz: 4192db45d77b75734e1b1be6280144c06d94e510
 SHA512:
-  metadata.gz: 11dcbafdbb5d8bc1d9c00586c38ea6bb15726d6045ab18a75ff622f087c18c76755899dce2fe6e5a2f5cf424d3b05e23b73b8beb3a4127a07b3782a1e1f4e9b3
-  data.tar.gz: 47c7b2bf0db583da4940395dbe9c3fc476892bebd04697335a9a38a9a6b1e6c0b3eb9f93447e5020b18acf66db88707a928803bcc1b7faa1126973ae152b3923
+  metadata.gz: 2d1b9081a8b0133ce8dc3a2d1195b5ed9d4478b40520739b25bb6a77ef9c75f978f92c472a6a1722acbed85e86561ede0dc4bdd0241559c38804b89d383317f6
+  data.tar.gz: ad0483d874c65bd03407e8e0f7058033bbb18f318cd1228f8d183238bb41b31dbff4d113516afacec7b852d29520abbc68909f2de5b82abc46866327adeb9c67

data/lib/reactive-record.rb

@@ -9,6 +9,7 @@ if RUBY_ENGINE == 'opal'
   require "reactive_record/active_record/associations"
   require "reactive_record/active_record/reactive_record/base"
   require "reactive_record/active_record/reactive_record/collection"
+  require "reactive_record/reactive_scope"
   require "reactive_record/active_record/class_methods"
   require "reactive_record/active_record/instance_methods"
   require "reactive_record/active_record/base"
@@ -22,6 +23,7 @@ else
   require "reactive_record/engine"
   require "reactive_record/server_data_cache"
   require "reactive_record/active_record/reactive_record/isomorphic_base"
+  require "reactive_record/reactive_scope"
   require "reactive_record/serializers"
   require "reactive_record/pry"
 

data/lib/reactive_record/active_record/reactive_record/base.rb

@@ -65,6 +65,28 @@ module ReactiveRecord
       @class_scopes[model.base_class]
     end
 
+    def self.sync_blocks
+      # @sync_blocks[watch_model][sync_model][scope_name][...array of blocks...]
+      @sync_blocks ||= Hash.new { |hash, key| hash[key] = Hash.new { |hash, key| hash[key] = Hash.new { |hash, key| hash[key] = [] } } }
+    end
+
+    def sync_scopes
+      self.class.sync_blocks[self.model].each do |watching_class, scopes|
+        scopes.each do |scope_name, blocks|
+          blocks.each do |block|
+            if block.arity > 0
+              block.call watching_class.send(scope_name), @ar_instance
+            elsif @ar_instance.instance_eval &block
+              watching_class.send(scope_name) << @ar_instance
+            else
+              watching_class.send(scope_name).delete(@ar_instance)
+            end
+          end
+        end
+      end
+      model.all << @ar_instance
+    end
+
     def self.find(model, attribute, value)
       # will return the unique record with this attribute-value pair
       # value cannot be an association or aggregation

data/lib/reactive_record/active_record/reactive_record/collection.rb

@@ -27,6 +27,7 @@ module ReactiveRecord
     end
 
     def all
+      observed
       @dummy_collection.notify if @dummy_collection
       unless @collection
         @collection = []
@@ -43,7 +44,7 @@ module ReactiveRecord
     end
 
     def [](index)
-
+      observed
       if (@collection || all).length <= index and @dummy_collection
         (@collection.length..index).each do |i|
           new_dummy_record = ReactiveRecord::Base.new_from_vector(@target_klass, nil, *@vector, "*#{i}")
@@ -55,6 +56,9 @@ module ReactiveRecord
     end
 
     def ==(other_collection)
+      observed
+      return nil unless other_collection.is_a? Collection
+      other_collection.observed
       my_collection = (@collection || []).select { |target| target != @dummy_record }
       other_collection = (other_collection ? (other_collection.collection || []) : []).select { |target| target != other_collection.dummy_record }
       my_collection == other_collection
@@ -68,6 +72,7 @@ module ReactiveRecord
     end
 
     def count
+      observed
       if @collection
         @collection.count
       elsif @count ||= ReactiveRecord::Base.fetch_from_db([*@vector, "*count"])
@@ -89,6 +94,7 @@ module ReactiveRecord
     end
 
     def <<(item)
+      return delete(item) if item.destroyed? # pushing a destroyed item is the same as removing it
       backing_record = item.backing_record
       all << item unless all.include? item # does this use == if so we are okay...
       if backing_record and @owner and @association and inverse_of = @association.inverse_of and item.attributes[inverse_of] != @owner
@@ -104,7 +110,7 @@ module ReactiveRecord
         @dummy_record = @collection.detect { |r| r.backing_record.vector.last =~ /^\*[0-9]+$/ }
         @dummy_collection = nil
       end
-      self
+      notify_of_change
     end
 
     [:first, :last].each do |method|
@@ -141,11 +147,11 @@ module ReactiveRecord
         @dummy_collection = @dummy_record = nil
         new_array.each { |item| self << item }
       end
-      new_array
+      notify_of_change new_array
     end
 
     def delete(item)
-      if @owner and @association and inverse_of = @association.inverse_of
+      notify_of_change(if @owner and @association and inverse_of = @association.inverse_of
         if backing_record = item.backing_record and backing_record.attributes[inverse_of] == @owner
           # the if prevents double update if delete is being called from << (see << above)
           backing_record.update_attribute(inverse_of, nil)
@@ -153,7 +159,7 @@ module ReactiveRecord
         all.delete(item).tap { @owner.backing_record.update_attribute(@association.attribute) } # forces a check if association contents have changed from synced values
       else
         all.delete(item)
-      end
+      end)
     end
 
     def loading?
@@ -185,6 +191,19 @@ module ReactiveRecord
       @dummy_collection
     end
 
+    def notify_of_change(value = nil)
+begin
+      React::State.set_state(self, "collection", collection) unless ReactiveRecord::Base.data_loading?
+rescue Exception => e
+  `debugger`
+end
+      value
+    end
+
+    def observed
+      React::State.get_state(self, "collection") unless ReactiveRecord::Base.data_loading?
+    end
+
   end
 
 end

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

@@ -316,7 +316,10 @@ module ReactiveRecord
                   end
                 end
 
-                response.json[:saved_models].each { | item | backing_records[item[0]].errors! item[3] }
+                response.json[:saved_models].each do | item |
+                  backing_records[item[0]].sync_scopes
+                  backing_records[item[0]].errors! item[3]
+                end
 
                 yield response.json[:success], response.json[:message], response.json[:models]  if block
                 promise.resolve response.json
@@ -546,6 +549,7 @@ module ReactiveRecord
 
         if !data_loading? and (id or vector)
           HTTP.post(`window.ReactiveRecordEnginePath`+"/destroy", payload: {model: ar_instance.model_name, id: id, vector: vector}).then do |response|
+            sync_scopes
             yield response.json[:success], response.json[:message] if block
             promise.resolve response.json
           end

data/lib/reactive_record/reactive_scope.rb

@@ -0,0 +1,18 @@
+class ActiveRecord::Base
+
+  def self.to_sync(scope_name, opts={}, &block)
+    watch_list = if opts[:watch]
+      [*opts.delete[:watch]]
+    else
+      [self]
+    end
+    if RUBY_ENGINE=='opal'
+      watch_list.each do |klass_to_watch|
+        ReactiveRecord::Base.sync_blocks[klass_to_watch][self][scope_name] << block
+      end
+    else
+      # this is where we put server side watchers in place to sync all clients!
+    end
+  end
+
+end

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.39"
+  VERSION = "0.7.40"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.39
+  version: 0.7.40
 platform: ruby
 authors:
 - Mitch VanDuyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,7 @@ files:
 - lib/reactive_record/interval.rb
 - lib/reactive_record/permissions.rb
 - lib/reactive_record/pry.rb
+- lib/reactive_record/reactive_scope.rb
 - lib/reactive_record/serializers.rb
 - lib/reactive_record/server_data_cache.rb
 - lib/reactive_record/version.rb