closes #169 #170

Author: catmando

ruby/hyper-model/lib/reactive_record/active_record/instance_methods.rb

@@ -81,7 +81,11 @@ def dup
     end
 
     def ==(ar_instance)
-      @backing_record == ar_instance.instance_eval { @backing_record }
+      return true  if @backing_record == ar_instance.instance_eval { @backing_record }
+      return false unless ar_instance.is_a?(ActiveRecord::Base)
+      return false if ar_instance.new_record?
+      return false unless self.class.base_class == ar_instance.class.base_class
+      id == ar_instance.id
     end
 
     def [](attr)

ruby/hyper-model/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -198,6 +198,7 @@ def self.get_type_hash(record)
     if RUBY_ENGINE == 'opal'
 
       def self.gather_records(records_to_process, force, record_being_saved)
+        puts "gather_records(#{records_to_process.count}, #{force}, #{record_being_saved.inspect})"
         # we want to pass not just the model data to save, but also enough information so that on return from the server
         # we can update the models on the client
 
@@ -213,6 +214,7 @@ def self.gather_records(records_to_process, force, record_being_saved)
         backing_records = Hash[*records_to_process.collect { |record| [record.object_id, record] }.flatten(1)]
 
         add_new_association = lambda do |record, attribute, assoc_record|
+          puts "adding new association(#{record.inspect}, #{attribute}, #{assoc_record})"
           unless backing_records[assoc_record.object_id]
             records_to_process << assoc_record
             backing_records[assoc_record.object_id] = assoc_record

ruby/hyper-model/lib/reactive_record/server_data_cache.rb

@@ -510,7 +510,7 @@ def self.load_from_json(tree, target = nil)
           load_from_json(value, new_target) if new_target
         end
       rescue Exception => e
-       raise e
+        raise e
       end
     end
   end

ruby/hyper-model/spec/batch7/equality_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+require 'test_components'
+require 'rspec-steps'
+
+RSpec::Steps.steps "record equality", js: true do
+
+  before(:all) do
+    require 'pusher'
+    require 'pusher-fake'
+    Pusher.app_id = "MY_TEST_ID"
+    Pusher.key =    "MY_TEST_KEY"
+    Pusher.secret = "MY_TEST_SECRET"
+    require "pusher-fake/support/base"
+
+    Hyperstack.configuration do |config|
+      config.transport = :pusher
+      config.channel_prefix = "synchromesh"
+      config.opts = {app_id: Pusher.app_id, key: Pusher.key, secret: Pusher.secret}.merge(PusherFake.configuration.web_options)
+    end
+
+    class ApplicationPolicy
+      always_allow_connection
+      regulate_all_broadcasts { |policy| policy.send_all }
+      allow_change(to: :all, on: [:create, :update, :destroy]) { true }
+    end
+
+    class ActiveRecord::Base
+      class << self
+        def public_columns_hash
+          @public_columns_hash ||= {}
+        end
+      end
+    end
+  end
+
+  before(:each) do
+
+    isomorphic do
+      module Sti
+        class Base < ActiveRecord::Base
+          def self.build_tables
+            connection.create_table :bases, force: true do |t|
+              t.string :type
+              t.string :data
+              t.timestamps
+            end
+            ActiveRecord::Base.public_columns_hash[name] = columns_hash
+          end
+          scope :a_scope, -> () {}, regulate: :always_allow
+          scope :is_subclass1, -> () { where(type: 'Sti::SubClass1') }, regulate: :always_allow, client: -> { type == 'Base::SubClass1' }
+        end
+
+        class SubClass1 < Base
+        end
+      end
+    end
+
+    Sti::Base.build_tables
+
+  end
+
+  it "two records are the same if the point the same base record" do
+    Sti::Base.create(data: 'record 1')
+    expect_promise do
+      Hyperstack::Model.load do
+        Sti::Base.find(1) == Sti::Base.find_by_data('record 1')
+      end
+    end.to be_truthy
+  end
+
+  it "two records are not the same if they point to different records" do
+    Sti::Base.create(data: 'record 2')
+    expect_promise do
+      Hyperstack::Model.load do
+        Sti::Base.find(1) == Sti::Base.find_by_data('record 2')
+      end
+    end.to be_falsy
+  end
+
+  it "two new records are never the same" do
+    expect_evaluate_ruby do
+      Sti::Base.new(data: 'new record') == Sti::Base.new(data: 'new record')
+    end.to be_falsy
+  end
+
+  it "a record is never something else" do
+    expect_evaluate_ruby do
+      Sti::Base.new(data: 'new record') == Object.new
+    end.to be_falsy
+  end
+
+  it "an STI base record is the same record if the id's match" do
+    expect_evaluate_ruby do
+      Sti::Base.find(3) == Sti::SubClass1.find(3)
+    end.to be_truthy
+  end
+end

ruby/hyper-operation/lib/hyper-operation/transport/client_drivers.rb

@@ -94,9 +94,13 @@ def self.connect_to(channel_name, id = nil)
           channel = "#{ClientDrivers.opts[:channel]}-#{channel_string}"
           %x{
             var channel = #{ClientDrivers.opts[:pusher_api]}.subscribe(#{channel.gsub('::', '==')});
-            channel.bind('dispatch', #{ClientDrivers.opts[:dispatch]})
+            if (#{!@pusher_dispatcher_registered}) {
+              console.log('registering dispatch for pusher')
+              channel.bind('dispatch', #{ClientDrivers.opts[:dispatch]})
+            }
             channel.bind('pusher:subscription_succeeded', #{lambda {ClientDrivers.get_queued_data("connect-to-transport", channel_string)}})
           }
+          @pusher_dispatcher_registered = true
         elsif ClientDrivers.opts[:transport] == :action_cable
           channel = "#{ClientDrivers.opts[:channel]}-#{channel_string}"
           Hyperstack::HTTP.post(ClientDrivers.polling_path('action-cable-auth', channel), headers: { 'X-CSRF-Token' => ClientDrivers.opts[:form_authenticity_token] }).then do |response|

ruby/hyper-spec/lib/hyper-spec/component_test_helpers.rb

@@ -281,11 +281,11 @@ def open_in_chrome
     def pause(message = nil)
       if message
         puts message
-        page.evaluate_ruby "puts #{message.inspect}.to_s + ' (type go() to continue)'"
+        page.evaluate_script "console.log('#{message} (type go() to continue)')"
       end
 
       page.evaluate_script('window.hyper_spec_waiting_for_go = true')
-
+      page.evaluate_script('go = function() {window.hyper_spec_waiting_for_go = false}')
       loop do
         sleep 0.25
         break unless page.evaluate_script('window.hyper_spec_waiting_for_go')