notee 1.0.7 → 1.0.8

data/db/migrate/20160809145754_create_notee_users.rb

@@ -12,6 +12,11 @@ class CreateNoteeUsers < ActiveRecord::Migration
       t.timestamps null: false
     end
 
+    # create root User
+    Notee::User.skip_callback(:create, :before, :create_authority)
+    Notee::User.create(id: 0, name: Notee.notee_id, email: "root", password: SecureRandom.hex, role: 9999)
+    Notee::User.set_callback(:create, :before, :create_authority)
+
     add_index :notee_users, [:name, :email], :unique => true
   end
 end

data/lib/notee/helpers/notee_helper.rb

@@ -7,6 +7,8 @@ module Notee
         post = Notee::Post.find_by(id: search_txt)
         post = Notee::Post.find_by(slug: search_txt) unless post
 
+        raise ActiveRecord::RecordNotFound unless post
+
         return if post.status == Notee::STATUS[:draft] ||
                   post.status == Notee::STATUS[:deleted] ||
                   post.status == Notee::STATUS[:privated] ||
@@ -25,8 +27,9 @@ module Notee
         # 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
+
+        raise ActiveRecord::RecordNotFound unless category
+        raise ActiveRecord::RecordNotFound if category.is_deleted
 
         @posts = Notee::Post.where(category_id: category.id, status: Notee::STATUS[:published], is_deleted: false).order(published_at: :desc)
         @posts
@@ -53,8 +56,9 @@ module Notee
       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
+
+        raise ActiveRecord::RecordNotFound unless writer
+        raise ActiveRecord::RecordNotFound if writer.is_deleted
 
         @posts = writer.posts
       end

data/lib/notee/version.rb

@@ -1,3 +1,3 @@
 module Notee
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/lib/tasks/config/notee.rb

@@ -1,6 +1,6 @@
 require 'notee'
 
-# Recommendation using .env for manage id & password
+# Recommendation using .env
 
 Notee.configure do |config|
 

data/lib/tasks/controllers/errors_controller.rb

@@ -0,0 +1,23 @@
+class ErrorsController < ActionController::Base
+  layout 'notee_application'
+
+  rescue_from ActiveRecord::RecordNotFound, with: :resque404
+  rescue_from ActionController::RoutingError, with: :resque404
+  rescue_from StandardError, with: :resque500
+
+  def resque404(exception = nil)
+    if exception
+      logger.info "Rendering 404 with exception: #{exception.message}"
+    end
+    render template: "notee/errors/not_found", status: 404
+  end
+
+  def resque500(exception = nil)
+    if exception
+      logger.info "Rendering 500 with exception: #{exception.message}"
+    end
+    render template: "notee/errors/internal_server_error", status: 500
+  end
+
+  def show; raise env["action_dispatch.exception"]; end
+end

data/lib/tasks/controllers/notee_controller.rb

@@ -1,4 +1,5 @@
 class NoteeController < ApplicationController
+  layout 'notee_application'
 
   before_action :set_meta_info, except: [:show]
 

data/lib/tasks/notee_tasks.rake

@@ -3,17 +3,9 @@ namespace :notee do
   require 'fileutils'
 
 
-  APPLICATION_ERB_PATH = "/app/views/layouts/application.html.erb"
-  ADD_META_TXT = <<-EOC
-
-    <!-- default notee setting -->
-
-    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-
-    <!-- notee setting end -->
-
-  EOC
-
+  # -----------------------------------------------
+  # Constants
+  # -----------------------------------------------
 
   APPLICATION_JS_PATH = "/app/assets/javascripts/application.js"
   ADD_HIGHLIGHT_TXT = <<-EOC
@@ -61,61 +53,108 @@ $(document).on('ready', function() {
   get '/writers/:name_or_id'        => 'notee#writer_posts',    as: 'notee_public_writer_posts'
   get '/:id_or_slug'                => 'notee#show',            as: 'notee_public_show'
 
+  get '*anything'                   => 'errors#resque404'
+
   ######## notee setting end
 
   EOC
 
 
-  NOTEE_VIEW_PATH = "/app/views/notee/"
-  NOTEE_VIEW_ORIGIN_PATH = "../views/notee"
-  NOTEE_CSS_PATH = "/app/assets/stylesheets/notee/"
-  NOTEE_CSS_ORIGIN_PATH = "../stylesheets/notee"
-  NOTEE_JS_PATH = "/app/assets/javascripts/notee/"
-  NOTEE_JS_ORIGIN_PATH = "../javascripts/notee"
-  NOTEE_SCHEJULE_PATH = "/config/schedule.rb"
-  NOTEE_SCHEJULE_ORIGIN_PATH = "../config/schedule.rb"
-  NOTEE_CONTROLLER_PATH = "/app/controllers/notee_controller.rb"
-  NOTEE_CONTROLLER_ORIGIN_PATH = "../controllers/notee_controller.rb"
+  ENV_PRODUCTION_FILE_PATH = "/config/environments/production.rb"
+  ADD_ENV_PRODUCTION_TXT = "config.exceptions_app = ->(env) { ErrorsController.action(:show).call(env) }"
+
+
+  #  FILE PATH
   NOTEE_INIT_FILE_PATH = "/config/initializers/notee.rb"
   NOTEE_INIT_FILE_ORIGIN_PATH = "../config/notee.rb"
-  NOTEE_IMAGE_PATH = "/public/notee/"
-  NOTEE_IMAGE_ORIGIN_PATH = "../images/notee"
+  NOTEE_LAYOUTS_FILE_PATH = "/app/views/layouts/notee_application.html.erb"
+  NOTEE_LAYOUTS_FILE_ORIGIN_PATH = "../views/layouts/notee_application.html.erb"
+  NOTEE_SCHEJULE_FILE_PATH = "/config/schedule.rb"
+  NOTEE_SCHEJULE_FILE_ORIGIN_PATH = "../config/schedule.rb"
+  NOTEE_CONTROLLER_FILE_PATH = "/app/controllers/notee_controller.rb"
+  NOTEE_CONTROLLER_FILE_ORIGIN_PATH = "../controllers/notee_controller.rb"
+  NOTEE_ERROR_CONTROLLER_FILE_PATH = "/app/controllers/errors_controller.rb"
+  NOTEE_ERROR_CONTROLLER_FILE_ORIGIN_PATH = "../controllers/errors_controller.rb"
+
+  # Directory PATH
+  NOTEE_VIEW_DIR_PATH = "/app/views/notee/"
+  NOTEE_VIEW_DIR_ORIGIN_PATH = "../views/notee"
+  NOTEE_CSS_DIR_PATH = "/app/assets/stylesheets/notee/"
+  NOTEE_CSS_DIR_ORIGIN_PATH = "../stylesheets/notee"
+  NOTEE_JS_DIR_PATH = "/app/assets/javascripts/notee/"
+  NOTEE_JS_DIR_ORIGIN_PATH = "../javascripts/notee"
+  NOTEE_IMAGE_DIR_PATH = "/public/notee/"
+  NOTEE_IMAGE_DIR_ORIGIN_PATH = "../images/notee"
+
+
+  # -----------------------------------------------
+  # Tasks
+  # -----------------------------------------------
+
 
   task :start do
     notee_mark
     sh 'bundle exec rake notee:install:migrations'
-    delete_line( APPLICATION_ERB_PATH, "<title>" )
-    add_notee_code( APPLICATION_ERB_PATH,  ADD_META_TXT,       "<head>",  '<meta name="viewport" content="width=device-width,initial-scale=1.0" />' )
+
+    # Add Code
     add_notee_code( APPLICATION_JS_PATH,   ADD_HIGHLIGHT_TXT,  "//= require_tree .", "hljs.initHighlightingOnLoad()" )
+    delete_line( APPLICATION_JS_PATH, "//= require turbolinks" )
     add_notee_code( APPLICATION_CSS_PATH,  ADD_CSS_TXT,        "*= require_tree .", "*= require_directory ./notee" )
     delete_line( APPLICATION_CSS_PATH, "*= require_tree ." )
     add_notee_code( ROUTE_FILE_PATH,       ADD_ROUTE_TXT,      "Rails.application.routes.draw do",  "Notee::Engine" )
-    copy_directory( NOTEE_VIEW_PATH,   NOTEE_VIEW_ORIGIN_PATH )
-    copy_directory( NOTEE_CSS_PATH,    NOTEE_CSS_ORIGIN_PATH )
-    copy_directory( NOTEE_JS_PATH,     NOTEE_JS_ORIGIN_PATH )
-    copy_directory( NOTEE_IMAGE_PATH,  NOTEE_IMAGE_ORIGIN_PATH )
-    create_file( NOTEE_SCHEJULE_PATH,    NOTEE_SCHEJULE_ORIGIN_PATH)
-    create_file( NOTEE_CONTROLLER_PATH,  NOTEE_CONTROLLER_ORIGIN_PATH)
+    add_line( ENV_PRODUCTION_FILE_PATH, ADD_ENV_PRODUCTION_TXT, "Rails.application.configure do")
+
+    # Copy Directory
+    copy_directory( NOTEE_VIEW_DIR_PATH,   NOTEE_VIEW_DIR_ORIGIN_PATH )
+    copy_directory( NOTEE_CSS_DIR_PATH,    NOTEE_CSS_DIR_ORIGIN_PATH )
+    copy_directory( NOTEE_JS_DIR_PATH,     NOTEE_JS_DIR_ORIGIN_PATH )
+    copy_directory( NOTEE_IMAGE_DIR_PATH,  NOTEE_IMAGE_DIR_ORIGIN_PATH )
+
+    # Create File
     create_file( NOTEE_INIT_FILE_PATH,   NOTEE_INIT_FILE_ORIGIN_PATH)
+    create_file( NOTEE_LAYOUTS_FILE_PATH,   NOTEE_LAYOUTS_FILE_ORIGIN_PATH)
+    create_file( NOTEE_SCHEJULE_FILE_PATH,    NOTEE_SCHEJULE_FILE_ORIGIN_PATH)
+    create_file( NOTEE_CONTROLLER_FILE_PATH,  NOTEE_CONTROLLER_FILE_ORIGIN_PATH)
+    create_file( NOTEE_ERROR_CONTROLLER_FILE_PATH,  NOTEE_ERROR_CONTROLLER_FILE_ORIGIN_PATH)
+
+    # Set Cron Job
     sh 'bundle exec whenever --update-crontab RAILS_ENV=production'
   end
 
+
   task :destroy do
-    delete_directory(NOTEE_VIEW_PATH)
-    delete_directory(NOTEE_CSS_PATH)
-    delete_directory(NOTEE_JS_PATH)
-    delete_directory(NOTEE_IMAGE_PATH)
-    delete_file(NOTEE_SCHEJULE_PATH)
-    delete_file(NOTEE_CONTROLLER_PATH)
+
+    # Delete File
+    delete_file(NOTEE_ERROR_CONTROLLER_FILE_PATH)
+    delete_file(NOTEE_CONTROLLER_FILE_PATH)
+    delete_file(NOTEE_SCHEJULE_FILE_PATH)
+    delete_file(NOTEE_LAYOUTS_FILE_PATH)
     delete_file(NOTEE_INIT_FILE_PATH)
-    add_line(APPLICATION_ERB_PATH, "<title>#{Rails.application.class.parent_name.to_s}</title>", "<head>", "<title>")
-    delete_notee_code(APPLICATION_ERB_PATH, "<!-- default notee setting -->", "<!-- notee setting end -->")
-    delete_notee_code(APPLICATION_JS_PATH, "//////// default notee setting", "//////// notee setting end")
-    add_line(APPLICATION_CSS_PATH, "*= require_tree .", "//////// notee setting end", "*= require_tree .")
-    delete_notee_code(APPLICATION_CSS_PATH, "//////// default notee setting", "//////// notee setting end")
+
+    # Delete Directory
+    delete_directory(NOTEE_IMAGE_DIR_PATH)
+    delete_directory(NOTEE_JS_DIR_PATH)
+    delete_directory(NOTEE_CSS_DIR_PATH)
+    delete_directory(NOTEE_VIEW_DIR_PATH)
+
+    # Delete Code
+    delete_line( ENV_PRODUCTION_FILE_PATH, ADD_ENV_PRODUCTION_TXT)
     delete_notee_code(ROUTE_FILE_PATH, "######## default notee path", "######## notee setting end")
+    add_line(APPLICATION_CSS_PATH, "*= require_tree .", "//////// notee setting end")
+    delete_notee_code(APPLICATION_CSS_PATH, "//////// default notee setting", "//////// notee setting end")
+    add_line( APPLICATION_JS_PATH, "//= require turbolinks", "//= require jquery_ujs")
+    delete_notee_code(APPLICATION_JS_PATH, "//////// default notee setting", "//////// notee setting end")
+
+    # Delte Cron Job
+    sh 'bundle exec whenever --clear-crontab'
   end
 
+
+  # -----------------------------------------------
+  # Methods
+  # -----------------------------------------------
+
+
   private
 
   def notee_mark
@@ -152,7 +191,7 @@ ________________________________
     f.write(new_file)
     f.close()
 
-    puts 'Notee added code => ' + add_file_path
+    puts 'Notee added code => in ' + add_file_path
   end
 
 
@@ -232,16 +271,16 @@ ________________________________
 
 
 
-  def add_line(file_path, add_line, beginning_path, check_txt)
+  def add_line(file_path, add_line, beginning_path)
     add_file_path = Rails.root.to_s  + file_path
 
     txt = <<-EOC
 
-#{add_line}
+  #{add_line}
     EOC
 
-    return puts 'delete failed => notee code '+ add_file_path + '\n' unless delete_file = File.open(add_file_path,"r")
-    return if File.open(add_file_path,"r").read.include?(check_txt)
+    return puts 'add failed => notee code '+ add_file_path + '\n' unless delete_file = File.open(add_file_path,"r")
+    return if File.open(add_file_path,"r").read.include?(add_line)
 
     new_file_text = String.new
     initial_txt = true
@@ -281,5 +320,4 @@ ________________________________
     puts 'Notee deleted => ' + delete_line + ' in' + delete_file_path
   end
 
-
 end

data/lib/tasks/stylesheets/notee/social/social.css

@@ -36,6 +36,7 @@ ul.social-button-syncer {
 @media screen and ( min-width:480px ) {
     ul.social-button-syncer {
         width: 410px ;
+        float: left;
     }
 }
 

data/lib/tasks/views/layouts/notee_application.html.erb

@@ -0,0 +1,6 @@
+<%= render :partial => "notee/partials/header.html.erb" %>
+  <div class="notee_wrapper">
+    <%= yield %>
+    <%= render :partial => "notee/partials/sidebar.html.erb" %>
+  </div>
+<%= render :partial => "notee/partials/footer.html.erb" %>

data/lib/tasks/views/notee/about.html.erb

@@ -1,43 +1,38 @@
-<%= render :partial => "notee/partials/header.html.erb" %>
-<div class="notee_wrapper">
-  <div class="notee_main">
-    <div class="notee_main_content">
-      <h1>Hello World</h1>
-      <p>
-        Lorem ipsum dolor sit amet,
-        consectetuer adipiscing elit.
-        Aenean commodo ligula eget dolor.
-        Aenean massa.
-        Cum sociis natoque penatibus et magnis dis parturient montes,
-        nascetur ridiculus mus.
-        Donec quam felis, ultricies nec, pellentesque eu,
-        pretium quis, sem. Nulla consequat massa quis enim.
-        Donec pede justo, fringilla vel, aliquet nec,
-        vulputate eget, arcu. In enim justo, rhoncus ut,
-        imperdiet a, venenatis vitae, justo.
-        Nullam dictum felis eu pede mollis pretium. Integer tincidunt.
-        Cras dapibus. Vivamus elementum semper nisi.
-        Aenean vulputate eleifend tellus.
-        Aenean leo ligula, porttitor eu,
-        consequat vitae, eleifend ac, enim.
-        Aliquam lorem ante,
-        dapibus in, viverra quis, feugiat a, tellus.
-        Phasellus viverra nulla ut metus varius laoreet.
-        Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue.
-        Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus.
-        Maecenas tempus, tellus eget condimentum rhoncus,
-        sem quam semper libero, sit amet adipiscing sem neque sed ipsum.
-        Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem.
-        Maecenas nec odio et ante tincidunt tempus.
-        Donec vitae sapien ut libero venenatis faucibus.
-        Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt.
-        Duis leo. Sed fringilla mauris sit amet nibh.
-        Donec sodales sagittis magna. Sed consequat,
-        leo eget bibendum sodales,
-        augue velit cursus nunc.
-      </p>
-    </div>
+<div class="notee_main">
+  <div class="notee_main_content">
+    <h1>Hello World</h1>
+    <p>
+      Lorem ipsum dolor sit amet,
+      consectetuer adipiscing elit.
+      Aenean commodo ligula eget dolor.
+      Aenean massa.
+      Cum sociis natoque penatibus et magnis dis parturient montes,
+      nascetur ridiculus mus.
+      Donec quam felis, ultricies nec, pellentesque eu,
+      pretium quis, sem. Nulla consequat massa quis enim.
+      Donec pede justo, fringilla vel, aliquet nec,
+      vulputate eget, arcu. In enim justo, rhoncus ut,
+      imperdiet a, venenatis vitae, justo.
+      Nullam dictum felis eu pede mollis pretium. Integer tincidunt.
+      Cras dapibus. Vivamus elementum semper nisi.
+      Aenean vulputate eleifend tellus.
+      Aenean leo ligula, porttitor eu,
+      consequat vitae, eleifend ac, enim.
+      Aliquam lorem ante,
+      dapibus in, viverra quis, feugiat a, tellus.
+      Phasellus viverra nulla ut metus varius laoreet.
+      Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue.
+      Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus.
+      Maecenas tempus, tellus eget condimentum rhoncus,
+      sem quam semper libero, sit amet adipiscing sem neque sed ipsum.
+      Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem.
+      Maecenas nec odio et ante tincidunt tempus.
+      Donec vitae sapien ut libero venenatis faucibus.
+      Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt.
+      Duis leo. Sed fringilla mauris sit amet nibh.
+      Donec sodales sagittis magna. Sed consequat,
+      leo eget bibendum sodales,
+      augue velit cursus nunc.
+    </p>
   </div>
-  <%= render :partial => "notee/partials/sidebar.html.erb" %>
 </div>
-<%= render :partial => "notee/partials/footer.html.erb" %>

data/lib/tasks/views/notee/archives.html.erb

@@ -1,15 +1,10 @@
-<%= render :partial => "notee/partials/header.html.erb" %>
-<div class="notee_wrapper">
-  <div class="notee_main">
-    <h2>Archive List</h2>
-    <% @archives.each do |key, count| %>
-        <div class="notee_list">
-          <a href="/archives/<%= key %>">
-            <h3><%= key %> (<%= count %>)</h3>
-          </a>
-        </div>
-    <% end %>
-  </div>
-  <%= render :partial => "notee/partials/sidebar.html.erb" %>
+<div class="notee_main">
+  <h2>Archive List</h2>
+  <% @archives.each do |key, count| %>
+      <div class="notee_list">
+        <a href="/archives/<%= key %>">
+          <h3><%= key %> (<%= count %>)</h3>
+        </a>
+      </div>
+  <% end %>
 </div>
-<%= render :partial => "notee/partials/footer.html.erb" %>

data/lib/tasks/views/notee/categories.html.erb

@@ -1,15 +1,10 @@
-<%= render :partial => "notee/partials/header.html.erb" %>
-<div class="notee_wrapper">
-  <div class="notee_main">
-    <h2>Category List</h2>
-    <% @categories.each do |key, category_array| %>
-        <div class="notee_list">
-          <a href="/categories/<%= category_array[1].slug %>">
-            <h3><%= category_array[1].name %> (<%= category_array[0] %>)</h3>
-          </a>
-        </div>
-    <% end %>
-  </div>
-  <%= render :partial => "notee/partials/sidebar.html.erb" %>
+<div class="notee_main">
+  <h2>Category List</h2>
+  <% @categories.each do |key, category_array| %>
+      <div class="notee_list">
+        <a href="/categories/<%= category_array[1].slug %>">
+          <h3><%= category_array[1].name %> (<%= category_array[0] %>)</h3>
+        </a>
+      </div>
+  <% end %>
 </div>
-<%= render :partial => "notee/partials/footer.html.erb" %>

data/lib/tasks/views/notee/errors/internal_server_error.html.erb

@@ -0,0 +1,5 @@
+<div class="notee_main">
+  <div class="notee_main_content">
+    <h2>ERROR:500 Internal Server Error.</h2>
+  </div>
+</div>

data/lib/tasks/views/notee/errors/not_found.html.erb

@@ -0,0 +1,5 @@
+<div class="notee_main">
+  <div class="notee_main_content">
+    <h2>ERROR:404 Not Found.</h2>
+  </div>
+</div>