jinda 0.7.7.4 → 1.0.0

data/lib/jinda/gen_helpers.rb

@@ -1,141 +1,148 @@
+# frozen_string_literal: true
 
+########################################################################
+#                  Methods to be overrided by gemhelp                  #
+#                            for Rspec Test
+########################################################################
+def gen_view_file_exist?(dir)
+  File.exist?(dir)
+end
 
-    ########################################################################
-    #                  Methods to be overrided by gemhelp                  #
-    #                            for Rspec Test
-    ########################################################################
-    def gen_view_file_exist?(dir)
-      File.exists?(dir)
-    end
-
-    def gen_view_mkdir(dir,t)
-      FileUtils.mkdir_p(dir) unless File.exists?(dir)
-      t << "create directory #{dir}"
-    end
-
-    def gen_view_createfile(s,f,t)
-      FileUtils.cp s,f
-      # FileUtils.cp "app/jinda/template/linkview.haml",f
-      t << "create file #{f}"
-    end
-    ########################################################################
-
-    def controller_exists?(modul)
-      File.exists? "#{Rails.root}/app/controllers/#{modul}_controller.rb"
-    end
-    def dup_hash(a)
-      h = Hash.new(0)
-      a.each do |aa|
-        h[aa] += 1
-      end
-      return h
-    end
-    def login?
-      ## To use remember me cookies then remove
-      #session[:user_id] != nil
-      current_ma_user != nil
-      #cookies[:auth_token] != nil
-    end
-    def own_xmain?
-      if $xmain
-        return current_ma_user.id==$xvars['user_id']
-      else
-        # if eval on first step would return true so user can start service
-        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?
-        c, h= url.split(':', 2)
-        opt= h ? h.strip : true
-      else
-        return nil
-      end
-    end
-    def m_icon(node)
-      mcons=[]
-      node.each_element("icon") do |mn|
-        mcons << mn.attributes["BUILTIN"]
-      end
-      ticon = mcons[0].to_s
-      return ticon
-    end
-
-    # Option to unlisted in the menu_mm if icon 'button_cancel'
-    def listed(node)
-      icons=[]
-      node.each_element("icon") do |nn|
-        icons << nn.attributes["BUILTIN"]
-      end
-
-      return !icons.include?("button_cancel")
-    end
-    def ma_secured?(node)
-      icons=[]
-      node.each_element("icon") do |nn|
-        icons << nn.attributes["BUILTIN"]
-      end
-      return icons.include?("password")
-    end
-    def ma_menu?
-      icons=[]
-      node.each_element("icon") do |mn|
-        icons << mn.attributes["BUILTIN"]
-      end
-      return icons.include?("menu")
-    end
-
-    def freemind2action(s)
-      case s.downcase
-        #when 'bookmark' # Excellent
-        #  'call'
-      when 'bookmark' # Excellent
-        'do'
-      when 'attach' # Look here
-        'form'
-      when 'edit' # Refine
-        'pdf'
-      when 'wizard' # Magic
-        'ws'
-      when 'help' # Question
-        'if'
-      when 'forward' # Forward
-        # 'redirect'
-        'direct_to'
-      when 'kaddressbook' #Phone
-        'invoke' # invoke new service along the way
-      when 'idea' # output
-        'output'
-      when 'list' # List
-        'list'
-      when 'folder' # Folder
-        'folder'
-      when 'mail'
-        'mail'
-      # when 'xmag' # Tobe discussed
-      when 'To be discusssed'
-        'search'  
-      end
-    end
-    def affirm(s)
-      return s =~ /[y|yes|t|true]/i ? true : false
-    end
-    def negate(s)
-      return s =~ /[n|no|f|false]/i ? true : false
-    end
-
-    # module FormBuilder
-    #   def date_field(method, options = {})
-    #     default= self.object.send(method) || Date.today
-    #     data_options= ({"mode"=>"calbox"}).merge(options)
-    #     %Q(<input name='#{self.object_name}[#{method}]' id='#{self.object_name}_#{method}' value='#{default.strftime("%F")}' type='date' data-role='datebox' data-options='#{data_options.to_json}'>).html_safe
-    #   end
-    # end
+def gen_view_mkdir(dir, t)
+  FileUtils.mkdir_p(dir)
+  t << "create directory #{dir}"
+end
+
+def gen_view_createfile(s, f, t)
+  FileUtils.cp s, f
+  # FileUtils.cp "app/jinda/template/linkview.haml",f
+  t << "create file #{f}"
+end
+########################################################################
+
+def controller_exists?(modul)
+  File.exist? Rails.root.join("app/controllers/#{modul}_controller.rb").to_s
+end
+
+def dup_hash(a)
+  h = Hash.new(0)
+  a.each do |aa|
+    h[aa] += 1
+  end
+  h
+end
+
+def login?
+  ## To use remember me cookies then remove
+  # session[:user_id] != nil
+  current_ma_user != nil
+  # cookies[:auth_token] != nil
+end
+
+def own_xmain?
+  if $xmain
+    current_ma_user.id == $xvars['user_id']
+  else
+    # if eval on first step would return true so user can start service
+    true
+  end
+end
+
+# return nil or value of opt: if provided
+def get_option_xml(opt, xml)
+  return unless xml
+
+  url = ''
+  xml.each_element('node') do |n|
+    text = n.attributes['TEXT']
+    # check if opt match from beginning of text
+    url  = text if /^#{opt}/.match?(text)
+  end
+  return nil if url.blank?
+
+  _, h = url.split(':', 2)
+  opt  = h ? h.strip : true
+end
+
+def m_icon(node)
+  mcons = []
+  node.each_element('icon') do |mn|
+    mcons << mn.attributes['BUILTIN']
+  end
+  mcons[0].to_s
+end
+
+# Option to unlisted in the menu_mm if icon 'button_cancel'
+def listed(node)
+  icons = []
+  node.each_element('icon') do |nn|
+    icons << nn.attributes['BUILTIN']
+  end
+
+  icons.exclude?('button_cancel')
+end
+
+def ma_secured?(node)
+  icons = []
+  node.each_element('icon') do |nn|
+    icons << nn.attributes['BUILTIN']
+  end
+  icons.include?('password')
+end
+
+def ma_menu?
+  icons = []
+  node.each_element('icon') do |mn|
+    icons << mn.attributes['BUILTIN']
+  end
+  icons.include?('menu')
+end
+
+def freemind2action(s)
+  case s.downcase
+    # when 'bookmark' # Excellent
+    #  'call'
+  when 'bookmark' # Excellent
+    'do'
+  when 'attach' # Look here
+    'form'
+  when 'edit' # Refine
+    'pdf'
+  when 'wizard' # Magic
+    'ws'
+  when 'help' # Question
+    'if'
+  when 'forward' # Forward
+    # 'redirect'
+    'direct_to'
+  when 'kaddressbook' # Phone
+    'invoke' # invoke new service along the way
+  when 'idea' # output
+    'output'
+  when 'list' # List
+    'list'
+  when 'folder' # Folder
+    'folder'
+  when 'mail'
+    'mail'
+  # when 'xmag' # Tobe discussed
+  when 'To be discusssed'
+    'search'
+  end
+end
+
+def affirm(s)
+  /[y|estru]/i.match?(s) || false
+end
+
+def negate(s)
+  /[n|ofalse]/i.match?(s) || false
+end
+
+# module FormBuilder
+#   def date_field(method, options = {})
+#     default= self.object.send(method) || Date.today
+#     data_options= ({"mode"=>"calbox"}).merge(options)
+#     %Q(<input name='#{self.object_name}[#{method}]' id='#{self.object_name}_#{method}' value='#{default.strftime("%F")}' type='date' data-role='datebox' data-options='#{data_options.to_json}'>).html_safe
+#   end
+# end

data/lib/jinda/gen_models.rb

@@ -1,137 +1,131 @@
-
-
-    def process_models
-
-      # app= get_app
-      # t= ["process models"]
-      #  xml map sample from index.mm 
-      #   node @CREATED=1273819432637 @ID=ID_1098419600 @MODIFIED=1334737006485 @TEXT=Jinda 
-      #    node @CREATED=1273819462973 @ID=ID_282419531 @MODIFIED=1493705904561 @POSITION=right @TEXT=services 
-      #     node @CREATED=1273819465949 @FOLDED=true @ID=ID_855471610 @MODIFIED=1493768913078 @POSITION=right @TEXT=roles 
-      #      node @CREATED=1273819456867 @ID=ID_1677010054 @MODIFIED=1493418874718 @POSITION=left @TEXT=models 
-      #       node @CREATED=1292122118499 @FOLDED=true @ID=ID_1957754752 @MODIFIED=1493705885123 @TEXT=person 
-      #       node @CREATED=1292122236285 @FOLDED=true @ID=ID_959987887 @MODIFIED=1493768919147 @TEXT=address 
-      #       node @CREATED=1493418879485 @ID=ID_1995497233 @MODIFIED=1493718770637 @TEXT=article 
-      #       node @CREATED=1493418915637 @ID=ID_429078131 @MODIFIED=1493418930081 @TEXT=comment 
-
-      models= @app.elements["//node[@TEXT='models']"] || REXML::Document.new
-      models.each_element('node') do |model|
-        # t << "= "+model.attributes["TEXT"]
-        model_name= model.attributes["TEXT"]
-        next if model_name.comment?
-        model_code= name2code(model_name)
-        model_file= "#{Rails.root}/app/models/#{model_code}.rb"
-
-        if File.exists?(model_file)
-          doc= File.read(model_file)
-        else
-          system("rails generate model #{model_code}")
-          doc= File.read(model_file)
-        end
-
-        doc = add_utf8(doc)
-        attr_hash= make_fields(model)
-        doc = add_jinda(doc, attr_hash)
-        # t << "modified:   #{model_file}"
-        File.open(model_file, "w") do |f|
-          f.puts doc
-        end
-
-      end
-
-      # puts t.join("\n")
+# frozen_string_literal: true
+
+def process_models
+  # app= get_app
+  # t= ["process models"]
+  #  xml map sample from index.mm
+  #   node @CREATED=1273819432637 @ID=ID_1098419600 @MODIFIED=1334737006485 @TEXT=Jinda
+  #    node @CREATED=1273819462973 @ID=ID_282419531 @MODIFIED=1493705904561 @POSITION=right @TEXT=services
+  #     node @CREATED=1273819465949 @FOLDED=true @ID=ID_855471610 @MODIFIED=1493768913078 @POSITION=right @TEXT=roles
+  #      node @CREATED=1273819456867 @ID=ID_1677010054 @MODIFIED=1493418874718 @POSITION=left @TEXT=models
+  #       node @CREATED=1292122118499 @FOLDED=true @ID=ID_1957754752 @MODIFIED=1493705885123 @TEXT=person
+  #       node @CREATED=1292122236285 @FOLDED=true @ID=ID_959987887 @MODIFIED=1493768919147 @TEXT=address
+  #       node @CREATED=1493418879485 @ID=ID_1995497233 @MODIFIED=1493718770637 @TEXT=article
+  #       node @CREATED=1493418915637 @ID=ID_429078131 @MODIFIED=1493418930081 @TEXT=comment
+
+  models = @app.elements["//node[@TEXT='models']"] || REXML::Document.new
+  models.each_element('node') do |model|
+    # t << "= "+model.attributes["TEXT"]
+    model_name = model.attributes['TEXT']
+    next if model_name.comment?
+
+    model_code = name2code(model_name)
+    model_file = Rails.root.join("app/models/#{model_code}.rb").to_s
+
+    system("rails generate model #{model_code}") unless File.exist?(model_file)
+    doc = File.read(model_file)
+
+    doc       = add_utf8(doc)
+    attr_hash = make_fields(model)
+    doc       = add_jinda(doc, attr_hash)
+    # t << "modified:   #{model_file}"
+    File.open(model_file, 'w') do |f|
+      f.puts doc
     end
-
-    def add_jinda(doc, attr_hash)
-      if doc =~ /#{@btext}/
-        s1,s2,s3= doc.partition(/  #{@btext}.*#{@etext}\n/m)
-          s2= ""
-      else
-        s1,s2,s3= doc.partition("include Mongoid::Document\n")
-      end
-      doc= s1+s2+ <<-EOT
+  end
+
+  # puts t.join("\n")
+end
+
+def add_jinda(doc, attr_hash)
+  if /#{@btext}/.match?(doc)
+    s1, _, s3 = doc.partition(/  #{@btext}.*#{@etext}\n/m)
+    s2        = ''
+  else
+    s1, s2, s3 = doc.partition("include Mongoid::Document\n")
+  end
+  doc = s1 + s2 + <<-EOT
   #{@btext}
   include Mongoid::Timestamps
-      EOT
-
-      attr_hash.each do |a|
-        # doc+= "\n*****"+a.to_s+"\n"
-        if a[:edit]
-          doc += "  #{a[:text]}\n"
-        else
-          # Fixed: Capitalize only first char
-          # doc += "  field :#{a[:code]}, :type => #{a[:type].capitalize}\n"
-          a[:type][0] = a[:type][0].capitalize 
-          doc += "  field :#{a[:code]}, :type => #{a[:type]}\n"
-        end
-      end
-      doc += "  #{@etext}\n"
-      doc + s3
-    end
-
-    def add_utf8(doc)
-      unless doc =~ /encoding\s*:\s*utf-8/
-        doc.insert 0, "# encoding: utf-8\n"
-      else
-        doc
-      end
-    end
-
-    # inspect all nodes that has attached file (2 cases) and replace relative path with absolute path
-    def make_folders_absolute(f,tt)
-      tt.elements.each("//node") do |nn|
-        if nn.attributes['LINK']
-          nn.attributes['LINK']= File.expand_path(File.dirname(f))+"/#{nn.attributes['LINK']}"
-        end
-      end
-    end
-
-    def name2code(s)
-      # rather not ignore # symbol cause it could be comment
-      code, name = s.split(':')
-      code.downcase.strip.gsub(' ','_').gsub(/[^#_\/a-zA-Z0-9]/,'')
-    end
-
-    def model_exists?(model)
-      File.exists? "#{Rails.root}/app/models/#{model}.rb"
+  EOT
+
+  attr_hash.each do |a|
+    # doc+= "\n*****"+a.to_s+"\n"
+    if a[:edit]
+      doc += "  #{a[:text]}\n"
+    else
+      # Fixed: Capitalize only first char
+      # doc += "  field :#{a[:code]}, :type => #{a[:type].capitalize}\n"
+      a[:type][0] = a[:type][0].capitalize
+      doc        += "  field :#{a[:code]}, :type => #{a[:type]}\n"
     end
-
-    def make_fields(n)
-      # s= field string used by generate model cli (old style jinda)
-      s= ""
-      # h= hash :code, :type, :edit, :text
-      h= []
-      n.each_element('node') do |nn|
-        text = nn.attributes['TEXT']
-        icon = nn.elements['icon']
-        edit= (icon && icon.attribute('BUILTIN').value=="edit")
-        next if text.comment? && !edit
-
-        # sometimes freemind puts all fields inside a blank node
-        unless text.empty?
-          k,v= text.split(/:\s*/,2)
-          v ||= 'string'
-          v= 'float' if v=~/double/i
-          s << " #{name2code(k.strip)}:#{v.strip} "
-          h << {:code=>name2code(k.strip), :type=>v.strip, :edit=>edit, :text=>text}
-        else
-          nn.each_element('node') do |nnn|
-            icon = nnn.elements['icon']
-            edit1= (icon && icon.attribute('BUILTIN').value=="edit")
-            text1 = nnn.attributes['TEXT']
-            next if text1 =~ /\#.*/
-            k,v= text1.split(/:\s*/,2)
-            v ||= 'string'
-            v= 'float' if v=~/double/i
-            s << " #{name2code(k.strip)}:#{v.strip} "
-            h << {:code=>name2code(k.strip), :type=>v.strip, :edit=>edit1, :text=>text1}
-          end
-        end
+  end
+  doc += "  #{@etext}\n"
+  doc + s3
+end
+
+def add_utf8(doc)
+  if /encoding\s*:\s*utf-8/.match?(doc)
+    doc
+  else
+    doc.insert 0, "# encoding: utf-8\n"
+  end
+end
+
+# inspect all nodes that has attached file (2 cases) and replace relative path with absolute path
+def make_folders_absolute(f, tt)
+  tt.elements.each('//node') do |nn|
+    nn.attributes['LINK'] = File.expand_path(File.dirname(f)) + "/#{nn.attributes['LINK']}" if nn.attributes['LINK']
+  end
+end
+
+def name2code(s)
+  # rather not ignore # symbol cause it could be comment
+  code, = s.split(':')
+  code.downcase.strip.tr(' ', '_').gsub(%r{[^#_/a-zA-Z0-9]}, '')
+end
+
+def model_exists?(model)
+  File.exist? Rails.root.join("app/models/#{model}.rb").to_s
+end
+
+def make_fields(n)
+  # s= field string used by generate model cli (old style jinda)
+  s = ''
+  # h= hash :code, :type, :edit, :text
+  h = []
+  n.each_element('node') do |nn|
+    text = nn.attributes['TEXT']
+    icon = nn.elements['icon']
+    edit = icon && icon.attribute('BUILTIN').value == 'edit'
+    next if text.comment? && !edit
+
+    # sometimes freemind puts all fields inside a blank node
+    if text.empty?
+      nn.each_element('node') do |nnn|
+        icon  = nnn.elements['icon']
+        edit1 = icon && icon.attribute('BUILTIN').value == 'edit'
+        text1 = nnn.attributes['TEXT']
+        next if /\#.*/.match?(text1)
+
+        k, v = text1.split(/:\s*/, 2)
+        v  ||= 'string'
+        v    = 'float' if /double/i.match?(v)
+        s += " #{name2code(k.strip)}:#{v.strip} "
+        h << { code: name2code(k.strip), type: v.strip, edit: edit1, text: text1 }
       end
-      # f
-      h
+    else
+      k, v = text.split(/:\s*/, 2)
+      v  ||= 'string'
+      v    = 'float' if /double/i.match?(v)
+      s += " #{name2code(k.strip)}:#{v.strip} "
+      h << { code: name2code(k.strip), type: v.strip, edit: edit, text: text }
     end
-
-    ########################################################################
-    #                     END  code from jinda.rake                        #
-    ########################################################################
+  end
+  # f
+  h
+end
+
+########################################################################
+#                     END  code from jinda.rake                        #
+########################################################################

data/lib/jinda/gen_modules.rb

@@ -1,16 +1,21 @@
-    # ##########################################################################
-    #                         Update module from Rails
-    # ##########################################################################
-    def gen_module_controller
-      # find s_controller name in Jinda::Module
-      # if found ..
-      # else 
-      #   create
-      # end
-      #
-      # MM was defined in Rails: config/initializer/jinda.rb
-      @prefix = "spec/temp/"
-      @tdir   = "#{@prefix}app/controllers/*_controller.rb"
-      # dir_module_names = Dir.glob("#{@prefix}app/controllers/*_controller.rb").map { |path| (path.match(/(\w+)/); $1) }
-      dir_module_names = Dir.glob(@tdir).map {|path| (path.match(/(\w+)_controller.rb/); $1)}
-    end
+# frozen_string_literal: true
+
+# ##########################################################################
+#                         Update module from Rails
+# ##########################################################################
+def gen_module_controller
+  # find s_controller name in Jinda::Module
+  # if found ..
+  # else
+  #   create
+  # end
+  #
+  # MM was defined in Rails: config/initializer/jinda.rb
+  @prefix = 'spec/temp/'
+  @tdir   = "#{@prefix}app/controllers/*_controller.rb"
+  # dir_module_names = Dir.glob("#{@prefix}app/controllers/*_controller.rb").map { |path| (path.match(/(\w+)/); $1) }
+  Dir.glob(@tdir).map do |path|
+    path =~ /(\w+)_controller.rb/
+    Regexp.last_match(1)
+  end
+end