ellen-slack 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7311839b4deb8e6f54145805aa7940d68bf3bed3
-  data.tar.gz: 4e427701eebba663b89132bd1d634ebde50a3642
+  metadata.gz: 591a05bb1956b8711b726716791ed7098fce98fc
+  data.tar.gz: b8b837ca25ef27bf03a484d457f139eb0d743db9
 SHA512:
-  metadata.gz: 59cd9a4615cf88fc3f6dc0b3fffaa2df4447d3774531b27354aee74e6f53ae8b209af84b500f6e4da9f29e177b16efddf00ec4307af19ede8eb7444c11b461b7
-  data.tar.gz: 7ef007dc98c6cd697d647be6281e0d44ee58274c27f614f63b24524a8472d3d68fbb439543ad2cd429861b1e6f86004bc66a26a8844ed641aa3aa621ccadb22a
+  metadata.gz: 46f6688855ad460932359bc82c1c4210654327e5c01063928622b90c3227b745360a7b45008042acb0c83e711b0f213f1dca8bffe3281da65badbe01291e695f
+  data.tar.gz: eb2c369c9e0c1aad2a2ddba033b352dcfacf8b975cf0b7ae0ca123af991653bdb48bf9aeaa2290c67c1b628d69f05b92830af044cf833fd49afcd89cb8c311ed

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.0
+* Use XMPP Gateway instead of IRC
+
 ## 0.0.4
 * Support Ellen v0.2.0
 

data/README.md

@@ -2,7 +2,7 @@
 Slack adapter for [Ellen](https://github.com/r7kamura/ellen).
 
 ## Usage
-Note that you must enable the IRC gateway at https://my.slack.com/admin/settings.
+See https://my.slack.com/admin/settings to enable XMPP Gateway on Slack.
 
 ```ruby
 # Gemfile
@@ -11,9 +11,8 @@ gem "ellen-slack"
 
 ## ENV
 ```
-SLACK_CHANNEL  - Channel name the bot logs in at first
-SLACK_PASSWORD - Account's IRC password (See https://my.slack.com/account/gateways)
-SLACK_TEAM     - Account's team name
-SLACK_USERNAME - Account's username, which must match the name on Slack account
-SLACK_NO_SSL   - Pass 1 if you don't want to use SSL connection (optional)
+SLACK_PASSWORD - Account's XMPP password
+SLACK_ROOM     - Room name to join in at first (e.g. general)
+SLACK_TEAM     - Account's team name (e.g. wonderland)
+SLACK_USERNAME - Account's username (e.g. alice)
 ```

data/ellen-slack.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "ellen", ">= 0.2.0"
-  spec.add_dependency "zircon", ">= 0.0.8"
+  spec.add_dependency "ellen", ">= 0.2.2"
+  spec.add_dependency "xrc", ">= 0.0.3"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

data/lib/ellen/adapters/slack.rb

@@ -1,16 +1,12 @@
-require "zircon"
-require "yaml"
+require "xrc"
 
 module Ellen
   module Adapters
     class Slack < Base
-      INTERVAL = 0.1
-
-      env :SLACK_CHANNEL, "Channel name the bot logs in at first"
-      env :SLACK_PASSWORD, "Account's IRC password (See https://my.slack.com/account/gateways)"
-      env :SLACK_TEAM, "Account's team name"
-      env :SLACK_USERNAME, "Account's username, which must match the name on Slack account"
-      env :SLACK_NO_SSL, "Pass 1 if you don't want to use SSL connection", optional: true
+      env :SLACK_PASSWORD, "Account's XMPP password (See https://tqhouse.slack.com/account/gateways)"
+      env :SLACK_ROOM, "Room name to join in at first (e.g. general)"
+      env :SLACK_TEAM, "Account's team name (e.g. wonderland)"
+      env :SLACK_USERNAME, "Account's username (e.g. alice)"
 
       def run
         bind
@@ -18,37 +14,43 @@ module Ellen
       end
 
       def say(message)
-        to = message[:to]
-        to = message[:from] if to == robot.name
-        message[:body].split("\n").each do |line|
-          client.privmsg(to, ":#{line}")
-          wait
-        end
+        client.say(
+          body: message[:body],
+          from: message[:from],
+          to: message[:original][:type] == "chat" ? message[:to] : message[:to] + "/resource",
+          type: message[:original][:type],
+        )
       end
 
       private
 
       def client
-        @client ||= Zircon.new(
-          channel: channel,
+        @client ||= Xrc::Client.new(
+          jid: jid,
+          nickname: username,
           password: password,
-          port: port,
-          server: server,
-          username: username,
-          use_ssl: ssl,
+          room_jid: room_jid,
         )
       end
 
-      def channel
-        ENV["SLACK_CHANNEL"]
+      def jid
+        "#{username}@#{host}"
       end
 
-      def port
-        "6667"
+      def room_jid
+        "#{room}@#{room_host}"
       end
 
-      def server
-        "#{team}.irc.slack.com"
+      def host
+        "#{team}.xmpp.slack.com"
+      end
+
+      def room_host
+        "conference.#{host}"
+      end
+
+      def room
+        ENV["SLACK_ROOM"]
       end
 
       def username
@@ -63,26 +65,22 @@ module Ellen
         ENV["SLACK_TEAM"]
       end
 
-      def ssl
-        !ENV["SLACK_NO_SSL"]
-      end
-
       def bind
-        client.on_privmsg do |message|
-          body = message.body.force_encoding("UTF-8")
-          robot.receive(body: body, from: message.from, to: message.to)
-        end
+        client.on_private_message(&method(:on_message))
+        client.on_room_message(&method(:on_message))
       end
 
       def connect
-        client.run!
+        client.connect
       end
 
-      # Wait for Slack IRC Gateway to process message queue.
-      # If we send 2 messages in too short time,
-      # sometimes the slack double-renders the first message by mistake.
-      def wait
-        sleep(INTERVAL)
+      def on_message(message)
+        robot.receive(
+          body: message.body,
+          from: message.from,
+          to: message.to,
+          type: message.type,
+        )
       end
     end
   end

data/lib/ellen/slack/version.rb

@@ -1,5 +1,5 @@
 module Ellen
   module Slack
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ellen-slack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ellen
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: zircon
+  name: xrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement