lita 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9bd8c0df22178884dc917ba0160f0eb1bc3b2dc
-  data.tar.gz: 79089bd4df8880b869b444b7dc98e9bb492fde20
+  metadata.gz: 0b293324db64514ccb9e45a84342fbf522363478
+  data.tar.gz: 50625efaedf4a1b1aeb8c7f0cde496ceee80fd88
 SHA512:
-  metadata.gz: 4de9444af3c84c039b113a5f3a5a0659cfb91f4438b607f61f5e3030b03cd90cd950403f855dc0e9e208a8324c535f85fba61628d7ac46f346947190b7d0eea5
-  data.tar.gz: 5bca9f0a44ac91b26e3519f02f9add4bb0569624d12f76b99102e5ae40057975744c7b0dc46b9c2a0fe26c0865697a69e83360c38b1c0a3ed0e91d2732693e30
+  metadata.gz: 44946d4c859be7be8bbcaf0aca603c26ff7532cff12451eb20f13931eaad7b67812f5604c810e0a4e38c0986dbf2be298260dff2239a9a89b87a28db7e2914b9
+  data.tar.gz: 44bace7dfae78672b8dcee24cdf3ed952e2dffa5982a442f79503255871bfbff37f8bf3235d8eb4640a624c9710dbf8633d7abeacd701651829cf974111ef3fa

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2013 Jimmy Cuadra
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/lita/handler.rb

@@ -52,7 +52,7 @@ module Lita
       # @return [void]
       def dispatch(robot, message)
         routes.each do |route|
-          if route_applies?(route, message)
+          if route_applies?(route, message, robot)
             Lita.logger.debug <<-LOG.chomp
 Dispatching message to #{self}##{route.method_name}.
 LOG
@@ -103,13 +103,16 @@ ERROR
       private
 
       # Determines whether or not an incoming messages should trigger a route.
-      def route_applies?(route, message)
+      def route_applies?(route, message, robot)
         # Message must match the pattern
         return unless route.pattern === message.body
 
         # Message must be a command if the route requires a command
         return if route.command? && !message.command?
 
+        # Messages from self should be ignored to prevent infinite loops
+        return if message.user.name == robot.name
+
         # User must be in auth group if route is restricted
         return if route.required_groups && route.required_groups.none? do |group|
           Authorization.user_in_group?(message.user, group)

data/lib/lita/version.rb

@@ -1,4 +1,4 @@
 module Lita
   # The current version of Lita.
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/lita/handler_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Lita::Handler, lita: true do
   let(:robot) { double("Lita::Robot", name: "Lita") }
-  let(:user) { double("Lita::User") }
+  let(:user) { double("Lita::User", name: "Test User") }
 
   let(:message) do
     message = double("Lita::Message", user: user, command?: false)
@@ -91,6 +91,14 @@ describe Lita::Handler, lita: true do
       handler_class.dispatch(robot, message)
     end
 
+    it "doesn't route messages from the bot back to the bot" do
+      allow(message).to receive(:body).and_return("#{robot.name}: bar")
+      allow(message).to receive(:command?).and_return(true)
+      allow(message).to receive(:user).and_return(robot)
+      expect_any_instance_of(handler_class).not_to receive(:blah)
+      handler_class.dispatch(robot, message)
+    end
+
     it "logs exceptions but doesn't crash the bot" do
       allow(message).to receive(:body).and_return("#{robot.name}: danger")
       allow(handler_class).to receive(:rspec_loaded?).and_return(false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,6 +189,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/lita