lita-xmpp 1.0.4 → 1.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1341e508fe9e3923c7afb7d3477b8fe8dab8b5ff
-  data.tar.gz: 5cab7c7401b25624bb8ff2feb98d4067c6be5c36
+  metadata.gz: 5676126a816e9ba871336d489c7979f55e8b6f90
+  data.tar.gz: 90996f40decf4c0a954b4e347f7e30b9ac820618
 SHA512:
-  metadata.gz: ddd093fc241c8d88a5e275dbf03fecebd9258a8d2adf30d91bfa12efe91826bf4c8902414af76a74e6eb99b7e29ac371e4cd21724592c1fe62d5d43011f52a06
-  data.tar.gz: 615d61312b1c213d88d74e00f0578ff77b5371716b1ab673edbb09c7d906be1ee0cdfd6ebbde2b31c8f2495dd11794284f23080d5d232eef8596f8fd98b051a4
+  metadata.gz: 62bc7bb06c85d88a7f325e7fb6c9a551d9d5a9c413bad9835e01e24e0ca29d4e0061bf1db3beb6f8f2a1f27d389b16f75dddf09c9ae7f5b0bc685ea2c85ab262
+  data.tar.gz: 1d6d2f9356df824f476c8fa37c58c322352ed362d21b9f66b347917c9a4f9c9944931ddb69bf6313042e0ddc7ca6ee2f431720b9fcaa782aa1d957a2770e21a5

data/README.md

@@ -1,8 +1,8 @@
 # lita-xmpp
 
