slacks 0.5.0.pre → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fa3ec9c05fdbe56d801c27cb5acbe5d879c07f7
-  data.tar.gz: 348dc602d884498580f7d72f9fba829333ab087e
+  metadata.gz: 0fe5955626325049c7ec170b8c67cb5b652d2d97
+  data.tar.gz: b73672adfc7da3608a86453a6b6c7c6b5271a5c5
 SHA512:
-  metadata.gz: aa37ba98e00e52d176b5481cca8793d710cc2f068242e448e1b20052d3da3654503008fd6efecf2a9ec21b230f8a4d4c13fb3fd404a79cb981262e35c5b581fd
-  data.tar.gz: 978735f54f957ee598631502c914f544aa3666f5a87ebe5f85da1c8bdea80e00b7c1331e49e2415f1749d03afab0e023c715b7c7177db5c43a442286ce5b66d1
+  metadata.gz: 44dc3585e769b303e2f82e57cc50b8d83e023c3a9e7a0cbeff276c10da8ddd67965f5f463059adc6151a35fb29f5cf3d5577a0810cfe5e2781c8090777f3315e
+  data.tar.gz: 71a0cc131fe1fc997093f8d0da62c971bcc50241699a80ce2cabd2cb8b7c7e0b0d25eb00058b226373ab0a96307bc1abec6a30f6ec3824775adacefa1c85626c

data/lib/slacks/channel.rb

@@ -12,17 +12,12 @@ module Slacks
     end
 
     def reply(*messages)
-      messages.flatten!
       return unless messages.any?
 
-      first_message = messages.shift
-      message_options = {}
-      message_options = messages.shift if messages.length == 1 && messages[0].is_a?(Hash)
-      slack.send_message(first_message, message_options.merge(channel: id))
-
-      messages.each do |message|
-        sleep message.length / slack.typing_speed
-        slack.send_message(message, channel: id)
+      if messages.first.is_a?(Array)
+        reply_many(messages[0])
+      else
+        reply_one(*messages)
       end
     end
     alias :say :reply
@@ -61,6 +56,19 @@ module Slacks
       "##{name}"
     end
 
+  protected
+
+    def reply_one(message, options={})
+      slack.send_message(message, options.merge(channel: id))
+    end
+
+    def reply_many(messages)
+      messages.each_with_index.map do |message, i|
+        sleep message.length / slack.typing_speed if i > 0
+        slack.send_message(message, channel: id)
+      end
+    end
+
   private
     attr_reader :slack
   end

data/lib/slacks/connection.rb

@@ -77,14 +77,22 @@ module Slacks
       end
     end
 
+
+
     def typing_on(channel)
+      raise NotListeningError unless listening?
       websocket.write MultiJson.dump(type: "typing", channel: to_channel_id(channel))
     end
 
     def ping
+      raise NotListeningError unless listening?
       websocket.ping
     end
 
+    def listening?
+      !websocket.nil?
+    end
+
 
 
     def listen!
@@ -319,12 +327,12 @@ module Slacks
 
 
 
-    def api(command, options={})
-      response = http.post(command, options.merge(token: token))
+    def api(command, params={})
+      response = http.post(command, params.merge(token: token))
       response = MultiJson.load(response.body)
       unless response["ok"]
         response["error"].split(/,\s*/).each do |error_code|
-          raise ::Slacks::Response.fetch(error_code).new(response)
+          raise ::Slacks::Response.fetch(error_code).new(command, params, response)
         end
       end
       response

data/lib/slacks/errors.rb

@@ -3,19 +3,29 @@ require "slacks/core_ext/exception"
 module Slacks
   module Response
     class Error < RuntimeError
-      attr_reader :response
+      attr_reader :command, :params, :response
 
-      def initialize(response, message)
+      def initialize(command, params, response, message)
         super message
+        @command = command
+        @params = params
         @response = response
+        additional_information[:command] = command
+        additional_information[:params] = params
         additional_information[:response] = response
       end
     end
 
+    class UnspecifiedError < ::Slacks::Response::Error
+      def initialize(command, params, response)
+        super command, params, response, "Request failed with #{response["error"].inspect}"
+      end
+    end
+
     @_errors = {}
 
     def self.fetch(error_code)
-      @_errors.fetch(error_code, ::Slacks::Response::Error)
+      @_errors.fetch(error_code, ::Slacks::Response::UnspecifiedError)
     end
 
     {
@@ -25,6 +35,7 @@ module Slacks
       "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",
+      "fatal_error"            => "",
       "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.",
@@ -49,15 +60,15 @@ module Slacks
       "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 = error_code.gsub(/(?:^|_)([a-z]+)/) { $1.capitalize }
       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}"
+          def initialize(command, params, response)
+            super command, params, response, "#{message}"
           end
         end
 
@@ -84,4 +95,10 @@ module Slacks
       super "Unable to connect to Slack; a token has no"
     end
   end
+
+  class NotListeningError < ArgumentError
+    def initialize
+      super "Not connected to the RTM API; call `listen!` first"
+    end
+  end
 end

data/lib/slacks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slacks
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre
+  version: 0.5.0
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -207,12 +207,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library for communicating via Slack