qiita_team_services 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d4c5b560eeb0143ee323479dd0ca493af868401
-  data.tar.gz: 76b0e85c196621822b0450b9a60f35cdeb54a84f
+  metadata.gz: 4da9ccfe481121e812f461f312a74732edfeb956
+  data.tar.gz: 16dcd0bf7ab843d2ab25cf2fcef6a0a3f9bb47eb
 SHA512:
-  metadata.gz: dec92fbde534b8681234212e2166d45ac262c6e1610ddd701113c3b46e7261e9060f037a4c33a7a8a5c20ef4ed6f0a0261385cf4ad7f8564da91da6358770d01
-  data.tar.gz: 658d390c292f958e6ea41ca29eb69262db05e3de447fa965150570cb586f5928bb02864f189596ae012369dd0d3b97938737d459e8b15a295f87af9d8f5aac87
+  metadata.gz: cead78f4002f9b6e63aa33528d1e32fb80da1cc2050a594023c74b3da4439c8c00503dea184e85bb10bac0f57d9ecb4bd5c0737e64e2ae4b12e52283c3fb9d36
+  data.tar.gz: 77802d7473b8dd267a16af6caa0bc6397ea6c824af27f7e4a867715924b754850cfb039178cf82a45c16d0187dfb1ccf74653c7918171f997eb8c8a18be06c97

data/lib/qiita/team/services/hooks/concerns/slack.rb

@@ -35,8 +35,7 @@ module Qiita::Team::Services
 
         # @return [void]
         def ping
-          fallback = "Test message sent from Qiita:Team"
-          send_message(attachments: [fallback: fallback, pretext: fallback])
+          send_message(text: "Test message sent from Qiita:Team")
         rescue DeliveryError
           nil
         end
@@ -65,12 +64,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def item_updated(event)
-          fallback = "#{user_link(event.user)} updated #{item_link(event.item)}"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} updated #{item_link(event.item)}",
           )
         end
 
@@ -78,12 +73,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def item_became_coediting(event)
-          fallback = "#{user_link(event.user)} changed #{item_link(event.item)} to coedit mode"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} changed #{item_link(event.item)} to coedit mode",
           )
         end
 
@@ -91,12 +82,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def item_destroyed(event)
-          fallback = "#{user_link(event.user)} deleted #{event.item.title}"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} deleted #{event.item.title}",
           )
         end
 
@@ -127,26 +114,17 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def item_comment_updated(event)
-          fallback = "#{user_link(event.user)} updated a #{comment_link(event.comment)}"
-          fallback << " on #{item_link(event.item)}"
-          send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
-          )
+          text = "#{user_link(event.user)} updated a #{comment_link(event.comment)}"
+          text << " on #{item_link(event.item)}"
+          send_message(text: text)
         end
 
         # @param event [Qiita::Team::Services::Events::ItemCommentDestroyed]
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def item_comment_destroyed(event)
-          fallback = "#{user_link(event.user)} deleted a comemnt on #{item_link(event.item)}"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} deleted a comemnt on #{item_link(event.item)}",
           )
         end
 
@@ -172,26 +150,17 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def project_comment_updated(event)
-          fallback = "#{user_link(event.user)} updated a #{comment_link(event.comment)}"
-          fallback << " on #{project_link(event.project)}"
-          send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
-          )
+          text = "#{user_link(event.user)} updated a #{comment_link(event.comment)}"
+          text << " on #{project_link(event.project)}"
+          send_message(text: text)
         end
 
         # @param event [Qiita::Team::Services::Events::ProjectCommentDestroyed]
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def project_comment_destroyed(event)
-          fallback = "#{user_link(event.user)} deleted a comemnt on #{project_link(event.project)}"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} deleted a comemnt on #{project_link(event.project)}",
           )
         end
 
@@ -199,12 +168,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def team_member_added(event)
-          fallback = "#{user_link(event.member)} was added to the #{team_link(event.team)} team"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.member)} was added to the #{team_link(event.team)} team",
           )
         end
 
@@ -212,12 +177,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def team_member_removed(event)
-          fallback = "#{event.member.name} was removed from the #{team_link(event.team)} team"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{event.member.name} was removed from the #{team_link(event.team)} team",
           )
         end
 
@@ -225,12 +186,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def project_created(event)
-          fallback = "#{user_link(event.user)} created #{project_link(event.project)} project"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} created #{project_link(event.project)} project",
           )
         end
 
@@ -238,12 +195,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def project_updated(event)
-          fallback = "#{user_link(event.user)} updated #{project_link(event.project)} project"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} updated #{project_link(event.project)} project",
           )
         end
 
@@ -251,12 +204,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def project_destroyed(event)
-          fallback = "#{user_link(event.user)} deleted #{project_link(event.project)} project"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} deleted #{project_link(event.project)} project",
           )
         end
 
@@ -264,12 +213,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def project_archived(event)
-          fallback = "#{user_link(event.user)} archived #{project_link(event.project)} project"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} archived #{project_link(event.project)} project",
           )
         end
 
@@ -277,12 +222,8 @@ module Qiita::Team::Services
         # @return [void]
         # @raise [Qiita::Team::Services::DeliveryError]
         def project_activated(event)
-          fallback = "#{user_link(event.user)} activated #{project_link(event.project)} project"
           send_message(
-            attachments: [
-              fallback: fallback,
-              pretext: fallback,
-            ],
+            text: "#{user_link(event.user)} activated #{project_link(event.project)} project",
           )
         end
 

data/lib/qiita/team/services/hooks/webhook.rb

@@ -13,7 +13,7 @@ module Qiita::Team::Services
 
       validates :token, format: %r{\A[A-Za-z0-9+/=]{20,40}\z}
       validates :url, presence: true,
-                      url: { scheme: ['http', 'https'],
+                      url: { scheme: %w(http https),
                              message: :invalid_scheme,
                              allow_blank: true }
 

data/lib/qiita/team/services/version.rb

@@ -1,3 +1,3 @@
 module Qiita::Team::Services
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/support/helpers/slack_hook_helper.rb

@@ -28,6 +28,15 @@ module Qiita::Team::Services
         :team_member_removed,
       ].freeze
 
+      EVENT_NAMES_TO_SEND_WITH_ATTACHMENTS = [
+        :item_comment_created,
+        :item_created,
+        :project_comment_created,
+      ].freeze
+
+      EVENT_NAMES_TO_SEND_WITH_TEXT =
+        (EXPECTED_AVAILABLE_EVENT_NAMES - EVENT_NAMES_TO_SEND_WITH_ATTACHMENTS).freeze
+
       included do
         shared_examples "Slack hook" do |hook:|
           describe ".service_name" do
@@ -51,9 +60,9 @@ module Qiita::Team::Services
               send(hook).ping
             end
 
-            it "sends message with proper attachments" do
+            it "sends proper text message" do
               expect(send(hook)).to receive(:send_message) do |request_body|
-                expect(request_body).to match_slack_attachments_request
+                expect(request_body).to match_slack_text_request
               end.once
               subject
             end
@@ -71,7 +80,34 @@ module Qiita::Team::Services
             end
           end
 
-          EXPECTED_AVAILABLE_EVENT_NAMES.each do |event_name|
+          EVENT_NAMES_TO_SEND_WITH_TEXT.each do |event_name|
+            describe "##{event_name}" do
+              subject do
+                send(hook).public_send(event_name, public_send("#{event_name}_event"))
+              end
+
+              it "sends proper text message" do
+                expect(send(hook)).to receive(:send_message) do |request_body|
+                  expect(request_body).to match_slack_text_request
+                end.once
+                subject
+              end
+
+              context "when message is delivered successfully" do
+                include_context "Delivery success"
+
+                it { expect { subject }.not_to raise_error }
+              end
+
+              context "when message is not delivered successfully" do
+                include_context "Delivery fail"
+
+                it { expect { subject }.to raise_error(Qiita::Team::Services::DeliveryError) }
+              end
+            end
+          end
+
+          EVENT_NAMES_TO_SEND_WITH_ATTACHMENTS.each do |event_name|
             describe "##{event_name}" do
               subject do
                 send(hook).public_send(event_name, public_send("#{event_name}_event"))

data/spec/support/matchers/match_slack_text_request.rb

@@ -0,0 +1,8 @@
+RSpec::Matchers.define :match_slack_text_request do
+  match do |request_body|
+    request_body.is_a?(Hash) && \
+      request_body.key?(:text) && \
+      !request_body.key?(:attachments) && \
+      request_body[:text].is_a?(String)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_team_services
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Yuku Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-url_validator
@@ -302,6 +302,7 @@ files:
 - spec/support/helpers/http_client_stub_helper.rb
 - spec/support/helpers/slack_hook_helper.rb
 - spec/support/matchers/match_slack_attachments_request.rb
+- spec/support/matchers/match_slack_text_request.rb
 - spec/support/resources/base.rb
 - spec/support/resources/comment.rb
 - spec/support/resources/item.rb