closes (hopefully) #21

Author: catmando

Diff for: lib/hyper-operation/transport/connection.rb

@@ -4,17 +4,22 @@ 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)
-      return false unless Hyperloop.on_server?
-      return true if defined?(Rails::Server)
-      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.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
     end
 
     def create_table(*args, &block)

Diff for: lib/hyper-operation/transport/hyperloop.rb

@@ -122,6 +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')