jinda 0.7.7.4 → 1.0.0

data/lib/jinda/gen_runseq.rb

@@ -1,71 +1,75 @@
+# frozen_string_literal: true
 
+# #######################################################################]
+#  Each xmain  will create many run_seq as many as steps and form_steps
+# #######################################################################]
+#
+##############################  @runseq ################################]
+#  @runseq => #<Jinda::Runseq _id: 5df31912a54d758417a7afc9,
+#   created_at: 2019-12-13 04:52:34 UTC,
+#   updated_at: 2019-12-13 04:52:43 UTC,
+#   user_id: nil,
+#   xmain_id: BSON::ObjectId('5df31912a54d758417a7afc7'),
+#   action: "do",
+#   status: "R",
+#   code: "create",
+#   name: "Create Article",
+#   role: "",
+#   rule: "true",
+#   rstep: 2,
+#   form_step: 1,
+#   start: 2019-12-13 04:52:43 UTC,
+#   stop: nil,
+#   end: true,
+#   xml: "<node CREATED='1493419491125' ID='ID_1687683396' MODIFIED='1493483244848' TEXT='create: Create Article'><icon BUILTIN='bookmark'/></node>",
+#   ip: nil>
+# #######################################################################]
 
-    ########################################################################]
-    #  Each xmain  will create many run_seq as many as steps and form_steps 
-    ########################################################################]
-    #
-    ##############################  @runseq ################################]
-    #  @runseq => #<Jinda::Runseq _id: 5df31912a54d758417a7afc9, 
-    #   created_at: 2019-12-13 04:52:34 UTC, 
-    #   updated_at: 2019-12-13 04:52:43 UTC, 
-    #   user_id: nil, 
-    #   xmain_id: BSON::ObjectId('5df31912a54d758417a7afc7'), 
-    #   action: "do", 
-    #   status: "R", 
-    #   code: "create", 
-    #   name: "Create Article", 
-    #   role: "", 
-    #   rule: "true", 
-    #   rstep: 2, 
-    #   form_step: 1, 
-    #   start: 2019-12-13 04:52:43 UTC, 
-    #   stop: nil, 
-    #   end: true, 
-    #   xml: "<node CREATED='1493419491125' ID='ID_1687683396' MODIFIED='1493483244848' TEXT='create: Create Article'><icon BUILTIN='bookmark'/></node>", 
-    #   ip: nil>
-    ########################################################################]
+def create_runseq(xmain)
+  @xvars                     = xmain.xvars
+  default_role               = get_default_role
+  xml                        = xmain.service.xml
+  root                       = REXML::Document.new(xml).root
+  i                          = 0
+  j                          = 0 # i= step, j= form_step
+  root.elements.each('node') do |activity|
+    text = activity.attributes['TEXT']
+    next if ma_comment?(text)
+    next if /^rule:\s*/.match?(text)
 
-    def create_runseq(xmain)
-      @xvars= xmain.xvars
-      default_role= get_default_role
-      xml= xmain.service.xml
-      root = REXML::Document.new(xml).root
-      i= 0; j= 0 # i= step, j= form_step
-      root.elements.each('node') do |activity|
-        text= activity.attributes['TEXT']
-        next if ma_comment?(text)
-        next if text =~/^rule:\s*/
-        action= freemind2action(activity.elements['icon'].attributes['BUILTIN']) if activity.elements['icon']
-        return false unless action
-        i= i + 1
-        output_ma_display= false
-        if action== ('output'|| 'list' ||'folder')
-          ma_display= get_option_xml("display", activity)
-          if ma_display && !affirm(ma_display)
-            output_ma_display= false
-          else
-            output_ma_display= true
-          end
-        end
-        j= j + 1 if (action=='form' || output_ma_display)
-        @xvars['referer'] = activity.attributes['TEXT'] if action=='redirect'
-        if action!= 'if' && !text.blank?
-          scode, name= text.split(':', 2)
-          name ||= scode; name.strip!
-          code= name2code(scode)
-        else
-          code= text
-          name= text
-        end
-        role= get_option_xml("role", activity) || default_role
-        rule= get_option_xml("rule", activity) || "true"
-        runseq= Jinda::Runseq.create :xmain=>xmain.id,
-          :name=> name, :action=> action,
-          :code=> code, :role=>role.upcase, :rule=> rule,
-          :rstep=> i, :form_step=> j, :status=>'I',
-          :xml=>activity.to_s
-        xmain.current_runseq= runseq.id if i==1
-      end
-      @xvars['total_steps']= i
-      @xvars['total_form_steps']= j
+    action = freemind2action(activity.elements['icon'].attributes['BUILTIN']) if activity.elements['icon']
+    return false unless action
+
+    i                   += 1
+    output_ma_display    = false
+    if action == ('output' || 'list' || 'folder')
+      ma_display        = get_option_xml('display', activity)
+      output_ma_display = if ma_display && !affirm(ma_display)
+                            false
+                          else
+                            true
+                          end
+    end
+    j                   += 1 if action == 'form' || output_ma_display
+    @xvars['referer']    = activity.attributes['TEXT'] if action == 'redirect'
+    if action != 'if' && text.present?
+      scode, name = text.split(':', 2)
+      name      ||= scode
+      name.strip!
+      code = name2code(scode)
+    else
+      code = text
+      name = text
     end
+    role                 = get_option_xml('role', activity) || default_role
+    rule                 = get_option_xml('rule', activity) || 'true'
+    runseq               = Jinda::Runseq.create xmain: xmain.id,
+                                                name: name, action: action,
+                                                code: code, role: role.upcase, rule: rule,
+                                                rstep: i, form_step: j, status: 'I',
+                                                xml: activity.to_s
+    xmain.current_runseq = runseq.id if i == 1
+  end
+  @xvars['total_steps']      = i
+  @xvars['total_form_steps'] = j
+end

data/lib/jinda/gen_services.rb

@@ -1,90 +1,84 @@
+# frozen_string_literal: true
 
+# ##########################################################################
+#
+# Create / Update Modules, Runseqs, Services from XML
+#
+# ##########################################################################
+def process_services
+  # TODO: persist mm_md5
+  xml = @app || get_app
+  if defined? session
+    md5 = Digest::MD5.hexdigest(xml.to_s)
+    if session[:mm_md5]
+      return if session[:mm_md5] == md5
+    else
+      session[:mm_md5] = md5
+    end
+  end
+  protected_services = []
+  protected_modules  = []
+  mseq               = 0
+  @services          = xml.elements["//node[@TEXT='services']"] || REXML::Document.new
+  @services.each_element('node') do |m|
+    # get icon for service menu
+    ss         = m.attributes['TEXT']
+    code, name = ss.split(':', 2)
+    next if code.blank?
+    next if code.comment?
+
+    module_code = code.to_code
+    menu_icon   = m_icon(m)
 
     # ##########################################################################
-    #
-    # Create / Update Modules, Runseqs, Services from XML
-    #
+    # First Node eg: Module Name
     # ##########################################################################
-    def process_services
-      # todo: persist mm_md5
-      xml= @app||get_app
-      if defined? session
-        md5= Digest::MD5.hexdigest(xml.to_s)
-        if session[:mm_md5]
-          return if session[:mm_md5]==md5
-        else
-          session[:mm_md5]= md5
-        end
-      end
-      protected_services = []
-      protected_modules = []
-      mseq= 0
-      @services= xml.elements["//node[@TEXT='services']"] || REXML::Document.new
-      @services.each_element('node') do |m|
-        # get icon for service menu
-        ss= m.attributes["TEXT"]
-        code, name= ss.split(':', 2)
-        next if code.blank?
-        next if code.comment?
-        module_code= code.to_code
-        menu_icon = m_icon(m)
+    # create or update to Jinda::Module model
+    ma_module = Jinda::Module.find_or_create_by code: module_code
+    ma_module.update uid: ma_module.id.to_s, icon: menu_icon
+    protected_modules << ma_module.uid
+    name = module_code if name.blank?
+    ma_module.update name: name.strip, seq: mseq
+    mseq     += 1
+    seq       = 0
 
-        # ##########################################################################
-        # First Node eg: Module Name 
-        # ##########################################################################
-        # create or update to Jinda::Module model
-        ma_module= Jinda::Module.find_or_create_by :code=>module_code
-        ma_module.update_attributes :uid=>ma_module.id.to_s, :icon=>menu_icon
-        protected_modules << ma_module.uid
-        name = module_code if name.blank?
-        ma_module.update_attributes :name=> name.strip, :seq=> mseq
-        mseq += 1
-        seq= 0
+    # ##########################################################################
+    # Second Nodes eg: Role, Link otherwise Services
+    # ##########################################################################
+    m.each_element('node') do |s|
+      service_name = s.attributes['TEXT'].to_s
+      scode, sname = service_name.split(':', 2)
+      sname      ||= scode
+      sname.strip!
+      scode = scode.to_code
+      if scode == 'role'
+        ma_module.update_attribute :role, sname
+        next
+      end
+      if scode.casecmp('link').zero?
+        role       = get_option_xml('role', s) || ''
+        rule       = get_option_xml('rule', s) || ''
+        ma_service = Jinda::Service.find_or_create_by module_code: ma_module.code, code: scode, name: sname
+      else
 
         # ##########################################################################
-        # Second Nodes eg: Role, Link otherwise Services
+        # Second and Third Nodes eg: Role, Normal Services
         # ##########################################################################
-        m.each_element('node') do |s|
-          service_name= s.attributes["TEXT"].to_s
-          scode, sname= service_name.split(':', 2)
-          sname ||= scode; sname.strip!
-          scode= scode.to_code
-          if scode=="role"
-            ma_module.update_attribute :role, sname
-            next
-          end
-          if scode.downcase=="link"
-            role= get_option_xml("role", s) || ""
-            rule= get_option_xml("rule", s) || ""
-            ma_service= Jinda::Service.find_or_create_by :module_code=> ma_module.code, :code=> scode, :name=> sname
-            ma_service.update_attributes :xml=>s.to_s, :name=>sname,
-              :list=>listed(s), :ma_secured=>ma_secured?(s),
-              :module_id=>ma_module.id, :seq => seq,
-              :confirm=> get_option_xml("confirm", xml),
-              :role => role, :rule => rule, :uid=> ma_service.id.to_s
-            seq += 1
-            protected_services << ma_service.uid
-          else
-
-            # ##########################################################################
-            # Second and Third Nodes eg: Role, Normal Services
-            # ##########################################################################
-            # normal service
-            step1 = s.elements['node']
-            role= get_option_xml("role", step1) || ""
-            rule= get_option_xml("rule", step1) || ""
-            ma_service= Jinda::Service.find_or_create_by :module_code=> ma_module.code, :code=> scode
-            ma_service.update_attributes :xml=>s.to_s, :name=>sname,
-              :list=>listed(s), :ma_secured=>ma_secured?(s),
-              :module_id=>ma_module.id, :seq => seq,
-              :confirm=> get_option_xml("confirm", xml),
-              :role => role, :rule => rule, :uid=> ma_service.id.to_s
-            seq += 1
-            protected_services << ma_service.uid
-          end
-        end
+        # normal service
+        step1      = s.elements['node']
+        role       = get_option_xml('role', step1) || ''
+        rule       = get_option_xml('rule', step1) || ''
+        ma_service = Jinda::Service.find_or_create_by module_code: ma_module.code, code: scode
       end
-      Jinda::Module.not_in(:uid=>protected_modules).delete_all
-      Jinda::Service.not_in(:uid=>protected_services).delete_all
+      ma_service.update xml: s.to_s, name: sname,
+                        list: listed(s), ma_secured: ma_secured?(s),
+                        module_id: ma_module.id, seq: seq,
+                        confirm: get_option_xml('confirm', xml),
+                        role: role, rule: rule, uid: ma_service.id.to_s
+      seq += 1
+      protected_services << ma_service.uid
     end
-
+  end
+  Jinda::Module.not_in(uid: protected_modules).delete_all
+  Jinda::Service.not_in(uid: protected_services).delete_all
+end

data/lib/jinda/gen_xmain.rb

@@ -1,38 +1,40 @@
+# frozen_string_literal: true
 
+# #######################################################################]
+# Each Service at one moment will create one xmain
+# #######################################################################]
+def create_xmain(service)
+  c                 = name2camel(service.module.code)
+  custom_controller = "#{c}Controller"
+  params['return']  = request.env['HTTP_REFERER']
+  Jinda::Xmain.create service: service,
+                      start: Time.zone.now,
+                      name: service.name,
+                      ip: get_ip,
+                      status: 'I', # init
+                      user: current_ma_user,
+                      xvars: {
+                        service_id: service.id,
+                        p: params.to_unsafe_h,
+                        id: params[:id],
+                        user_id: current_ma_user.try(:id),
+                        custom_controller: custom_controller,
+                        host: request.host,
+                        referer: request.env['HTTP_REFERER']
+                      }
+end
 
-    ########################################################################]
-    # Each Service at one moment will create one xmain
-    ########################################################################]
-    def create_xmain(service)
-      c = name2camel(service.module.code)
-      custom_controller= "#{c}Controller"
-      params["return"] = request.env['HTTP_REFERER']
-      Jinda::Xmain.create :service=>service,
-        :start=>Time.now,
-        :name=>service.name,
-        :ip=> get_ip,
-        :status=>'I', # init
-        :user=>current_ma_user,
-        :xvars=> {
-          :service_id=>service.id,
-          :p=>params.to_unsafe_h,
-          :id=>params[:id],
-          :user_id=>current_ma_user.try(:id),
-          :custom_controller=>custom_controller,
-          :host=>request.host,
-          :referer=>request.env['HTTP_REFERER']
-        }
-    end
-    def clear_xmains
-      Jinda::Xmain.where(:status =>{'$in'=>['R','I']}).update_all(:status=>'X')
-      redirect_to action:"pending"
-    end
-    def ajax_notice
-      if notice=Jinda::Notice.recent(current_ma_user, request.env["REMOTE_ADDR"])
-        notice.update_attribute :unread, false
-        js = "notice('#{notice.message}');"
-      else
-        js = ""
-      end
-      render plain: "<script>#{js}</script>"
-    end
+def clear_xmains
+  Jinda::Xmain.where(status: { '$in' => %w[R I] }).update_all(status: 'X')
+  redirect_to action: 'pending'
+end
+
+def ajax_notice
+  if (notice = Jinda::Notice.recent(current_ma_user, request.env['REMOTE_ADDR']))
+    notice.update_attribute :unread, false
+    js = "notice('#{notice.message}');"
+  else
+    js = ''
+  end
+  render plain: "<script>#{js}</script>"
+end

data/lib/jinda/get_app.rb

@@ -1,34 +1,36 @@
+# frozen_string_literal: true
 
+# ##########################################################################
+#                         Load index.mm from Rails
+# ##########################################################################
+def get_app
+  # MM was defined in Rails: config/initializer/jinda.rb
+  f          = MM || Rails.root.join('app/jinda/index.mm').to_s
+  dir        = File.dirname(f)
+  t          = REXML::Document.new(File.read(MM).delete("\n")).root
+  recheck    = true
+  first_pass = true
+  while recheck
+    recheck = false
+    t.elements.each('//node') do |n|
+      next unless n.attributes['LINK'] # has attached file
 
-    # ##########################################################################
-    #                         Load index.mm from Rails
-    # ##########################################################################
-    def get_app
-      # MM was defined in Rails: config/initializer/jinda.rb
-      f= MM || "#{Rails.root}/app/jinda/index.mm" 
-      dir= File.dirname(f)
-      t= REXML::Document.new(File.read(MM).gsub("\n","")).root
-      recheck= true ; first_pass= true
-      while recheck
-        recheck= false
-        t.elements.each("//node") do |n|
-          if n.attributes['LINK'] # has attached file
-            if first_pass
-              f= "#{dir}/#{n.attributes['LINK']}"
-            else
-              f= n.attributes['LINK']
-            end
-            next unless File.exists?(f)
-            tt= REXML::Document.new(File.read(f).gsub("\n","")).root.elements["node"]
-            make_folders_absolute(f,tt)
-            tt.elements.each("node") do |tt_node|
-              n.parent.insert_before n, tt_node
-            end
-            recheck= true
-            n.parent.delete_element n
+      f = if first_pass
+            "#{dir}/#{n.attributes['LINK']}"
+          else
+            n.attributes['LINK']
           end
-        end
-        first_pass = false
+      next unless File.exist?(f)
+
+      tt = REXML::Document.new(File.read(f).delete("\n")).root.elements['node']
+      make_folders_absolute(f, tt)
+      tt.elements.each('node') do |tt_node|
+        n.parent.insert_before n, tt_node
       end
-      return t
+      recheck = true
+      n.parent.delete_element n
     end
+    first_pass = false
+  end
+  t
+end

data/lib/jinda/helpers.rb

@@ -1,11 +1,13 @@
-# -*- encoding : utf-8 -*-
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/core_ext'
 
 module Jinda
   module Helpers
-    require "rexml/document"
+    require 'rexml/document'
     include REXML
+
     require_relative 'date_helpers'
     require_relative 'gen_helpers'
     require_relative 'gen_class'
@@ -16,7 +18,6 @@ module Jinda
     require_relative 'themes'
     require_relative 'gen_xmain'
     require_relative 'gen_models'
-    require_relative 'date_helpers'
     require_relative 'rake_views'
     require_relative 'gen_runseq'
     require_relative 'gen_services'
@@ -24,4 +25,3 @@ module Jinda
     require_relative 'get_app'
   end
 end
-

data/lib/jinda/init_vars.rb

@@ -1,36 +1,41 @@
-    def init_vars_by_runseq(runseq_id)
-      @runseq= Jinda::Runseq.find runseq_id
-      @xmain= @runseq.xmain
-      @xvars= @xmain.xvars
-      #@xvars[:current_step]= @runseq.rstep
-      @runseq.start ||= Time.now
-      @runseq.status= 'R' # running
-      @runseq.save
-    end
-    def init_vars(xmain)
-      @xmain= Jinda::Xmain.find xmain
-      @xvars= @xmain.xvars
-      @runseq= @xmain.runseqs.find @xmain.current_runseq
-      #    authorize?
-      @xvars['current_step']= @runseq.rstep
-      @xvars['referrer']= request.referrer
-      session[:xmain_id]= @xmain.id
-      session[:runseq_id]= @runseq.id
-      unless params[:action]=='run_call'
-        @runseq.start ||= Time.now
-        @runseq.status= 'R' # running
-        @runseq.save
-      end
-      $xmain= @xmain; $xvars= @xvars
-      $runseq_id= @runseq.id
-      $user_id= current_ma_user.try(:id)
-    end
-    def init_vars_by_runseq(runseq_id)
-      @runseq= Jinda::Runseq.find runseq_id
-      @xmain= @runseq.xmain
-      @xvars= @xmain.xvars
-      #@xvars[:current_step]= @runseq.rstep
-      @runseq.start ||= Time.now
-      @runseq.status= 'R' # running
-      @runseq.save
-    end
+# frozen_string_literal: true
+
+def init_vars_by_runseq(runseq_id)
+  @runseq         = Jinda::Runseq.find runseq_id
+  @xmain          = @runseq.xmain
+  @xvars          = @xmain.xvars
+  # @xvars[:current_step]= @runseq.rstep
+  @runseq.start ||= Time.zone.now
+  @runseq.status  = 'R' # running
+  @runseq.save
+end
+
+def init_vars(xmain)
+  @xmain                 = Jinda::Xmain.find xmain
+  @xvars                 = @xmain.xvars
+  @runseq                = @xmain.runseqs.find @xmain.current_runseq
+  #    authorize?
+  @xvars['current_step'] = @runseq.rstep
+  @xvars['referrer']     = request.referer
+  session[:xmain_id]     = @xmain.id
+  session[:runseq_id]    = @runseq.id
+  unless params[:action] == 'run_call'
+    @runseq.start ||= Time.zone.now
+    @runseq.status  = 'R' # running
+    @runseq.save
+  end
+  $xmain                 = @xmain
+  $xvars                 = @xvars
+  $runseq_id             = @runseq.id
+  $user_id               = current_ma_user.try(:id)
+end
+
+def init_vars_by_runseq(runseq_id)
+  @runseq         = Jinda::Runseq.find runseq_id
+  @xmain          = @runseq.xmain
+  @xvars          = @xmain.xvars
+  # @xvars[:current_step]= @runseq.rstep
+  @runseq.start ||= Time.zone.now
+  @runseq.status  = 'R' # running
+  @runseq.save
+end