notee 0.4.0 → 1.0.0

data/app/models/notee/category.rb

@@ -12,10 +12,11 @@
 #
 
 module Notee
-  class Category < ActiveRecord::Base
+  class Category < ApplicationRecord
+
     # callbacks
     before_save :set_slug
-    before_destroy :protect_default
+    before_save :protect_default
 
     # relations
     has_many :children, class_name: Notee::Category, foreign_key: 'parent_id', dependent: :destroy
@@ -29,5 +30,17 @@ module Notee
     def protect_default
       return false if self.id == 1
     end
+
+    def self.before_destroy_parent(id)
+      @child_with_parent =Category.where(parent_id: id)
+
+      Category.skip_callback(:update, :before, :update_authority)
+      Category.skip_callback(:update, :before, :destroy_authority)
+      @child_with_parent.each do |child|
+        child.update(parent_id: nil)
+      end
+      Category.set_callback(:update, :before, :update_authority)
+      Category.set_callback(:update, :before, :destroy_authority)
+    end
   end
 end

data/app/models/notee/comment.rb

@@ -1,5 +1,11 @@
 module Notee
   class Comment < ActiveRecord::Base
+
+    # scopes
+    scope :trash, -> { where(is_deleted: true) }
+    scope :time_limit, -> { where('updated_at <= ?', Time.current - 60*60*24*30) }
+
+    # validates
     validates :post_id, presence: true
     validates :content, presence: true
   end

data/app/models/notee/image.rb

@@ -11,13 +11,13 @@
 require 'securerandom'
 
 module Notee
-  class Image < ActiveRecord::Base
+  class Image < ApplicationRecord
     # accessors
     attr_accessor :file
 
     # callbacks
     before_save :manage_image
-    before_destroy :protect_default
+    before_save :protect_default
 
     private
 

data/app/models/notee/post.rb

@@ -17,20 +17,25 @@
 #
 
 module Notee
-  class Post < ActiveRecord::Base
+  class Post < ApplicationRecord
     # callbacks
     before_create :set_title
     before_create :set_slug
+
     before_save :set_published_at
-    before_save :check_role
 
     # relations
+    belongs_to :user
     belongs_to :category
     belongs_to :thumbnail, class_name: Notee::Image, foreign_key: 'thumbnail_id'
 
     # accessors
     attr_accessor :editor_id
 
+    def set_user_id
+      self.user_id = Authority.get_user_id
+    end
+
     private
 
     def set_title
@@ -48,8 +53,5 @@ module Notee
       end
     end
 
-    def check_role
-
-    end
   end
 end

data/app/models/notee/user.rb

@@ -1,74 +1,130 @@
 module Notee
-  class User < ActiveRecord::Base
-    # enums
-    enum role: { writer: 0, editor: 10, manager: 20, suspended: 99 }
-
-    # writer
-    # - create: 	posts, categories, images
-    # - update: 	my posts, my user
-    # - delete: 	my posts (Logical delete)
-
-    # editor
-    # - create: 	posts, categories, images
-    # - update: 	posts, categories, images, my user
-    # - delete: 	posts, categories, images (Logical delete)
+  class User < ApplicationRecord
 
-    # manager
-    # - create: 	posts, categories, images, users
-    # - update: 	posts, categories, images, users
-    # - delete: 	posts, categories, images, users (Logical delete)
+    # relations
+    has_many :posts
 
-    # suspended
-    # all none
-
-    # root
-    # all
+    # enums
+    enum role: { writer: 0, editor: 10, manager: 20, root: 9999 }
 
     # accessors
     attr_accessor :file
+    attr_accessor :now_password
     attr_accessor :password
     attr_accessor :password_confirm
     attr_accessor :editor_id
 
     # callback
-    before_save :confirm_password
-    before_save :encrypt_password
+    before_create :confirm_password
+    before_create :encrypt_password
+    before_update :confirm_password, if: :has_password?  # 1
+    before_update :encrypt_password, if: :has_password?  # 2
+    before_update :set_user_id_to_root, if: :is_destroy?
+    before_update :restrict_change_own_role
     before_save :manage_profile_img
 
-    def sign_in(name_or_email, password)
-      user = find_by(name: name_or_email)
-      user = find_by(email: name_or_email) unless user
-      return false unless user
-      return false unless user.encrypted_password == encrypt(password)
+    # constants
+    SECURE = 'SOFHGPOIJERPGOKSPDO2SPTI4RJ6POIFDJVS7ETJ1EITJHSPEKMVOEIGU'
+    CIPHER = 'aes-256-cbc'
 
-      user
+    def update_password(params)
+      return false unless params[:now_password] == User.decrypt(self.encrypted_password)
+      return false unless params[:password] == params[:password_confirm]
+      self.update(params)
     end
 
     def encrypt(password)
-      OpenSSL::Digest::MD5.hexdigest(password)
+      crypt = ActiveSupport::MessageEncryptor.new(SECURE, CIPHER)
+      crypt.encrypt_and_sign(password)
     end
 
-    def confirm_password
-      return false unless password == password_confirm
+    def self.decrypt(password)
+      crypt = ActiveSupport::MessageEncryptor.new(SECURE, CIPHER)
+      crypt.decrypt_and_verify(password)
     end
 
-    def encrypt_password
-      self.encrypted_password = encrypt(password)
+    def self.sign_in(name_or_email, password)
+
+      # root-user login
+      if Notee.notee_id == name_or_email && Notee.notee_password == password
+        return root_user_setting
+      end
+
+      # other-user login
+      user = not_trash.find_by(name: name_or_email)
+      user = not_trash.find_by(email: name_or_email) unless user
+      return false unless user
+      return false if user.id == 0 # root_user
+      return false unless password == decrypt(user.encrypted_password)
+
+      user_setting(user)
+    end
+
+    def self.user_setting(user)
+      if token = Token.create!(user_id: user.id)
+        Thread.current[:request].session[:access_token] = token.access_token
+      end
+    end
+
+    def self.root_user_setting
+      unless User.exists?(id: 0)
+        User.skip_callback(:create, :before, :create_authority)
+        User.create(id: 0, name: Notee.notee_id, email: "root", password: SecureRandom.hex, role: 9999)
+        User.set_callback(:create, :before, :create_authority)
+      end
+
+      if token = Token.create!(user_id: 0)
+        Thread.current[:request].session[:access_token] = token.access_token
+      end
+    end
+
+    private
+
+    def restrict_change_own_role
+      now_user = Token.find_by_access_token(Thread.current[:request].session[:access_token]).user
+      self.role = now_user.role if self.id == now_user.id
     end
 
     def manage_profile_img
-      return unless file
-      return if User.exists?(profile_img: file)
+      return unless self.file.present?
 
-      image_dir = Rails.root.to_s + '/public/notee/profile/'
+      image_dir = Rails.root.to_s + "/public/notee/profile/"
       FileUtils.mkdir_p(image_dir) unless FileTest.exist?(image_dir)
       image_name = Time.now.strftime('%Y%m%d%H%M%S') + '--' + SecureRandom.uuid + '.jpg'
+
+      return if User.exists?(profile_img: image_name)
+
       transaction do
-        open(image_dir + '/' + image_name, 'wb') do |output|
-          output.write(file.read)
+        open(image_dir + "/" + image_name, 'wb') do |output|
+          output.write(self.file.read)
+        end
+        self.profile_img = image_name
+      end
+    end
+
+    def set_user_id_to_root
+      posts = Post.where(user_id: self.id)
+
+      Post.skip_callback(:update, :before, :destroy_authority)
+      Post.transaction do
+        posts.each do |post|
+          post.update(user_id: 0)
         end
       end
-      self.profile_img = image_name
+      Post.set_callback(:update, :before, :destroy_authority)
+
+    end
+
+    def confirm_password
+      return false unless password == password_confirm
+    end
+
+    def encrypt_password
+      self.encrypted_password = encrypt(self.password)
+    end
+
+    def has_password?
+      self.password.present?
     end
   end
 end

data/app/views/layouts/notee/application.html.erb

@@ -3,7 +3,9 @@
 <head>
   <title>Notee</title>
   <%= stylesheet_link_tag    "notee/application", media: "all" %>
-  <%= javascript_include_tag "notee/application" %>
+  <% unless new_token_path == "/notee" + request.path_info %>
+    <%= javascript_include_tag "notee/application" %>
+  <% end %>
   <%= favicon_link_tag(asset_path "favicon.ico") %>
   <%= csrf_meta_tags %>
 </head>

data/config/routes.rb

@@ -2,25 +2,35 @@ Notee::Engine.routes.draw do
 
   root to: 'notees#index'
 
-  get 'new'             => 'notees#index'
-  get 'edit/:id'        => 'notees#index'
-  get 'categories'      => 'notees#index'
-  get 'images'          => 'notees#index'
-  get 'comments'        => 'notees#index'
-  get 'users'           => 'notees#index'
-  get 'users/new'       => 'notees#index'
-  get 'users/edit/:id'  => 'notees#index'
+  get 'posts'                 => 'notees#index'
+  get 'posts/new'             => 'notees#index'
+  get 'posts/edit/:id'        => 'notees#index'
+  get 'categories'            => 'notees#index'
+  get 'categories/edit/:id'   => 'notees#index'
+  get 'images'                => 'notees#index'
+  get 'comments'              => 'notees#index'
+  get 'users'                 => 'notees#index'
+  get 'users/new'             => 'notees#index'
+  get 'users/edit/:id'        => 'notees#index'
+  get 'trashes'               => 'notees#index'
+  get 'trashes/:model'        => 'notees#index'
+  get 'mypage'                => 'notees#index'
+  get 'mypage/edit'           => 'notees#index'
+  get 'mypage/edit/password'  => 'notees#index'
 
   # post 'secret_published' => 'notees#secret_published'
   resources :tokens, only: [:new, :create, :destroy]
 
   scope :api, { format: 'json' } do
     resources :posts, only: [:index, :show, :create, :update, :destroy]
