slacks 0.4.4 → 0.5.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5dca8b35462a36816d2ac22a58904c7801e779d
-  data.tar.gz: ea16047ea5dbafc775bbb6d79bdd30c85446aec8
+  metadata.gz: 3fa3ec9c05fdbe56d801c27cb5acbe5d879c07f7
+  data.tar.gz: 348dc602d884498580f7d72f9fba829333ab087e
 SHA512:
-  metadata.gz: 423b632d2810deaac520ea364122ff15030876e66dacdde761d957bd7bd8cabd8caaa6d7d0a1a33293bec184f16e8fe051be35eb94291c595cc28f78857e1a54
-  data.tar.gz: 889dc9cbc90679e968006aebeac2c798981aa0dde9873e3c14bb4e21da3ab19a3756d2da0a27ee085f298c725f5db16c5bd8f53350a987c9ddad5f58c0fa0fa1
+  metadata.gz: aa37ba98e00e52d176b5481cca8793d710cc2f068242e448e1b20052d3da3654503008fd6efecf2a9ec21b230f8a4d4c13fb3fd404a79cb981262e35c5b581fd
+  data.tar.gz: 978735f54f957ee598631502c914f544aa3666f5a87ebe5f85da1c8bdea80e00b7c1331e49e2415f1749d03afab0e023c715b7c7177db5c43a442286ce5b66d1

data/lib/slacks/connection.rb

@@ -43,8 +43,6 @@ module Slacks
       params.merge!(attachments: MultiJson.dump(attachments)) if attachments.any?
       params.merge!(options.select { |key, _| SEND_MESSAGE_PARAMS.member?(key) })
       api("chat.postMessage", params)
-    rescue Slacks::ResponseError
-      $!.response
     end
     alias :say :send_message
 
@@ -53,8 +51,6 @@ module Slacks
         channel: to_channel_id(channel),
         timestamp: ts }
       api("reactions.get", params)
-    rescue Slacks::ResponseError
-      $!.response
     end
 
     def update_message(ts, message, options={})
@@ -70,8 +66,6 @@ module Slacks
       params.merge!(options.select { |key, _| [:username, :as_user, :parse, :link_names,
         :unfurl_links, :unfurl_media, :icon_url, :icon_emoji].member?(key) })
       api("chat.update", params)
-    rescue Slacks::ResponseError
-      $!.response
     end
 
     def add_reaction(emojis, message)
@@ -81,22 +75,20 @@ module Slacks
           channel: message.channel.id,
           timestamp: message.timestamp })
       end
-    rescue Slacks::ResponseError
-      $!.response
     end
 
     def typing_on(channel)
       websocket.write MultiJson.dump(type: "typing", channel: to_channel_id(channel))
     end
 
+    def ping
+      websocket.ping
+    end
+
 
 
     def listen!
       response = api("rtm.start")
-      unless response["ok"]
-        raise MigrationInProgress if response["error"] == "migration_in_progress"
-        raise ResponseError.new(response, response["error"])
-      end
       store_context!(response)
 
       @websocket = Slacks::Driver.new
@@ -246,8 +238,6 @@ module Slacks
 
       @groups_by_id = Hash[response.fetch("groups").map { |attrs| [attrs.fetch("id"), attrs] }]
       @group_id_by_name = Hash[response.fetch("groups").map { |attrs| [attrs.fetch("name"), attrs.fetch("id")] }]
-    rescue KeyError
-      raise ResponseError.new(response, $!.message)
     end
 
 
@@ -276,7 +266,6 @@ module Slacks
     def get_dm_for_user_id(user_id)
       user_ids_dm_ids[user_id] ||= begin
         response = api("im.open", user: user_id)
-        raise UnableToDirectMessageError.new(response, user_id) unless response["ok"]
         response["channel"]["id"]
       end
     end
@@ -332,7 +321,13 @@ module Slacks
 
     def api(command, options={})
       response = http.post(command, options.merge(token: token))
-      MultiJson.load(response.body)
+      response = MultiJson.load(response.body)
+      unless response["ok"]
+        response["error"].split(/,\s*/).each do |error_code|
+          raise ::Slacks::Response.fetch(error_code).new(response)
+        end
+      end
+      response
 
     rescue MultiJson::ParseError
       $!.additional_information[:response_body] = response.body

data/lib/slacks/driver.rb

@@ -70,6 +70,10 @@ module Slacks
       @driver.text(message)
     end
 
+    def ping
+      @driver.ping
+    end
+
     def connected?
       @connected || false
     end

data/lib/slacks/errors.rb

@@ -1,19 +1,68 @@
 require "slacks/core_ext/exception"
 
 module Slacks
-  class MigrationInProgress < RuntimeError
-    def initialize
-      super "Team is being migrated between servers. Try the request again in a few seconds."
+  module Response
+    class Error < RuntimeError
+      attr_reader :response
+
+      def initialize(response, message)
+        super message
+        @response = response
+        additional_information[:response] = response
+      end
     end
-  end
 
-  class ResponseError < RuntimeError
-    attr_reader :response
+    @_errors = {}
 
-    def initialize(response, message)
-      super message
-      @response = response
-      additional_information[:response] = response
+    def self.fetch(error_code)
+      @_errors.fetch(error_code, ::Slacks::Response::Error)
+    end
+
+    {
+      "account_inactive"       => "Authentication token is for a deleted user or team.",
+      "already_reacted"        => "The specified item already has the user/reaction combination.",
+      "bad_timestamp"          => "Value passed for timestamp was invalid.",
+      "cant_update_message"    => "Authenticated user does not have permission to update this message.",
+      "channel_not_found"      => "Value passed for channel was invalid.",
+      "edit_window_closed"     => "The message cannot be edited due to the team message edit settings",
+      "file_comment_not_found" => "File comment specified by file_comment does not exist.",
+      "file_not_found"         => "File specified by file does not exist.",
+      "invalid_arg_name"       => "The method was passed an argument whose name falls outside the bounds of common decency. This includes very long names and names with non-alphanumeric characters other than _. If you get this error, it is typically an indication that you have made a very malformed API call.",
+      "invalid_array_arg"      => "The method was passed a PHP-style array argument (e.g. with a name like foo[7]). These are never valid with the Slack API.",
+      "invalid_auth"           => "Invalid authentication token.",
+      "invalid_charset"        => "The method was called via a POST request, but the charset specified in the Content-Type header was invalid. Valid charset names are: utf-8 iso-8859-1.",
+      "invalid_form_data"      => "The method was called via a POST request with Content-Type application/x-www-form-urlencoded or multipart/form-data, but the form data was either missing or syntactically invalid.",
+      "invalid_name"           => "Value passed for name was invalid.",
+      "invalid_post_type"      => "The method was called via a POST request, but the specified Content-Type was invalid. Valid types are: application/json application/x-www-form-urlencoded multipart/form-data text/plain.",
+      "is_archived"            => "Channel has been archived.",
+      "message_not_found"      => "Message specified by channel and timestamp does not exist.",
+      "migration_in_progress"  => "Team is being migrated between servers. See the team_migration_started event documentation for details.",
+      "missing_post_type"      => "The method was called via a POST request and included a data payload, but the request did not include a Content-Type header.",
+      "msg_too_long"           => "Message text is too long",
+      "no_item_specified"      => "file, file_comment, or combination of channel and timestamp was not specified.",
+      "no_text"                => "No message text provided",
+      "not_authed"             => "No authentication token provided.",
+      "not_in_channel"         => "Cannot post user messages to a channel they are not in.",
+      "rate_limited"           => "Application has posted too many messages, read the Rate Limit documentation for more information",
+      "request_timeout"        => "The method was called via a POST request, but the POST data was either missing or truncated.",
+      "too_many_attachments"   => "Too many attachments were provided with this message. A maximum of 100 attachments are allowed on a message.",
+      "too_many_emoji"         => "The limit for distinct reactions (i.e emoji) on the item has been reached.",
+      "too_many_reactions"     => "The limit for reactions a person may add to the item has been reached."
+    }.each do |error_code, message|
+      class_name = error_code.classify
+      class_name = {
+        "MsgTooLong" => "MessageTooLong"
+      }.fetch(class_name, class_name)
+
+      module_eval <<-RUBY, __FILE__, __LINE__ + 1
+        class #{class_name} < ::Slacks::Response::Error
+          def initialize(response)
+            super response, "#{message}"
+          end
+        end
+
+        @_errors["#{error_code}"] = ::Slacks::Response::#{class_name}
+      RUBY
     end
   end
 
@@ -24,21 +73,15 @@ module Slacks
     end
   end
 
-  class AlreadyRespondedError < RuntimeError
-    def initialize(message=nil)
-      super message || "You have already replied to this Slash Command; you can only reply once"
-    end
-  end
-
   class NotInChannelError < RuntimeError
     def initialize(channel)
       super "The bot is not in the channel #{channel} and cannot reply"
     end
   end
 
-  class UnableToDirectMessageError < ResponseError
-    def initialize(response, user_id)
-      super response, "Unable to direct message the user #{user_id.inspect}: #{response["error"]}"
+  class MissingTokenError < ArgumentError
+    def initialize
+      super "Unable to connect to Slack; a token has no"
     end
   end
 end

data/lib/slacks/version.rb

@@ -1,3 +1,3 @@
 module Slacks
-  VERSION = "0.4.4"
+  VERSION = "0.5.0.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slacks
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0.pre
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -207,9 +207,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.2.2