ellen-hipchat 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e30afae6e417e1a412d8bbdddf1c14c2ab2196e
-  data.tar.gz: 386ae5b9880c4546b3d94aceb354c208bb5404fa
+  metadata.gz: e93050d2c424827b21eae85f71b6159d1277e398
+  data.tar.gz: ffd18a8711dcdc370adf2baaa991d86731dfcf6d
 SHA512:
-  metadata.gz: 2ba38dd9f9a90b298eb1bd769e05ab41f14d0f00166105a7cb2ab5064c9c174c7f4768830c5661d980bc1cabf9c7d51f1b8f8098ecbaded14945838de82c93c2
-  data.tar.gz: 50c7202d5166c6c2f814c539b77dd739a84d42834849f263f7f4c356226da45e0ba34d2e3bb1dbc3a77a98a49f1de5d8ebde359813b7224e4ad8f6121c17aee9
+  metadata.gz: b51939dc3d3693b15e2295b63a2782418583d8695976c0e813b7924ee458f8194a03db0c2d633f5944868428b97b50ff00b15ed0d72f439ebe3f36a8f19cd6ac
+  data.tar.gz: 877a99c1c3026fe5dcdc2d6d99f3183c92d094f9cec9fcd8de57e84e29400269e2a9a0ad9873429fab3b3d2a4ac3cac71c7cea8145fd1396e0a5258eee238045

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.0
+* Change XMPP library: xmpp4r -> xrc
+
 ## 0.0.4
 * Support Ellen v0.2.0
 

data/ellen-hipchat.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "ellen", ">= 0.2.0"
-  spec.add_dependency "xmpp4r"
+  spec.add_dependency "xrc", ">= 0.0.5"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

data/lib/ellen/adapters/hipchat.rb

@@ -1,116 +1,82 @@
-require "timeout"
-require "xmpp4r"
-require "xmpp4r/muc/helper/simplemucclient"
-require "xmpp4r/roster/helper/roster"
+require "xrc"
 
 module Ellen
   module Adapters
     class Hipchat < Base
       include Mem
 
-      env :HIPCHAT_DEBUG, "Pass `1` to show debug information on stdout (optional)", optional: true
       env :HIPCHAT_JID, "Account's JID (e.g. 12345_67890@chat.hipchat.com)"
-      env :HIPCHAT_NICKNAME, "Account's nickname, which must match the name on the HipChat account (e.g. Ellen)"
+      env :HIPCHAT_NICKNAME, "Account's nickname, which must match the name on the HipChat account (e.g. ellen)"
       env :HIPCHAT_PASSWORD, "Account's password (e.g. xxx)"
-      env :HIPCHAT_ROOM_ID, "Room ID the robot first logs in (e.g. 12345_room-name@conf.hipchat.com)"
+      env :HIPCHAT_ROOM_NAME, "Room name ellen first logs in (e.g. 12345_myroom)"
 
       def run
-        log
-        debug
         bind
-        join
-        present
-        sleep
+        connect
       rescue Interrupt
         exit
       end
 
-      # TODO: We should use message[:from] & message[:to] to select correct room
       def say(message)
-        room.say(message[:body])
+        client.say(
+          body: message[:code] ? "/quote #{message[:body]}" : message[:body],
+          from: message[:from],
+          to: message[:original][:type] == "chat" ? message[:to] + "/resource" : message[:to],
+          type: message[:original][:type],
+        )
       end
 
       private
 
       def client
-        client = Jabber::Client.new(jid)
-        client.connect
-        client.auth(password)
-        client
-      end
-      memoize :client
-
-      def room
-        Jabber::MUC::SimpleMUCClient.new(client)
+        @client ||= Xrc::Client.new(
+          jid: jid,
+          nickname: nickname,
+          password: password,
+          room_jid: room_jid,
+        )
       end
-      memoize :room
 
       private
 
       def jid
-        jid = Jabber::JID.new(ENV["HIPCHAT_JID"])
+        jid = Xrc::Jid.new(ENV["HIPCHAT_JID"])
         jid.resource = "bot"
-        jid
-      end
-
-      def password
-        ENV["HIPCHAT_PASSWORD"]
-      end
-
-      def room_id
-        ENV["HIPCHAT_ROOM_ID"]
+        jid.to_s
       end
 
-      def nickname
-        ENV["HIPCHAT_NICKNAME"]
+      def room_jid
+        "#{room_name}@conf.hipchat.com"
       end
 
-      def room_key
-        "#{room_id}/#{nickname}"
+      def room_name
+        ENV["HIPCHAT_ROOM_NAME"]
       end
 
-      def log
-        Jabber.logger = Ellen.logger
+      def password
+        ENV["HIPCHAT_PASSWORD"]
       end
 
-      def debug
-        Jabber.debug = true if ENV["HIPCHAT_DEBUG"]
+      def nickname
+        ENV["HIPCHAT_NICKNAME"]
       end
 
       def bind
-        room.on_message do |time, nickname, body|
-          robot.receive(body: body, from: nickname, to: room_id)
-        end
-      end
-
-      def join
-        room.join(room_key)
-      end
-
-      def present
-        client.send(presence)
-      end
-
-      def presence
-        Jabber::Presence.new.set_type(:available)
+        client.on_private_message(&method(:on_message))
+        client.on_room_message(&method(:on_message))
       end
 
-      def prefixed_mention_name
-        "@#{mention_name}"
-      end
-
-      def mention_name
-        Timeout.timeout(3) { roster[jid].attributes["mention_name"] }
-      rescue Timeout::Error
-        nickname.split(" ").first
+      def connect
+        client.connect
       end
-      memoize :mention_name
 
-      def roster
-        roster = Jabber::Roster::Helper.new(client, false)
-        roster.get_roster
-        roster.wait_for_roster
-        roster
+      def on_message(message)
+        robot.receive(
+          body: message.body,
+          from: message.from,
+          to: message.to,
+          type: message.type,
+        )
       end
     end
   end

data/lib/ellen/hipchat/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ellen-hipchat
 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-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ellen
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: xmpp4r
+  name: xrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement