jarib-celerity 0.0.6.15 → 0.0.6.16

data/lib/celerity.rb

@@ -8,7 +8,7 @@ require "uri"
 require "pp"
 require "timeout"
 require "time"
-require "drb"
+require "socket"
 require "fileutils"
 require "thread"
 
@@ -67,6 +67,7 @@ require "celerity/util"
 require "celerity/default_viewer"
 require "celerity/listener"
 require "celerity/ignoring_web_connection"
+require "celerity/viewer_connection"
 require "celerity/browser"
 require "celerity/watir_compatibility"
 

data/lib/celerity/browser.rb

@@ -68,19 +68,18 @@ module Celerity
       @charset       = opts.delete(:charset)   || "UTF-8"
       self.log_level = opts.delete(:log_level) || :warning
 
-      @page = nil
-      @viewer = DefaultViewer
-      @error_checkers  = []
-      @browser         = self # for Container#browser
+      @page           = nil
+      @error_checkers = []
+      @browser        = self # for Container#browser
 
-      setup_webclient(opts)
+      setup_webclient opts
+      setup_viewer opts.delete(:viewer)
 
-      find_viewer unless opts.delete(:viewer) == false
       raise ArgumentError, "unknown option #{opts.inspect}" unless opts.empty?
     end
 
     def inspect
-      short_inspect :exclude => %w[@webclient @browser @object @options]
+      short_inspect :exclude => %w[@webclient @browser @object @options @listener @event_listener]
     end
 
     #
@@ -815,6 +814,22 @@ module Celerity
       enable_event_listener
     end
 
+    def setup_viewer(option)
+      @viewer = DefaultViewer
+      return if option == false
+
+      begin
+        host_string = option.kind_of?(String) ? option : "127.0.0.1:6429"
+        host, port  = host_string.split(":")
+
+        if viewer = ViewerConnection.create(host, port.to_i)
+          @viewer = viewer
+        end
+      rescue Errno::ECONNREFUSED => e
+        raise e if option.kind_of?(String)
+      end
+    end
+
     #
     # This *should* be unneccessary, but sometimes the page we get from the
     # window is different (ie. a different object) from our current @page
@@ -838,26 +853,7 @@ module Celerity
 
     def render
       @viewer.render_html(self.send(@render_type), url)
-    rescue DRb::DRbConnError, Errno::ECONNREFUSED => e
-      @viewer = DefaultViewer
-    end
-
-    #
-    # Check if we have a viewer available on druby://127.0.0.1:6429
-    # @api private
-    #
-
-    def find_viewer
-      # needed to avoid DRb raising and rescuing lots exceptions
-      DRb.start_service unless DRb.primary_server
-
-      viewer = DRbObject.new_with_uri("druby://127.0.0.1:6429")
-      if viewer.respond_to?(:render_html)
-        @viewer = viewer
-      else
-        @viewer = DefaultViewer
-      end
-    rescue DRb::DRbConnError, Errno::ECONNREFUSED
+    rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EPIPE
       @viewer = DefaultViewer
     end
 

data/lib/celerity/version.rb

@@ -3,7 +3,7 @@ module Celerity #:nodoc:
     MAJOR = 0
     MINOR = 0
     TINY  = 6
-    PATCH = 15 # Set to nil for official release
+    PATCH = 16 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/lib/celerity/viewer_connection.rb

@@ -0,0 +1,33 @@
+module Celerity
+  class ViewerConnection
+
+    def self.create(host, port)
+      socket = TCPSocket.new(host, port)
+      require "json"
+      new(socket)
+    end
+
+    def initialize(socket)
+      @socket = socket
+    end
+
+    def render_html(html, url)
+      send_data({'method' => 'page_changed', 'html' => html, 'url' => url}.to_json)
+    end
+
+    def save(path = nil)
+      send_data({'method' => 'save', 'path' => path}.to_json)
+    end
+
+    def close
+      @socket.close
+    end
+
+    private
+
+    def send_data(data)
+      @socket.write ["Content-Length: #{data.size}", data].join("\n\n")
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.15
+  version: 0.0.6.16
 platform: ruby
 authors: 
 - Jari Bakken
@@ -82,6 +82,7 @@ files:
 - lib/celerity/short_inspect.rb
 - lib/celerity/util.rb
 - lib/celerity/version.rb
+- lib/celerity/viewer_connection.rb
 - lib/celerity/watir_compatibility.rb
 - lib/celerity/xpath_support.rb
 - lib/celerity.rb