jinda 0.7.7.4 → 1.0.0

data/test/dummy/app/jinda/template/index.mm

@@ -43,6 +43,7 @@
 <node CREATED="1273913393454" ID="ID_1088166839" MODIFIED="1511159690490" TEXT="link: pending tasks: /jinda/pending"/>
 <node CREATED="1275790679363" ID="ID_829325467" MODIFIED="1511159696044" TEXT="link: logs: /jinda/logs"/>
 <node CREATED="1507573166973" ID="ID_351025910" MODIFIED="1511159700908" TEXT="link: docs: /jinda/doc"/>
+<node CREATED="1720000000000" ID="ID_999999999" MODIFIED="1720000000000" TEXT="link: Mindmap Editor: /mindmap_editor/edit"/>
 </node>
 <node CREATED="1273706796854" ID="ID_1003882979" MODIFIED="1588964401951" TEXT="devs: Developer">
 <node CREATED="1275373154914" ID="ID_340725299" MODIFIED="1275373158632" TEXT="role:d"/>

data/test/dummy/app/mailers/application_mailer.rb

@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
-  layout 'mailer'
+  default from: "from@example.com"
+  layout "mailer"
 end

data/test/dummy/app/mailers/application_mailer.rb-org

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end

data/test/dummy/app/mailers/jinda_mailer.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class JindaMailer < ActionMailer::Base
-  default from: "from@example.com"
-  def gmail(ui, to="", subject="", from="")
+  default from: 'from@example.com'
+  def gmail(ui, to = '', subject = '', from = '')
     @ui = ui
-    mail(:to => to, :subject => subject, :from => from)
+    mail(to: to, subject: subject, from: from)
   end
 end

data/test/dummy/app/mailers/note_mailer.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class NoteMailer < ActionMailer::Base
-  default from: "from@example.com"
-  
-  def gmail(body , to="", subject="", from="")
+  default from: 'from@example.com'
+
+  def gmail(body, to = '', subject = '', from = '')
     @body   = body
     @title  = subject
     @from   = from
-    mail(:to => to, :subject => subject, :from => from)
+    mail(to: to, subject: subject, from: from)
   end
 end

data/test/dummy/app/mailers/user_mailer.rb

@@ -1,15 +1,15 @@
-class UserMailer < ApplicationMailer
+# frozen_string_literal: true
 
+class UserMailer < ApplicationMailer
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
   #   en.user_mailer.password_reset.subject
   #
   def password_reset(user)
-
-    @greeting = "Hi"
+    @greeting = 'Hi'
 
     @user = user
-    mail :to => user.email, :subject => "Password Reset"  end
+    mail to: user.email, subject: 'Password Reset'
   end
-
+end

data/test/dummy/app/models/address.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 class Address
   include Mongoid::Document
   # jinda begin

data/test/dummy/app/models/article.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 class Article
   include Mongoid::Document
   # jinda begin

data/test/dummy/app/models/comment.rb

@@ -1,13 +1,14 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 class Comment
   include Mongoid::Document
   # jinda begin
   include Mongoid::Timestamps
   field :body, :type => String
-  field :name, :type => String
-  field :image, :type => String
   belongs_to :article, :class_name => "Article"  
   belongs_to :user, :class_name => "User"  
+  belongs_to :job, :class_name => "Job"  
   belongs_to :commentable, polymorphic: true 
   index({ commentable_id: 1, commentable_type: 1}) 
   # jinda end

data/test/dummy/app/models/identity.rb

@@ -1,18 +1,19 @@
+# frozen_string_literal: true
+
 class Identity
   include Mongoid::Document
   include OmniAuth::Identity::Models::Mongoid
-  self.auth_key 'code'
 
-  field :code, :type => String
-  field :email, :type => String
-  field :password_digest, :type => String
-  field :auth_token, :type => String
-	field :image, :type => String
-	
+  auth_key 'code'
 
+  field :code, type: String
+  field :email, type: String
+  field :password_digest, type: String
+  field :auth_token, type: String
+  field :image, type: String
 
-  validates_presence_of :code
-  validates_uniqueness_of :code
-  validates_uniqueness_of :email
+  validates :code, presence: true
+  validates :code, uniqueness: true
+  validates :email, uniqueness: true
   # validates_format_of :email, :with => /^[-a-z0-9_+\.]+\@([-a-z0-9]+\.)+[a-z0-9]{2,4}$/i
 end

data/test/dummy/app/models/jinda/doc.rb

@@ -1,36 +1,39 @@
-# -*- encoding : utf-8 -*-
-class Jinda::Doc
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Attributes::Dynamic
-  field :name, :type => String
-  field :filename, :type => String
-  field :content_type, :type => String
-  field :data_text, :type => String
-  field :url, :type => String
-  field :basename, :type => String
-  field :cloudinary, :type => Boolean
-  belongs_to :xmain, :class_name => "Jinda::Xmain"
-  belongs_to :runseq, :class_name => "Jinda::Runseq"
-  belongs_to :user
-  belongs_to :service, :class_name => "Jinda::Service"
-  field :ip, :type => String
-  field :description, :type => String
-  field :category, :type => String
-  field :ma_display, :type => Boolean
-  field :ma_secured, :type => Boolean
-  field :dscan, :type => String
-  field :keywords, :type => String
+# frozen_string_literal: true
 
-  def self.search(q, page, per_page=PER_PAGE)
-    paginate :per_page=>per_page, :page => page, :conditions =>
-      ["content_type=? AND data_text LIKE ? AND (ma_secured=? OR ma_user_id=?)",
-      "output", "%#{q}%", false, session[:user_id] ],
-      :order=>'ma_xmain_id DESC', :select=>'DISTINCT ma_xmain_id'
-  end
-  def self.search_ma_secured(q, page, per_page=PER_PAGE)
-    paginate :per_page=>per_page, :page => page, :conditions =>
-      ["content_type=? AND data_text LIKE ?", "output", "%#{q}%" ],
-      :order=>'ma_xmain_id DESC', :select=>'DISTINCT ma_xmain_id'
+module Jinda
+  class Doc
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include Mongoid::Attributes::Dynamic
+
+    field :name, type: String
+    field :filename, type: String
+    field :content_type, type: String
+    field :data_text, type: String
+    field :url, type: String
+    field :basename, type: String
+    field :cloudinary, type: Boolean
+    belongs_to :xmain, class_name: 'Jinda::Xmain'
+    belongs_to :runseq, class_name: 'Jinda::Runseq'
+    belongs_to :user
+    belongs_to :service, class_name: 'Jinda::Service'
+    field :ip, type: String
+    field :description, type: String
+    field :category, type: String
+    field :ma_display, type: Boolean
+    field :ma_secured, type: Boolean
+    field :dscan, type: String
+    field :keywords, type: String
+
+    def self.search(q, page, per_page = PER_PAGE)
+      paginate per_page: per_page, page: page, conditions:         ['content_type=? AND data_text LIKE ? AND (ma_secured=? OR ma_user_id=?)',
+                                                                    'output', "%#{q}%", false, session[:user_id]],
+               order: 'ma_xmain_id DESC', select: 'DISTINCT ma_xmain_id'
+    end
+
+    def self.search_ma_secured(q, page, per_page = PER_PAGE)
+      paginate per_page: per_page, page: page, conditions:         ['content_type=? AND data_text LIKE ?', 'output', "%#{q}%"],
+               order: 'ma_xmain_id DESC', select: 'DISTINCT ma_xmain_id'
+    end
   end
 end

data/test/dummy/app/models/jinda/jinda_module.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Jinda
+  class JindaModule
+    include Mongoid::Document
+
+    field :uid, type: String
+    field :code, type: String
+    field :name, type: String
+    field :role, type: String
+    field :seq, type: Integer
+    field :icon, type: String
+    has_many :services, class_name: 'Jinda::Service', inverse_of: :jinda_module
+  end
+end

data/test/dummy/app/models/jinda/module.rb

@@ -1,11 +1,15 @@
-# -*- encoding : utf-8 -*-
-class Jinda::Module
-  include Mongoid::Document
-  field :uid, :type => String
-  field :code, :type => String
-  field :name, :type => String
-  field :role, :type => String
-  field :seq, :type => Integer
-  field :icon, :type => String
-  has_many :services, :class_name => "Jinda::Service"
+# frozen_string_literal: true
+
+module Jinda
+  class Module
+    include Mongoid::Document
+
+    field :uid, type: String
+    field :code, type: String
+    field :name, type: String
+    field :role, type: String
+    field :seq, type: Integer
+    field :icon, type: String
+    has_many :services, class_name: 'Jinda::Service'
+  end
 end

data/test/dummy/app/models/jinda/notice.rb

@@ -1,14 +1,18 @@
-# -*- encoding : utf-8 -*-
-class Jinda::Notice
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  field :message, :type => String
-  field :unread, :type => Boolean
-  field :ip, :type => String
-  belongs_to :user, :class_name => "User"
+# frozen_string_literal: true
 
-  def self.recent(user_id, ip)
-    where(unread: true, ip: ip).last
-    # where(unread: true, user_id: user_id, ip: ip).last
+module Jinda
+  class Notice
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    field :message, type: String
+    field :unread, type: Boolean
+    field :ip, type: String
+    belongs_to :user, class_name: 'User'
+
+    def self.recent(_user_id, ip)
+      where(unread: true, ip: ip).last
+      # where(unread: true, user_id: user_id, ip: ip).last
+    end
   end
 end

data/test/dummy/app/models/jinda/role.rb

@@ -1,8 +1,12 @@
-# -*- encoding : utf-8 -*-
-class Jinda::Role
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  field :code, :type => String
-  field :name, :type => String
-  belongs_to :user, :class_name => "User"
+# frozen_string_literal: true
+
+module Jinda
+  class Role
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    field :code, type: String
+    field :name, type: String
+    belongs_to :user, class_name: 'User'
+  end
 end

data/test/dummy/app/models/jinda/runseq.rb

@@ -1,24 +1,27 @@
-# -*- encoding : utf-8 -*-
-class Jinda::Runseq
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  belongs_to :user, :class_name => "User"
-  belongs_to :xmain, :class_name => "Jinda::Xmain"
+# frozen_string_literal: true
 
-  field :action, :type => String
-  field :status, :type => String
-  field :code, :type => String
-  field :name, :type => String
-  field :role, :type => String
-  field :rule, :type => String
-  field :rstep, :type => Integer
-  field :form_step, :type => Integer
-  field :start, :type => DateTime
-  field :stop, :type => DateTime
-  field :end, :type => Boolean
-  field :xml, :type => String
-  field :ip, :type => String
+module Jinda
+  class Runseq
+    include Mongoid::Document
+    include Mongoid::Timestamps
 
-  scope :form_action, ->{where(:action.in=> ['form','output','pdf'])}
+    belongs_to :user, class_name: 'User'
+    belongs_to :xmain, class_name: 'Jinda::Xmain'
 
+    field :action, type: String
+    field :status, type: String
+    field :code, type: String
+    field :name, type: String
+    field :role, type: String
+    field :rule, type: String
+    field :rstep, type: Integer
+    field :form_step, type: Integer
+    field :start, type: DateTime
+    field :stop, type: DateTime
+    field :end, type: Boolean
+    field :xml, type: String
+    field :ip, type: String
+
+    scope :form_action, -> { where(:action.in => %w[form output pdf]) }
+  end
 end

data/test/dummy/app/models/jinda/service.rb

@@ -1,17 +1,21 @@
-# -*- encoding : utf-8 -*-
-class Jinda::Service
-  include Mongoid::Document
-  field :uid, :type => String
-  field :module_code, :type => String
-  field :code, :type => String
-  field :name, :type => String
-  field :xml, :type => String
-  field :role, :type => String
-  field :rule, :type => String
-  field :seq, :type => Integer
-  field :list, :type => Boolean
-  field :ma_secured, :type => Boolean
-  field :confirm, :type => Boolean
+# frozen_string_literal: true
 
-  belongs_to :module, :class_name => "Jinda::Module"
+module Jinda
+  class Service
+    include Mongoid::Document
+
+    field :uid, type: String
+    field :module_code, type: String
+    field :code, type: String
+    field :name, type: String
+    field :xml, type: String
+    field :role, type: String
+    field :rule, type: String
+    field :seq, type: Integer
+    field :list, type: Boolean
+    field :ma_secured, type: Boolean
+    field :confirm, type: Boolean
+
+    belongs_to :module, class_name: 'Jinda::Module'
+  end
 end

data/test/dummy/app/models/jinda/xmain.rb

@@ -1,38 +1,44 @@
-# -*- encoding : utf-8 -*-
-class Jinda::Xmain
-  include Mongoid::Document
-  field :xid, :type => String
-  # Jinda begin
-  include Mongoid::Timestamps
-  belongs_to :service, :class_name => "Jinda::Service"
-  field :start, :type => DateTime
-  field :stop, :type => DateTime
-  field :name, :type => String
-  field :ip, :type => String
-  field :status, :type => String
-  belongs_to :user, :class_name => "User"
-  field :xvars, :type => Hash
-  field :current_runseq, :type => String
-  # Jinda end
-
-  has_many :runseqs, :class_name => "Jinda::Runseq"
-  has_many :docs, :class_name => "Jinda::Doc"
-  before_create :assign_xid
-
-
-  # number of xmains on the specified date
-  def self.get(xid)
-    find_by(xid:xid)
-  end
-  def assign_xid
-    self.xid = Param.gen(:xid)
-  end
-  def self.number(d)
-    all(:conditions=>['DATE(created_at) =?', d.to_date]).count
-  end
-  def self.search(q, page, per_page=10)
-    paginate :per_page=>per_page, :page => page, :conditions =>
-      ["LOWER(xvars) LIKE ?", "%#{q}%" ],
-      :order=>'created_at DESC'
+# frozen_string_literal: true
+
+module Jinda
+  class Xmain
+    include Mongoid::Document
+
+    field :xid, type: String
+    # Jinda begin
+    include Mongoid::Timestamps
+
+    belongs_to :service, class_name: 'Jinda::Service'
+    field :start, type: DateTime
+    field :stop, type: DateTime
+    field :name, type: String
+    field :ip, type: String
+    field :status, type: String
+    belongs_to :user, class_name: 'User'
+    field :xvars, type: Hash
+    field :current_runseq, type: String
+    # Jinda end
+
+    has_many :runseqs, class_name: 'Jinda::Runseq'
+    has_many :docs, class_name: 'Jinda::Doc'
+    before_create :assign_xid
+
+    # number of xmains on the specified date
+    def self.get(xid)
+      find_by(xid: xid)
+    end
+
+    def assign_xid
+      self.xid = Param.gen(:xid)
+    end
+
+    def self.number(d)
+      all(conditions: ['DATE(created_at) =?', d.to_date]).count
+    end
+
+    def self.search(q, page, per_page = 10)
+      paginate per_page: per_page, page: page, conditions:         ['LOWER(xvars) LIKE ?', "%#{q}%"],
+               order: 'created_at DESC'
+    end
   end
 end

data/test/dummy/app/models/note.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 class Note
   include Mongoid::Document
   # jinda begin
@@ -10,13 +12,6 @@ class Note
   before_validation :ensure_title_has_a_value 
   validates :title, length: { maximum: (MAX_TITLE_LENGTH = 30), message: "Must be less   than 30 characters" }, presence: true
   validates :body, length: { maximum: (MAX_BODY_LENGTH = 1000), message: "Must be less   than 1000 characters"} 
-  private
-  def ensure_title_has_a_value
-    if title.blank?
-      self.title = body[0..(MAX_TITLE_LENGTH-1)] unless body.blank?
-    end
-  end
-  
-
+  private  def ensure_title_has_a_value    if title.blank?      self.title = body[0..(MAX_TITLE_LENGTH-1)] unless body.blank?    end  end  
   # jinda end
 end

data/test/dummy/app/models/param.rb

@@ -1,41 +1,44 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 class Param
   include Mongoid::Document
-  validates_uniqueness_of :code
+
+  validates :code, uniqueness: true
   # jinda begin
   include Mongoid::Timestamps
-  field :code, :type => String
-  field :pid, :type => String
-  field :yearly, :type => Boolean
-  field :description, :type => String
+
+  field :code, type: String
+  field :pid, type: String
+  field :yearly, type: Boolean
+  field :description, type: String
   # jinda end
 
   def self.get(code)
-    p= where(:code=> code).first
+    p = where(code: code).first
     p.pid
   end
+
   def self.set(code, pid)
-    p= where(:code=> code).first
+    p     = where(code: code).first
     p.pid = pid.to_s
     p.save
   end
+
   def self.gen(code)
-    p= where(:code=> code).first
-    unless p
-      p= self.create! :code => code, :pid => '0', :yearly => false, :description => 'auto'
-    end
+    p   = where(code: code).first
+    p ||= create! code: code, pid: '0', yearly: false, description: 'auto'
     if p.yearly
       num, year = p.pid.split('/')
-      y_now = (Time.now.year.to_i) -1957
-      if year.to_i==y_now
-        p.pid = "#{num.to_i+1}/#{y_now}"
-      else # new year, restart counter
-        p.pid = "1/#{y_now}"
-      end
+      y_now     = Time.now.year.to_i(-1957)
+      p.pid     = if year.to_i == y_now
+                    "#{num.to_i + 1}/#{y_now}"
+                  else # new year, restart counter
+                    "1/#{y_now}"
+                  end
     else
-      p.pid = (p.pid.to_i+1).to_s
+      p.pid = (p.pid.to_i + 1).to_s
     end
     p.save
-    return p.pid
+    p.pid
   end
 end

data/test/dummy/app/models/person.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 class Person
   include Mongoid::Document
   # jinda begin

data/test/dummy/app/models/picture.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+class Picture
+  include Mongoid::Document
+  # jinda begin
+  include Mongoid::Timestamps
+  field :picture, :type => String
+  field :description, :type => String
+  belongs_to :user
+  # jinda end
+  include Mongoid::Timestamps
+end