sinatra-slack 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1001e651845588b445467b51c39c70088b645578db40e9a3ab8912fbca3627bb
-  data.tar.gz: 7bfd5bb48ed346097648304703bb55a8976a99af2018788f2bbd683a64b113d8
+  metadata.gz: 66dde3da3ae5d04be459e5acc55cc5069d7f48c6a96b6e4a544ae47370cba42f
+  data.tar.gz: 4f523cffb4780a06a9a53c7e717c91b61aef670350ab83657fed29fcf8dbed75
 SHA512:
-  metadata.gz: c7cd89a308c80e2d57c021e31a52ca345906b1807480eed6dc88ee1fd82a283899650d6c7920ff02b369155ce59e3364b646c6afb1e2abb99e2b54fe896c35ee
-  data.tar.gz: 95cd9900d8bdc6d890b57319826da7d17b2538d1d12548f922ee2342a5f8127fc94a47d83e9a2e6b451934e15fd6b5698257e8dd917c4523ce88371dbe8f2d80
+  metadata.gz: 9e1521ea66b1bf106f9ba8da4377bbae740ec0cdf9f969d80e949f56d29a53b0d2def83e786b3afb1d7f3cb2cffddd86c3384fad269ec37bdd763cb0a9d86102
+  data.tar.gz: 4bc88b2b3410bb1b1c15fdbb32102fdaea86accef830bfbc0a03301f7a3f8675eef2985013656483cc69146d018a7352078d7324bc3a241791d5269f2ffe65e8

data/lib/sinatra/slack.rb

@@ -24,6 +24,8 @@ module Sinatra
       set_endpoint(path, quick_reply) do
         signature = "#{command.command} #{command.text}"
         command_pattern = self.class.get_pattern(signature)
+        raise 'Command not defined' unless command_pattern
+
         request_params = command_pattern.params(signature).values
 
         {
@@ -38,6 +40,8 @@ module Sinatra
     def actions_endpoint(path, quick_reply: '')
       set_endpoint(path, quick_reply) do
         action_pattern = self.class.get_pattern(action.name)
+        raise 'Action not defined' unless action_pattern
+
         request_params = action_pattern.params(action.name).values || []
         request_params << action.value
 
@@ -88,19 +92,18 @@ module Sinatra
       define_method("#{path}_options", &block)
 
       settings.apost(path) do
-        halt 401, 'Invalid Headers' unless authorized?
+        handle_with_rescue do
+          halt 401, 'Invalid Headers' unless authorized?
 
-        get_options = self.class.instance_method "#{path}_options"
-        options = get_options.bind(self).call
+          get_options = self.class.instance_method "#{path}_options"          
+          options = get_options.bind(self).call
 
-        halt 400 unless options
+          halt 400 unless options
 
-        options[:quick_reply] = quick_reply
+          options[:quick_reply] = quick_reply
 
-        handle_request(options)
-      rescue StandardError => ex
-        logger.error ex.full_message
-        channel.send(slack_error_notification)
+          handle_request(options)
+        end
       end
     end
   end

data/lib/sinatra/slack/instance_helpers.rb

@@ -35,16 +35,24 @@ module Sinatra
 
       def handle_request(request_handler:, request_params:, quick_reply: '...')
         EM.defer do
-          deferred_message = request_handler.bind(self).call(*request_params)
-          channel.send(deferred_message)
-        rescue StandardError => ex
-          logger.error ex.full_message
-          channel.send(slack_error_notification)
+          handle_with_rescue do
+            deferred_message = request_handler.bind(self).call(*request_params)
+            channel.send(deferred_message)
+          end
         end
 
         body quick_reply
       end
 
+      def handle_with_rescue
+        return unless block_given?
+
+        yield
+      rescue StandardError => ex
+        logger.error ex.full_message
+        channel.send(slack_error_notification)
+      end
+
       # Checks for Slack defined HTTP headers
       # and computes the request signature (HMAC). If provided signature
       # is the same as the computed one, the request is valid.

data/lib/sinatra/slack/version.rb

@@ -2,6 +2,6 @@
 
 module Sinatra
   module Slack
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-slack
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Nuno Namorado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async_sinatra