jinda 0.7.0.4 → 0.7.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e005b8c5e10b6bea34554b5539ecd3b6d9e8ef8f5077d7dccff000523b59f04c
-  data.tar.gz: 5f92f912934ae5936edd5ab9a6b2bc0dd5ba4a497e13b78ec89ebc3f35f8c9eb
+  metadata.gz: c2dab3c1ee5e525bfce90630e720c8e45cd79da38196853f29df66db25d50526
+  data.tar.gz: af80a165a501ceffb2e150dbf3b1ecdb2647d14ebef721ef3392364deb1bfdaf
 SHA512:
-  metadata.gz: 2ed46b40d167ec06f330f745982dde313379e44049b3cd752db9913818ff4b92042ffe730a53e62231fac887b80ac467987a291c9dd8b1891eb0a2fee354c944
-  data.tar.gz: 7bb1ddc0a2d39f131020e5bb18ec6f58e97d9f251c5f1df10f3dae5577a56115ebdbbc8f8f57d5c838d4172227bf616d15d535d7bc772c2fed01a0bacc52b5db
+  metadata.gz: e01c9a5848758ba074e0e78b0cfdf3b917a47aeacca3b64e31338cc6a48eff49b10f36dbe9cce21a12caffcddb0429d00dad2b7b0e328459acd44b0581d809dd
+  data.tar.gz: f5e7603baf72c5f85f413daf9ce47ec66e14d465ac0444e9006153d6e76626262bbefdfee06526dbe8619a317b722e3e4e60f7dbf59e77e31b57bbb30fad06f4

data/README.md

@@ -15,7 +15,7 @@ Rails Application Generator using Freemind
 These versions works for sure but others may do.
 
 * Ruby 2.7.1
-* Rails 6.0.3
+* Rails 6.1.0
 * MongoDB 6
 * Freemind 1.0.1
 
@@ -40,7 +40,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.7.0.1'
+    gem 'jinda'
 
 For Development (most updated)
 
@@ -62,8 +62,6 @@ Then run bundle again to install additional gems added by jinda
 
     $ bundle
 
-    (or run all with "sh install.sh" )
-
 configure mongoid, omniauth
 
     $ rails generate jinda:config

data/app/controllers/concerns/jinda_run_concern.rb

@@ -18,9 +18,12 @@ module JindaRunConcern
           # Check if help file available for this form
           ###############################################################################################
           @help = File.read(fhelp) if File.exists?(fhelp)
-          f= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
-          if File.file?(f)
-            @ui= File.read(f)
+          f1= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
+          f2= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.haml"
+          if File.file?(f1)
+            @ui= File.read(f1)
+          elsif File.file?(f2)
+            @ui= File.read(f2)
           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"

data/app/views/jinda/index.html.haml

@@ -20,7 +20,7 @@
           %b Recently tested with:
           %ul  
             %li Rubygems 2.7.1
-            %li Rails 6.0.3
+            %li Rails 6.1.0
     %div.col-lg-4.col-md-4.col-xs-12
       %div.small-box.bg-yellow
         %div.inner

data/lib/generators/jinda/config_generator.rb

@@ -43,7 +43,6 @@ module Jinda
                 end
             end
 
-
             desc "Set up mongoid config"
             def setup_mongoid
                 generate "mongoid:config"

data/lib/generators/jinda/install_generator.rb

@@ -5,68 +5,141 @@ module Jinda
       def self.source_root
         File.dirname(__FILE__) + "/templates"
       end
-
       def setup_gems
-        gem 'maruku', '~> 0.7.3'
-        gem 'rouge'
-        gem 'normalize-rails'
-        gem 'font-awesome-rails'
-        gem 'font-awesome-sass', '~> 5.12.0'
-        gem 'mongoid-paperclip', require: 'mongoid_paperclip'
-        gem 'meta-tags'
-        gem 'jquery-turbolinks', '2.1.0'
-        gem 'mongo', '2.11.3'
-        gem 'bson', '4.4.2'
-        gem 'mongoid', '7.1.0.rc0'
-        gem 'turbolinks_render'
-        gem 'nokogiri', '~> 1.11.0'
-        gem 'haml', '~> 5.1', '>= 5.1.2'
-        gem 'haml-rails', '~> 2.0.1'
-        gem 'mail'
-        gem 'prawn'
-        gem 'redcarpet'
-        gem 'bcrypt'
-        gem 'oauth2', '1.4.4'
-        gem 'omniauth', '1.9.1'
-        gem 'omniauth-oauth2', '1.6.0'
-        gem 'omniauth-identity', '~> 1.1.1'
-        gem 'omniauth-facebook', '6.0.0'
-        gem 'omniauth-google-oauth2', '0.8.0'
-        gem 'dotenv-rails', '2.7.5'
-        gem 'cloudinary', '1.13.2'
-        gem 'kaminari', '1.2.0'
-        gem 'kaminari-mongoid', '1.0.1'
-        gem 'jquery-rails', '4.3.5'
-        gem_group :development, :test do
-          gem 'shoulda'
-          gem 'rspec'
-          gem 'rspec-rails'
-          gem 'better_errors'
-          gem 'binding_of_caller'
-          gem 'pry-byebug'
-          gem 'factory_bot_rails'
-		      gem 'database_cleaner'
-          gem 'guard'
-          gem 'guard-rspec'
-          gem 'guard-minitest'
-          gem 'capybara'
-		      gem 'selenium-webdriver'
-          gem 'rb-fsevent'
-		      gem 'valid_attribute'
-          gem 'faker' 
+        # define required gems: jinda_gem, jinda_dev_gem
+        jinda_gem = 
+          [
+            ["bson", "4.4.2"],
+            ["maruku", "~> 0.7.3"],
+            ["bcrypt"],
+            ["rouge"],
+            ["normalize-rails"],
+            ["font-awesome-rails"],
+            ["font-awesome-sass", "~> 5.12.0"],
+            ["meta-tags"],
+            ["jquery-turbolinks", "2.1.0"],
+            ["mongo", "2.11.3"],
+            ["turbolinks_render"],
+            ["haml-rails", "~> 2.0.1"],
+            ["haml", "~> 5.1", ">= 5.1.2"],
+            ["mail"],
+            ["prawn"],
+            ["redcarpet"],
+            ["oauth2", "1.4.4"],
+            ["omniauth", "1.9.1"],
+            ["omniauth-oauth2", "1.6.0"],
+            ["omniauth-identity", "~> 1.1.1"],
+            ["omniauth-facebook", "6.0.0"],
+            ["omniauth-google-oauth2", "0.8.0"],
+            ["dotenv-rails"],
+            ["cloudinary", "1.13.2"],
+            ["kaminari", "1.2.0"],
+            ["jquery-rails", "4.3.5"]
+        ]
+
+        jinda_custom = 
+          [
+            ["mongoid-paperclip", require: "mongoid_paperclip"],
+            ["kaminari-mongoid", "1.0.1"],
+            ["nokogiri", "~> 1.11.0"],
+            ["mongoid", git: "git@github.com:kul1/mongoid.git"]
+          ]
+
+        jinda_dev_gem =
+          [
+            ["shoulda"],
+            ["rspec"],
+            ["rspec-rails"],
+            ["better_errors"],
+            ["binding_of_caller"],
+            ["pry-byebug"],
+            ["factory_bot_rails"],
+            ["database_cleaner"],
+            ["guard"],
+            ["guard-rspec"],
+            ["guard-minitest"],
+            ["capybara"],
+            ["selenium-webdriver"],
+            ["rb-fsevent"],
+            ["valid_attribute"],
+            ["faker"]
+          ]
+
+        # Check each jinda_gem and create new array if found one otherwise just create.
+        # Open Gemfile add gem if not exist
+        jinda_gem.each do |g|
+          unless (%x(gem list -e --no-versions #{g[0]})) == "#{g[0]}\n"
+            if g.count == 2
+                gem g[0], g[1]
+            else
+              gem g[0]
+            end
+          else
+            if g.count == 2
+              xgem_0 = %x(gem list -e #{g[0]})
+              unless xgem_0.include?(("#{g[1]}").gsub(/[~> ]/, ''))
+                say "    Found existing #{xgem_0} in Gemfile or System, Please edit Gemfile", :red
+                gem g[0], g[1]
+              else  
+                say "     Checking #{g[0]} found Ver. #{g[1]} already exist in Gemfile", :green
+              end 
+            end
+            say "     SKIP adding #{g[0]} in Gemfile", :yellow
+          end
         end
-      end
 
+        # create list of gem in sub-group dev and test
+        jinda_dev_new  = Array.new
+        jinda_dev_gem.each do |g|
+          unless (%x(gem list -e --no-versions #{g[0]})) == "#{g[0]}\n"
+            jinda_dev_new << g
+          else
+            say "     #{g[0]} already exist in Gemfile", :yellow
+          end
+        end
+        unless jinda_dev_new.count == 0
+          gem_group :development, :test do
+            jinda_dev_new.each do |n|
+              if n.count == 1
+                gem n[0]
+              else
+                gem n[0], n[1]
+              end
+            end
+          end
+        end
+
+        # create list of custom gem
+        jinda_custom_new = Array.new
+        jinda_custom.each do |g|
+          unless (%x(gem list -e --no-versions #{g[0]})) == "#{g[0]}\n"
+            jinda_custom_new << g
+          else
+            say "     #{g[0]} already exist in Gemfile", :yellow
+          end
+        end
+        unless jinda_custom_new.count == 0
+            jinda_custom_new.each do |c|
+            say "     Checking if #{c[0]} already exist in Gemfile", :yellow
+              if c.count == 1
+                gem c[0]
+              else
+                gem c[0], c[1]
+              end
+            end
+        end
+        
+      end
       def setup_app
         # inside("public") { run "FileUtils.mv index.html index.html.bak" }
-          inside("db") {(File.file? "seeds.rb") ? (FileUtils.mv "seeds.rb", "seeds.rb.bak") : ( say "no seeds.rb", :green)}
+        inside("db") {(File.file? "seeds.rb") ? (FileUtils.mv "seeds.rb", "seeds.rb.bak") : ( say "no seeds.rb", :green)}
         inside("app/views/layouts") {(File.file? "application.html.erb") ? (FileUtils.mv 'application.html.erb', 'application.html.erb.bak') : ( say "no app/views/layout/ application.html.erb", :blue )}
         inside("app/controllers") {(File.file? "application_controller.rb") ? (FileUtils.mv 'application_controller.rb', 'application_controller.rb.bak' ) : ( say "no app/controller/application_controller.rb, :blue ")}
         inside("app/helpers") {(File.file? "application_helper.rb") ? (FileUtils.mv 'application_helper.rb', 'application_helper.rb.bak') : ( say "no app/helpers/application_helper.rb", :blue)}
         inside("app/assets/javascripts") {(File.file? 'application.js') ? (FileUtils.mv 'application.js', 'application.js.bak') : ( say "no application.js", :blue)}
         inside("app/assets/stylesheets") {(File.file? "application.css") ? (FileUtils.mv 'application.css', 'application.css.bak') : ( say "no application.css", :blue)}
         inside("config/initializers") {(File.file? "omniauth.rb") ? (FileUtils.mv 'omniauth.rb', 'omniauth.rb.bak') : (say "no omniauth.rb", :blue)}
-        # inside("config/initializers") {(File.file? "mongoid.rb") ? (FileUtils.mv 'mongoid.rb', 'mongoid.rb.bak') : (say "no mongoid.rb")}
+        inside("config/initializers") {(File.file? "mongoid.rb") ? (FileUtils.mv 'mongoid.rb', 'mongoid.rb.bak') : (say "no mongoid.rb")}
         inside("app/assets/config") {(File.file? "manifest.js") ? (FileUtils.mv "manifest.js", "manifest.js-rails") : (puts "backup to manifest.js-rails")}
         directory "app"
         directory "spec"
@@ -79,79 +152,32 @@ module Jinda
         # inside("app/assets/javascripts") {(File.file? "application.js") ? ( say "Please include application-org.js in application.js", :red) : (FileUtils.mv 'application-org.js', 'application.js')}
         # inside("app/assets/stylesheets") {(File.file? "application.css") ? ( say "Please include application-org.css in application.css", :red) : (FileUtils.mv 'application-org.css', 'application.css')}
         # inside("app/assets/stylesheets") {(File.file? "application.css.scss") ? ( say "Please include application-org.css.scss in application.css.scss", :red) : (FileUtils.mv 'application-org.css.scss', 'application.css.scss')}
-        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? "application_controller.rb") ? ( say "Pleas merge existing jinda_org/application_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/application_controller.rb', 'application_controller.rb')}
+        inside("app/controllers") {(File.file? "admins_controller.rb") ? ( say "   Please merge existing jinda_org/admins_controller.rb after this installation", :yellow) : (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", :yellow) : (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", :yellow) : (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", :yellow) : (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", :yellow) : (FileUtils.mv 'jinda_org/identities_controller.rb', 'identities_controller.rb')}
+        inside("app/controllers") {(File.file? "application_controller.rb") ? ( say "   Pleas merge existing jinda_org/application_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/application_controller.rb', 'application_controller.rb')}
         ## Moved to Engine
-        # 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')}
-        inside("app/controllers") {(File.file? "password_resets.rb") ? ( say "Please merge existing jinda_org/password_resets.rb after this installation", :red) : (FileUtils.mv 'jinda_org/password_resets.rb', 'password_resets.rb')}
-        inside("app/controllers") {(File.file? "sessions_controller.rb") ? ( say "Please merge existing jinda_org/sessions_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/sessions_controller.rb', 'sessions_controller.rb')}
-        inside("app/controllers") {(File.file? "users_controller.rb") ? ( say "Please merge existing jinda_org/users_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/users_controller.rb', 'users_controller.rb')}
-        inside("app/controllers") {(File.file? "sitemap_controller.rb") ? ( say "Please merge existing jinda_org/sitemap_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/sitemap_controller.rb', 'sitemap_controller.rb')}
-        inside("app/controllers") {(File.file? "notes_controller.rb") ? ( say "Please merge existing jinda_org/notes_controller.rb after this installation", :red) : (FileUtils.mv 'jinda_org/notes_controller.rb', 'notes_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", :yellow) : (FileUtils.mv 'jinda_org/password_resets_controller.rb', 'password_resets_controller.rb')}
+        inside("app/controllers") {(File.file? "password_resets.rb") ? ( say "   Please merge existing jinda_org/password_resets.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/password_resets.rb', 'password_resets.rb')}
+        inside("app/controllers") {(File.file? "sessions_controller.rb") ? ( say "   Please merge existing jinda_org/sessions_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/sessions_controller.rb', 'sessions_controller.rb')}
+        inside("app/controllers") {(File.file? "users_controller.rb") ? ( say "   Please merge existing jinda_org/users_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/users_controller.rb', 'users_controller.rb')}
+        inside("app/controllers") {(File.file? "sitemap_controller.rb") ? ( say "   Please merge existing jinda_org/sitemap_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/sitemap_controller.rb', 'sitemap_controller.rb')}
+        inside("app/controllers") {(File.file? "notes_controller.rb") ? ( say "   Please merge existing jinda_org/notes_controller.rb after this installation", :yellow) : (FileUtils.mv 'jinda_org/notes_controller.rb', 'notes_controller.rb')}
       end
       # routes created each line as reversed order in routes
       # Moved routes to Engine
       def setup_routes
-      #  route "end"
-      #   route "  end"
-      #   route "    namespace :v1 do resources :notes, :only => [:index] end"
-      #   route "  namespace :api do"
-      #   route "post '/api/v1/notes' => 'api/v1/notes#create', as: 'api_v1_notes'" 
-      #   route "get '/api/v1/notes/my' => 'api/v1/notes#my'"
-      #   route "\# api"
         route "root :to => 'jinda#index'"        
-      #   route "resources :jinda, :only => [:index, :new]"
-      #   route "resources :password_resets"
-      #   route "resources :sessions"
-      #   route "resources :identities"
-      #   route "resources :users"
-      #   route "resources :docs"
-      #   route "resources :notes"
-      #   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/edit' => 'articles/edit'"
-      #   route "get '/articles/show' => 'articles/show'"
-		  #   route "get '/articles/my/destroy' => 'articles#destroy'"
-      #   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'"
-      #   route "post '/auth/:provider/callback' => 'sessions#create'"        
-		  #   route "\# end jinda method routes"
-      #   route "post '/jinda/end_output' => 'jinda#end_output'"
-      #   route "post '/jinda/end_form' => 'jinda#end_form'"
-      #   route "post '/jinda/pending' => 'jinda#index'"
-      #   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"
-	    end
+      end
 
       def setup_env
         FileUtils.mv "README.md", "README.md.bak"
         create_file 'README.md', ''
-        # FileUtils.mv 'install.sh', 'install.sh'
-        # inject_into_file 'config/application.rb', :after => 'require "active_resource/railtie"' do
-        # inject_into_file 'config/application.rb', :after => 'require "rails"' do
-        #   "\nrequire 'rexml/document'\n"+
-        #   "\nrequire 'mongoid/railtie'\n"
-        # end
         application do
-%q{
+          %q{
   # Jinda default
   config.generators do |g|
     g.orm             :mongoid
@@ -174,10 +200,10 @@ module Jinda
   #   :enable_starttls_auto => true  }
   # config.action_mailer.raise_delivery_errors = true
   # config.action_mailer.perform_deliveries = true
-}
+          }
         end
         initializer "jinda.rb" do
-%q{# encoding: utf-8
+          %q{# encoding: utf-8
 MM = "#{Rails.root}/app/jinda/index.mm"
 DEFAULT_TITLE = 'Jinda'
 DEFAULT_HEADER = 'Jinda'
@@ -190,25 +216,26 @@ NEXT = "Next >"
 IMAGE_LOCATION = "upload"
 # for debugging
 # DONT_SEND_MAIL = true
-}
+          }
         end
-
-initializer "mongoid.rb" do
-%q{# encoding: utf-8
-#
-# Mongoid 6 follows the new pattern of AR5 requiring a belongs_to relation to always require its parent
-# belongs_to` will now trigger a validation error by default if the association is not present.
-# You can turn this off on a per-association basis with `optional: true`.
-# (Note this new default only applies to new Rails apps that will be generated with
-# `config.active_record.belongs_to_required_by_default = true` in initializer.)
-#
-Mongoid::Config.belongs_to_required_by_default = false
-}
+        # Move mongoid.rb to jinda:config
+        # To avoid repeate install jinda:install crash
+        initializer "mongoid.rb" do
+          %q{# encoding: utf-8
+  #
+  # Mongoid 6 follows the new pattern of AR5 requiring a belongs_to relation to always require its parent
+  # belongs_to` will now trigger a validation error by default if the association is not present.
+  # You can turn this off on a per-association basis with `optional: true`.
+  # (Note this new default only applies to new Rails apps that will be generated with
+  # `config.active_record.belongs_to_required_by_default = true` in initializer.)
+  #
+  Mongoid::Config.belongs_to_required_by_default = false
+          }
         end
 
         inject_into_file 'config/environment.rb', :after => "initialize!"  do
           "\n\n# hack to fix cloudinary error https://github.com/archiloque/rest-client/issues/141" +
-          "\nclass Hash\n  remove_method :read\nrescue\nend"
+            "\nclass Hash\n  remove_method :read\nrescue\nend"
         end
         inject_into_file 'config/environments/development.rb', :after => 'config.action_mailer.raise_delivery_errors = false' do
           "\n  config.action_mailer.default_url_options = { :host => 'localhost:3000' }"
@@ -218,16 +245,15 @@ Mongoid::Config.belongs_to_required_by_default = false
           "\n  config.assets.compile = true"
         end
         inject_into_file 'config/initializers/assets.rb', :after => '# Precompile additional assets.
-' do        
-"Rails.application.config.assets.precompile += %w( sarabun.css )" +
-"\nRails.application.config.assets.precompile += %w( disable_enter_key.js )\n"
+        ' do        
+          "Rails.application.config.assets.precompile += %w( sarabun.css )" +
+            "\nRails.application.config.assets.precompile += %w( disable_enter_key.js )\n"
         end
       end
 
       def finish
         say "\n"
         say "Jinda gem ready for next configuration install.\n"
-        say "    (or short cut with sh install.sh)\n" 
         say "Normally you will use  the following command:\n"
         say "----------------------------------------\n"
         say "bundle install\n"

data/lib/generators/jinda/installer/gemfiles-org/custom_gems.rb

@@ -0,0 +1,8 @@
+@custom_gems = Array.new
+@custom_gems = 
+  [
+    ["mongoid-paperclip", require: "mongoid_paperclip"],
+    ["kaminari-mongoid", "1.0.1"],
+    ["nokogiri", "~> 1.11.0"]
+  #  ["mongoid", git: "git@github.com:kul1/mongoid-jinda.git"]
+  ]

data/lib/generators/jinda/installer/gemfiles-org/dev_gems.rb

@@ -0,0 +1,20 @@
+@dev_gems = Array.new
+@dev_gems =
+  [
+    ["shoulda"],
+    ["rspec"],
+    ["rspec-rails"],
+    ["better_errors"],
+    ["binding_of_caller"],
+    ["pry-byebug"],
+    ["factory_bot_rails"],
+    ["database_cleaner"],
+    ["guard"],
+    ["guard-rspec"],
+    ["guard-minitest"],
+    ["capybara"],
+    ["selenium-webdriver"],
+    ["rb-fsevent"],
+    ["valid_attribute"],
+    ["faker"]
+  ]