jinda 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecac4f20399ba16041c265028b66ed5121fc564fcd1d03232bc63c49bae06d59
-  data.tar.gz: 040c63dd43667737d2388b89eb4c682ae77c27b859308730f957b4505cc0cf1d
+  metadata.gz: 86e26953c4782d41554c6d2d906ce58d2a2320ddfa49446d14920819fbd19990
+  data.tar.gz: 6e4752ee8dcab6758bcb5d3640fcb5af993800bfa965c6a937ab794f0066d5d8
 SHA512:
-  metadata.gz: ca4d56c87c21ee29adea2d9068ff6bbd7f272dc3da85dfef033e05895ea9d905e7fdeeda28acb4184c4271aca81028240e7e6cd48f078539d86484f6c6532a6e
-  data.tar.gz: a30945796a4c41f85fbc859260e54867a0db663247c5ef5318da374d4d0ec6c5cdc386371f62f895076eccd8de2420b77156d8ec27fcbd31545895f89577b45c
+  metadata.gz: c0ade9552fde2d3b14032f796845465cf591e70d8d906821301ada8f3e2e30456d9b2632cf7642663d1601e54d463d0ef848c78c8ed6a7eb94a48845d1605b56
+  data.tar.gz: 59b9411947dbc7290dc94fb7b4f37700554507a8b910c01324b29012e359428999a911118212e0490e0fbf5e2dc10e79af8b9e89d64b56b796c118f2d5c4c07d

data/README.md

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

data/lib/generators/jinda/install_generator.rb

@@ -150,7 +150,7 @@ module Jinda
   end
 
   # config time zone
-  # config.time_zone = "Central Time (US & Canada)"
+  config.time_zone = "Central Time (US & Canada)"
 
   # gmail config
   # config.action_mailer.delivery_method = :smtp

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

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

data/lib/generators/jinda/templates/app/controllers/jinda_org/jinda_controller.rb

@@ -170,6 +170,7 @@ class JindaController < ApplicationController
     $user_id= current_ma_user.try(:id)
     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)
     init_vars_by_runseq($runseq_id)
     @xvars = $xvars
@@ -192,10 +193,13 @@ class JindaController < ApplicationController
   def run_output
     init_vars(params[:id])
     service= @xmain.service
-    # disp= get_option("ma_display")
-    disp= get_option("ma_display")
+    # disp= get_option("display")
+    # disp = Nil or :"??????"
+    disp= get_option("display")
     ma_display = (disp && !affirm(disp)) ? false : true
-    if service
+    # 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?
@@ -203,27 +207,34 @@ class JindaController < ApplicationController
         @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
+          :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
+          :ma_secured => @xmain.service.ma_secured,
+          :filename => "#{@runseq.code}.html.erb"
       end
-      @message = defined?(MSG_NEXT) ? MSG_NEXT : "Next &gt;"
+      # @message = defined?(MSG_NEXT) ? MSG_NEXT : "Next &gt;"
+      @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"
+      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
-    #ma_display= get_option("ma_display")
+    #
+    # Check if ma_display available
+    #
+    # ma_display= get_option("ma_display")
     unless ma_display
       end_action
     end
+    # display from  @ui
   end
   def run_mail
     init_vars(params[:id])
@@ -511,7 +522,7 @@ class JindaController < ApplicationController
       i= i + 1
       output_ma_display= false
       if action=='output'
-        ma_display= get_option_xml("ma_display", activity)
+        ma_display= get_option_xml("display", activity)
         if ma_display && !affirm(ma_display)
           output_ma_display= false
         else
@@ -520,7 +531,7 @@ class JindaController < ApplicationController
       end
       j= j + 1 if (action=='form' || output_ma_display)
       @xvars['referer'] = activity.attributes['TEXT'] if action=='redirect'
-      if action!= 'if'
+      if action!= 'if' && !text.blank?
         scode, name= text.split(':', 2)
         name ||= scode; name.strip!
         code= name2code(scode)

data/lib/generators/jinda/templates/app/views/jinda/index.html.haml

@@ -21,7 +21,7 @@
 
   %h2 Installation
   %ul
-    %li add gem 'jinda', '0.5.0'
+    %li add gem 'jinda', '0.5.1'
     %li bundle
     %li rails generate jinda:install
     %li (run all with "sh install.sh" )

data/lib/jinda/helpers.rb

@@ -65,17 +65,13 @@ module Jinda
     end
     # Todo refactor code
     def get_option(opt, runseq=@runseq)
-      ma_log("Todo in def get_option(opt, runseq=@runseq)")
       xml= REXML::Document.new(runseq.xml).root
       url=''
-      # xml.each_element('///node') do |n|
-      xml.each_element('/node') do |n|
+      # get option from second element of node using '//node'
+      xml.each_element('//node') do |n|
         if n.attributes['TEXT']
           text = n.attributes['TEXT']
-          puts "text = " + text
           url= text if text =~ /^#{opt}:\s*/
-          puts "url = " + url
-          ma_log("Todo in def get_option(opt, runseq=@runseq)")
         end
       end
       return nil if url.blank?
@@ -642,11 +638,13 @@ module Jinda
         return true
       end
     end
+    # return nil or value of opt: if provided
     def get_option_xml(opt, xml)
       if xml
         url=''
         xml.each_element('node') do |n|
           text= n.attributes['TEXT']
+          # check if opt match from beginning of text
           url= text if text =~/^#{opt}/
         end
         return nil if url.blank?

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler