slkecho 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aa38817dd7a85a9bb6a39924da65ad1d45173c29b058347481c1f98e62b37a0
-  data.tar.gz: 963364abf7315212c650aa05650634dc3662e3bd1728adaaa83e89f9f94d5ad7
+  metadata.gz: 4316f376c8717965ab2c3518c054be6d983bc005d343803305bdb90f2bc0b963
+  data.tar.gz: 11cf2ec4be6b49b6a4d4d566ac9c767036ae91871c3ebe39e4a760198f13e367
 SHA512:
-  metadata.gz: 1079f1a9c85669cb0ea19a6879b9d724a389f3bf7c23dfbd716fb9fc73dffda189c1d42a9dd8674a90d7decf42037a8adc4b9f32a6718230673b0c27f5c71acd
-  data.tar.gz: 33b784774eb1c33908807c0600af4e9113dfa28ffb957da395ed2742741db00360bb7741f80fdb94990daf08ddb768925eaf02efcd2f977b8435fe395b005ca7
+  metadata.gz: 25a8acf5fd4f84c7d76b91ac9a44e99e780e398c0b878dac33352e621e5139dc09d9d13b041eaec04227b20c7996596799656b5cf367195d65aeb10b959507e2
+  data.tar.gz: da7a9a3a06f06910e7660f5408c0a9c9a3b1d0f057c02ad88b5c9bc10ba96f559141b956659a6993b6b04c611a6fde5f0b26a06998c39ad9651270ad21d877f0

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [v2.1.1] - 2024-02-12
+
+- chore: Add ruby-lsp gem
+- refactor: Parse JSON with symbolize names
+- refactor: Make request body with symbolize keys
+- refactor: Make blocks with symbolize keys
+- refactor: Extract http response checking
+- test: Introduce saharspec gem
+
 ## [v2.1.0] - 2024-01-19
 
 - feat: Add --message-as-blocks option

data/lib/slkecho/blocks_builder.rb

@@ -7,10 +7,10 @@ module Slkecho
     def build_from_message(message, user_id = nil)
       [
         {
-          "type" => "section",
-          "text" => {
-            "type" => "mrkdwn",
-            "text" => user_id.nil? ? message : "<@#{user_id}> #{message}"
+          type: "section",
+          text: {
+            type: "mrkdwn",
+            text: user_id.nil? ? message : "<@#{user_id}> #{message}"
           }
         }
       ]

data/lib/slkecho/slack_request/lookup_user_by_email.rb

@@ -4,6 +4,8 @@ require "net/http"
 require "uri"
 require "json"
 
+require_relative "../slack_request"
+
 module Slkecho
   module SlackRequest
     class LookupUserByEmail
@@ -20,18 +22,18 @@ module Slkecho
       end
 
       def request(email:)
-        begin
-          response = @http.get(uri_with_query(@uri, { email: email }), @headers)
-        rescue StandardError => e
-          raise Slkecho::SlackApiHttpError, e.message
+        user_info = Slkecho::SlackRequest.send_request do
+          @http.get(uri_with_query(@uri, { email: email }), @headers)
         end
-        raise Slkecho::SlackApiHttpError, response.body unless response.is_a?(Net::HTTPSuccess)
 
-        user_info = JSON.parse(response.body)
-        raise Slkecho::SlackApiResultError, "user not found. (#{email})" if user_info["error"] == "users_not_found"
-        raise Slkecho::SlackApiResultError, user_info["error"] unless user_info["ok"]
+        case user_info
+        in { ok: true, user: user }
+          user
+        in { ok: false, error: error }
+          raise Slkecho::SlackApiResultError, "user not found. (#{email})" if error == "users_not_found"
 
-        user_info["user"]
+          raise Slkecho::SlackApiResultError, error
+        end
       end
 
       def uri_with_query(uri, params)

data/lib/slkecho/slack_request/post_message.rb

@@ -4,6 +4,8 @@ require "net/http"
 require "uri"
 require "json"
 
+require_relative "../slack_request"
+
 module Slkecho
   module SlackRequest
     class PostMessage
@@ -22,26 +24,26 @@ module Slkecho
       end
 
       def request(params)
-        response = @http.post(
-          @uri.path,
-          request_body(params).to_json,
-          @headers
-        )
-        raise Slkecho::SlackApiHttpError, "#{response.code} #{response.message}" unless response.is_a?(Net::HTTPSuccess)
+        result = Slkecho::SlackRequest.send_request do
+          @http.post(
+            @uri.path,
+            request_body(params).to_json,
+            @headers
+          )
+        end
 
-        result = JSON.parse(response.body)
-        raise Slkecho::SlackApiResultError, result["error"] unless result["ok"]
+        raise Slkecho::SlackApiResultError, result[:error] unless result[:ok]
 
         true
       end
 
       def request_body(params)
         {
-          "channel" => params.channel,
-          "blocks" => params.blocks,
-          "username" => params.username,
-          "icon_url" => params.icon_url,
-          "icon_emoji" => params.icon_emoji
+          channel: params.channel,
+          blocks: params.blocks,
+          username: params.username,
+          icon_url: params.icon_url,
+          icon_emoji: params.icon_emoji
         }
       end
     end

data/lib/slkecho/slack_request.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Slkecho
+  module SlackRequest
+    def self.send_request
+      return unless block_given?
+
+      response = yield
+      raise Slkecho::SlackApiError, "API Response could not be retrieved." unless response.is_a?(Net::HTTPResponse)
+      raise Slkecho::SlackApiHttpError, "#{response.code} #{response.message}" unless response.is_a?(Net::HTTPSuccess)
+
+      begin
+        JSON.parse(response.body, symbolize_names: true)
+      rescue JSON::ParserError
+        raise Slkecho::SlackApiError, "API Response is not JSON."
+      end
+    end
+  end
+end

data/lib/slkecho/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Slkecho
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/slkecho.rb

@@ -19,6 +19,7 @@ module Slkecho
   end
 
   class InvalidOptionError < StandardError; end
+  class SlackApiError < StandardError; end
   class SlackApiHttpError < StandardError; end
   class SlackApiResultError < StandardError; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slkecho
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - okonomi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies: []
 description: Post message to Slack like echo command.
 email:
@@ -29,6 +29,7 @@ files:
 - lib/slkecho/option_parser.rb
 - lib/slkecho/options.rb
 - lib/slkecho/slack_client.rb
+- lib/slkecho/slack_request.rb
 - lib/slkecho/slack_request/lookup_user_by_email.rb
 - lib/slkecho/slack_request/post_message.rb
 - lib/slkecho/version.rb