closes #21 #22

Author: catmando

lib/hyper-operation/server_op.rb

@@ -1,3 +1,5 @@
+require 'net/http' unless RUBY_ENGINE == 'opal'
+
 module Hyperloop
   class ServerOp < Operation
 

lib/hyper-operation/transport/connection.rb

@@ -1,25 +1,16 @@
 module Hyperloop
   module AutoCreate
+    def table_exists?
+      # works with both rails 4 and 5 without deprecation warnings
+      if connection.respond_to?(:data_sources)
+        connection.data_sources.include?(table_name)
+      else
+        connection.tables.include?(table_name)
+      end
+    end
+
     def needs_init?
-      return false if Hyperloop.transport == :none
-      return true if connection.respond_to?(:data_sources) && !connection.data_sources.include?(table_name)
-      return true if !connection.respond_to?(:data_sources) && !connection.tables.include?(table_name)
-      Hyperloop.on_server?
-      # the above line appears equivilent to the following two original lines
-      # the only
-      #   return false unless Hyperloop.on_server?
-      #   return true if defined?(Rails::Server)
-      # the following lines appeared to be unreachable but perhaps because on_server uses Rails.const_defined? it has some
-      # subtle difference.
-      #   return true unless Connection.root_path
-      #   uri = URI("#{Connection.root_path}server_up")
-      #   http = Net::HTTP.new(uri.host, uri.port)
-      #   request = Net::HTTP::Get.new(uri.path)
-      #   if uri.scheme == 'https'
-      #     http.use_ssl = true
-      #     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      #   end
-      #   http.request(request) && return rescue true
+      Hyperloop.transport != :none && Hyperloop.on_server? && !table_exists?
     end
 
     def create_table(*args, &block)
@@ -111,6 +102,10 @@ class << self
       attr_accessor :transport
 
       def active
+        # if table doesn't exist then we are either calling from within
+        # a migration or from a console before the server has ever started
+        # in these cases there are no channels so we return nothing
+        return [] unless table_exists?
         if Hyperloop.on_server?
           expired.delete_all
           refresh_connections if needs_refresh?
@@ -158,9 +153,10 @@ def root_path=(path)
       end
 
       def root_path
-        QueuedMessage.root_path
-      rescue
-        nil
+        # if the QueuedMessage table doesn't exist then we are either calling from within
+        # a migration or from a console before the server has ever started
+        # in these cases there is no root path to the server
+        QueuedMessage.root_path if QueuedMessage.table_exists?
       end
 
       def refresh_connections

lib/hyper-operation/transport/hyperloop.rb

@@ -122,16 +122,7 @@ def self.send_data(channel, data)
   end
 
   def self.on_server?
-    return !Rails.const_defined?('Console')
-    if !Rails.const_defined?('Console') || Rails.const_defined?('Puma') || Rails.const_defined?('Unicorn') || Rails.const_defined?('Server')
-      true
-    elsif Rails.const_defined?('Console')
-      false
-    else
-      Rails.logger.warn "Warning: You may encounter performance problems, because your server is currently not known.\n" +
-        'Please open a server support ticket at http://github.com/ruby-hyperloop/hyper-operation.'
-      false
-    end
+    return defined? Rails::Server
   end
 
   def self.pusher