jinda 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3ce5c17fcecc4aec0dd04876f2f49d0eb09652708eac9940830cbd421feb472
-  data.tar.gz: 78a7b9a7cbb4bf0d24b87156a66c40d56b024a55cc2cba4244f287ce44ce2286
+  metadata.gz: 8b84fcc19349e4dc4ecaf04277c5de4b5e83a59c102c8f89de93cde6f563be5d
+  data.tar.gz: aa08af1a7565d4b873ab2989365c2186298341d412da536919cecfad295187df
 SHA512:
-  metadata.gz: 8be7403c5159d253c77b86aa9a8c4012e6ae92555d9dd0c83907e585f17a252fe6b4f0ec2009a0504ff3cdf4377021c8704285930332f4b36f14dfe1ab705ce8
-  data.tar.gz: e192a43b60a0588f8b64e8d60f5a029596e5063700c9f105e8087de2ef2416a4c45addb5f2be48b0594690092b60d5f74a2559af618a45f9a67e3519f71d4234
+  metadata.gz: a5a7180d9bde1efc58adfa2d069f0640566c75b7d0d1162885ab57896361af6e1fc35bbaf19eb9ab52406ed9bb0bfb8fb053d718b5dfaba3f5d2a6f4956a884e
+  data.tar.gz: c9c79c5b4a4e82aaa406b3ad4c42258217fed3dba81a05772063df643b30aaa4e3f4811c6320dd9d143d6b747d5f2d2641e88c13c09668e0071aef49f8c3f685

data/README.md

@@ -16,7 +16,7 @@ Rails Application Generator using Freemind
 These versions works for sure but others may do.
 
 * Ruby 2.5.0
-* Rails 5.2.0
+* Rails 5.2.1
 * MongoDB 6
 * Freemind 1.0.1
 
@@ -36,7 +36,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.1.8'
+    gem 'jinda', '~> 0.2.0'
 
 For Development (most updated)
 

data/lib/jinda/helpers.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 # This helper handle 
 # 1. Read xml from mm file to run core program: 
-# 	process_services
+#   process_services
 # 2. Update Models, Services, Runseqs from index.mm (XML)
 # 3. Rake Task to create app models, views and controller from index.mm(updated)
 #
@@ -23,6 +23,8 @@
 
 require 'active_support'
 require 'active_support/core_ext'
+
+
 module Jinda
   module Helpers
     require "rexml/document"
@@ -82,31 +84,31 @@ module Jinda
       return default_role ? default_role.name.to_s : ''
     end
 
-		def sign_in?
-			if current_ma_user.present?
-				return true
-			else
-				return false
-			end
-		end
-
-		# ############################### Themes ###################################
-		#
-		# Check login user information from User model: name(code), image for Themes
-		#
-		# ##########################################################################
-		def get_login_user_info
-			if current_ma_user.present?
-				$user_image = current_ma_user.image
-				$user_name = current_ma_user.code
-				$user_email = current_ma_user.email
-			else
-				$user_image = asset_url("user.png", :width => "48")
-				$user_name = 'Guest User'
-				$user_email = 'guest@sample.com'
-			end
-			return $user_image, $user_name, $user_email
-		end
+    def sign_in?
+      if current_ma_user.present?
+        return true
+      else
+        return false
+      end
+    end
+
+    # ############################### Themes ###################################
+    #
+    # Check login user information from User model: name(code), image for Themes
+    #
+    # ##########################################################################
+    def get_login_user_info
+      if current_ma_user.present?
+        $user_image = current_ma_user.image
+        $user_name = current_ma_user.code
+        $user_email = current_ma_user.email
+      else
+        $user_image = asset_url("user.png", :width => "48")
+        $user_name = 'Guest User'
+        $user_email = 'guest@sample.com'
+      end
+      return $user_image, $user_name, $user_email
+    end
 
     def name2code(s)
       # rather not ignore # symbol cause it could be comment
@@ -246,12 +248,12 @@ module Jinda
     #     ""
     #   end
     # end
