offshore 0.0.3 → 0.0.4

data/lib/offshore/client/host.rb

@@ -21,8 +21,8 @@ module Offshore
     def base_uri
       with_http = host
       with_http = "http://#{host}" unless (host =~ /^https?:/) == 0
-      need_port = port || 80
-      "#{with_http}:#{need_port}"
+      with_http << ":#{port}" if port
+      "#{with_http}"
     end
   
     def connection
@@ -30,7 +30,10 @@ module Offshore
       connection_class = Faraday.respond_to?(:new) ? ::Faraday : ::Faraday::Connection
 
       timeout_seconds = 5*60 # 5 minutes
-      @connection = connection_class.new(base_uri, :timeout => timeout_seconds) do |builder|
+      options = {:timeout => timeout_seconds}
+      options[:ssl] = {:verify => false}
+
+      @connection = connection_class.new(base_uri, options) do |builder|
         builder.use Faraday::Request::UrlEncoded  if defined?(Faraday::Request::UrlEncoded)
         builder.adapter Faraday.default_adapter
       end
@@ -49,9 +52,9 @@ module Offshore
         else
           begin
             hash = MultiJson.decode(http_response.body)
-            message = "Error in offshore connection (#{append_path}): #{hash}"
+            message = "Error in offshore connection (#{append_path}): #{http_response.status},\n#{hash}"
           rescue
-            message = "Error in offshore connection (#{append_path}): #{http_response.status}"
+            message = "Error in offshore connection (#{append_path}): #{http_response.status}\n#{hash}"
           end
           raise message
         end

data/lib/offshore/server/middleware.rb

@@ -5,13 +5,13 @@ module Offshore
     end
     
     def init_server
-      Offshore::Database.init # has it's own singleton code
+      Offshore::Database.init # has its own singleton code
     end
     
     def init_thread
       return if @init_thread
       @init_thread = true
-      
+
       # TODO: move this to a config block
       if defined?(Rails)
         begin
@@ -29,20 +29,31 @@ module Offshore
 
 
     def call(env)
-      if (env["PATH_INFO"] =~ /^\/offshore_tests\/(.*)/) == 0
-        offshore_call($1, env)
+      if offshore_request?(env)
+        offshore_call(env)
       else
         @app.call(env)
       end
     end
+
+    def offshore_request?(env)
+      return false unless Offshore.enabled?
+      !!offshore_method(env)
+    end
+
+    def offshore_method(env)
+      env["PATH_INFO"] =~ /^\/offshore_tests\/(.*)/
+      $1
+    end
   
-    def offshore_call(method, env)
+    def offshore_call(env)
       status = 500     
       headers = {}
+      method = offshore_method(env)
       hash = {"error" => "Unknown method: #{method}"}
       
       Logger.info("Offshore Tests Action: #{method}")
-      
+
       begin
         case method
         when "factory_create", "suite_start", "suite_stop", "test_start", "test_stop"

data/lib/offshore/server/snapshot.rb

@@ -12,7 +12,7 @@ module Offshore
       raise "Only supported in Rails for now" unless defined?(Rails)
       
       yml = Rails.root.join("config", "database.yml")
-      hash = YAML.load(ERB.new(File.read(yml)).result)["test"]
+      hash = YAML.load(ERB.new(File.read(yml)).result)['test']
 
       @config = {}
       ['username', 'password', 'host', 'port', 'database', 'collation', 'charset'].each do |key|

data/lib/offshore/version.rb

@@ -1,3 +1,3 @@
 module Offshore
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/offshore.rb

@@ -12,6 +12,18 @@ module Offshore
   def test
     Offshore::Test
   end
+
+  def enable!
+    @enabled = true
+  end
+
+  def enabled?
+    !!@enabled
+  end
+
+  def disable!
+    @enabled = false
+  end
 end
 
 require "offshore/client"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: offshore
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json