jinda 0.5.2 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d32e253610977d016f3a715060ae616171a2c71331474c9f7dc7091682b4d58b
-  data.tar.gz: 6af32a30a010f037e392fb630713c5b42a8ebc1482da18faae7605aaff8d804d
+  metadata.gz: c9ccb1a4e45e53213b02caa625662e84ccd386d446509fef479f183f8a2aa3b9
+  data.tar.gz: f0efd2ac4630d6a145510969de1d361a28d3c376179649b906bb3f6f9e5b46b9
 SHA512:
-  metadata.gz: b4fa824aa0b3598642f0e2b818883e2b1eea7f5dcfb5eacc04bd3dbc1c279dbc6ec697dca9a6b0759f8ba6f4b5eab9c12d31736b70a520d2d84fa4eff9aab99b
-  data.tar.gz: '04840e4df4f2d0e02a8f200bf5707d294b7993c53d2fc009c4ef558a9a9bab87cb4a3700f666b19a7b09fe094f655dd9e33c6815138ae8d194ab4d8c746d9d32'
+  metadata.gz: a2fbe028c4cd8b129c70b35c908479ca9aec7b0d0389256a1e423eb81315b8c07728ac8dc5a81d469114f2eb9e6380c39420d35202247b878bc690cda832d8d2
+  data.tar.gz: 84ef6f473657779def3fdfe49dfbfdb08f386d79028d3cffb5d3896ae06d864185b6ddb949e695a0deb1162fcae7f40ffa353b289f67cc6d2320c532a0f5b88a

data/README.md

@@ -14,8 +14,8 @@ Rails Application Generator using Freemind
 
 These versions works for sure but others may do.
 
-* Ruby 2.7.0
-* Rails 6.0.2
+* Ruby 2.7.1
+* Rails 6.0.3
 * MongoDB 6
 * Freemind 1.0.1
 
@@ -40,7 +40,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.5.2'
+    gem 'jinda', '~> 0.5.7'
 
 For Development (most updated)
 

data/lib/generators/jinda/install_generator.rb

@@ -83,6 +83,7 @@ module Jinda
         inside("app/controllers") {(File.file? "admins_controller.rb") ? ( say "Please merge existing jinda_org/admins_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/admins_controller.rb', 'admins_controller.rb')}
         inside("app/controllers") {(File.file? "articles_controller.rb") ? ( say "Please merge existing jinda_org/articles_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/articles_controller.rb', 'articles_controller.rb')}
         inside("app/controllers") {(File.file? "comments_controller.rb") ? ( say "Please merge existing jinda_org/comments_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/comments_controller.rb', 'comments_controller.rb')}
+        inside("app/controllers") {(File.file? "docs_controller.rb") ? ( say "Please merge existing jinda_org/docs_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/docs_controller.rb', 'docs_controller.rb')}
         inside("app/controllers") {(File.file? "identities_controller.rb") ? ( say "Please merge existing jinda_org/identities_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/identities_controller.rb', 'identities_controller.rb')}
         inside("app/controllers") {(File.file? "jinda_controller.rb") ? ( say "Please merge existing jinda_org/jinda_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/jinda_controller.rb', 'jinda_controller.rb')}
         inside("app/controllers") {(File.file? "password_resets_controller.rb") ? ( say "Please merge existing jinda_org/password_resets_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/password_resets_controller.rb', 'password_resets_controller.rb')}
@@ -107,13 +108,19 @@ module Jinda
         route "resources :sessions"
         route "resources :identities"
         route "resources :users"
+        route "resources :docs"
         route "resources :notes"
-        route "resources :articles"
+        route "resources :comments"
+        route "resources :articles do resources :comments end"
+        route "get '/jinda/document/:id' => 'jinda#document'"
         route "get '/notes/destroy/:id' => 'notes#destroy'"
         route "get '/notes/my/destroy/:id' => 'notes#destroy'"
+        route "get '/docs/my/destroy' => 'docs#destroy'"
         route "get '/notes/my' => 'notes/my'"
+        route "get '/docs/my' => 'docs/my'"
 		    route "get '/articles/my/destroy' => 'articles#destroy'"
-        route "get '/articles/my' => 'articles/my'"
+        route "get '/articles/show' => 'articles/show'"
+        route "get '/articles/my' => 'articles#my'"
         route "get '/logout' => 'sessions#destroy', :as => 'logout'"
         route "get '/auth/failure' => 'sessions#destroy'"
         route "get '/auth/:provider/callback' => 'sessions#create'"
@@ -125,6 +132,7 @@ module Jinda
         route "post '/jinda/init' => 'jinda#init'"
         route "jinda_methods.each do \|aktion\| get \"/jinda/\#\{aktion\}\" => \"jinda#\#\{aktion\}\" end"
         route "jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']"
+        route "jinda_methods += ['run_redirect', 'run_direct_to','run_if']"
         route "jinda_methods += ['init', 'run', 'run_mail', 'document', 'run_do', 'run_form', 'end_form']"
         route "jinda_methods = ['pending', 'status', 'search', 'doc', 'doc_print', 'logs', 'ajax_notice']"  
         route "\# start jiinda method routes"

data/lib/generators/jinda/templates/README.md

@@ -36,7 +36,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.5.2'
+    gem 'jinda', '~> 0.5.3'
 
 For Development (most updated)
 

data/lib/generators/jinda/templates/app/assets/stylesheets/app.scss

@@ -1,14 +1,19 @@
 
+#article-title {
+  text-align: left;
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  color:#333;
+}
+
 #title {
   font-size: 14pt;
   font-weight: bold;
-  text-align: center;
-  background: #d2f0ff;
+  text-align: left;
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
   color:#333;
 
 }
-#text {
+#text{
   font-size: 14pt;
   font-weight: bold;
   text-align:left;
@@ -41,7 +46,6 @@
 #table th {
   background-color: #bcecff;
   color:#333;
-;
   width:100%;
 }
 
@@ -59,12 +63,14 @@
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
   /*font-size: 110%;*/
 }
-.ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: 7px 75px 7px 15px; display: block; }
+.ui-li .ui-btn-inner a.ui-link-inherit, .ui-li-static.ui-li { padding: 7px 75px 7px 7px; display: block; }
 .ui-link-inherit { font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;}
 label.ui-input-text {
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
   /*font-size: 110%;*/
   text-shadow: none;
+  margin: 2% 2% 0 0;
+
 }
 label.ui-select {
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;

data/lib/generators/jinda/templates/app/assets/stylesheets/articles.scss

@@ -1,16 +1,28 @@
 
-#article-title {
+
+#article-table {
   font-size: 14pt;
   font-weight: bold;
-  text-align: center;
-  background: #d2f0ff;
+  text-align: left;
+  background:#f7f7f7;
   font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  padding:2px 5px;
   color:#333;
 
 }
-#article-text {
+
+#article-title {
   font-size: 14pt;
   font-weight: bold;
+  text-align: left;
+  background:#f7f7f7;
+  font-family: 'TH SarabunPSK', Helvetica, Arial, sans-serif;
+  padding:2px 5px;
+  color:#333;
+
+}
+#article-text {
+  font-size: 8pt;
   text-align:left;
   border:1px solid #c1c1c1;
   background:#f7f7f7;
@@ -28,7 +40,6 @@
 
 #comment-body {
   font-size: 10pt;
-  font-weight: bold;
   text-align:left;
   color:#333;
 }
@@ -41,7 +52,6 @@
 #article-table th {
   background-color: #bcecff;
   color:#333;
-;
   width:100%;
 }
 

data/lib/generators/jinda/templates/app/controllers/concerns/jinda_general_concern.rb

@@ -55,6 +55,7 @@ module JindaGeneralConcern
   end
 
   # process images from second level, e.g,, fields_for
+  # save uploaded file info to Doc
   def get_image1(key, key1, params)
     doc = Jinda::Doc.create(
       :name=> "#{key}_#{key1}",
@@ -63,16 +64,24 @@ module JindaGeneralConcern
       :filename=> params.original_filename,
       :content_type => params.content_type || 'application/zip',
       :data_text=> '',
+      :dscan=> '',
+      :description=>'',
+      :keywords=>'',
+      :category=>'',
       :ma_display=>true, :ma_secured => @xmain.service.ma_secured )
     if defined?(IMAGE_LOCATION)
       filename = "#{IMAGE_LOCATION}/f#{Param.gen(:asset_id)}"
       File.open(filename,"wb") { |f| f.write(params.read) }
       eval "@xvars[@runseq.code][key][key1] = '#{url_for(:action=>'document', :id=>doc.id, :only_path => true)}' "
-      doc.update_attributes :url => filename, :basename => File.basename(filename), :cloudinary => false
+      doc.update_attributes :url => filename, 
+        :basename => File.basename(filename), 
+        :cloudinary => false, 
+        :dscan => @xvars[@runseq.code][key][key1],
+        :user_id => @xvars["user_id"]
     else
       result = Cloudinary::Uploader.upload(params)
       eval %Q{ @xvars[@runseq.code][key][key1] = '#{result["url"]}' }
-      doc.update_attributes :url => result["url"], :basename => File.basename(result["url"]), :cloudinary => true
+      doc.update_attributes :url => result["url"], :basename => File.basename(result["url"]), :cloudinary => true, :dscan => @xvars[@runseq.code][key][key1]
     end
   end
 
@@ -81,13 +90,27 @@ module JindaGeneralConcern
   end
 
   # generate documentation for application
+  # search data from Doc
+  def document
+    doc = Jinda::Doc.find params[:id]
+    if doc.cloudinary
+      require 'net/http'
+      require "uri"
+      uri = URI.parse(doc.url)
+      data = Net::HTTP.get_response(uri)
+      send_data(data.body, :filename=>doc.filename, :type=>doc.content_type, :disposition=>"inline")
+    else
+      data= read_binary(doc.url)
+      send_data(data, :filename=>doc.filename, :type=>doc.content_type, :disposition=>"inline")
+    end
+  end
+
   def doc
     require 'rdoc'
     @app= get_app
     @intro = File.read('README.md')
     @print= "<div align='right'><img src='/assets/printer.png'/> <a href='/jinda/doc_print' target='_blank'/>Print</a></div>"
     doc= render_to_string 'doc.md', :layout => false
-
     html= Maruku.new(doc).to_html
     File.open('public/doc.html','w') {|f| f.puts html }
     respond_to do |format|
@@ -127,7 +150,7 @@ module JindaGeneralConcern
 
   def search
     @q = params[:q] || params[:ma_search][:q] || ""
-    @title = "ผลการค้นหา #{@q}"
+    @title = "Search Result #{@q}"
     @backbtn= true
     @cache= true
     if @q.blank?

data/lib/generators/jinda/templates/app/controllers/concerns/jinda_run_concern.rb

@@ -60,6 +60,20 @@ module JindaRunConcern
     end_action(next_runseq)
   end
 
+  # redirect when finish last runseq
+  # eg: http://localhost:3000/notes/my
+  def run_direct_to
+    init_vars(params[:id])
+    next_runseq= @xmain.runseqs.where(:id.ne=>@runseq.id, :code=>@runseq.code).first
+    if !@runseq.code.blank? 
+      @xvars['p']['return'] = @runseq.code
+    else
+      flash[:notice]= "Error: missing required forward path in Freemind"
+      ma_log "Error: require forward path in Freemind"
+    end
+    end_action(next_runseq)
+  end
+
   def run_redirect
     init_vars(params[:id])
     # next_runseq= @xmain.runseqs.first :conditions=>["id != ? AND code = ?",@runseq.id, @runseq.code]
@@ -68,16 +82,19 @@ module JindaRunConcern
     end_action(next_runseq)
   end
 
+    # call controller to do the freemind task using Star symbol eg: Update
+    # not for run_form
   def run_do
     init_vars(params[:id])
     @runseq.start ||= Time.now
     @runseq.status= 'R' # running
     $runseq_id= @runseq.id
     $user_id= current_ma_user.try(:id)
+    # $xmain, $runseq, $user, $xvars, $ip from local
     set_global
     controller = Kernel.const_get(@xvars['custom_controller']).new
-    # call controller to do the freemind task using Star symbol eg: Update
     result = controller.send(@runseq.code)
+    # save local var to database
     init_vars_by_runseq($runseq_id)
     @xvars = $xvars
     @xvars[@runseq.code.to_sym]= result.to_s
@@ -97,6 +114,100 @@ module JindaRunConcern
     refresh_to "/", :alert => "Sorry opeation error at  #{@xmain.id} #{@xvars['error']}"
   end
 
+  def run_list
+    init_vars(params[:id])
+    service= @xmain.service
+    # disp= get_option("display")
+    # disp = Nil or :"??????"
+    # get option from last node: rule, role, display
+    disp= get_option("display")
+    # change from Nil to false and string to true
+    ma_display = (disp && !affirm(disp)) ? false : true
+    # Todo check if file is available
+    # if service and file exist
+    # ma_display from disp of 3rd level node as rule, role, display
+    if service && !@runseq.code.blank? 
+      f= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
+      @ui= File.read(f)
+      if Jinda::Doc.where(:runseq_id=>@runseq.id).exists?
+        @doc= Jinda::Doc.where(:runseq_id=>@runseq.id).first
+        @doc.update_attributes :data_text=> render_to_string(:inline=>@ui, :layout=>"utf8"),
+          :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+          :ip=> get_ip, :service=>service, :ma_display=>ma_display,
+          :ma_secured => @xmain.service.ma_secured,
+          :filename => "#{@runseq.code}.html.erb"
+      else
+        @doc= Jinda::Doc.create :name=> @runseq.name,
+          :content_type=>"output", :data_text=> render_to_string(:inline=>@ui, :layout=>"utf8"),
+          :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+          :ip=> get_ip, :service=>service, :ma_display=>ma_display,
+          :ma_secured => @xmain.service.ma_secured,
+          :filename => "#{@runseq.code}.html.erb"
+      end
+      # @message = defined?(MSG_NEXT) ? MSG_NEXT : "Next >"
+      @message = defined?(MSG_NEXT) ? MSG_NEXT : "Next >>"
+      @message = "Finish" if @runseq.end
+      ma_log("Todo defined?(NSG_NEXT : Next >>)")
+      eval "@xvars[@runseq.code] = url_for(:controller=>'jinda', :action=>'document', :id=>@doc.id)"
+    else
+      flash[:notice]= "Error: Can not find the view file for this controller"
+      ma_log "Error: Can not find the view file for this controller"
+      redirect_to_root
+    end
+    # Check if ma_display available
+    # ma_display= get_option("display")
+    # if not ma_display then no display both controller-view and content then  end back to root
+    unless ma_display
+      end_action
+    end
+    # controller display from  @ui
+  end
+
+  def run_folder
+    init_vars(params[:id])
+    service= @xmain.service
+    # disp= get_option("display")
+    # disp = Nil or :"??????"
+    disp= get_option("display")
+    ma_display = (disp && !affirm(disp)) ? false : true
+    # Todo check if file is available
+    # if service and file exist
+    if service && !@runseq.code.blank? 
+      f= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
+      @ui= File.read(f)
+      if Jinda::Doc.where(:runseq_id=>@runseq.id).exists?
+        @doc= Jinda::Doc.where(:runseq_id=>@runseq.id).first
+        @doc.update_attributes :data_text=> render_to_string(:inline=>@ui, :layout=>"utf8"),
+          :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+          :ip=> get_ip, :service=>service, :ma_display=>ma_display,
+          :ma_secured => @xmain.service.ma_secured,
+          :filename => "#{@runseq.code}.html.erb"
+      else
+        @doc= Jinda::Doc.create :name=> @runseq.name,
+          :content_type=>"output", :data_text=> render_to_string(:inline=>@ui, :layout=>"utf8"),
+          :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+          :ip=> get_ip, :service=>service, :ma_display=>ma_display,
+          :ma_secured => @xmain.service.ma_secured,
+          :filename => "#{@runseq.code}.html.erb"
+      end
+      # @message = defined?(MSG_NEXT) ? MSG_NEXT : "Next >"
+      @message = defined?(MSG_NEXT) ? MSG_NEXT : "Next >>"
+      @message = "Finish" if @runseq.end
+      ma_log("Todo defined?(NSG_NEXT : Next >>)")
+      eval "@xvars[@runseq.code] = url_for(:controller=>'jinda', :action=>'document', :id=>@doc.id)"
+    else
+      flash[:notice]= "Error: Can not find the view file for this controller"
+      ma_log "Error: Can not find the view file for this controller"
+      redirect_to_root
+    end
+    # Check if ma_display available
+    # ma_display= get_option("display")
+    unless ma_display
+      end_action
+    end
+    # controller display from  @ui
+  end
+
   def run_output
     init_vars(params[:id])
     service= @xmain.service
@@ -135,11 +246,11 @@ module JindaRunConcern
       redirect_to_root
     end
     # Check if ma_display available
-    # ma_display= get_option("ma_display")
+    # ma_display= get_option("display")
     unless ma_display
       end_action
     end
-    # display from  @ui
+    # controller display from  @ui
   end
 
   def run_mail
@@ -168,8 +279,11 @@ module JindaRunConcern
     end_action
   end
 
+  # Store params to @xvars[@runseq]
+  # Perform task from the form input eg: attach file
+  # replace end_action (for form)
+  # Store params attach file to @xvars to use in get_image
   def end_form
-    # Check error using xmain_id to redirect_to_root and return
     if params[:xmain_id]
       init_vars(params[:xmain_id])
     else
@@ -183,13 +297,17 @@ module JindaRunConcern
         get_image(k, params[k])
         # check if params of array in form eg: edit_article	
       elsif params[k].is_a?(ActionController::Parameters)
+        eval "@xvars[@runseq.code][k] = {} unless @xvars[@runseq.code][k]"
         params[k].each { |k1,v1|
           # eval "@xvars[@runseq.code][k1] = params.require(k1).permit(k1)"
-          eval "@xvars[@runseq.code][k1] = v1" 
+          eval "@xvars[@runseq.code][k][k1] = v1" 
           next unless v1.respond_to?(:original_filename)
+          doc = {}
           get_image1(k, k1, params[k][k1])
         }
       else
+        # No file attached
+        #
         # https://stackoverflow.com/questions/34949505/rails-5-unable-to- retrieve-hash-values-from-parameter     # bug in to_unsalfe_h rails 5.1.6 https://github.com/getsentry/raven-ruby/issues/799
         # Solution:
         # https://stackoverflow.com/questions/34949505/rails-5-unable-to-retrieve-hash-values-from-parameter
@@ -200,10 +318,21 @@ module JindaRunConcern
         eval "@xvars[@runseq.code][k] = v"
       end
     }
-    end_action
+  end_action
+  rescue => e
+    @xmain.status='E'
+    @xvars['error']= e.to_s+e.backtrace.to_s
+    @xmain.xvars= $xvars
+    @xmain.save
+    @runseq.status= 'F' #finish
+    @runseq.stop= Time.now
+    @runseq.save
+    ma_log "Error:end_form "
+    refresh_to "/", :alert => "Sorry opeation error at  #{@xmain.id} #{@xvars['error']}"
   end
 
   def end_action(next_runseq = nil)
+    # not for form
     #    @runseq.status='F' unless @runseq_not_f
     @xmain.xvars= @xvars
     @xmain.status= 'R' # running