homeland-wiki 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8efe19f3119e5867c24bc768eb200e44fedcd984
-  data.tar.gz: 94f9232944ad2e7f08a25de1faf0b4b677111444
+  metadata.gz: 33c85fe4edab99469bbd84cb946d85b3769a87d1
+  data.tar.gz: ef6028d5cddedb8320de340163defb3b1c23f56c
 SHA512:
-  metadata.gz: ab76466efa368b108ba4f8d96d41bf48ceb6cafaa2b9f32971f4d9dc89283663a7bcfda852462756cd01ed47ef3bb75da1f7a431b1ee9d00742053239c49465d
-  data.tar.gz: '087f335fd8666bba63cfeabd7e823f70f9eeab58b647f719a5b659bd2be3aca8dd6d5dd09184317f018b3d3a3e461f09b827dcc86924ffe1b03b64dc00db8daf'
+  metadata.gz: d6a81401716122682d49dd9de3664005bcb632c395f0b94ef46013a59298eca944209521f9566b48976a41f5b258fafb7570c8432c9be83ea935a78531ff7a00
+  data.tar.gz: 725e9074db67ce09237f681ebc846f2eab2a2e2ddfa2ebf06a0700c14d3064ef264d1569094c5be80dc30ec2169268204179a0a2b8eb86968e7d7e651f183934

data/app/controllers/homeland/wiki/application_controller.rb

@@ -1,5 +1,9 @@
 module Homeland::Wiki
   class ApplicationController < ::ApplicationController
     helper ApplicationHelper
+
+    def current_ability
+      @current_ability ||= Homeland::Wiki::Ability.new(current_user)
+    end
   end
 end

data/app/controllers/homeland/wiki/pages_controller.rb

@@ -1,7 +1,6 @@
 module Homeland::Wiki
   class PagesController < Homeland::Wiki::ApplicationController
     require_module_enabled! :wiki
-    authorize_resource :page
     before_action :set_page, only: [:show, :edit, :update, :destroy, :comments]
 
     etag { Setting.wiki_sidebar_html }
@@ -35,6 +34,8 @@ module Homeland::Wiki
     end
 
     def new
+      authorize! :create, Page
+
       @page = Page.new
       @page.slug = params[:title]
       respond_to do |format|
@@ -44,9 +45,12 @@ module Homeland::Wiki
     end
 
     def edit
+      authorize! :edit, @page
     end
 
     def create
+      authorize! :create, Page
+
       @page = Page.new(page_params)
       @page.user_id = current_user.id
       @page.version_enable = true
@@ -59,6 +63,8 @@ module Homeland::Wiki
     end
 
     def update
+      authorize! :update, @page
+
       @page.version_enable = true
       @page.user_id = current_user.id
 

data/app/models/homeland/wiki/ability.rb

@@ -6,15 +6,21 @@ module Homeland::Wiki
 
     def initialize(u)
       @user = u
-      return roles_for_create_wiki if @user.present? && (@user.roles?(:admin) || @user.roles?(:wiki_editor))
-      roles_for_anonymous
+      if @user.blank?
+        roles_for_anonymous
+      elsif @user.roles?(:admin)
+        can :manage, Page
+      elsif @user.roles?(:wiki_editor)
+        roles_for_wiki_editor
+      else
+        roles_for_anonymous
+      end
     end
 
     protected
 
-    def roles_for_create_wiki
+    def roles_for_wiki_editor
       can :create, Page
-      can :edit, Page, locked: false
       can :update, Page, locked: false
     end
 

data/lib/homeland/wiki/version.rb

@@ -2,6 +2,6 @@ module Homeland
   module Wiki
     NAME    = 'wiki'
     DESCRIPTION = 'Display Wiki channel in navbar for wike pages.'
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homeland-wiki
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Griffin Qiu