-WIP, probably has some bugs.
+If it works, cool. If it doesn't, there's always [HipChat](http://hipchat.com).
 
-**lita-xmpp** is an adapter for [Lita](https://github.com/jimmycuadra/lita) that allows you to use the robot with [HipChat](https://www.hipchat.com/).
+**lita-xmpp** is an adapter for [Lita](https://github.com/jimmycuadra/lita) that allows you to use the robot with XMPP.
 
 ## Installation
 

data/lib/lita/adapters/xmpp.rb

@@ -1,6 +1,4 @@
 require "lita"
-require "lita/adapters/xmpp/html_message"
-require "lita/adapters/xmpp/notify_room"
 require "lita/adapters/xmpp/connector"
 
 module Lita

data/lib/lita/adapters/xmpp/callback.rb

@@ -11,11 +11,10 @@ module Lita
         end
 
         def private_message(client)
-          return
           client.add_message_callback do |m|
             next if m.type == :error || m.body.nil?
             user = user_by_jid(m.from)
-            source = Source.new(user)
+            source = Source.new(user: user)
             message = Message.new(robot, m.body, source)
             message.command!
             Lita.logger.debug("Dispatching PM to Lita from #{user.id}.")
@@ -30,7 +29,7 @@ module Lita
               next
             else
               user = user_by_name(nick)
-              source = Source.new(user, muc.jid.bare.to_s)
+              source = Source.new(user: user, room: muc.jid.bare.to_s)
               message = Message.new(robot, text, source)
               Lita.logger.debug(
                 "Dispatching message to Lita from #{user.id} in MUC #{muc.jid}."
@@ -51,7 +50,7 @@ module Lita
         private
 
         def jid_without_domain(jid)
-          jid.to_s.downcase.sub(/@.*/, '')
+          jid.to_s.sub(/@.*/, '')
         end
 
         def create_user(user_data)
@@ -69,12 +68,8 @@ module Lita
         end
 
         def user_by_name(name)
-          name = name.to_s.downcase
           Lita.logger.info("Looking up user with name: #{name}.")
-          items = roster.items.detect do |jid, item|
-            Lita.logger.debug("Checking #{jid}: #{jid_without_domain(jid)} => #{name}.")
-            jid_without_domain(jid) == name || jid_without_domain(jid).sub(/\./, ' ') == name
-          end
+          items = roster.items.detect { |jid, item| jid_without_domain(jid) == name }
 
           if items
             Lita.logger.info("Looking up user by jid: #{items.first}.")

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

@@ -39,7 +39,7 @@ module Lita
         def join_rooms(muc_domain, rooms)
           rooms.each do |room_name|
             muc = Jabber::MUC::SimpleMUCClient.new(client)
-            room_jid = normalized_jid(room_name, muc_domain, robot.name)
+            room_jid = normalized_jid(room_name, muc_domain.dup, robot.name)
             mucs[room_jid.bare.to_s] = muc
             register_muc_message_callback(muc)
             Lita.logger.info("Joining room: #{room_jid}.")

data/lita-xmpp.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-xmpp"
-  spec.version       = "1.0.4"
+  spec.version       = "1.1.0.pre"
   spec.authors       = ["Justin Mazzi"]
   spec.email         = ["jmazzi@gmail.com"]
   spec.description   = %q{A XMPP adapter for Lita.}
@@ -13,10 +13,10 @@ 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.0"
-  spec.add_runtime_dependency "gmcmillan-xmpp4r", "~> 0.6.2"
+  spec.add_runtime_dependency "lita", "~> 3.3.1"
+  spec.add_runtime_dependency "xmpp4r", "~> 0.5.6"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.7.2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: lita-xmpp
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0.pre
 platform: ruby
 authors:
 - Justin Mazzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
-  name: gmcmillan-xmpp4r
+  name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A XMPP adapter for Lita.
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -125,8 +125,6 @@ files:
 - lib/lita/adapters/xmpp.rb
 - lib/lita/adapters/xmpp/callback.rb
 - lib/lita/adapters/xmpp/connector.rb
-- lib/lita/adapters/xmpp/html_message.rb
-- lib/lita/adapters/xmpp/notify_room.rb
 - lib/lita/encoding_patches.rb
 - lita-xmpp.gemspec
 - spec/lita/adapters/hipchat/callback_spec.rb
@@ -143,17 +141,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A XMPP adapter for the Lita chat robot.

data/lib/lita/adapters/xmpp/html_message.rb

@@ -1,52 +0,0 @@
-require 'xmpp4r'
-
-module Lita
-  module Adapters
-    # Usage:
-    #
-    # h = HtmlMessage.new
-    # h.add_text = "Hi"
-    #
-    # Or:
-    #
-    # HtmlMessage.new { add_text "hi" }
-    class HtmlMessage
-      include ::Jabber
-      attr_reader :body, :doc
-
-      def initialize
-        @doc  = REXML::Element::new("html")
-        @body = REXML::Element::new("body")
-
-        build
-
-        yield(self) if block_given?
-      end
-
-      def message
-        doc.add body
-        doc
-      end
-
-      def add_text(str)
-        text = REXML::Text.new("#{str}", false, nil, true, nil, %r/.^/)
-        body.add text
-      end
-
-      def add_link(text, url)
-        link = REXML::Element.new('a')
-        link.add_attribute('href', url)
-        link.text = text
-
-        body.add link
-      end
-
-      private
-
-      def build
-        doc.add_namespace('http://jabber.org/protocol/xhtml-im')
-        body.add_namespace('http://www.w3.org/1999/xhtml')
-      end
-    end
-  end
-end

data/lib/lita/adapters/xmpp/notify_room.rb

@@ -1,30 +0,0 @@
-module Lita
-  module Adapters
-    module NotifyRoom
-      def send_html_message_to_room(string, room)
-        muc_domain = Lita.config.adapter.muc_domain
-        target     = Source.new(nil, "#{room}@#{muc_domain}")
-        adapter    = robot.instance_variable_get('@adapter')
-
-        begin
-          adapter.send_raw_messages(target, string)
-        rescue => e
-          puts e.backtrace.join("\n")
-          puts :error
-        end
-      end
-
-      def send_message_to_room(string, room)
-        muc_domain = Lita.config.adapter.muc_domain
-        target     = Source.new(nil, "#{room}@#{muc_domain}")
-        robot.send_message(target, string)
-      end
-
-      def create_raw_message(string)
-        message = Jabber::Message::new.set_type(:groupchat)
-        message.add_element string
-        message
-      end
-    end
-  end
-end