all tests passing on synchromesh side 5 files with fails on reactive-record side

Author: catmando

Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in synchromesh.gemspec
 gem 'hyper-trace'
 gem 'opal-browser'
+gem 'hyper-react', path: '../reactrb'
 gemspec

README.md

@@ -1,6 +1,6 @@
-# Synchromesh ![](logo.jpg?raw=true)
+# Hyper-mesh ![](https://avatars3.githubusercontent.com/u/15810526?v=3&s=200&raw=true)
 
-[Synchromesh](https://en.wikipedia.org/wiki/Manual_transmission#Synchromesh) provides multi-client synchronization for [reactive-record.](https://github.com/catprintlabs/reactive-record)
+Hyper-mesh] provides multi-client synchronization for [reactive-record.](https://github.com/catprintlabs/reactive-record)
 
 In other words browser 1 creates, updates, or destroys a model, and the changes are broadcast to all other clients.
 
@@ -77,7 +77,7 @@ For complete details see [Authorization Policies](docs/authorization-policies.md
 
 ## Installation
 
-If you do not already have reactrb installed, then use the reactrb-rails-generator gem to setup reactrb, reactive-record and associated gems.
+If you do not already have hyper-react installed, then use the reactrb-rails-generator gem to setup hyper-react, reactive-record and associated gems.
 
 Then add this line to your application's Gemfile:
 
@@ -244,7 +244,7 @@ pusher.self.js?body=1:62 WebSocket connection to
 failed: Error in connection establishment: net::ERR_CONNECTION_REFUSED
 ```
 Check to see if you are including the pusher-fake gem.  
-Synchromesh will always try to use pusher-fake if it sees the gem included.  Remove it and you should be good to go.  See [issue #5](https://github.com/reactrb/synchromesh/issues/5) for more details.
+Synchromesh will always try to use pusher-fake if it sees the gem included.  Remove it and you should be good to go.  See [issue #5](https://github.com/hyper-react/synchromesh/issues/5) for more details.
 
 ## Debugging
 

docs/action_cable_quickstart.md

@@ -8,24 +8,24 @@ You need to be on rails 5 to use ActionCable.  Make sure you upgrade to rails 5
 
 #### 2 Add ReactRb
 
-If you have not already installed the `reactrb` and `reactive-record` gems, then do so now using the [reactrb-rails-generator](https://github.com/reactrb/reactrb-rails-generator) gem.
+If you have not already installed the `hyper-react` and `reactive-record` gems, then do so now using the [reactrb-rails-generator](https://github.com/hyper-react/reactrb-rails-generator) gem.
 
 - add `gem 'reactrb-rails-generator'` to your gem file (in the development section)
 - run `bundle install`
-- run `rails g reactrb:install --all` (make sure to use the --all option)
+- run `rails g hyper-react:install --all` (make sure to use the --all option)
 - run `bundle update`
 
 #### 3 Add the synchromesh gem
 
 - ~~add `gem 'synchromesh'` to your gem file~~  
-- add `gem 'synchromesh', git: 'https://github.com/reactrb/synchromesh', branch: 'authorization-policies'`
+- add `gem 'synchromesh', git: 'https://github.com/hyper-react/synchromesh', branch: 'authorization-policies'`
 - then `bundle install`  
 - and in `app/views/components.rb` add `require 'synchromesh'`  
  immediately below`require 'reactive-record'`
 
 #### 4 Set the transport
 
-Once you have reactrb installed then add this initializer:
+Once you have hyper-react installed then add this initializer:
 ```ruby
 #config/initializers/synchromesh.rb
 Synchromesh.configuration do |config|

docs/simple_poller_quickstart.md

@@ -8,23 +8,23 @@ Either take an existing rails app, or create a new one the usual way.
 
 #### 2 Add ReactRb
 
-If you have not already installed the `reactrb` and `reactive-record` gems, then do so now using the [reactrb-rails-generator](https://github.com/reactrb/reactrb-rails-generator) gem.
+If you have not already installed the `hyper-react` and `reactive-record` gems, then do so now using the [reactrb-rails-generator](https://github.com/hyper-react/reactrb-rails-generator) gem.
 
 - add `gem 'reactrb-rails-generator'` to your gem file (in the development section)
 - run `bundle install`
-- run `bundle exec rails g reactrb:install --all` (make sure to use the --all option)
+- run `bundle exec rails g hyper-react:install --all` (make sure to use the --all option)
 - run `bundle update`
 
 #### 3 Add the synchromesh gem
 
-- add `gem 'synchromesh', git: 'https://github.com/reactrb/synchromesh', branch: 'authorization-policies'`
+- add `gem 'synchromesh', git: 'https://github.com/hyper-react/synchromesh', branch: 'authorization-policies'`
 - then `bundle install`  
 - and in `app/views/components.rb` add `require 'synchromesh'`  
  immediately below`require 'reactive-record'`
 
 #### 4 Set the transport
 
-Once you have reactrb installed then add this initializer:
+Once you have hyper-react installed then add this initializer:
 ```ruby
 #config/initializers/synchromesh.rb
 Synchromesh.configuration do |config|

examples/action-cable/Gemfile

@@ -48,7 +48,7 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'reactrb'
+gem 'hyper-react'
 gem 'react-rails', '>= 1.3.0'
 gem 'opal-rails', '>= 0.8.1'
 gem 'therubyracer', platforms: :ruby

examples/action-cable/Gemfile.lock

@@ -162,15 +162,15 @@ GEM
       opal-rails
       rails (>= 3.2.13)
       react-rails
-      reactrb
-    reactrb (0.8.8)
+      hyper-react
+    hyper-react (0.8.8)
       opal (>= 0.8.0)
       opal-activesupport (>= 0.2.0)
       opal-browser (= 0.2.0)
     reactrb-rails-generator (0.2.0)
       rails (>= 4.0.0)
     reactrb-router (0.8.2)
-      reactrb
+      hyper-react
     ref (2.0.0)
     sass (3.4.22)
     sass-rails (5.0.6)
@@ -229,7 +229,7 @@ DEPENDENCIES
   react-rails (>= 1.3.0)
   react-router-rails (~> 0.13.3)
   reactive-record (>= 0.8.0)
-  reactrb
+  hyper-react
   reactrb-rails-generator
   reactrb-router
   sass-rails (~> 5.0)

examples/action-cable/app/views/components.rb

@@ -1,7 +1,7 @@
 # app/views/components.rb
 require 'opal'
 require 'react'
-require 'reactrb'
+require 'hyper-react'
 if React::IsomorphicHelpers.on_opal_client?
   require 'opal-jquery'
   require 'browser'

examples/simple-poller/Gemfile

@@ -29,7 +29,7 @@ gem 'jbuilder', '~> 2.5'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
-gem 'synchromesh', path: '../..' #git: 'https://github.com/reactrb/synchromesh', branch: 'authorization-policies'
+gem 'synchromesh', path: '../..' #git: 'https://github.com/hyper-react/synchromesh', branch: 'authorization-policies'
 #gem 'pusher'
 #gem 'pusher-fake'
 
@@ -53,7 +53,7 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'reactrb'
+gem 'hyper-react'
 gem 'react-rails', '>= 1.3.0'
 gem 'opal-rails', '>= 0.8.1'
 gem 'therubyracer', platforms: :ruby

examples/simple-poller/Gemfile.lock

@@ -181,15 +181,15 @@ GEM
       opal-rails
       rails (>= 3.2.13)
       react-rails
-      reactrb
-    reactrb (0.8.8)
+      hyper-react
+    hyper-react (0.8.8)
       opal (>= 0.8.0)
       opal-activesupport (>= 0.2.0)
       opal-browser (= 0.2.0)
     reactrb-rails-generator (0.2.0)
       rails (>= 4.0.0)
     reactrb-router (0.8.2)
-      reactrb
+      hyper-react
     ref (2.0.0)
     sass (3.4.22)
     sass-rails (5.0.6)
@@ -254,7 +254,7 @@ DEPENDENCIES
   react-rails (>= 1.3.0)
   react-router-rails (~> 0.13.3)
   reactive-record (>= 0.8.0)
-  reactrb
+  hyper-react
   reactrb-rails-generator
   reactrb-router
   sass-rails (~> 5.0)

examples/simple-poller/app/views/components.rb

@@ -1,7 +1,7 @@
 # app/views/components.rb
 require 'opal'
 require 'react'
-#require 'reactrb'
+#require 'hyper-react'
 require 'synchromesh'
 if React::IsomorphicHelpers.on_opal_client?
   require 'opal-jquery'

examples/words/Gemfile

@@ -48,7 +48,7 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'reactrb'
+gem 'hyper-react'
 gem 'react-rails', '>= 1.3.0'
 gem 'opal-rails', '>= 0.8.1'
 gem 'therubyracer', platforms: :ruby

examples/words/Gemfile.lock

@@ -162,15 +162,15 @@ GEM
       opal-rails
       rails (>= 3.2.13)
       react-rails
-      reactrb
-    reactrb (0.8.8)
+      hyper-react
+    hyper-react (0.8.8)
       opal (>= 0.8.0)
       opal-activesupport (>= 0.2.0)
       opal-browser (= 0.2.0)
     reactrb-rails-generator (0.2.0)
       rails (>= 4.0.0)
     reactrb-router (0.8.2)
-      reactrb
+      hyper-react
     ref (2.0.0)
     sass (3.4.22)
     sass-rails (5.0.6)
@@ -229,7 +229,7 @@ DEPENDENCIES
   react-rails (>= 1.3.0)
   react-router-rails (~> 0.13.3)
   reactive-record (>= 0.8.0)
-  reactrb
+  hyper-react
   reactrb-rails-generator
   reactrb-router
   sass-rails (~> 5.0)

examples/words/app/views/components.rb

@@ -1,7 +1,7 @@
 # app/views/components.rb
 require 'opal'
 require 'react'
-require 'reactrb'
+require 'hyper-react'
 if React::IsomorphicHelpers.on_opal_client?
   require 'opal-jquery'
   require 'browser'

lib/reactive_record/active_record/reactive_record/collection.rb

@@ -2,6 +2,30 @@ module ReactiveRecord
 
   class Collection
 
+    class DummySet
+      def new
+        @master ||= super
+      end
+      def method_missing(*args)
+      end
+    end
+
+    def unsaved_children
+      old_uc_already_being_called = @uc_already_being_called
+      if @owner && @association
+        @unsaved_children ||= Set.new
+        unless @uc_already_being_called
+          @uc_already_being_called = true
+          #@owner.backing_record.update_attribute(@association.attribute)
+        end
+      else
+        @unsaved_children ||= DummySet.new
+      end
+      @unsaved_children
+    ensure
+      @uc_already_being_called = old_uc_already_being_called
+    end
+
     def initialize(target_klass, owner = nil, association = nil, *vector)
       @owner = owner  # can be nil if this is an outer most scope
       @association = association
@@ -59,9 +83,14 @@ def ==(other_collection)
       observed
       return !@collection 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
+      my_children = (@collection || []).select { |target| target != @dummy_record }
+      if other_collection
+        other_children = (other_collection.collection || []).select { |target| target != other_collection.dummy_record }
+        return false unless my_children == other_children
+        unsaved_children.to_a == other_collection.unsaved_children.to_a
+      else
+        my_children.empty? && unsaved_children.empty?
+      end
     end
 
     def apply_scope(scope, *args)
@@ -93,6 +122,8 @@ def klass
       @target_klass
     end
 
+    attr_reader :client_collection
+
     def <<(item)
       return delete(item) if item.destroyed? # pushing a destroyed item is the same as removing it
       backing_record = item.backing_record
@@ -106,7 +137,9 @@ def <<(item)
       end
       if item.id and @dummy_record
         @dummy_record.id = item.id
-        @collection.delete(@dummy_record)
+        # we cant use == because that just means the objects are referencing
+        # the same backing record.
+        @collection.reject { |i| i.object_id == @dummy_record.object_id }
         @dummy_record = @collection.detect { |r| r.backing_record.vector.last =~ /^\*[0-9]+$/ }
         @dummy_collection = nil
       end
@@ -150,17 +183,17 @@ def replace(new_array)
       notify_of_change new_array
     end
 
-    def delete(item)
-      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)
-        end
-        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
+    # def delete(item)
+    #   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)
+    #     end
+    #     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
 
     def loading?
       all # need to force initialization at this point

lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -283,7 +283,7 @@ def self.gather_records(records_to_process, force, record_being_saved)
           record.attributes.each do |attribute, value|
             if association = record.model.reflect_on_association(attribute)
               if association.collection?
-                value.each do |assoc|
+                [*value.all, *value.unsaved_children].each do |assoc|
                   add_new_association.call(record, attribute, assoc.backing_record) if assoc.changed?(association.inverse_of) or assoc.new?
                 end
               elsif record.new? || record.changed?(attribute) || (record == record_being_saved && force)

lib/reactive_record/server_data_cache.rb

@@ -341,14 +341,6 @@ def self.load_from_json(tree, target = nil)
           end
           load_from_json(value, new_target) if new_target
         end
-        #target.save if target.respond_to? :save
-rescue Exception => e
-  `debugger`
-  nil
       end
-
-
     end
-
-
   end