gremlin_client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4694cadbf9dbc8ce9f454f9e20eaf0ad95c1c6b
-  data.tar.gz: 98c15a631f800a380fa3836914b47c462ee33d77
+  metadata.gz: ac1726d69ef30e73f89b9df036282fdaaa2ba7ec
+  data.tar.gz: 5cc55e6a074faad8e7ed1b95a3e5832a572ac3b8
 SHA512:
-  metadata.gz: b0a39378eb6e2fea15ceb005d1345352dd49bd183a2f28092c94e10c881be6ecd956dd977145b0c9700eab927e00fb7024bcae028cc42b3a4de083d9ee20f46c
-  data.tar.gz: a795247ff901231d19f47f243b2464134c098d45c96ed6acacab119068c99c6fac576e9d968868a599fdca6db5fe746523739cefac2809631b928a8d8742a5c8
+  metadata.gz: 577ae755b2dd6838ae88caa683af726f65b6e8423717608a1fe23173b0dc85a5a96c6f7695e06136de2ed559f337eeafdb0134ced79f53f7765434ce283a6804
+  data.tar.gz: ca42b57048b747bf4816aa1b7e4ebd4f556fddcdbe743e0037744c7f4f7153fa59bc31aeb746a4bcf8bdc53a57428980a12a7cdc8cb34d76637a44ca043b26a0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gremlin_client (0.1.2)
+    gremlin_client (0.1.3)
       websocket-client-simple (~> 0.3)
 
 GEM
@@ -108,4 +108,4 @@ DEPENDENCIES
   rubocop (~> 0.47)
 
 BUNDLED WITH
-   1.14.5
+   1.14.6

data/lib/gremlin_client/connection.rb

@@ -97,7 +97,15 @@ module GremlinClient
     def receive_message(msg)
       response = JSON.parse(msg.data)
       # this check is important in case a request timeout and we make new ones after
-      @response = response if response['requestId'] == @request_id
+      if response['requestId'] == @request_id
+        if @response.nil?
+          @response = response
+        else
+          @response['result']['data'].concat response['result']['data']
+          @response['result']['meta'].merge! response['result']['meta']
+          @response['status'] = response['status']
+        end
+      end
     end
 
     def receive_error(e)
@@ -128,8 +136,15 @@ module GremlinClient
         @response = nil
       end
 
+      def is_finished?
+        return true unless @error.nil?
+        return false if @response.nil?
+        return false if @response['status'].nil?
+        return @response['status']['code'] != STATUS[:partial_content]
+      end
+
       def wait_response
-        while @response.nil? and @error.nil? && (Time.now.to_i - @started_at < @timeout)
+        while !is_finished? && (Time.now.to_i - @started_at < @timeout)
           sleep 0.001
         end
 

data/lib/gremlin_client/version.rb

@@ -1,3 +1,3 @@
 module GremliClient
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/connection_spec.rb

@@ -27,9 +27,17 @@ RSpec.describe :connection do
     def self.data
       @called ||= 0
       @called += 1
-      rid = ", \"requestId\" : \"#{@request_id}\"" unless @request_id.nil?
-      stt = ", \"status\" : { \"code\" : #{@status_code} }" unless @status_code.nil?
-      "{\"example\" : \"data #{@called}\"#{rid}#{stt}}"
+      #rid = ", \"requestId\" : \"#{@request_id}\"" unless @request_id.nil?
+      #stt = ", \"status\" : { \"code\" : #{@status_code} }" unless @status_code.nil?
+      #"{\'{\"example\" : \"data #{@called}\"#{rid}#{stt}}"
+      {
+        requestId: @request_id,
+        status: { code: @status_code },
+        result: {
+          data: [@called],
+          meta: {},
+        },
+      }.to_json
     end
   end
 
@@ -75,8 +83,10 @@ RSpec.describe :connection do
     it :socket_listeners do
       Message.called = 0
       conn = GremlinClient::Connection.new
-      expect(conn.instance_variable_get('@response')).to eq({'example' => 'data 1'})
-      expect(conn.instance_variable_get('@error').data).to eq("{\"example\" : \"data 2\"}")
+      expect(conn.instance_variable_get('@response')['result']['data']).to eq([1])
+      expect(conn.instance_variable_get('@error').data).to eq(
+        "{\"requestId\":null,\"status\":{\"code\":null},\"result\":{\"data\":[2],\"meta\":{}}}"
+      )
     end
   end
 
@@ -133,9 +143,37 @@ RSpec.describe :connection do
       conn.send(:reset_request)
       conn.instance_variable_set('@request_id', '123')
       conn.receive_message(Message)
-      expect(conn.instance_variable_get('@response')).to eq({'example' => 'data 2', 'requestId' => '123'})
+      expect(conn.instance_variable_get('@response')).to eq({
+        'requestId' => '123',
+        'status' => { 'code' => nil },
+        'result' => { 'data' => [2], 'meta' => {} }
+      })
+      # exit this block reseting this value
+      Message.request_id = nil
+    end
+
+    it :partial_message do
+      Message.called = 0
+
+      conn = GremlinClient::Connection.new
+      conn.send(:reset_request)
+      Message.request_id = conn.instance_variable_get('@request_id')
+      Message.status = :partial_content
+      conn.receive_message(Message)
+      expect(conn.send('is_finished?')).to be false
+      Message.status = :success
+      conn.receive_message(Message)
+      expect(conn.send('is_finished?')).to be true
+      expect(conn.instance_variable_get('@response')).to eq({
+        'requestId' => conn.instance_variable_get('@request_id'),
+        'status' => { 'code' => 200 },
+        # not 1, 2 because it is called once uppon init
+        'result' => { 'data' => [2, 3], 'meta' => {} }
+      })
       # exit this block reseting this value
       Message.request_id = nil
+      # clear the status
+      Message.status = nil
     end
   end
 
@@ -217,8 +255,9 @@ RSpec.describe :connection do
       conn.receive_message(Message)
       conn.send(:wait_response)
       expect(conn.instance_variable_get('@response')).to eq({
-          'example' =>'data 1',
-          'requestId' => conn.instance_variable_get('@request_id')
+          'requestId' => conn.instance_variable_get('@request_id'),
+          'status' => { 'code' => nil } ,
+          'result' => { 'data' => [1], 'meta' => {} }
       })
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gremlin_client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marcelo Coraça de Freitas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Simple Gremlin server client for the WebSocketChannelizer