closes #159

Author: catmando

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

@@ -35,16 +35,35 @@ def self.production?
 
 
   if RUBY_ENGINE == 'opal'
+    # Patch in a dummy copy of Model.load in case we are not using models
+    # this will be defined properly by hyper-model
+    module Model
+      def self.load
+        Promise.new.tap { |promise| promise.resolve(yield) }
+      end unless respond_to?(:load)
+    end
+
     def self.connect(*channels)
       channels.each do |channel|
         if channel.is_a? Class
           IncomingBroadcast.connect_to(channel.name)
         elsif channel.is_a?(String) || channel.is_a?(Array)
           IncomingBroadcast.connect_to(*channel)
-        elsif channel.id
-          IncomingBroadcast.connect_to(channel.class.name, channel.id)
+        elsif channel.respond_to?(:id)
+          Hyperstack::Model.load do
+            channel.id
+          end.then do |id|
+            raise "Hyperstack.connect cannot connect to #{channel.inspect}.  "\
+                  "The id is nil. This can be caused by connecting to a model "\
+                  "that is not saved, or that does not exist." unless id
+            IncomingBroadcast.connect_to(channel.class.name, id)
+          end
         else
-          raise "cannot connect to model before it has been saved"
+          raise "Hyperstack.connect cannot connect to #{channel.inspect}.\n"\
+                "Channels must be either a class, or a class name,\n"\
+                "a string in the form 'ClassName-id',\n"\
+                "an array in the form [class, id] or [class-name, id],\n"\
+                "or an object that responds to the id method with a non-nil value"
         end
       end
     end

ruby/hyper-operation/spec/aaa_run_first/transports_spec.rb

@@ -346,5 +346,74 @@ def connect(*args)
     it 'has a anti_csrf_token' do
       expect_evaluate_ruby('Hyperstack.anti_csrf_token').to be_present
     end
+
+    it 'wait for an instance channel to be loaded before connecting' do
+      # Make a pretend mini model, and allow it to be accessed by user-123
+      stub_const "UserModelPolicy", Class.new
+      stub_const "UserModel", Class.new
+      UserModel.class_eval do
+        def initialize(id)
+          @id = id
+        end
+        def ==(other)
+          id == other.id
+        end
+        def self.find(id)
+          new(id)
+        end
+        def id
+          @id.to_s
+        end
+      end
+      UserModelPolicy.class_eval do
+        regulate_instance_connections { UserModel.new(123) }
+      end
+
+      # During checkin we will run this op.  The spec will make sure it runs
+      isomorphic do
+        class CheckIn < Hyperstack::ControllerOp
+          param :id
+          validate { params.id == '123' }
+          step { params.id }
+        end
+      end
+
+
+      on_client do
+        # Stub the user model on the client
+        class UserModel
+          def initialize(id)
+            @id = id
+          end
+          def id
+            @id.to_s
+          end
+        end
+        # stub the normal Hyperstack::Model.load to call checkin
+        # note that load returns a promise and so does checkin!  Lovely
+        module Hyperstack
+          module Model
+            def self.load
+              CheckIn.run(id: yield)
+            end
+          end
+        end
+      end
+
+      # use action cable
+      Hyperstack.configuration do |config|
+        config.connect_session = false
+        config.transport = :action_cable
+        config.channel_prefix = "synchromesh"
+      end
+
+      expect(CheckIn).to receive(:run).and_call_original
+      evaluate_ruby "Hyperstack.connect(UserModel.new(123))"
+      # the suite previously redefined connect so we have to call this to initiate
+      # the connection
+      evaluate_ruby "Hyperstack.go_ahead_and_connect"
+      wait(10.seconds).for { Hyperstack::Connection.active }.to eq(['UserModel-123'])
+    end
+
   end
 end