cognition 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06462dac8c1c3f92692619d523bc9f1a58fc4de4
-  data.tar.gz: db097768b8ff030201e53fb93f3aaf1efb8c997d
+  metadata.gz: 1b37fef34af5c88fc16e34dd5855d50d6c214ec4
+  data.tar.gz: aab660a7e21a9324369638de7fd663d39c32efda
 SHA512:
-  metadata.gz: c9a2814d94865711e1605188d017ccd865a416c714b9e6d21b15dba5691862119b6d425cc0696f9fbe1fed932744e3e1bbb4dda8c760d3614181b1471aa2a483
-  data.tar.gz: e8ab955d9bbe0862248e6b233c0e7dd2212db532ba342a145cb8d4264ceca1f5657ce9f00a3ff321bca53732f30652cee37161a7c10f0129e06bb8f90ed81794
+  metadata.gz: 5b34e06406f19030648972a5b1fa157b33fde810306d11a948f74ae8f306edb5a99552d06df855387f327b96f49b91ea8464ca1769c0596abbbe7380a8cf1943
+  data.tar.gz: 793bab140adef11717fba95d70d6cc625b6c20ea5f2d89b0628931288d231b8fab91a80892116615300d77a8815b2b5e17ebb946fc0ca4f6fd1710f2ac0747a2

data/lib/cognition/matcher.rb

@@ -24,6 +24,8 @@ module Cognition
 
     def run(msg)
       @response = action.call(msg, match_data)
+    rescue => e
+      @response = "'#{msg.command}' found, but raised #{e.inspect}"
     end
 
     def matches?(msg)

data/lib/cognition/version.rb

@@ -1,3 +1,3 @@
 module Cognition
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/test/fixtures/hello.rb

@@ -1,5 +1,5 @@
 require 'tilt/haml'
-require 'tilt/erubis'
+require 'tilt/erb'
 require 'haml'
 class Hello < Cognition::Plugins::Base
   match 'hello', :hello, help: {

data/test/test_default_plugin.rb

@@ -7,12 +7,12 @@ class DefaultPluginTest < Minitest::Test
   end
 
   def test_returns_help
-    help = "ping - Test if the endpoint is responding. Returns PONG.\nhelp - Lists all commands with help\nhelp <command> - Lists help for <command>\n"
+    help = "ping - Test if the endpoint is responding. Returns PONG.\nhelp - Lists all commands with help\nhelp <command> - Lists help for <command>"
     assert_equal help, @bot.process("help")
   end
 
   def test_returns_filtered_help
-    help = "ping - Test if the endpoint is responding. Returns PONG.\n"
+    help = "ping - Test if the endpoint is responding. Returns PONG."
     assert_equal help, @bot.process("help ping")
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-require 'webmock/test_unit'
+require 'webmock/minitest'
 
 class Minitest::Test
   include WebMock::API

data/test/test_matcher.rb

@@ -74,8 +74,18 @@ class MatcherTest < Minitest::Test
     matcher_with_help = Cognition::Matcher.new(/hello\s*(?<name>.*)/, {help: {'hello' => 'says hello'}}, &Proc.new(&method(:dummy_method)))
     assert_equal ['hello - says hello'], matcher_with_help.help
   end
+
+  def test_returns_error_if_method_returns_an_error
+    msg = Cognition::Message.new('error')
+    matcher_with_error = Cognition::Matcher.new(/error/, &Proc.new(&method(:error_method)))
+    assert matcher_with_error.attempt(msg).match("'error' found, but raised")
+  end
 end
 
 def dummy_method(msg, match_data)
   "Hello #{match_data['name']}"
 end
+
+def error_method(*)
+  foobarcall
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cognition
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Nathan Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty