slkecho 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77afa5c20a94b0e30aa7aa41e5a2849a235d4fc2a60fe4437db1401b655cc784
-  data.tar.gz: 7bd371392c450668e17d39f9e97e5a37490cded751b0a046c924ba063da5394f
+  metadata.gz: 1758bd89b754485e44d4268df132bb18866fc210d4ecb6e460f3e76bf0906f76
+  data.tar.gz: 3ab51b0007244fa47314cfb837a254e668a9ea2f00a5e96b433cdd42b672d3b0
 SHA512:
-  metadata.gz: 7e4b16802556b7e67e0d12c3ab51c272d423bc57ca3a9066e82a31d697535c8ff2254e012dca963aa2e5fb99d23d6ce1a7ab6e40dcdcc3751dbe722ac33ab4f1
-  data.tar.gz: 0ee38f3cf91680f85ebaa03c328d89b8aae3e8793ecf03e9b63ed5e9b5f5c147733e66911c179403dc879044d782a7bc80f22886a2fe53856152e79dd5129477
+  metadata.gz: 49428da2ed9644b5d70c154dd7c0218aaac8fe009f1fdd22ca4abd20601e71db9d7fd254ef9dbd78839402281fe76f789e1bdf07d4489d52d6bed197f4a5f549
+  data.tar.gz: b9f38dc1c3be84941b08b9cc69e0fa94bf84e7439d1c4e03b03ad99fc3d695a39efee653702d85f44a3dd459ff599511fd58368a0b42ca6a69466a6440734969

data/CHANGELOG.md

@@ -1,14 +1,18 @@
 ## [Unreleased]
 
-- feat: Start type signature implementation
+## [v2.1.6] - 2025-01-05
+
+- refactor: options building
+- refactor: slack request
 
 ## [v2.1.5] - 2025-01-04
 
-- Only update dependencies
+- feat: Start type signature implementation
+- chore: update dependencies
 
 ## [v2.1.4] - 2024-08-31
 
-- Only update dependencies
+- chore: update dependencies
 
 ## [v2.1.3] - 2024-03-15
 

data/lib/slkecho/http.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "uri"
+
+module Slkecho
+  class HTTP
+    class << self
+      def get(uri, headers: nil)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = uri.scheme == "https"
+        http.get(uri, headers)
+      end
+
+      def post(uri, headers: nil, body: nil)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = uri.scheme == "https"
+        http.post(uri, body, headers)
+      end
+    end
+  end
+end

data/lib/slkecho/option_parser.rb

@@ -4,46 +4,47 @@ require "optparse"
 
 module Slkecho
   class OptionParser
-    def option_parser # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    def option_parser # rubocop:disable Metrics/MethodLength
       @option_parser ||= ::OptionParser.new do |o|
         o.banner = "Usage: slkecho [options] message"
         o.program_name = "slkecho"
         o.version = Slkecho::VERSION
-        o.on("-c", "--channel CHANNEL", "Slack channel to post message.") { @options.channel = _1 }
-        o.on("-m", "--mention-by-email EMAIL", "Mention to user by email.") { @options.mention_by_email = _1 }
-        o.on("--username USERNAME", "Set user name for message.") { @options.username = _1 }
-        o.on("--icon-url ICON_URL", "Set user icon image for message by URL.") { @options.icon_url = _1 }
-        o.on("--icon-emoji ICON_EMOJI", "Set user image for message by emoji.") { @options.icon_emoji = _1 }
-        o.on("--message-as-blocks", "Post message as blocks.") { @options.message_as_blocks = true }
+        o.on("-c", "--channel CHANNEL", "Slack channel to post message.")
+        o.on("-m", "--mention-by-email EMAIL", "Mention to user by email.")
+        o.on("--username USERNAME", "Set user name for message.")
+        o.on("--icon-url ICON_URL", "Set user icon image for message by URL.")
+        o.on("--icon-emoji ICON_EMOJI", "Set user image for message by emoji.")
+        o.on("--message-as-blocks", "Post message as blocks.")
       end
     end
 
     def parse(argv)
-      options = parse_options(argv)
+      options = build_options(argv)
       validate_options(options)
 
       options
     end
 
-    def parse_options(argv)
-      @options = Slkecho::Options.new
-      argv = option_parser.parse(argv)
+    def build_options(argv)
+      option_values = {}
+      argv = option_parser.parse(argv, into: option_values)
+      option_values = option_values.transform_keys { _1.to_s.tr("-", "_") }
 
-      @options.message = if !argv.empty?
-                           argv.first
-                         elsif !$stdin.tty?
-                           $stdin.read.then { _1.empty? ? nil : _1 }
-                         end
+      Slkecho::Options.new(option_values).tap do |opt|
+        opt.message = fetch_message(argv)
+      end
+    end
 
-      @options.dup
+    def fetch_message(argv)
+      if !argv.empty?
+        argv.first
+      elsif !$stdin.tty?
+        $stdin.read.then { _1.empty? ? nil : _1 }
+      end
     end
 
     def validate_options(options)
-      # channel
-      raise Slkecho::InvalidOptionError, "channel is required." if options.channel.nil?
-
-      # message
-      raise Slkecho::InvalidOptionError, "message is missing." if options.message.nil?
+      raise Slkecho::InvalidOptionError, options.error_message unless options.valid?
 
       true
     end

data/lib/slkecho/options.rb

@@ -1,7 +1,25 @@
 # frozen_string_literal: true
 
+require "active_model"
+
 module Slkecho
   class Options
-    attr_accessor :channel, :mention_by_email, :message, :username, :icon_url, :icon_emoji, :message_as_blocks
+    include ActiveModel::Model
+    include ActiveModel::Attributes
+
+    attribute :channel, :string
+    attribute :mention_by_email, :string
+    attribute :message, :string
+    attribute :username, :string
+    attribute :icon_url, :string
+    attribute :icon_emoji, :string
+    attribute :message_as_blocks, :boolean
+
+    validates :channel, presence: { message: "is required." }
+    validates :message, presence: { message: "is missing." }, if: -> { message.nil? }
+
+    def error_message
+      errors.full_messages.join(" ").downcase
+    end
   end
 end

data/lib/slkecho/slack_request/lookup_user_by_email.rb

@@ -5,28 +5,17 @@ require "uri"
 require "json"
 
 require_relative "../slack_request"
+require_relative "../http"
 
 module Slkecho
   module SlackRequest
     class LookupUserByEmail
       def initialize(slack_api_token:)
         @slack_api_token = slack_api_token
-
-        @uri = URI.parse("https://slack.com/api/users.lookupByEmail")
-        host = @uri.host
-        @http = Net::HTTP.new(host, @uri.port) unless host.nil?
-        @http.use_ssl = true
-        @headers = {
-          "Authorization" => "Bearer #{slack_api_token}",
-          "Content-Type" => "application/x-www-form-urlencoded"
-        }
       end
 
       def request(email:)
-        user_info = Slkecho::SlackRequest.send_request do
-          @http.get(uri_with_query(@uri, { email: email }), @headers)
-        end
-
+        user_info = send_request(email, @slack_api_token)
         case user_info
         in { ok: true, user: user }
           user
@@ -37,8 +26,21 @@ module Slkecho
         end
       end
 
+      private
+
+      def send_request(email, token)
+        Slkecho::SlackRequest.send_request do
+          uri = uri_with_query("https://slack.com/api/users.lookupByEmail", { email: email })
+          headers = {
+            "Authorization" => "Bearer #{token}",
+            "Content-Type" => "application/x-www-form-urlencoded"
+          }
+          Slkecho::HTTP.get(uri, headers: headers)
+        end
+      end
+
       def uri_with_query(uri, params)
-        uri.dup.tap { _1.query = URI.encode_www_form(params) }
+        URI(uri).tap { _1.query = URI.encode_www_form(params) }
       end
     end
   end

