actionslack 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d806e62f1769081a642b1bc493bb2bff9385e12a42695c0efd50ee40a6c8d05
-  data.tar.gz: 8bb05daac3e625e206c7ba47141fe88272831b531513c732916a4acaeb8e1635
+  metadata.gz: 27afb3fa4f6da31ef2138615bbf368d9cded850396c67122d73a647ca6bf2d1d
+  data.tar.gz: 9b3804e467796b8a3a0d44d720afd384e8a46cf8840a2250b2ad60b0f3ffe98f
 SHA512:
-  metadata.gz: ee9728f120912769b9eccf32bd4a77c8b63d1cd5a888a7f0ea25a2019216e31aeb528c461cb3a6fd10dc193405999cde8ab8f336be507de6f8cf95d564a9c4f1
-  data.tar.gz: 030caa0c7a13a46b7bdaadc5607bce2c8114b89c78a40785b21e02d721ba68c561e50235b33278e012ea4457336854c11bc82c6c921c15f78e145fb75cbeb457
+  metadata.gz: 2ad13e13c673e0e4c208ae4950e27403d271d23389f522485b00ce667fb166fbb49dd40340c511dd6a3108604d394b0d12861690787c41870ad4ddfc726a5b1f
+  data.tar.gz: 2f8394d469eddc413087431ff0bebfa62f018ec09cb0aea9b191fbc0236a152fc5ba2a920fc58f8da0f66cf5f26164e512c14989c73ea599916505e2ec9ee646

data/lib/action_slack/base.rb

@@ -12,11 +12,7 @@ module ActionSlack
       def notify(**kargs)
         instance = create(**kargs)
 
-        if ActionSlack.configuration.async
-          SendJob.perform_later(url: instance.url, message: instance.message)
-        else
-          Notifier.notify(url: instance.url, message: instance.message)
-        end
+        Notifier.notify(url: instance.url, message: instance.message)
       end
 
       def attributes=(attrs)

data/lib/action_slack/configuration.rb

@@ -24,8 +24,18 @@ module ActionSlack
       @configuration = self.class.default_configuration.dup
     end
 
+    def async?
+      async
+    end
+
+    %i[local testflight production].each do |type_name|
+      define_method :"#{type_name}?" do
+        type_name == type
+      end
+    end
+
     set_default(:filepath, 'config/slack_webhooks.yml')
     set_default(:async, true)
-    set_default(:env, :development)
+    set_default(:type, :local) # production, testflight, local
   end
 end

data/lib/action_slack/logger.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module ActionSlack
+  class Logger < ::Logger; end
+end

data/lib/action_slack/notifier.rb

@@ -1,9 +1,33 @@
 # frozen_string_literal: true
 
 module ActionSlack
-  class Notifier
-    def self.notify(url:, message:)
-      Slack::Notifier.new(url).post(text: message)
+  module Notifier
+    module_function
+
+    def notify(url:, message:)
+      message = ActionSlack.configuration.testflight? ? "[ActionSlack Test Posting]\n#{message}\n" : message
+
+      if ActionSlack.configuration.async?
+        notify_later(url, message)
+      else
+        notify_now(url, message)
+      end
+    end
+
+    private
+
+    def notify_now(url, message)
+      if ActionSlack.configuration.local?
+        ActionSlack.logger.debug { "Post to Slack webhook url: #{url}, message: \"#{message}\"" }
+      else
+        ActionSlack.logger.info { "Start posting to Slack webhook url: #{url}, message: \"#{message}\"" }
+        Slack::Notifier.new(url).post(text: message)
+        ActionSlack.logger.info 'Posted to Slack'
+      end
+    end
+
+    def notify_later(url, message)
+      SendJob.perform_later(url: url, message: message)
     end
   end
 end

data/lib/action_slack/send_job.rb

@@ -2,8 +2,8 @@
 
 module ActionSlack
   class SendJob < ActiveJob::Base
-    def perform(url:, message:)
-      Notifier.notify(url: url, message: message)
+    def perform(url, message)
+      Notifier.__send__(:notify_now, url, message)
     end
   end
 end

data/lib/action_slack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionSlack
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/action_slack/webhook.rb

@@ -26,9 +26,9 @@ module ActionSlack
 
       def load_yaml(src)
         if Psych::VERSION > '4.0'
-          YAML.load(src, symbolize_names: true, aliases: true, freeze: true)
+          YAML.safe_load(src, symbolize_names: true, freeze: true)
         else
-          YAML.safe_load(src)
+          YAML.safe_load(src, symbolize_names: true)
         end
       end
     end

data/lib/action_slack.rb

@@ -4,6 +4,7 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'yaml'
 require 'erb'
+require 'logger'
 require 'slack-notifier'
 
 module ActionSlack
@@ -13,6 +14,7 @@ module ActionSlack
   autoload :Webhook
   autoload :Notifier
   autoload :Base
+  autoload :Logger
 
   autoload :SendJob if const_defined?(:ActiveJob)
 
@@ -24,5 +26,18 @@ module ActionSlack
     def configuration
       @configuration ||= Configuration.new
     end
+
+    def logger
+      @logger ||= ActionSlack::Logger.new($stdout, level: :info)
+    end
+
+    def logger=(logger)
+      if logger.nil?
+        self.logger.level = Logger::FATAL
+        return
+      end
+
+      @logger = logger
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionslack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - kakubin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,6 +70,7 @@ files:
 - lib/action_slack.rb
 - lib/action_slack/base.rb
 - lib/action_slack/configuration.rb
+- lib/action_slack/logger.rb
 - lib/action_slack/notifier.rb
 - lib/action_slack/send_job.rb
 - lib/action_slack/version.rb
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: actionslack