ruboty-slack_rtm 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9630308dfdbf7041fdca0a1dc1a5386b051b3417
-  data.tar.gz: efa4af910759b1c3cf9c34a5717a8726163deffa
+  metadata.gz: 93c08b4ce16ca7213ea2ddf212a6aaffb610fc38
+  data.tar.gz: 31d5e90d93ea1a8d49926ec9940d8e219a769f9d
 SHA512:
-  metadata.gz: 6f0e1420f9f50107be9f46a3bab49b25e526af045a807cf2b6801bd3b5b132e6b1f5d201dd4527a2d7efe4b25aeb398583965eaa5dd11e0da26458ff4a33af6f
-  data.tar.gz: 8c0cc313e1a2621853d709a0d11c3f4cdfd641c69c788886cf88993d14365c74160ff2dfbd31afea3c6d8cb562ea3ed1fc7a065571f61b6360845e562cd7ed00
+  metadata.gz: ae54aff21e430e74a9fb7168664de3c53155084fc3290d8576535b4c6c2c898cc4f8a0470e897d6662c273a8c819c3b239a80d88aaba6eb00eaea203aa4a3cdd
+  data.tar.gz: 7c0d6aea7581e8cc26052c583f1a3e6320779ea18cbd7d73bb01afe12d9c9d0f97727c6ba4cd7d507e2860ccebbeec0fb0d65e97e12e3616991ce8f46331ee02

data/lib/ruboty/adapters/slack_rtm.rb

@@ -1,7 +1,6 @@
 require 'cgi'
 require 'time'
 require 'slack'
-require 'slack-rtmapi'
 require 'ruboty/adapters/base'
 
 module Ruboty
@@ -68,7 +67,12 @@ module Ruboty
       end
 
       def url
-        @url ||= ::SlackRTM.get_url(token: ENV['SLACK_TOKEN'])
+        @url ||= begin
+          response = Net::HTTP.post_form(URI.parse('https://slack.com/api/rtm.start'), token: ENV['SLACK_TOKEN'])
+          body = JSON.parse(response.body)
+
+          URI.parse(body['url'])
+        end
       end
 
       def client
@@ -76,7 +80,7 @@ module Ruboty
       end
 
       def realtime
-        @realtime ||= ::SlackRTM::Client.new(websocket_url: url)
+        @realtime ||= ::Ruboty::SlackRTM::Client.new(websocket_url: url)
       end
 
       def expose_channel_name?

data/lib/ruboty/slack_rtm/client.rb

@@ -0,0 +1,31 @@
+require 'json'
+require 'websocket-client-simple'
+
+module Ruboty
+  module SlackRTM
+    class Client
+      def initialize(websocket_url:)
+        @client = WebSocket::Client::Simple.connect(websocket_url.to_s)
+        @queue = Queue.new
+      end
+
+      def send(data)
+        data[:id] = Time.now.to_i * 10 + rand(10)
+        @queue.enq(data.to_json)
+      end
+
+      def on(event, &block)
+        @client.on(event) do |message|
+          block.call(JSON.parse(message.data))
+        end
+      end
+
+      def main_loop
+        loop do
+          message = @queue.deq
+          @client.send(message)
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/slack_rtm/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module SlackRTM
-    VERSION = '1.6.0'
+    VERSION = '2.0.0'
   end
 end

data/lib/ruboty/slack_rtm.rb

@@ -1,2 +1,3 @@
 require 'ruboty/slack_rtm/version'
+require 'ruboty/slack_rtm/client'
 require 'ruboty/adapters/slack_rtm'

data/ruboty-slack_rtm.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 11.1'
   spec.add_development_dependency 'rubocop', '>= 0.28.0'
 
   spec.add_dependency 'ruboty', '>= 1.1.4'
-  spec.add_dependency 'slack-api', '~> 1.0.0'
-  spec.add_dependency 'slack-rtmapi', '~> 1.0.0.rc4'
+  spec.add_dependency 'slack-api', '~> 1.2'
+  spec.add_dependency 'websocket-client-simple', '~> 0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_rtm
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: slack-rtmapi
+  name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc4
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc4
+        version: 0.3.0
 description: Slack real time messaging adapter for Ruboty
 email:
 - rosylilly@aduca.org
@@ -109,6 +109,7 @@ files:
 - Rakefile
 - lib/ruboty/adapters/slack_rtm.rb
 - lib/ruboty/slack_rtm.rb
+- lib/ruboty/slack_rtm/client.rb
 - lib/ruboty/slack_rtm/version.rb
 - ruboty-slack_rtm.gemspec
 homepage: https://github.com/rosylilly/ruboty-slack_rtm
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Slack real time messaging adapter for Ruboty