gremlin_client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d93c96d3bd662c361f27897fa4d1f893df713a6
-  data.tar.gz: 9401ccd8d090760cc6007f9ccf654164f21f7a95
+  metadata.gz: fc716e4dee2bd4e4e566ed3d136702832de0c480
+  data.tar.gz: ef08136b65687b30af6ce277115d5d25352fb9a7
 SHA512:
-  metadata.gz: adbfeb75273dcf99e6b67e008ba1633220a1c1365b7f5300d2ca9458a211225a85b2c6de76f357990199f283ee6116d76fdd8b06f616e408e767e59f83637217
-  data.tar.gz: 313bfb016083761bec62ccdadf7452bb977523f46e19feed9e57329486a52f53c8b36b869c4198b811086c217203801ad8cf11135c492096be34901ec0e26380
+  metadata.gz: 95beb8ca2da1f158cd3645d3e2de793561f6e623e6d4a60fabeaaab448d39fe1dae2e30e64a8586637fc3b66c9b660793b74d3d7563ca01c17a9ae6410c9eb10
+  data.tar.gz: 9830edf26890fa8057cb5d8b1c05b83aafea82e1dc7d07e5cdb2ca878714ebca88d97901a815d78a9505e09ea28d738538fa52b99ab9a8692ce7a381cce7e809

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gremlin_client (0.1.0)
+    gremlin_client (0.1.1)
       websocket-client-simple (~> 0.3)
 
 GEM

data/example/test.rb

@@ -4,11 +4,11 @@ require 'pp'
 require 'gremlin_client'
 
 
-conn = GremlinClient::Connection.new(groovy_script_path: 'example/scripts')
+conn = GremlinClient::Connection.new(gremlin_script_path: 'example/scripts')
 
-pp conn.send('1+what', {what: 10})
+pp conn.send_query('1+what', {what: 10})
 
-pp conn.send('g.V().count()')
+pp conn.send_query('0 && 1')
 
 pp conn.send_file('test.groovy', {what: Time.now.to_i})
 

data/lib/gremlin_client/connection.rb

@@ -35,12 +35,23 @@ module GremlinClient
       port: 8182,
       connection_timeout: 1,
       timeout: 10,
-      gremlin_script_path: '.'
+      gremlin_script_path: '.',
+      autoconnect: true
     )
-      url = "ws://#{host}:#{port}"
+      @host = host
+      @port = port
+      @connection_timeout = connection_timeout
+      @timeout = timeout
+      @gremlin_script_path = gremlin_script_path
+      @gremlin_script_path = Pathname.new(@gremlin_script_path) unless @gremlin_script_path.is_a?(Pathname)
+      @autoconnect = autoconnect
+      connect if @autoconnect
+    end
 
+    # creates a new connection object
+    def connect
       gremlin = self
-      WebSocket::Client::Simple.connect("ws://#{host}:#{port}/") do |ws|
+      WebSocket::Client::Simple.connect("ws://#{@host}:#{@port}/") do |ws|
         @ws = ws
 
         @ws.on :message do |msg|
@@ -51,12 +62,11 @@ module GremlinClient
           receive_error(e)
         end
       end
+    end
 
-
-      @connection_timeout = connection_timeout
-      @timeout = timeout
-      @gremlin_script_path = gremlin_script_path
-      @gremlin_script_path = Pathname.new(@gremlin_script_path) unless @gremlin_script_path.is_a?(Pathname)
+    def reconnect
+      @ws.close unless @ws.nil?
+      connect
     end
 
     def send_query(command, bindings={})
@@ -93,12 +103,19 @@ module GremlinClient
 
     protected
 
-      def wait_connection
+      def wait_connection(skip_reconnect = false)
         w_from = Time.now.to_i
         while !open? && Time.now.to_i - @connection_timeout < w_from
           sleep 0.001
         end
-        fail ::GremlinClient::ConnectionTimeoutError.new(@connection_timeout) unless open?
+        unless open?
+          # reconnection code
+          if @autoconnect && !skip_reconnect
+            reconnect
+            return wait_connection(true)
+          end
+          fail ::GremlinClient::ConnectionTimeoutError.new(@connection_timeout)
+        end
       end
 
       def reset_request

data/lib/gremlin_client/version.rb

@@ -1,3 +1,3 @@
 module GremliClient
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/connection_spec.rb

@@ -6,6 +6,9 @@ require 'spec_helper'
 # Tests on the freetext feature
 RSpec.describe :connection do
   class MockedSocket
+    def close
+      nil
+    end
   end
 
   module Message
@@ -156,12 +159,21 @@ RSpec.describe :connection do
     end
 
     it :fails_with_longer_timeout do
-      conn = GremlinClient::Connection.new(connection_timeout: 3)
+      conn = GremlinClient::Connection.new(connection_timeout: 3, autoconnect: false)
+      conn.connect
       started_at = Time.now.to_i
       expect(conn).to receive(:open?).and_return(false).at_least(:once)
       expect{conn.send(:wait_connection)}.to raise_exception(::GremlinClient::ConnectionTimeoutError)
       expect(Time.now.to_i - started_at).to be_within(1).of(3)
     end
+
+    it :fails_with_autonnect do
+      conn = GremlinClient::Connection.new(connection_timeout: 2, autoconnect: true)
+      started_at = Time.now.to_i
+      expect(conn).to receive(:open?).and_return(false).at_least(:once)
+      expect{conn.send(:wait_connection)}.to raise_exception(::GremlinClient::ConnectionTimeoutError)
+      expect(Time.now.to_i - started_at).to be_within(1).of(4)
+    end
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gremlin_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marcelo Coraça de Freitas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple