mattermost-api4-ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b077fcf5d2d80d9bde0f5bd341fab99fa281cfe6
-  data.tar.gz: 5f89521bbaa8dda1690090029830d23aeec4a48c
+  metadata.gz: 19d64e50d31233c3c823ca05b2bde709d004e2b4
+  data.tar.gz: 8ecbb00dff5bfcdbdebeca57d9d56b294e7f7076
 SHA512:
-  metadata.gz: ab1ee97cd45a22d2d47909880faa0d236aeae444b653ab365b53d6790041e8f686d596feb550dd45c8660cb45f7a4b0723884ac447b24439c34267c2e11f2353
-  data.tar.gz: f24042f31a078065fc4e8b182f55bf6c9c84efaa75f86a4be9266f17ca65db251437418dcbd8468678404f6d1463054465cc75ae5971242831493feb55e991a2
+  metadata.gz: 7d85a810c0a898da5c6fb26f59b48e59cf32603f52f867310394799456ae78ffdd87e16569242fcafeb3b63e414d0511a3377144ec2ebf8ffe3145b80dc6c930
+  data.tar.gz: 5fd7a8abae791675cb01a738d5c89897ef8685fc9b649ec5494345b651d79c6ed6f496a40637333d1bb276fa05fac4235e57c2040182f0a7e6a5aa58a0b7ac58

data/lib/mattermost/client.rb

@@ -1,6 +1,7 @@
 require 'httparty'
 require_relative 'endpoint'
 require_relative 'request'
+require_relative 'websocket_client'
 
 module Mattermost
 
@@ -36,6 +37,17 @@ module Mattermost
 			getMe().success?
 		end
 
+		def connect_websocket
+			# TODO raise exception then connected? == false
+			@ws_client = WebSocketClient.new "#{base_uri}/websocket", token, {:headers => self.class.headers}
+			yield @ws_client if block_given?
+			@ws_client
+		end
+
+		def ws_client
+			@ws_client
+		end
+
 		def get(path, options = {}, &block)
 			self.class.get(path, options, &block)
 		end

data/lib/mattermost/websocket_client.rb

@@ -0,0 +1,94 @@
+require 'websocket-client-simple'
+require 'event_emitter'
+require 'json'
+
+module Mattermost
+	class WebSocketClient
+		include EventEmitter
+
+		def initialize(url, token, option = {})
+			@token = token
+			@url = url
+			@seq_mutex = Mutex.new
+			@seq = 0
+			@connected = false
+			mm_ws = self
+			@client = WebSocket::Client::Simple.connect(url, option) do |ws|
+				ws.on :open do
+					mm_ws.on_open
+				end
+				ws.on :message do |msg|
+					mm_ws.on_message msg.data
+				end
+				ws.on :close do |e|
+					mm_ws.on_close e
+				end
+				ws.on :error do |e|
+					mm_ws.on_error e
+				end
+			end
+			yield self if block_given?
+		end
+
+		def on_open
+			emit :open
+		end
+
+		def on_message(data)
+			json = JSON.parse data
+			event = json["event"]
+			#puts "on_message json:#{json}, event:#{event}"
+			seq_up json
+			case event
+			when "hello"
+				@connected = true
+			else
+				emit event.to_sym, json
+				emit :message, json
+			end
+		end
+
+		def on_close(msg)
+			@connected = false
+			emit :close, msg
+		end
+
+		def on_error(err)
+			emit :error, err
+		end
+
+		def send_msg(action, data)
+			payload = {
+				:seq => next_seq,
+				:action => action,
+				:data => data
+			}.to_json
+			@client.send payload
+		end
+
+		def connected?
+			@connected && @client.connected?
+		end
+
+		def close
+			@client.close
+		end
+
+		private
+
+		def seq_up(event)
+			@seq_mutex.synchronize do
+				return if !event.key? "seq"
+				new_seq = event["seq"]
+				@seq = new_seq if @seq < new_seq
+			end
+		end
+
+		def next_seq
+			@seq_mutex.synchronize do
+				@seq = @seq + 1
+				@seq
+			end
+		end
+	end
+end

data/mattermost-api4-ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "mattermost-api4-ruby"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Takayuki Maruyama"]
   spec.email         = ["bis5.wsys@gmail.com"]
 
@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_dependency "httparty", "~> 0.15"
+  spec.add_dependency "websocket-client-simple", "~> 0.3"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mattermost-api4-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Takayuki Maruyama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: websocket-client-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: 
 email:
 - bis5.wsys@gmail.com
@@ -109,6 +123,7 @@ files:
 - lib/mattermost/endpoint/users.rb
 - lib/mattermost/endpoint/webhooks.rb
 - lib/mattermost/request.rb
+- lib/mattermost/websocket_client.rb
 - mattermost-api4-ruby.gemspec
 homepage: https://github.com/maruTA-bis5/mattermost-api4-ruby
 licenses: