jinda 0.7.7.4 → 1.0.0

data/test/dummy/app/controllers/notes_controller.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class NotesController < ApplicationController
-  before_action :load_note, only: [:show, :destroy]
+  before_action :load_note, only: %i[show destroy]
   # before_action :xload_current_ma_user, only: [:destroy]
 
   def index
@@ -11,19 +13,19 @@ class NotesController < ApplicationController
     @notes = Note.where(user_id: current_ma_user).desc(:created_at).page(params[:page]).per(10)
   end
 
-  def show 
-  end
+  def show; end
 
   def edit
-    @note = Note.find(params[:id])
-    @page_title       = 'Edit Note'
+    @note       = Note.find(params[:id])
+    @page_title = 'Edit Note'
   end
 
   def create
     @note = Note.new(
-      title: $xvars["new_note"]["note"]["title"],
-      body: $xvars["new_note"]["note"]["body"],
-      user_id: $xvars["user_id"])
+      title: $xvars['new_note']['note']['title'],
+      body: $xvars['new_note']['note']['body'],
+      user_id: $xvars['user_id']
+    )
     @note.save!
     # if @note.save!
     #   format.html { redirect_to @note, notice: 'Sample was successfully created.'  }
@@ -32,53 +34,49 @@ class NotesController < ApplicationController
     #   format.html { render :new }
     #   format.json { render json: @note.errors, status: :unprocessable_entity }
     # end
-
   end
 
-
   def update
     # $xvars["select_note"] and $xvars["edit_note"]
     # These are variables.
     # They contain everything that we get their forms select_note and edit_note
-    note_id = $xvars["select_note"] ? $xvars["select_note"]["id"] : $xvars["p"]["note_id"]
-    @note = Note.find(note_id)
-    @note.update(title: $xvars["edit_note"]["note"]["title"],
-                 body: $xvars["edit_note"]["note"]["body"])
+    note_id = $xvars['select_note'] ? $xvars['select_note']['id'] : $xvars['p']['note_id']
+    @note   = Note.find(note_id)
+    @note.update(title: $xvars['edit_note']['note']['title'],
+                 body: $xvars['edit_note']['note']['body'])
   end
 
   def delete
     # called by freemind
-  # Tobe called from other controller:jinda
-    @note_id = $xvars["select_note"] ? $xvars["select_note"]["id"] : $xvars["p"]["note_id"]
-    @note = Note.find(@note_id)
+    # Tobe called from other controller:jinda
+    @note_id = $xvars['select_note'] ? $xvars['select_note']['id'] : $xvars['p']['note_id']
+    @note    = Note.find(@note_id)
     @note.destroy
   end
 
   def destroy
     # called by rails menu my
-    if current_ma_user.role.upcase.split(',').include?("A") || current_ma_user == @note.user
-      @note.destroy
-    end
-    redirect_to :action=>'my'
+    @note.destroy if current_ma_user.role.upcase.split(',').include?('A') || current_ma_user == @note.user
+    redirect_to action: 'my'
   end
 
   def mail
     NoteMailer.gmail(
-                    $xvars["display_mail"]["body"],
-                    $xvars["select_note"]["email"],
-                    $xvars["display_mail"]["title"],
-                    xload_current_ma_user.email)
+      $xvars['display_mail']['body'],
+      $xvars['select_note']['email'],
+      $xvars['display_mail']['title'],
+      xload_current_ma_user.email
+    )
   end
 
   private
 
   # Tobe called from other controller:jinda
   def xload_current_ma_user
-    @current_ma_user = User.find($xvars["user_id"])
+    @current_ma_user = User.find($xvars['user_id'])
   end
 
   def load_note
     @note = Note.find(params[:id])
   end
-
 end

data/test/dummy/app/controllers/password_resets_controller.rb

@@ -1,34 +1,32 @@
+# frozen_string_literal: true
+
 class PasswordResetsController < ApplicationController
+  def index; end
 
-  def index
+  def edit
+    ## Deprecated syntax in rail 5
+    # #@user = User.find_by_password_reset_token!(params[:id])
+    @user = User.where(password_reset_token: params[:id]).first
   end
 
   def create
-    #user = User.find_by_email(params[:email])
-    user = User.where(:email => params[:email]).first
+    # user = User.find_by_email(params[:email])
+    user = User.where(email: params[:email]).first
 
-    user.send_password_reset if user
-    redirect_to root_url, :ma_notice => "Email sent with password reset instructions."
-  end
-
-  def edit
-    ## Deprecated syntax in rail 5
-    ##@user = User.find_by_password_reset_token!(params[:id])
-    @user = User.where(:password_reset_token => params[:id]).first
+    user&.send_password_reset
+    redirect_to root_url, ma_notice: 'Email sent with password reset instructions.'
   end
 
   def update
-    ##@user = User.find_by_password_reset_token!(params[:id])
-    @user = User.where(:password_reset_token => params[:id]).first
+    # #@user = User.find_by_password_reset_token!(params[:id])
+    @user = User.where(password_reset_token: params[:id]).first
     if @user.password_reset_sent_at < 2.hours.ago
-      redirect_to new_password_reset_path, :alert => "Password &crarr;
+      redirect_to new_password_reset_path, alert: "Password &crarr;
       reset has expired."
-    elsif @user.update_attributes(params[:user])
-      redirect_to root_url, :notice => "Password has been reset."
+    elsif @user.update(params[:user])
+      redirect_to root_url, notice: 'Password has been reset.'
     else
       render :edit
     end
   end
-
 end
-

data/test/dummy/app/controllers/sessions_controller.rb

@@ -1,44 +1,43 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 class SessionsController < ApplicationController
   def new
-    @title= 'Sign In'
+    @title = 'Sign In'
   end
 
   def failure
     # redirect_to login_path, alert: "Authentication failed, please try again."
-    redirect_to login_path, alert: "Authentication failed, please try again."
+    redirect_to login_path, alert: 'Authentication failed, please try again.'
   end
 
   # to refresh the page, must know BEFOREHAND that the action needs refresh
   # then use attribute 'data-ajax'=>'false'
   # see app/views/sessions/new.html.erb for sample
   def create
-    auth = request.env["omniauth.auth"]
-    user = User.from_omniauth(auth)
+    auth              = request.env['omniauth.auth']
+    user              = User.from_omniauth(auth)
     session[:user_id] = user.id
-    if params.permit[:remember_me]
+    if params[:remember_me]
       cookies.permanent[:auth_token] = user.auth_token
     else
       cookies[:auth_token] = user.auth_token
     end
     # refresh_to root_path, :ma_notice => "Logged in" # Called by jinda_conroller
     redirect_to root_path
-		# redirect_to articles_my_path
-
-  rescue
-    redirect_to root_path, :alert=> "Authentication failed, please try again."
+    # redirect_to articles_my_path
+  rescue StandardError
+    redirect_to root_path, alert: 'Authentication failed, please try again.'
   end
 
   def destroy
     session[:user_id] = nil
     cookies.delete(:auth_token)
-    refresh_to root_path, :ma_notice => "Logged Out" # called by jinda_controller, not pass tested
+    refresh_to root_path, ma_notice: 'Logged Out' # called by jinda_controller, not pass tested
     # redirect_to root_path # Ok with test
-
   end
 
   def failure
-    ma_log "Authentication failed, please try again."
-    redirect_to new_session_path, :alert=> "Authentication failed, please try again."
+    ma_log 'Authentication failed, please try again.'
+    redirect_to new_session_path, alert: 'Authentication failed, please try again.'
   end
 end

data/test/dummy/app/controllers/sitemap_controller.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 class SitemapController < ApplicationController
-# From https://makandracards.com/makandra/689-know-your-haml-comments
-	SitemapController < ApplicationController
+  # From https://makandracards.com/makandra/689-know-your-haml-comments
   layout nil
   def index
     headers['Content-Type'] = 'application/xml'
     respond_to do |format|
-      format.xml {@articles = Article.all}
+      format.xml { @articles = Article.all }
     end
   end
-
 end

data/test/dummy/app/controllers/users_controller.rb

@@ -1,35 +1,35 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
+
 class UsersController < ApplicationController
   def index
-    @today = Date.today
-    @xmains = current_ma_user.xmains.in(status:['R','I']).asc(:created_at)
+    @today  = Time.zone.today
+    @xmains = current_ma_user.xmains.in(status: %w[R I]).asc(:created_at)
   end
 
   # jinda methods
   def update_user
     # can't use session, current_ma_user inside jinda methods
-    $user.update_attribute :email, $xvars["enter_user"]["user"]["email"]
-    $user.update_attribute :image, $xvars["enter_user"]["user"]["image"]
+    $user.update_attribute :email, $xvars['enter_user']['user']['email']
+    $user.update_attribute :image, $xvars['enter_user']['user']['image']
   end
+
   def change_password
     # check if old password correct
-    identity = Identity.find_by :code=> $user.code
-    if identity.authenticate($xvars["enter"]["epass"])
-      identity.password = $xvars["enter"]["npass"]
-      identity.password_confirmation = $xvars["enter"]["npass_confirm"]
+    identity = Identity.find_by code: $user.code
+    if identity.authenticate($xvars['enter']['epass'])
+      identity.password              = $xvars['enter']['npass']
+      identity.password_confirmation = $xvars['enter']['npass_confirm']
       identity.save
-      ma_log "Password changed"
+      ma_log 'Password changed'
     else
-      ma_log "Unauthorized access"
+      ma_log 'Unauthorized access'
     end
   end
-  
+
   def send_password_reset
     generate_token(:password_reset_token)
     self.password_reset_sent_at = Time.zone.now
     save!
     UserMailer.password_reset(self).deliver
   end
-
 end
-

data/test/dummy/app/helpers/admins_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module AdminsHelper
 end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,5 +1,6 @@
-module ApplicationHelper
+# frozen_string_literal: true
 
+module ApplicationHelper
   def title(blog_title)
     content_for(:title) { blog_title }
   end
@@ -8,26 +9,26 @@ module ApplicationHelper
     content_for(:meta_description) { blog_text }
   end
 
-require 'redcarpet'
-require 'rouge'
-require 'rouge/plugins/redcarpet'
+  require 'redcarpet'
+  require 'rouge'
+  require 'rouge/plugins/redcarpet'
 
-class CodeRayify < Redcarpet::Render::HTML
-  def block_code(code, language)
-    CodeRay.scan(code, language).div
+  class CodeRayify < Redcarpet::Render::HTML
+    def block_code(code, language)
+      CodeRay.scan(code, language).div
+    end
   end
-end
 
-def markdown(text)
-  coderayified = CodeRayify.new(:filter_html => true, 
-                                :hard_wrap => true)
-  options = {
-    :fenced_code_blocks => true,
-    :no_intra_emphasis => true,
-    :autolink => true,
-    :lax_html_blocks => true,
-  }
-  markdown_to_html = Redcarpet::Markdown.new(coderayified, options)
-  markdown_to_html.render(text).html_safe
+  def markdown(text)
+    coderayified     = CodeRayify.new(filter_html: true,
+                                      hard_wrap: true)
+    options          = {
+      fenced_code_blocks: true,
+      no_intra_emphasis: true,
+      autolink: true,
+      lax_html_blocks: true
+    }
+    markdown_to_html = Redcarpet::Markdown.new(coderayified, options)
+    markdown_to_html.render(text).html_safe
+  end
 end
-end

data/test/dummy/app/helpers/articles_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ArticlesHelper
 end

data/test/dummy/app/helpers/basic_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module BasicHelper
 end

data/test/dummy/app/helpers/comments_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module CommentsHelper
 end

data/test/dummy/app/helpers/ctrs_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module CtrsHelper
 end

data/test/dummy/app/helpers/devs_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module DevsHelper
 end

data/test/dummy/app/helpers/mindmap_editor_helper.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+module MindmapEditorHelper
+end

data/test/dummy/app/helpers/pictures_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module PicturesHelper
 end

data/test/dummy/app/helpers/sitemap_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module SitemapHelper
 end

data/test/dummy/app/helpers/users_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module UsersHelper
 end