lita-hipchat 1.6.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2008096896f5668bf8f7ab76b4052adfd9234ebc
-  data.tar.gz: e8330ab2e846e8f0e29ca0c9f044b22c09e56693
+  metadata.gz: 06b49ea9905f7fa01abf8fc5ea4ac12b3ee8534a
+  data.tar.gz: 743d1bb267b79febabd7f2dd224c45d9ba96b2fa
 SHA512:
-  metadata.gz: 698f9488fab611f47c4624d96050ef1f13a19bac98e8a3e7c765b2c8d14eec23b1c28d39e03cddb56fe86b8d48b756305a697b2903b71ffd418b83f51aabdcc0
-  data.tar.gz: f1736b9d19db9c29ce4b9fe40656a103907f9a7f4ed2efbe684af4fd5052708ad4512dbbc90a8c96d15182a4570c8d7fe3b56cbc411876608fbd509450a78159
+  metadata.gz: deb61b39730229d24905c17aee14d1fa98046ed14d90fdb949ba625f7632e2e796eb4e90313a50aa5c40bee01ee8adaecb9e668cf5626ce1fcc514d5513c1ef8
+  data.tar.gz: ded6e57e89e1dea9a5d2bf323b5df42db99f4fef4602cf23af637c9392ffe445773fab8b1c6d453647d7cc9df0995e2c5c195835577f54fbee4f255e700114cd

data/README.md

@@ -40,11 +40,11 @@ There's no need to set `config.robot.mention_name` manually. The adapter will lo
 Lita.configure do |config|
   config.robot.name = "Lita Bot"
   config.robot.adapter = :hipchat
-  config.adapter.jid = "12345_123456@chat.hipchat.com"
-  config.adapter.password = "secret"
-  config.adapter.debug = false
-  config.adapter.rooms = :all
-  config.adapter.muc_domain = "conf.hipchat.com"
+  config.adapters.hipchat.jid = "12345_123456@chat.hipchat.com"
+  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/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/lita/adapters/hipchat.rb

@@ -4,13 +4,23 @@ require "lita/adapters/hipchat/connector"
 module Lita
   module Adapters
     class HipChat < Adapter
-      require_configs :jid, :password
+      namespace "hipchat"
+
+      # Required attributes
+      config :jid, type: String, required: true
+      config :password, type: String, required: true
+
+      # Optional attributes
+      config :debug, type: [TrueClass, FalseClass], default: false
+      config :rooms, type: [Symbol, Array]
+      config :muc_domain, type: String, default: "conf.hipchat.com"
+      config :ignore_unknown_users, type: [TrueClass, FalseClass], default: false
 
       attr_reader :connector
 
       def initialize(robot)
         super
-        @connector = Connector.new(robot, config.jid, config.password, debug: debug)
+        @connector = Connector.new(robot, config.jid, config.password, debug: config.debug)
       end
 
       def join(room_id)
@@ -64,16 +74,8 @@ module Lita
         end
       end
 
-      def config
-        Lita.config.adapter
-      end
-
-      def debug
-        config.debug || false
-      end
-
       def muc_domain
-        config.muc_domain.nil? ? "conf.hipchat.com" : config.muc_domain.dup
+        config.muc_domain.dup
       end
 
     end

data/lita-hipchat.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-hipchat"
-  spec.version       = "1.6.2"
+  spec.version       = "2.0.0"
   spec.authors       = ["Jimmy Cuadra"]
   spec.email         = ["jimmy@jimmycuadra.com"]
   spec.description   = %q{A HipChat adapter for Lita.}
@@ -14,12 +14,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lita", ">= 2.5"
+  spec.add_runtime_dependency "lita", ">= 4.0"
   spec.add_runtime_dependency "xmpp4r", ">= 0.5.6"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 3.0.0.beta2"
+  spec.add_development_dependency "rspec", ">= 3.0.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
 end

data/spec/lita/adapters/hipchat_spec.rb

@@ -1,12 +1,12 @@
 require "spec_helper"
 
-describe Lita::Adapters::HipChat do
+describe Lita::Adapters::HipChat, lita: true do
   before do
-    Lita.configure do |config|
-      config.adapter.jid = "jid"
-      config.adapter.password = "secret"
-      config.adapter.rooms = nil
-      config.adapter.muc_domain = nil
+    registry.register_adapter(:hipchat, described_class)
+
+    registry.configure do |config|
+      config.adapters.hipchat.jid = "jid"
+      config.adapters.hipchat.password = "secret"
     end
 
     allow(described_class::Connector).to receive(:new).and_return(connector)
@@ -14,7 +14,7 @@ describe Lita::Adapters::HipChat do
 
   subject { described_class.new(robot) }
 
-  let(:robot) { instance_double("Lita::Robot") }
+  let(:robot) { Lita::Robot.new(registry) }
   let(:connector) { instance_double("Lita::Adapters::HipChat::Connector") }
   let(:domain) { "conf.hipchat.com" }
 
@@ -22,12 +22,6 @@ describe Lita::Adapters::HipChat do
     expect(Lita.adapters[:hipchat]).to eql(described_class)
   end
 
-  it "requires config.jid and config.password" do
-    Lita.config.adapter.jid = Lita.config.adapter.password = nil
-    expect(Lita.logger).to receive(:fatal).with(/jid, password/)
-    expect { subject }.to raise_error(SystemExit)
-  end
-
   describe "#join" do
     let(:room) { "#foo" }
     before do
@@ -75,7 +69,7 @@ describe Lita::Adapters::HipChat do
     context "with a custom domain" do
       let(:domain) { "foo.bar.com" }
       it "joins rooms with a custom muc_domain" do
-        Lita.config.adapter.muc_domain = domain
+        registry.config.adapters.hipchat.muc_domain = domain
         allow(subject).to receive(:rooms).and_return(rooms)
         expect(subject.connector).to receive(:join).with(domain, anything)
         subject.run
@@ -83,7 +77,7 @@ describe Lita::Adapters::HipChat do
     end
 
     it "joins all rooms when config.rooms is :all" do
-      Lita.config.adapter.rooms = :all
+      registry.config.adapters.hipchat.rooms = :all
       allow(subject.connector).to receive(:list_rooms).with(domain).and_return(rooms)
       rooms.each do |room|
         expect(subject).to receive(:join).with(room)
@@ -93,7 +87,7 @@ describe Lita::Adapters::HipChat do
 
     it "joins rooms specified by config.rooms" do
       custom_rooms = rooms
-      Lita.config.adapter.rooms = custom_rooms
+      registry.config.adapters.hipchat.rooms = custom_rooms
       rooms.each do |room|
         expect(subject).to receive(:join).with(room)
       end
@@ -138,6 +132,8 @@ describe Lita::Adapters::HipChat do
   describe "#shut_down" do
     it "shuts down the connector" do
       expect(subject.connector).to receive(:shut_down)
+      allow(robot).to receive(:trigger)
+      allow(subject.connector).to receive(:part)
       expect(robot).to receive(:trigger).with(:disconnected)
       subject.shut_down
     end

data/spec/spec_helper.rb

@@ -8,3 +8,5 @@ SimpleCov.start { add_filter "/spec/" }
 
 require "lita-hipchat"
 require "lita/rspec"
+
+Lita.version_3_compatibility_mode = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-hipchat
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement