add slack notifications for wiki pages

update changelog

11 files changed, 127 insertions, 6 deletions

diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 8b2577aebe1..739681f4085 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -6,7 +6,7 @@ class Projects::ServicesController < Projects::ApplicationController
                     :description, :issues_url, :new_issue_url, :restrict_to_branch, :channel,
                     :colorize_messages, :channels,
                     :push_events, :issues_events, :merge_requests_events, :tag_push_events,
-                    :note_events, :build_events,
+                    :note_events, :build_events, :wiki_page_events,
                     :notify_only_broken_builds, :add_pusher,
                     :send_from_committer_email, :disable_diffs, :external_wiki_url,
                     :notify, :color,
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index 9f3a4a69721..6ffcba8d906 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -44,7 +44,7 @@ class Projects::WikisController < Projects::ApplicationController
 
     return render('empty') unless can?(current_user, :create_wiki, @project)
 
-    if @page.update(content, format, message)
+    if @page = WikiPages::UpdateService.new(@project, current_user, wiki_params).execute(@page)
       redirect_to(
         namespace_project_wiki_path(@project.namespace, @project, @page),
         notice: 'Wiki was successfully updated.'
@@ -55,9 +55,9 @@ class Projects::WikisController < Projects::ApplicationController
   end
 
   def create
-    @page = WikiPage.new(@project_wiki)
+    @page = WikiPages::CreateService.new(@project, current_user, wiki_params).execute
 
-    if @page.create(wiki_params)
+    if @page
       redirect_to(
         namespace_project_wiki_path(@project.namespace, @project, @page),
         notice: 'Wiki was successfully updated.'
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb
index 7365e360de2..bc6e0f98c3c 100644
--- a/app/models/hooks/project_hook.rb
+++ b/app/models/hooks/project_hook.rb
@@ -25,4 +25,5 @@ class ProjectHook < WebHook
   scope :note_hooks, -> { where(note_events: true) }
   scope :merge_request_hooks, -> { where(merge_requests_events: true) }
   scope :build_hooks, -> { where(build_events: true) }
+  scope :wiki_page_hooks, ->  { where(wiki_page_events: true) }
 end
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index d89cf6d17b2..fd65027f084 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -60,7 +60,7 @@ class SlackService < Service
   end
 
   def supported_events
-    %w(push issue merge_request note tag_push build)
+    %w(push issue merge_request note tag_push build wiki_page)
   end
 
   def execute(data)
@@ -90,6 +90,8 @@ class SlackService < Service
         NoteMessage.new(data)
       when "build"
         BuildMessage.new(data) if should_build_be_notified?(data)
+      when "wiki_page"
+        WikiPageMessage.new(data)
       end
 
     opt = {}
@@ -133,3 +135,4 @@ require "slack_service/push_message"
 require "slack_service/merge_message"
 require "slack_service/note_message"
 require "slack_service/build_message"
+require "slack_service/wiki_page_message"
diff --git a/app/models/project_services/slack_service/wiki_page_message.rb b/app/models/project_services/slack_service/wiki_page_message.rb
new file mode 100644
index 00000000000..61134054859
--- /dev/null
+++ b/app/models/project_services/slack_service/wiki_page_message.rb
@@ -0,0 +1,53 @@
+class SlackService
+  class WikiPageMessage < BaseMessage
+    attr_reader :user_name
+    attr_reader :title
+    attr_reader :project_name
+    attr_reader :project_url
+    attr_reader :wiki_page_url
+    attr_reader :action
+    attr_reader :description
+
+    def initialize(params)
+      @user_name = params[:user][:name]
+      @project_name = params[:project_name]
+      @project_url = params[:project_url]
+
+      obj_attr = params[:object_attributes]
+      obj_attr = HashWithIndifferentAccess.new(obj_attr)
+      @title = obj_attr[:title]
+      @wiki_page_url = obj_attr[:url]
+      @description = obj_attr[:content]
+
+      @action = \
+        case obj_attr[:action]
+        when "create"
+          "created"
+        when "update"
+          "edited"
+        end
+    end
+
+    def attachments
+      description_message
+    end
+
+    private
+
+    def message
+      "#{user_name} #{action} #{wiki_page_link} in #{project_link}: *#{title}*"
+    end
+
+    def description_message
+      [{ text: format(@description), color: attachment_color }]
+    end
+
+    def project_link
+      "[#{project_name}](#{project_url})"
+    end
+
+    def wiki_page_link
+      "[wiki page](#{wiki_page_url})"
+    end
+  end
+end
diff --git a/app/models/service.rb b/app/models/service.rb
index 721273250ea..2645b8321d7 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -32,6 +32,7 @@ class Service < ActiveRecord::Base
   default_value_for :tag_push_events, true
   default_value_for :note_events, true
   default_value_for :build_events, true
+  default_value_for :wiki_page_events, true
 
   after_initialize :initialize_properties
 
@@ -53,6 +54,7 @@ class Service < ActiveRecord::Base
   scope :merge_request_hooks, -> { where(merge_requests_events: true, active: true) }
   scope :note_hooks, -> { where(note_events: true, active: true) }
   scope :build_hooks, -> { where(build_events: true, active: true) }
+  scope :wiki_page_hooks, -> { where(wiki_page_events: true, active: true) }
 
   default_value_for :category, 'common'
 
@@ -94,7 +96,7 @@ class Service < ActiveRecord::Base
   end
 
   def supported_events
-    %w(push tag_push issue merge_request)
+    %w(push tag_push issue merge_request wiki_page)
   end
 
   def execute(data)
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 526760779a4..3d5fd9d3ee9 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -29,6 +29,10 @@ class WikiPage
   # new Page values before writing to the Gollum repository.
   attr_accessor :attributes
 
+  def hook_attrs
+    attributes
+  end
+
   def initialize(wiki, page = nil, persisted = false)
     @wiki       = wiki
     @page       = page
diff --git a/app/services/wiki_pages/base_service.rb b/app/services/wiki_pages/base_service.rb
new file mode 100644
index 00000000000..e4c0506e20c
--- /dev/null
+++ b/app/services/wiki_pages/base_service.rb
@@ -0,0 +1,26 @@
+module WikiPages
+  class BaseService < ::BaseService
+
+    def hook_data(page, action)
+      hook_data = {
+        object_kind: page.class.name.underscore,
+        user: current_user.hook_attrs,
+        project: @project.hook_attrs,
+        object_attributes: page.hook_attrs,
+        # DEPRECATED
+        repository: @project.hook_attrs.slice(:name, :url, :description, :homepage)
+      }
+      page_url = "#{Gitlab.config.gitlab.url}#{@project.wiki.wiki_base_path}/#{page.slug}"
+      hook_data[:object_attributes].merge!(url: page_url, action: action)
+      hook_data
+    end
+
+    private
+
+    def execute_hooks(page, action = 'create')
+      page_data = hook_data(page, action)
+      @project.execute_hooks(page_data, :wiki_page_hooks)
+      @project.execute_services(page_data, :wiki_page_hooks)
+    end
+  end
+end
diff --git a/app/services/wiki_pages/create_service.rb b/app/services/wiki_pages/create_service.rb
new file mode 100644
index 00000000000..988c663b9d0
--- /dev/null
+++ b/app/services/wiki_pages/create_service.rb
@@ -0,0 +1,13 @@
+module WikiPages
+  class CreateService < WikiPages::BaseService
+    def execute
+      page = WikiPage.new(@project.wiki)
+
+      if page.create(@params)
+        execute_hooks(page, 'create')
+      end
+
+      page
+    end
+  end
+end
diff --git a/app/services/wiki_pages/update_service.rb b/app/services/wiki_pages/update_service.rb
new file mode 100644
index 00000000000..8f6a50da838
--- /dev/null
+++ b/app/services/wiki_pages/update_service.rb
@@ -0,0 +1,11 @@
+module WikiPages
+  class UpdateService < WikiPages::BaseService
+    def execute(page)
+      if page.update(@params[:content], @params[:format], @params[:message])
+        execute_hooks(page, 'update')
+      end
+
+      page
+    end
+  end
+end
diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml
index fc935166bf6..4eaf7c2a025 100644
--- a/app/views/shared/_service_settings.html.haml
+++ b/app/views/shared/_service_settings.html.haml
@@ -62,6 +62,14 @@
               %strong Build events
             %p.light
               This url will be triggered when a build status changes
+      - if @service.supported_events.include?("wiki_page")
+        %div
+          = form.check_box :wiki_page_events, class: 'pull-left'
+          .prepend-left-20
+            = form.label :wiki_page_events, class: 'list-label' do
+              %strong Wiki Page events
+            %p.light
+              This url will be triggered when a wiki page is created/updated
 
 
 - @service.fields.each do |field|