qiita_team_services 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa60f5f85d9c9deceb8a8403f680042891c72fcb
-  data.tar.gz: 3bc9e9b9b9c9b2ee382a74b0469fd44924f9cd94
+  metadata.gz: 6d4c5b560eeb0143ee323479dd0ca493af868401
+  data.tar.gz: 76b0e85c196621822b0450b9a60f35cdeb54a84f
 SHA512:
-  metadata.gz: 17827eede279cc56a83a4c816e3901af1ce8316b0aa3a3a72ff2d6180c739464b6721550269b232e555fbee45a9ec1812b39cdbe99050397845a6cd0c479c290
-  data.tar.gz: 7769a578f0078ea5b46afcabc3d3cdae36f8b1f1664a6d23f540631e6e1deabd2e86db95dad8c46dae4325ecaa44a0875e889f3f78cc40744639d559dfe2f13b
+  metadata.gz: dec92fbde534b8681234212e2166d45ac262c6e1610ddd701113c3b46e7261e9060f037a4c33a7a8a5c20ef4ed6f0a0261385cf4ad7f8564da91da6358770d01
+  data.tar.gz: 658d390c292f958e6ea41ca29eb69262db05e3de447fa965150570cb586f5928bb02864f189596ae012369dd0d3b97938737d459e8b15a295f87af9d8f5aac87

data/config/locales/en.yml

@@ -32,3 +32,14 @@ en:
           webhook:
             url: URL
             token: Token
+  activemodel:
+    errors:
+      models:
+        qiita/team/services/hooks/slack_v2:
+          attributes:
+            webhook_url:
+              not_slack_url: is not a valid Slack hook url.
+        qiita/team/services/hooks/webhook:
+          attributes:
+            url:
+              invalid_scheme: must be a http or https url.

data/config/locales/ja.yml

@@ -33,3 +33,14 @@ ja:
           webhook:
             url: URL
             token: トークン
+  activemodel:
+    errors:
+      models:
+        qiita/team/services/hooks/slack_v2:
+          attributes:
+            webhook_url:
+              not_slack_url: は正しいSlack URLではありません。
+        qiita/team/services/hooks/webhook:
+          attributes:
+            url:
+              invalid_scheme: はhttpかhttpsでなければなりません。

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

@@ -8,7 +8,10 @@ module Qiita::Team::Services
 
       define_property :webhook_url
 
-      validates :webhook_url, presence: true
+      validates :webhook_url, presence: true,
+                              format: { with: %r{\Ahttps://hooks\.slack\.com},
+                                        message: :not_slack_url,
+                                        allow_blank: true }
 
       private
 

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

@@ -1,3 +1,4 @@
+require "activemodel-url_validator"
 require "securerandom"
 
 require "qiita/team/services/hooks/base"
@@ -11,7 +12,10 @@ module Qiita::Team::Services
       define_property :token
 
       validates :token, format: %r{\A[A-Za-z0-9+/=]{20,40}\z}
-      validates :url, presence: true
+      validates :url, presence: true,
+                      url: { scheme: ['http', 'https'],
+                             message: :invalid_scheme,
+                             allow_blank: true }
 
       # @note Override {Qiita::Team::Services::Hooks::Base.service_name}.
       def self.service_name

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

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

data/qiita_team_services.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activemodel-url_validator"
   spec.add_dependency "faraday", "~> 0.9"
   spec.add_dependency "faraday_middleware", "~> 0.10"
   spec.add_dependency "rails", "~> 4.2"

data/spec/hooks/chatwork_v1_spec.rb

@@ -34,7 +34,7 @@ describe Qiita::Team::Services::Hooks::ChatworkV1 do
     end
   end
 
-  let(:hook) do
+  subject(:hook) do
     described_class.new(properties)
   end
 

data/spec/hooks/hipchat_v1_spec.rb

@@ -27,7 +27,7 @@ describe Qiita::Team::Services::Hooks::HipchatV1 do
     end
   end
 
-  let(:hook) do
+  subject(:hook) do
     described_class.new(properties)
   end
 

data/spec/hooks/slack_v1_spec.rb

@@ -21,7 +21,7 @@ describe Qiita::Team::Services::Hooks::SlackV1 do
     end
   end
 
-  let(:hook) do
+  subject(:hook) do
     described_class.new(properties)
   end
 
@@ -51,5 +51,5 @@ describe Qiita::Team::Services::Hooks::SlackV1 do
   end
 
   it_behaves_like "hook"
-  it_behaves_like "Slack hook"
+  it_behaves_like "Slack hook", hook: :hook
 end

data/spec/hooks/slack_v2_spec.rb

@@ -21,7 +21,7 @@ describe Qiita::Team::Services::Hooks::SlackV2 do
     end
   end
 
-  let(:hook) do
+  subject(:hook) do
     described_class.new(properties)
   end
 
@@ -46,5 +46,25 @@ describe Qiita::Team::Services::Hooks::SlackV2 do
   end
 
   it_behaves_like "hook"
-  it_behaves_like "Slack hook"
+  it_behaves_like "Slack hook", hook: :hook
+
+  describe "#valid?" do
+    subject { hook.valid? }
+
+    context "when url starts with https://hooks.slack.com/" do
+      let(:webhook_url) do
+        "https://hooks.slack.com/services/foo/bar"
+      end
+
+      it { should be true }
+    end
+
+    context "when url does not start with https://hooks.slack.com/" do
+      let(:webhook_url) do
+        "http://hooks.slack.com/services/foo/bar"
+      end
+
+      it { should be false }
+    end
+  end
 end

data/spec/hooks/webhook_spec.rb

@@ -1,5 +1,5 @@
 describe Qiita::Team::Services::Hooks::Webhook, :versioning do
-  let(:hook) do
+  subject(:hook) do
     described_class.new(properties)
   end
 
@@ -462,4 +462,40 @@ describe Qiita::Team::Services::Hooks::Webhook, :versioning do
       expect(request).to have_been_made
     end
   end
+
+  describe "#valid?" do
+    subject { hook.valid? }
+
+    context "when url is http" do
+      let(:url) do
+        FFaker::Internet.uri(:http)
+      end
+
+      it { should be true }
+    end
+
+    context "when url is http" do
+      let(:url) do
+        FFaker::Internet.uri(:https)
+      end
+
+      it { should be true }
+    end
+
+    context "when url is ftp" do
+      let(:url) do
+        FFaker::Internet.uri(:ftp)
+      end
+
+      it { should be false }
+    end
+
+    context "when url is not a URI" do
+      let(:url) do
+        "example.com"
+      end
+
+      it { should be false }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
+require "faraday"
 require "ffaker"
 require "pry"
 require "webmock/rspec"
-require "faraday"
 require "qiita_team_services"
 
 Dir.glob("spec/support/{helpers,matchers}/*.rb").each do |filepath|

data/spec/support/helpers/slack_hook_helper.rb

@@ -29,7 +29,7 @@ module Qiita::Team::Services
       ].freeze
 
       included do
-        shared_examples "Slack hook" do
+        shared_examples "Slack hook" do |hook:|
           describe ".service_name" do
             subject do
               described_class.service_name
@@ -48,11 +48,11 @@ module Qiita::Team::Services
 
           describe "#ping" do
             subject do
-              hook.ping
+              send(hook).ping
             end
 
             it "sends message with proper attachments" do
-              expect(hook).to receive(:send_message) do |request_body|
+              expect(send(hook)).to receive(:send_message) do |request_body|
                 expect(request_body).to match_slack_attachments_request
               end.once
               subject
@@ -74,11 +74,11 @@ module Qiita::Team::Services
           EXPECTED_AVAILABLE_EVENT_NAMES.each do |event_name|
             describe "##{event_name}" do
               subject do
-                hook.public_send(event_name, public_send("#{event_name}_event"))
+                send(hook).public_send(event_name, public_send("#{event_name}_event"))
               end
 
               it "sends message with proper attachments" do
-                expect(hook).to receive(:send_message) do |request_body|
+                expect(send(hook)).to receive(:send_message) do |request_body|
                   expect(request_body).to match_slack_attachments_request
                 end.once
                 subject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qiita_team_services
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Yuku Takahashi
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel-url_validator
+  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'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement