lita-hipchat 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e12641b30c087c18ee3b25a1b4157f740f010de6
-  data.tar.gz: 8eb8b306212cfcd1a42ea2234de06956c2d38639
+  metadata.gz: 518a294fc9b098810837c5ae37baedf74b41dd1d
+  data.tar.gz: 839c1911a104d0192263ac8ca50d7bdd57a1b812
 SHA512:
-  metadata.gz: 0e381dfe3ce2c885fb2b4412f8b740bf1442f7e01558703c4c9972fdef4df5ea869ee1cf6f2c0f3e6c2de3f6bd64eb6830838aa8481ce7dd510b73038bbbe1cf
-  data.tar.gz: 10e6eeb25e03551147db619926d9c48c9b90ac2e791a9953ebb7e558ed39e049bb16b431b028cfb69813d6dc3c00ca410e9093033b86adf146b99ce66dd64157
+  metadata.gz: 0124b4e76b0e2e11019b03acd41271a2c5e043b69e1217eb547807ebfef0e505cff46f0080adf31702bb71a08b4b20c138bcf70fd59aa3e2bf58344da7e6564c
+  data.tar.gz: 03c37f96b4b3c029906f2a9543cf1962efd4ecbe8fd10562c66bdfc9b4dfe470e387394e6a64004f61e87aa758b1f3e922443ba5d45583c182d801489cadf521

data/README.md

@@ -25,6 +25,7 @@ Values for all of the following attributes can be found on the "XMPP/Jabber info
 
 ### Optional attributes
 
+* `server` (String) - The HipChat Server address. Override this with the full domain of your server if using a private HipChat Server installation. Default: `"chat.hipchat.com"`
 * `debug` (Boolean) - If `true`, turns on the underlying Jabber library's (xmpp4r) logger, which is fairly verbose. Default: `false`.
 * `rooms` (Symbol, Array<String>) - An array of room JIDs that Lita should join upon connection. Can also be the symbol `:all`, which will cause Lita to discover and join all rooms. Default: `nil` (no rooms).
 * `muc_domain` (String) - The XMPP Multi-User Chat domain to use. Default: `"conf.hipchat.com"`.
@@ -44,7 +45,6 @@ Lita.configure do |config|
   config.adapters.hipchat.password = "secret"
   config.adapters.hipchat.debug = true
   config.adapters.hipchat.rooms = :all
-  config.adapters.hipchat.muc_domain = "conf.hipchat.com"
 end
 ```
 

data/lib/lita/adapters/hipchat.rb

@@ -11,6 +11,7 @@ module Lita
       config :password, type: String, required: true
 
       # Optional attributes
+      config :server, type: String, default: "chat.hipchat.com"
       config :debug, type: [TrueClass, FalseClass], default: false
       config :rooms, type: [Symbol, Array]
       config :muc_domain, type: String, default: "conf.hipchat.com"
@@ -20,7 +21,7 @@ module Lita
 
       def initialize(robot)
         super
-        @connector = Connector.new(robot, config.jid, config.password, debug: config.debug)
+        @connector = Connector.new(robot, config.jid, config.password, config.server, debug: config.debug)
       end
 
       def join(room_id)

data/lib/lita/adapters/hipchat/connector.rb

@@ -11,10 +11,11 @@ module Lita
       class Connector
         attr_reader :robot, :client, :roster
 
-        def initialize(robot, jid, password, debug: false)
+        def initialize(robot, jid, password, server, debug: false)
           @robot = robot
           @jid = normalized_jid(jid, "chat.hipchat.com", "bot")
           @password = password
+          @server = server
           @client = Jabber::Client.new(@jid)
           if debug
             Lita.logger.info("Enabling Jabber log.")
@@ -108,7 +109,7 @@ module Lita
 
         def client_connect
           Lita.logger.info("Connecting to HipChat.")
-          client.connect
+          client.connect(@server)
           Lita.logger.debug("Authenticating with HipChat.")
           client.auth(@password)
         end

data/lita-hipchat.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-hipchat"
-  spec.version       = "2.0.1"
+  spec.version       = "2.1.0"
   spec.authors       = ["Jimmy Cuadra"]
   spec.email         = ["jimmy@jimmycuadra.com"]
   spec.description   = %q{A HipChat adapter for Lita.}

data/spec/lita/adapters/hipchat/connector_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Lita::Adapters::HipChat::Connector, lita: true do
-  subject { described_class.new(robot, "user", "secret") }
+  subject { described_class.new(robot, "user", "secret", "chat.hipchat.com") }
 
   let(:client) do
     client = instance_double("Jabber::Client")
@@ -17,23 +17,23 @@ describe Lita::Adapters::HipChat::Connector, lita: true do
   before { allow(subject).to receive(:client).and_return(client) }
 
   it "sets the JID properly when only a node is supplied" do
-    subject = described_class.new(robot, "user", "secret")
+    subject = described_class.new(robot, "user", "secret", "chat.hipchat.com")
     expect(subject.jid).to eq("user@chat.hipchat.com/bot")
   end
 
   it "sets the JID properly when a node and domain are supplied" do
-    subject = described_class.new(robot, "user@example.com", "secret")
+    subject = described_class.new(robot, "user@example.com", "secret", "chat.hipchat.com")
     expect(subject.jid).to eq("user@example.com/bot")
   end
 
   it "sets the JID properly when a resource is supplied" do
-    subject = described_class.new(robot, "user@example.com/wrong", "secret")
+    subject = described_class.new(robot, "user@example.com/wrong", "secret", "chat.hipchat.com")
     expect(subject.jid).to eq("user@example.com/bot")
   end
 
   it "turns on the xmpp4r logger if debug: true is supplied" do
     expect(Jabber).to receive(:debug=).with(true)
-    subject = described_class.new(robot, "user", "secret", debug: true)
+    subject = described_class.new(robot, "user", "secret", "chat.hipchat.com", debug: true)
   end
 
   describe "#connect" do
@@ -57,7 +57,14 @@ describe Lita::Adapters::HipChat::Connector, lita: true do
     end
 
     it "connects to HipChat" do
-      expect(subject.client).to receive(:connect)
+      expect(subject.client).to receive(:connect).with("chat.hipchat.com")
+      subject.connect
+    end
+
+    it "connects to HipChat Server" do
+      subject = described_class.new(robot, "user", "secret", "hipchat.example.com")
+      allow(subject).to receive(:client).and_return(client)
+      expect(subject.client).to receive(:connect).with("hipchat.example.com")
       subject.connect
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-hipchat
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita