剥离记事本成为独立插件 homeland-note

Gemfile

@@ -122,6 +122,7 @@ gem 'bundler-audit', require: false
 gem 'homeland-press'
 gem 'homeland-jobs'
 gem 'homeland-wiki'
+gem 'homeland-note'
 
 gem 'sdoc', '1.0.0.rc1'
 

Gemfile.lock

@@ -164,9 +164,11 @@ GEM
     hiredis (0.6.1)
     homeland-jobs (0.1.1)
       rails (~> 5)
+    homeland-note (0.1.2)
+      rails (~> 5)
     homeland-press (0.3.3)
       rails (~> 5)
-    homeland-wiki (0.2.2)
+    homeland-wiki (0.3.0)
       rails (~> 5)
     html-pipeline (2.5.0)
       activesupport (>= 2)
@@ -449,6 +451,7 @@ DEPENDENCIES
   font-awesome-rails
   hiredis
   homeland-jobs
+  homeland-note
   homeland-press
   homeland-wiki
   html-pipeline

PLUGIN_DEV.md

@@ -29,7 +29,7 @@ module Homeland
 
       initializer 'homeland.foo.init' do |app|
         # 确定应用 config.modules 启用了 foo，才开启
-        return unless Setting.has_module?(:foo)
+        next unless Setting.has_module?(:foo)
         # 注册 Homeland Plugin
         Homeland.register_plugin do |plugin|
           # 插件名称，应用 Ruby 的变量命名风格，例如 foo_bar

app/assets/javascripts/app.coffee

@@ -21,7 +21,6 @@
 #= require action_cable
 #= require form_storage
 #= require topics
-#= require notes
 #= require editor
 #= require toc
 #= require turbolinks
@@ -57,14 +56,7 @@ AppView = Backbone.View.extend
     if $('body').data('controller-name') in ['topics', 'replies']
       window._topicView = new TopicView({parentView: @})
 
-    if $('body').data('controller-name') in ['pages']
-      window._pageView = new PageView({parentView: @})
-
-    if $('body').data('controller-name') in ['notes']
-      window._noteView = new NoteView({parentView: @})
-
-    if $('body').data('controller-name') in ['topics', 'pages']
-      window._tocView = new TOCView({parentView: @})
+    window._tocView = new TOCView({parentView: @})
 
   initComponents: () ->
     $("abbr.timeago").timeago()

app/assets/stylesheets/front.scss

@@ -5,7 +5,6 @@
  *= require notifications
  *= require home
  *= require users
- *= require notes
  *= require teams
  *= require search
  *= require toc

app/controllers/users/user_actions.rb

@@ -4,7 +4,7 @@ module UserActions
 
     included do
       before_action :authenticate_user!, only: [:block, :unblock, :blocked, :follow, :unfollow]
-      before_action :only_user!, only: [:topics, :replies, :favorites, :notes,
+      before_action :only_user!, only: [:topics, :replies, :favorites,
                                         :block, :unblock, :follow, :unfollow,
                                         :followers, :following, :calendar, :reward]
     end
@@ -24,11 +24,6 @@ def favorites
       @topics = @topics.page(params[:page])
     end
 
-    def notes
-      @notes = @user.notes.published.recent
-      @notes = @notes.page(params[:page])
-    end
-
     def block
       current_user.block_user(@user.id)
       render json: { code: 0 }

app/helpers/topics_helper.rb

@@ -52,4 +52,8 @@ def topic_close_tag(topic)
     return '' unless topic.closed?
     content_tag(:i, '', title: '问题已解决／话题已结束讨论', class: 'fa fa-check', data: { toggle: 'tooltip' })
   end
+
+  def render_node_name(name, id)
+    link_to(name, node_topics_path(id), class: 'node')
+  end
 end

app/models/ability.rb

@@ -22,7 +22,6 @@ def initialize(u)
   def roles_for_members
     roles_for_topics
     roles_for_replies
-    roles_for_notes
     roles_for_comments
     roles_for_photos
     roles_for_sites
@@ -62,12 +61,6 @@ def current_lock_reply?
     Time.zone.now.hour > 22 || Time.zone.now.hour < 9
   end
 
-  def roles_for_notes
-    can :create, Note
-    can [:update, :destroy, :read], Note, user_id: user.id
-    can :read, Note, publish: true
-  end
-
   def roles_for_photos
     can :tiny_new, Photo
     can :create, Photo
@@ -105,11 +98,9 @@ def roles_for_team_users
   def basic_read_only
     can [:read, :feed, :node], Topic
     can [:read, :reply_to], Reply
-    can :preview, Note
     can :read, Photo
     can :read, Site
     can :read, Section
-    can :read, Node
     can :read, Comment
     can :read, Team
   end

app/models/user.rb

@@ -24,7 +24,6 @@ class User < ApplicationRecord
   mount_uploader :avatar, AvatarUploader
 
   has_many :topics, dependent: :destroy
-  has_many :notes
   has_many :replies, dependent: :destroy
   has_many :authorizations, dependent: :destroy
   has_many :notifications, dependent: :destroy

app/views/admin/home/index.html.erb

@@ -71,18 +71,6 @@
       </div>
     </div>
 
-    <div class="col-sm-3" id="note-stat">
-      <div class="stat">
-        <div class="total">0</div>
-        <div class="name">
-          记事本总数
-          <span class="total-week" rel="twipsy" title="本周新增">+0</span>
-          <span class="total-month" rel="twipsy" title="本月新增">+0</span>
-        </div>
-      </div>
-    </div>
-
-
 
     <div class="col-sm-3" id="photo-stat">
       <div class="stat">

app/views/devise/menu/_registration_items.html.erb

@@ -1,10 +1,9 @@
 <% if user_signed_in? %>
 你好 <strong><a href="<%= user_path(current_user.login)%>"><%= current_user.login %></a></strong>,
 <% if not params[:controller].match(/admin/) %>
-  <a href="<%= notes_path %>">记事本</a> | 
   <%= link_to('设置', setting_path) %> |
   <% if admin? current_user %><a href="/admin">后台</a> | <% end %>
 <% end %>
 <% else %>
-  <%= link_to('加入社区', new_user_registration_path)  %>  
+  <%= link_to('加入社区', new_user_registration_path)  %>
 <% end %>