+    get 'users/mypage' => 'users#mypage'
+    put 'users/mypage' => 'users#update_password'
     resources :users, only: [:index, :show, :create, :update, :destroy]
     resources :images, only: [:index, :show, :create, :destroy]
     resources :categories, only: [:index, :show, :create, :update, :destroy]
     resources :statuses, only: [:index, :show]
-    resources :comments, only: [:index, :show, :create, :update, :delete]
+    resources :comments, only: [:index, :show, :create, :update, :destroy]
     resources :roles, only: [:index, :show]
+    resources :trashes, only: [:index, :update]
   end
 end

data/db/migrate/20160605141437_create_notee_posts.rb

@@ -12,6 +12,7 @@ class CreateNoteePosts < ActiveRecord::Migration
       t.integer :thumbnail_id, default: 0
       t.datetime :published_at
       t.integer :user_id
+      t.boolean :is_deleted, null: false, default: false
 
       # seo
       t.string  :seo_keyword, default: ""

data/db/migrate/20160605141510_create_notee_categories.rb

@@ -5,9 +5,10 @@ class CreateNoteeCategories < ActiveRecord::Migration
     create_table :notee_categories do |t|
 
       t.string  :name, null: false, default: "category_name"
-      t.string  :slug, null: false, uniqueness: true
+      t.string  :slug, uniqueness: true
       t.integer :parent_id
       t.boolean :is_private, null: false, default: false
+      t.boolean :is_deleted, null: false, default: false
 
       t.timestamps null: false
     end
@@ -15,6 +16,8 @@ class CreateNoteeCategories < ActiveRecord::Migration
     add_index :notee_categories, :slug, :unique => true
 
     # create default category
+    Notee::Category.skip_callback(:create, :before, :create_authority)
     Notee::Category.create :name => 'No_Category'
+    Notee::Category.set_callback(:create, :before, :create_authority)
   end
 end

data/db/migrate/20160605141547_create_notee_images.rb

@@ -5,6 +5,7 @@ class CreateNoteeImages < ActiveRecord::Migration
     create_table :notee_images do |t|
 
       t.string :content, null: false, uniqueness: true
+      t.boolean :is_deleted, null: false, default: false
 
       # if you have user_id
       # t.integer :user_id
@@ -13,8 +14,9 @@ class CreateNoteeImages < ActiveRecord::Migration
     end
 
     # create default image
-    default_image = Notee::Image.create :content => 'aa'
-    default_image.update_column("content", "default.png")
+    Notee::Image.skip_callback(:create, :before, :create_authority)
+    Notee::Image.create :content => 'default.png'
+    Notee::Image.set_callback(:create, :before, :create_authority)
   end
 
 end

data/db/migrate/20160803154954_create_notee_comments.rb

@@ -5,7 +5,8 @@ class CreateNoteeComments < ActiveRecord::Migration
       t.text :content
       t.string :name
       t.string :email
-      t.boolean :is_hidden
+      t.boolean :is_hidden, null: false, default: false
+      t.boolean :is_deleted, null: false, default: false
 
       t.timestamps
     end

data/db/migrate/20160809145754_create_notee_users.rb

@@ -7,6 +7,7 @@ class CreateNoteeUsers < ActiveRecord::Migration
       t.text :profile
       t.string :profile_img
       t.integer :role, null: false
+      t.boolean :is_deleted, null: false, default: false
 
       t.timestamps null: false
     end

data/lib/notee/helpers/notee_helper.rb

@@ -4,76 +4,89 @@ module Notee
 
       def notee(search_txt)
         return false unless search_txt
-        @notee = Notee::Post.find_by(id: search_txt)
-        @notee = Notee::Post.find_by(slug: search_txt) unless @notee
+        post = Notee::Post.find_by(id: search_txt)
+        post = Notee::Post.find_by(slug: search_txt) unless post
 
-        return if @notee.status == Notee::STATUS[:draft] ||
-                  @notee.status == Notee::STATUS[:deleted] ||
-                  @notee.status == Notee::STATUS[:privated]
-        @notee
+        return if post.status == Notee::STATUS[:draft] ||
+                  post.status == Notee::STATUS[:deleted] ||
+                  post.status == Notee::STATUS[:privated] ||
+                  post.is_deleted == true
+        post
       end
 
-      def notees(search_txt = 'all')
-        @notees = []
 
-        if search_txt == 'all'
-          # all_notees
-          @notees = Notee::Post.where(status: Notee::STATUS[:published]).order(published_at: :desc)
-        else
-          # search_by_category_slug
-          category_id = Notee::Category.find_by(slug: search_txt)
-          category_id = Notee::Category.find_by(name: search_txt) unless category_id
-          return false unless category_id
+      def notees
+        @posts = Notee::Post.where(status: Notee::STATUS[:published], is_deleted: false).order(published_at: :desc)
+        @posts
+      end
+
+
+      def category_notees(search_txt)
+        # search_by_category_slug
+        category = Notee::Category.find_by(slug: search_txt)
+        category = Notee::Category.find_by(name: search_txt) unless category
+        return false unless category
+        return false if category.is_deleted
+
+        @posts = Notee::Post.where(category_id: category.id, status: Notee::STATUS[:published], is_deleted: false).order(published_at: :desc)
+        @posts
+      end
+
 
-          @notees = Notee::Post.where(category_id: category_id, status: Notee::STATUS[:published]).order(published_at: :desc)
+      def archive_notees(year, month)
+        if month
+          tmp_month = (month.to_s.size != 2 ? "0" : "") + month.to_s
+          tmp_date = year.to_s + tmp_month + "01"
+          begin_time = Date.parse(tmp_date).beginning_of_month
+          end_time = Date.parse(tmp_date).end_of_month
+        else
+          tmp_date = year.to_s + "0101"
+          begin_time = Date.parse(tmp_date).beginning_of_year
+          end_time = Date.parse(tmp_date).end_of_year
         end
 
-        @notees
+        @posts = Notee::Post.where(published_at: begin_time..end_time).order(published_at: :desc)
+        @posts
       end
 
-      # TODO: secret_mode
-      # def secret_notees
-      #   @notees = Notee::Post.where(status: Notee::STATUS[:secret_published]).order(published_at: :desc)
-      # end
 
-      def notee_categories(sort = nil)
-        @notee_categories = Notee::Category.all.order(created_at: :desc)
+      def writer_notees(name_or_id)
+        writer = Notee::User.find_by(name: name_or_id)
+        writer = Notee::User.find_by(name: name_or_id) unless writer
+        return false unless writer
+        return false if writer.is_deleted
+
+        @posts = writer.posts
+      end
 
-        case sort
-          when 'alphabetal'
-            @notee_categories = @notee_categories.sort
-          when 'size'
-            @notee_categories = @notee_categories.sort_by {|category| category.name.size }
-        end
 
-        @notee_categories
+      def notee_categories
+        # DATA: {notee.category.name, notee.count}
+        Notee::Post.find_by_sql("SELECT category_id as category_id, count(*) as count FROM notee_posts WHERE notee_posts.status=1 and notee_posts.is_deleted=false GROUP BY category_id;")
       end
 
-      def notee_archives(year, month)
-        start_date = Date.new(year, month, 1)
-        end_date = Date.new(year, month, -1)
-        @notee_archives = Notee::Post.where(status: Notee::STATUS[:published], :published_at => start_date...end_date)
 
-        @notee_archives
+      def notee_archives
+        # DATA: {notee.time, notee.count}
+        Notee::Post.find_by_sql("SELECT DATE_FORMAT(published_at, '%Y-%m') as time, count(*) as count FROM notee_posts WHERE status=1 and is_deleted=false GROUP BY DATE_FORMAT(published_at, '%Y-%m') ORDER BY time DESC;")
       end
 
-      def notee_archives_menu(type = nil)
-        case type
-          when 'year'
-            return Notee::Post.where(status: Notee::STATUS[:published]).group('year(published_at)').count
-          when 'month'
-            return Notee::Post.where(status: Notee::STATUS[:published]).group('year(published_at)').group('month(published_at)').count
-          else
-            return Notee::Post.where(status: Notee::STATUS[:published]).group('year(published_at)').group('month(published_at)').count
-        end
+
+      def notee_writers
+        users = Notee::User.where(is_deleted: false)
+        writers = users.select { |user| user if user.posts.count > 0 }.map { |user| user }
+
+        writers
       end
 
+
       def notee_comments(id)
         return if id.nil?
-        @notee_comments = Notee::Post.where(post_id: id)
+        @notee_comments = Notee::Comment.where(post_id: id, is_hidden: false, is_deleted: false)
         @notee_comments
       end
 
+
       def notee_set_meta_by_post(post)
         return {
             title: post.title,
@@ -82,6 +95,12 @@ module Notee
             og_image: request.base_url + "/notee/" + post.thumbnail.content
         }
       end
+
+
+      # TODO: secret_mode
+      # def secret_notees
+      #   @notees = Notee::Post.where(status: Notee::STATUS[:secret_published]).order(published_at: :desc)
+      # end
     end
   end
 end