-		
-		# ##########################################################################
-		#
-		# Create / Update Modules, Runseqs, Services from XML
-		#
-		# ##########################################################################
+    
+    # ##########################################################################
+    #
+    # Create / Update Modules, Runseqs, Services from XML
+    #
+    # ##########################################################################
     def process_services
       # todo: persist mm_md5
       xml= @app||get_app
@@ -276,9 +278,9 @@ module Jinda
         module_code= code.to_code
         menu_icon = m_icon(m)
 
-		# ##########################################################################
-		# First Node eg: Module Name 
-		# ##########################################################################
+    # ##########################################################################
+    # First Node eg: Module Name 
+    # ##########################################################################
         # create or update to GmaModule
         ma_module= Jinda::Module.find_or_create_by :code=>module_code
         ma_module.update_attributes :uid=>ma_module.id.to_s, :icon=>menu_icon
@@ -288,9 +290,9 @@ module Jinda
         mseq += 1
         seq= 0
 
-		# ##########################################################################
-		# Second Nodes eg: Role, Link otherwise Services
-		# ##########################################################################
+    # ##########################################################################
+    # 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)
@@ -313,9 +315,9 @@ module Jinda
             protected_services << ma_service.uid
           else
 
-		# ##########################################################################
-		# Second and Third Nodes eg: Role, Normal Services
-		# ##########################################################################
+    # ##########################################################################
+    # Second and Third Nodes eg: Role, Normal Services
+    # ##########################################################################
             # normal service
             step1 = s.elements['node']
             role= get_option_xml("role", step1) || ""
@@ -335,13 +337,13 @@ module Jinda
       Jinda::Service.not_in(:uid=>protected_services).delete_all
     end
 
-		# ##########################################################################
-		#                         Load index.mm from Rails
-		# ##########################################################################
+    # ##########################################################################
+    #                         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)
+      # 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
@@ -368,243 +370,243 @@ module Jinda
       return t
     end
 
