sockeye-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1fde1748f44529891a66051e2c7903efaf2735e
-  data.tar.gz: bce702ee8620fe7e6fa645d567f08dc403dbb685
+  metadata.gz: 5c99d3e071afcea42497129c3f5b75b1646d0de3
+  data.tar.gz: 417d2cd068b7da62e45de1400ab9c5c94c4bd00c
 SHA512:
-  metadata.gz: 673ddb0a6bab37578a5af1ff449004ae36f30a810291483a83bb26a29babeaeb79d390f05dd53db305f3d1e79752250ef69fdb5ae866db7c1a9b1e6ba0e3d289
-  data.tar.gz: 0f93ae8ec8b0fc103a820984de4fb1f0cbe554967d98a3fff648dfce6fdc2cfd051b0042ca69880fa8717f1c88da55f8406773a907a8854dc39c0022978b6936
+  metadata.gz: bc4cea9e02fe51a81cc3ad51eb16dacb3b5389e393b69ce19daad2256f5b182cab02b4d2d0ee810325c4aa1aff3f1b417e3ad71a4efb0c03a8252cbf0058f762
+  data.tar.gz: 60c823c83fad0fc70202ae2f3c9eeae44888ed6634aba4ee7837bc5d863e1fda1d957de490851c9ff733dde2e685de353b97ac486413de09e8b5ea0c549d0b4c

data/README.md

@@ -20,7 +20,29 @@ Or install it yourself as:
 
 ## Usage
 
-Don't bother
+```ruby
+def on_message(message)
+  puts "message:"
+  puts message.inspect
+end
+
+def on_error(code)
+  puts "error:"
+  puts code.inspect
+end
+
+def on_close
+  puts "closed"
+end
+
+Sockeye::Client.new(
+  server_address: "ws://sockeye.local:8443", 
+  auth_token:     "THIS USER'S AUTH TOKEN", 
+  on_message:     Proc.new {|message| on_message(message)}, 
+  on_error:       Proc.new {|code| on_error(code)}, 
+  on_close:       Proc.new {on_close}
+).connect
+```
 
 ## Development
 

data/lib/sockeye/client.rb

@@ -1,4 +1,3 @@
-require "sockeye/client/version"
 require 'json'
 require 'websocket-eventmachine-client'
 
@@ -7,49 +6,55 @@ module Sockeye
 
     attr_accessor :server_address, :auth_token, :on_message, :on_error, :on_close
 
-    def initialize(server_address:, auth_token:, on_message:, on_error:, on_close:)
+    def initialize(server_address:, auth_token:, on_message: nil, on_error: nil, on_close: nil)
       self.server_address = server_address
-      self.auth_token = auth_token
-      self.on_message = on_message
-      self.on_error = on_error
-      self.on_close = on_close
+      self.auth_token     = auth_token
+      self.on_message     = on_message || Proc.new { |payload| nil }
+      self.on_error       = on_error   || Proc.new { |payload| nil }
+      self.on_close       = on_close   || Proc.new { nil }
+    end
+
+    @raw_socket = nil 
+
+    def close
+      @raw_socket.close
+      EM.stop
     end
 
     def connect
 
       EM.run do
 
-        ws = WebSocket::EventMachine::Client.connect(uri: self.server_address)
+        @raw_socket = WebSocket::EventMachine::Client.connect(uri: self.server_address)
 
-        ws.onopen do
-          ws.send({action: :authenticate, payload: self.auth_token}.to_json)
+        @raw_socket.onopen do
+          @raw_socket.send({action: :authenticate, payload: self.auth_token}.to_json)
         end
 
         # When a message is received, ensure the server sent a valid payload
         # then handle it based on status code.
         #
-        ws.onmessage do |msg, type|
+        @raw_socket.onmessage do |msg, type|
           message = json_try_parse(msg)
-          puts message.inspect
           if message.nil? || message[:payload].nil? || message[:status].nil?
             puts "Invalid message"
             self.on_error.call
             ws.close
-          elsif message[:status] != 200
-            self.on_error.call(message[:status])
+          elsif message[:status].to_i >= 400 || message[:status].to_i == 0
+            self.on_error.call(message)
           else
-            self.on_message.call(message[:payload])
+            self.on_message.call(message)
           end
         end
 
-        ws.onclose do
+        @raw_socket.onclose do
           self.on_close.call
           EM.stop
         end
 
-        ws.onerror do
+        @raw_socket.onerror do
           self.on_error.call(0)
-          ws.close
+          @raw_socket.close
           EM.stop
         end
 

data/sockeye-client.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sockeye/client/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "sockeye-client"
-  spec.version       = Sockeye::Client::VERSION
+  spec.version       = "0.1.1"
   spec.authors       = ["Jack Hayter"]
   spec.email         = ["jack@hockey-community.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sockeye-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jack Hayter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,6 @@ files:
 - bin/console
 - bin/setup
 - lib/sockeye/client.rb
-- lib/sockeye/client/version.rb
 - sockeye-client.gemspec
 homepage: https://github.com/HockeyCommunity/sockeye-client
 licenses:
@@ -97,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Acts as a simple websocket client, designed for use with the sockeye-server.

data/lib/sockeye/client/version.rb

@@ -1,5 +0,0 @@
-module Sockeye
-  module Client
-    VERSION = "0.1.0"
-  end
-end