data/lib/slkecho/slack_request/post_message.rb

@@ -4,30 +4,30 @@ require "net/http"
 require "uri"
 require "json"
 
+require_relative "../http"
 require_relative "../slack_request"
 
 module Slkecho
   module SlackRequest
     class PostMessage
-      Params = Struct.new(:channel, :blocks, :username, :icon_url, :icon_emoji, keyword_init: true)
+      Params = Struct.new(:channel, :blocks, :username, :icon_url, :icon_emoji, keyword_init: true) do
+        def to_request_body
+          JSON.dump({
+                      channel: channel,
+                      blocks: blocks,
+                      username: username,
+                      icon_url: icon_url,
+                      icon_emoji: icon_emoji
+                    })
+        end
+      end
 
       def initialize(slack_api_token:)
         @slack_api_token = slack_api_token
-
-        @uri = URI.parse("https://slack.com/api/chat.postMessage")
-        @http = Net::HTTP.new(@uri.host, @uri.port)
-        @http.use_ssl = true
-        @headers = {
-          "Content-Type" => "application/json; charset=utf-8",
-          "Authorization" => "Bearer #{slack_api_token}"
-        }
       end
 
       def request(params)
-        result = Slkecho::SlackRequest.send_request do
-          @http.post(@uri.path, request_body(params).to_json, @headers)
-        end
-
+        result = send_request(@slack_api_token, params)
         case result
         in { ok: true }
           true
@@ -36,14 +36,19 @@ module Slkecho
         end
       end
 
-      def request_body(params)
-        {
-          channel: params.channel,
-          blocks: params.blocks,
-          username: params.username,
-          icon_url: params.icon_url,
-          icon_emoji: params.icon_emoji
-        }
+      private
+
+      def send_request(token, params)
+        Slkecho::SlackRequest.send_request do
+          uri = URI("https://slack.com/api/chat.postMessage")
+          headers = {
+            "Content-Type" => "application/json; charset=utf-8",
+            "Authorization" => "Bearer #{token}"
+          }
+          body = params.to_request_body
+
+          Slkecho::HTTP.post(uri, headers: headers, body: body)
+        end
       end
     end
   end

data/lib/slkecho/version.rb

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

data/sig/slkecho/http.rbs

@@ -0,0 +1,5 @@
+module Slkecho
+  class HTTP
+    def self.get: (URI::Generic, headers: Hash[String, String]) -> void
+  end
+end

data/sig/slkecho/slack_request/lookup_user_by_email.rbs

@@ -2,12 +2,10 @@ module Slkecho
   module SlackRequest
     class LookupUserByEmail
       @slack_api_token: String
-      @uri: URI::Generic
-      @http: Net::HTTP
-      @headers: Hash[String, String]
 
       def initialize: (slack_api_token: String) -> void
-      def uri_with_query: (URI::Generic, untyped) -> untyped
+      def send_request: (String, String) -> untyped
+      def uri_with_query: (String, untyped) -> untyped
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: slkecho
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - okonomi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
-dependencies: []
+date: 2025-01-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Post message to Slack like echo command.
 email:
 - okonomi@oknm.jp
@@ -27,6 +41,7 @@ files:
 - lib/slkecho/blocks_builder.rb
 - lib/slkecho/cli.rb
 - lib/slkecho/configuration.rb
+- lib/slkecho/http.rb
 - lib/slkecho/option_parser.rb
 - lib/slkecho/options.rb
 - lib/slkecho/slack_client.rb
@@ -35,6 +50,7 @@ files:
 - lib/slkecho/slack_request/post_message.rb
 - lib/slkecho/version.rb
 - sig/slkecho.rbs
+- sig/slkecho/http.rbs
 - sig/slkecho/slack_request.rbs
 - sig/slkecho/slack_request/lookup_user_by_email.rbs
 homepage: https://github.com/okonomi/slkecho