-		########################################################################
-		#                            Jinda Rake Task                           #
-		########################################################################
-		
-		def gen_views
-			t = ["*** generate ui ***"]
-
-			# create array of files to be tested
-			$afile = Array.new
-
-			Jinda::Module.all.each do |m|
-				m.services.each do |s|
-					dir ="app/views/#{s.module.code}"
-					unless gen_view_file_exist?(dir)
-						gen_view_mkdir(dir,t) 
-					end
-					
-					if s.code=='link'
-						f= "app/views/#{s.module.code}/index.haml"
-						$afile << f
-						unless gen_view_file_exist?(f)
-						  sv = "app/jinda/template/linkview.haml"
-						  f= "app/views/#{s.module.code}/index.haml"
-							gen_view_createfile(sv,f,t)
-						end
-						next   
-					end
-					
-					dir ="app/views/#{s.module.code}/#{s.code}"
-				  unless gen_view_file_exist?(dir)
-						gen_view_mkdir(dir,t) 
-					end
-
-					xml= REXML::Document.new(s.xml)
-					xml.elements.each('*/node') do |activity|
-						icon = activity.elements['icon']
-						next unless icon
-						action= freemind2action(icon.attributes['BUILTIN'])
-						next unless ui_action?(action)
-						code_name = activity.attributes["TEXT"].to_s
-						next if code_name.comment?
-						code= name2code(code_name)
-						if action=="pdf"
-							f= "app/views/#{s.module.code}/#{s.code}/#{code}.pdf.prawn"
-						else
-							f= "app/views/#{s.module.code}/#{s.code}/#{code}.html.erb"
-						end
-						$afile << f
-						unless gen_view_file_exist?(f)
-							sv = "app/jinda/template/view.html.erb"
-							gen_view_createfile(sv,f,t)
-						end
-					end
-				end
-			end
-			puts $afile.join("\n")
-			puts t.join("\n")
-		  return $afile	
-		end
-
-		def process_controllers
-			process_services
-			modules= Jinda::Module.all
-			modules.each do |m|
-				next if controller_exists?(m.code)
-				system("rails generate controller #{m.code}")
-			end
-		end
-
-		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")
-		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
-		#{@btext}
-		include Mongoid::Timestamps
-		EOT
-
-			attr_hash.each do |a|
-				# doc+= "\n*****"+a.to_s+"\n"
-				if a[:edit]
-					doc += "  #{a[:text]}\n"
-				else
-					doc += "  field :#{a[:code]}, :type => #{a[:type].capitalize}\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"
-		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
-			# f
-			h
-		end
-
-		# Add method to ruby class String
-		# ###############################
-		class String
-			def comment?
-				self[0]=='#'
-				# self[0]==35 # check if first char is #
-			end
-			def to_code
-				s= self.dup
-				s.downcase.strip.gsub(' ','_').gsub(/[^#_\/a-zA-Z0-9]/,'')
-			end
-		end
-
-		########################################################################
-		#                     END  code from jinda.rake                        #
-		########################################################################
-	
-		
-		########################################################################
-		#                  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)
-			Dir.mkdir(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)
+    ########################################################################
+    #                            Jinda Rake Task                           #
+    ########################################################################
+    
+    def gen_views
+      t = ["*** generate ui ***"]
+
+      # create array of files to be tested
+      $afile = Array.new
+
+      Jinda::Module.all.each do |m|
+        m.services.each do |s|
+          dir ="app/views/#{s.module.code}"
+          unless gen_view_file_exist?(dir)
+            gen_view_mkdir(dir,t) 
+          end
+          
+          if s.code=='link'
+            f= "app/views/#{s.module.code}/index.haml"
+            $afile << f
+            unless gen_view_file_exist?(f)
+              sv = "app/jinda/template/linkview.haml"
+              f= "app/views/#{s.module.code}/index.haml"
+              gen_view_createfile(sv,f,t)
+            end
+            next   
+          end
+          
+          dir ="app/views/#{s.module.code}/#{s.code}"
+          unless gen_view_file_exist?(dir)
+            gen_view_mkdir(dir,t) 
+          end
+
+          xml= REXML::Document.new(s.xml)
+          xml.elements.each('*/node') do |activity|
+            icon = activity.elements['icon']
+            next unless icon
+            action= freemind2action(icon.attributes['BUILTIN'])
+            next unless ui_action?(action)
+            code_name = activity.attributes["TEXT"].to_s
+            next if code_name.comment?
+            code= name2code(code_name)
+            if action=="pdf"
+              f= "app/views/#{s.module.code}/#{s.code}/#{code}.pdf.prawn"
+            else
+              f= "app/views/#{s.module.code}/#{s.code}/#{code}.html.erb"
+            end
+            $afile << f
+            unless gen_view_file_exist?(f)
+              sv = "app/jinda/template/view.html.erb"
+              gen_view_createfile(sv,f,t)
+            end
+          end
+        end
+      end
+      puts $afile.join("\n")
+      puts t.join("\n")
+      return $afile  
+    end
+
+    def process_controllers
+      process_services
+      modules= Jinda::Module.all
+      modules.each do |m|
+        next if controller_exists?(m.code)
+        system("rails generate controller #{m.code}")
+      end
+    end
+
+    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")
+    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
+  #{@btext}
+  include Mongoid::Timestamps
+  EOT
+
+      attr_hash.each do |a|
+        # doc+= "\n*****"+a.to_s+"\n"
+        if a[:edit]
+          doc += "  #{a[:text]}\n"
+        else
+          doc += "  field :#{a[:code]}, :type => #{a[:type].capitalize}\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"
+    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
+      # f
+      h
+    end
+
+    # Add method to ruby class String
+    # ###############################
+    class String
+      def comment?
+        self[0]=='#'
+        # self[0]==35 # check if first char is #
+      end
+      def to_code
+        s= self.dup
+        s.downcase.strip.gsub(' ','_').gsub(/[^#_\/a-zA-Z0-9]/,'')
+      end
+    end
+
+    ########################################################################
+    #                     END  code from jinda.rake                        #
+    ########################################################################
+  
+    
+    ########################################################################
+    #                  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)
+      Dir.mkdir(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)

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-	VERSION = "0.1.9"
+	VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler