jinda 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a75e9044c742215b4a88279c71bf994b083791e8b2968307cd9fd1272cd630
-  data.tar.gz: 45b023769cd651c2b20310f01298d9477705604ea2b0dfece5312f7abcff11c6
+  metadata.gz: c493bb3f9ec9c0d77fe441c37484ea0a345cb39eb0dc196bf52e1eee46414adf
+  data.tar.gz: 6cbaad855b865abda8351eea97336b322a0e9a9652b3a3ae8d1e8b51e6c6b89a
 SHA512:
-  metadata.gz: 884f1007b8642e2e42d01b66811444279c4c9b01f1cb52e1baa9833f2677883a89c046172b459db665c3d86b97a9f57bc416b015e382f6d62ff2b6c640039f59
-  data.tar.gz: e91ce213262754eaee44bcc6270113bf66429f4232c9380622eb0060eae31a976fa711a45999e2dd7bad665de7b9e3aa242f24a120637f88c301cefb2931d256
+  metadata.gz: 344e5084a67024897045c73004309f873a406dfee3e6a563779df47d432c1238abc8432f6eeae80ec3c9569cf36943be14f0bc4f00aefb72a49d6690835d6856
+  data.tar.gz: 260da9dd4da82cccba3bbcf58b8b78a75d536c29e45d912c4def129539e98c3825b1b86058c16dc4d3210d0da44ad239438fdfbc393f78b0c4492f324d18a88f

data/README.md

@@ -15,8 +15,8 @@ Rails Application Generator using Freemind
 
 These versions works for sure but others may do.
 
-* Ruby 2.5.0
-* Rails 5.2.3
+* Ruby 2.6.3
+* Rails 6.0.0
 * MongoDB 6
 * Freemind 1.0.1
 
@@ -32,11 +32,11 @@ These versions works for sure but others may do.
 Supposed we want to create ecommerce web site, first create a Rails
 app without ActiveRecord
 
-    $ rails new YOURAPP -BOT
+    $ rails new YOURAPP -BOTJ
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.3.5'
+    gem 'jinda', '~> 0.4.0'
 
 For Development (most updated)
 

data/lib/generators/jinda/config_generator.rb

@@ -1,103 +1,109 @@
 module Jinda
-  module Generators
-    class ConfigGenerator < Rails::Generators::Base
-      def self.source_root
-        File.dirname(__FILE__) + "/templates"
-      end
-      desc "Backup Files"
-      def backup_files
-        st="      "
-        inside("config/initializers") {(File.file? "omniauth.rb") ? (run "mv omniauth.rb omniauth.rb.bak") : (puts "new omniauth.rb created")}
-        inside("config/initializers") {(File.file? "mongoid.rb") ? (run "mv mongoid.rb omniauth.rb.bak") : (puts "new mongoid.rb created")}
-				(File.file? ".env") ? (run "cp .env .env-bak") : (puts "backup .env")
-      end
+    module Generators
+        class ConfigGenerator < Rails::Generators::Base
+            def self.source_root
+                File.dirname(__FILE__) + "/templates"
+            end
+            desc "Backup Files"
+            def backup_files
+                st="      "
+                # inside("config/initializers") {(File.file? "omniauth.rb") ? (FileUtils.mv "omniauth.rb",  "omniauth.rb.bak") : (puts "new omniauth.rb created")}
+                # inside("config/initializers") {(File.file? "mongoid.rb") ? (FileUtils.mv "mongoid.rb", "omniauth.rb.bak") : (puts "new mongoid.rb created")}
+                (File.file? ".env") ? (FileUtils.mv ".env", ".env-bak") : (puts "backup .env")
+            end
 
-      desc "gen_image_store"
-      def gen_image_store
-        copy_file "cloudinary.yml","config/cloudinary.yml"
-        copy_file ".env",".env"
-				copy_file "dot.rspec",".rspec"
-        empty_directory "upload" # create upload directory just in case
-      end
-      desc "Set up omniauth config"
-      def setup_omniauth
-        # gem 'bcrypt-ruby', '~> 3.0.0'
-        # gem 'omniauth-identity'
-        initializer "omniauth.rb" do
-%q{
-Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :identity,
-    :fields => [:code, :email],
-    :on_failed_registration=> lambda { |env|
-      IdentitiesController.action(:new).call(env)
-  }
-  provider :facebook, ENV['FACEBOOK_API'], ENV['FACEBOOK_KEY']
-	provider :google_oauth2, ENV['GOOGLE_CLIENT_ID'], ENV['GOOGLE_CLIENT_SECRET']
-end
-}
-        end
-      end
-# gem 'ckeditor', github: 'galetahub/ckeditor'      
-# rails generate ckeditor:install --orm=mongoid --backend=paperclip
-      desc "Set up setup_ckeditor config"
-      def setup_ckeditor
-        initializer "ckeditor.rb" do
-%q{# gem 'ckeditor', github: 'galetahub/ckeditor'      
-Ckeditor.setup do |config|
-  require 'ckeditor/orm/mongoid'
-end  
-}  
-        end            
-      end
+            desc "gen_image_store"
+            def gen_image_store
+                # FileUtils.cp "cloudinary.yml","config/cloudinary.yml"
+                # FileUtils.cp "dot.env",".env"
+                # FileUtils.cp "dot.rspec",".rspec"
+                empty_directory "upload" # create upload directory just in case
+            end
+            desc "Set up omniauth config"
+            def setup_omniauth
+                # gem 'bcrypt-ruby', '~> 3.0.0'
+                # gem 'omniauth-identity'
+                initializer "omniauth.rb" do
+                  %q{
+                    Rails.application.config.middleware.use OmniAuth::Builder do
+                      provider :identity,
+                               :fields => [:code, :email],
+                               :on_failed_registration=> lambda { |env|
+                                 IdentitiesController.action(:new).call(env)
+                               }
+                      provider :facebook, ENV['FACEBOOK_API'], ENV['FACEBOOK_KEY']
+                      provider :google_oauth2, ENV['GOOGLE_CLIENT_ID'], ENV['GOOGLE_CLIENT_SECRET']
+                    end
 
-      desc "Set up mongoid config"
-      def setup_mongoid
-        generate "mongoid:config"
-        inject_into_file 'config/mongoid.yml', :after => '  # raise_not_found_error: true' do
-          "\n    raise_not_found_error: false"
-        end
+                    # https://stackoverflow.com/questions/11461084/handle-omniautherror-invalid-credentials-for-identity-login
+                    OmniAuth.config.on_failure = Proc.new { |env|
+                      OmniAuth::FailureEndpoint.new(env).redirect_to_failure
+                    }
+                    
+                  }
+                end
+            end
 
-        inject_into_file 'config/mongoid.yml', :after => '  # belongs_to_required_by_default: true' do
-          "\n    belongs_to_required_by_default: false"
-        end
-        inject_into_file 'config/mongoid.yml', :after => '  # app_name: MyApplicationName' do
-          "\n\nproduction:" +
-              "\n  clients:" +
-              "\n    default:" +
-              "\n      uri: <%= ENV['MONGODB_URI'] %>" +
-              "\n  options:" +
-              "\n    raise_not_found_error: false" +
-              "\n    belongs_to_required_by_default: false\n"
-        end
-      end
+            # gem 'ckeditor', github: 'galetahub/ckeditor'      
+            # rails generate ckeditor:install --orm=mongoid --backend=paperclip
+            desc "Set up setup_ckeditor config"
+            def setup_ckeditor
+                initializer "ckeditor.rb" do
+                  %q{# gem 'ckeditor', github: 'galetahub/ckeditor'      
+                    Ckeditor.setup do |config|
+                      require 'ckeditor/orm/mongoid'
+                    end  
+                  }  
+                end            
+            end
 
-      def finish
-        puts "      configured omniauth.\n"
-        puts "      configured setup_ckeditor.\n"
-        puts "      configured Mongoid.\n"
-        puts "\n"
-        puts "      To set user/password as admin/secret run:\n"
-        puts "-----------------------------------------\n"
-        puts "rails jinda:seed\n"
-        puts "-----------------------------------------\n"
-        puts "      To test with rspec  run:"
-        puts "-----------------------------------------\n"
-        puts "rspec\n"
-        puts "-----------------------------------------\n"
-        puts "      To config rspec run:"
-        puts "rails g jinda:rspec\n"
-        puts "run $chromediver for Capybara & Chrome\n"
-        puts "-----------------------------------------\n"
-        puts "      To config minitest run:"
-        puts "-----------------------------------------\n"
-        puts "rails g jinda:minitest\n"
-        puts "-----------------------------------------\n"
-        puts "      To login with facebook"
-        puts "-----------------------------------------\n"
-		puts "Please config. in .env or restore from .env-bak \n"
-        puts "-----------------------------------------\n"
-      end
+            desc "Set up mongoid config"
+            def setup_mongoid
+                generate "mongoid:config"
+                inject_into_file 'config/mongoid.yml', :after => '  # raise_not_found_error: true' do
+                    "\n    raise_not_found_error: false"
+                end
+
+                inject_into_file 'config/mongoid.yml', :after => '  # belongs_to_required_by_default: true' do
+                    "\n    belongs_to_required_by_default: false"
+                end
+                inject_into_file 'config/mongoid.yml', :after => '  # app_name: MyApplicationName' do
+                    "\n\nproduction:" +
+                        "\n  clients:" +
+                        "\n    default:" +
+                        "\n      uri: <%= ENV['MONGODB_URI'] %>" +
+                        "\n  options:" +
+                        "\n    raise_not_found_error: false" +
+                        "\n    belongs_to_required_by_default: false\n"
+                end
+            end
+
+            def finish
+                puts "      configured omniauth.\n"
+                puts "      configured setup_ckeditor.\n"
+                puts "      configured Mongoid.\n"
+                puts "\n"
+                puts "      To set user/password as admin/secret run:\n"
+                puts "-----------------------------------------\n"
+                puts "rails jinda:seed\n"
+                puts "-----------------------------------------\n"
+                puts "      To test with rspec  run:"
+                puts "-----------------------------------------\n"
+                puts "rspec\n"
+                puts "-----------------------------------------\n"
+                puts "      To config rspec run:"
+                puts "rails g jinda:rspec\n"
+                puts "run $chromediver for Capybara & Chrome\n"
+                puts "-----------------------------------------\n"
+                puts "      To config minitest run:"
+                puts "-----------------------------------------\n"
+                puts "rails g jinda:minitest\n"
+                puts "-----------------------------------------\n"
+                puts "      To login with facebook"
+                puts "-----------------------------------------\n"
+                puts "Please config. in .env or restore from .env-bak \n"
+                puts "-----------------------------------------\n"
+            end
+        end
     end
-  end
 end
-

data/lib/generators/jinda/install_generator.rb

@@ -12,13 +12,12 @@ module Jinda
         gem 'normalize-rails'
         gem 'font-awesome-sass', '~> 4.7.0'
         gem 'ckeditor', github: 'galetahub/ckeditor'
-
         gem 'mongoid-paperclip', require: 'mongoid_paperclip'
         gem 'meta-tags'
         gem 'jquery-turbolinks'
-        gem 'mongo', '~> 2.2'
+        gem 'mongo', '~> 2.5.1'
         gem 'bson', '~> 4.0'
-        gem 'mongoid', github: 'mongodb/mongoid'
+        gem 'mongoid', git: 'https://github.com/mongodb/mongoid.git', branch: 'master'
         gem 'nokogiri' # use for jinda/doc
         gem 'haml', git: 'https://github.com/haml/haml'
         gem 'haml-rails'
@@ -29,6 +28,7 @@ module Jinda
         gem 'omniauth-identity'
         gem 'omniauth-facebook'
 	    gem 'omniauth-google-oauth2'
+        gem 'omniauth-rails_csrf_protection'
         gem 'dotenv-rails'
         gem 'cloudinary'
         gem 'kaminari'
@@ -54,17 +54,38 @@ module Jinda
       end
 
       def setup_app
-        # inside("public") { run "mv index.html index.html.bak" }
-        inside("app/views/layouts") {(File.file? "application.html.erb") ? (run  "mv application.html.erb application.html.erb.bak" ) : ( puts "no app/views/layout/ application.html.erb")}
-        inside("app/controllers") {(File.file? "application_controller.rb") ? (run  "mv application_controller.rb application_controller.rb.bak" ) : ( puts "no app/controller/application_controller.rb")}
-        inside("app/helpers") {(File.file? "application_helper.rb") ? (run  "mv application_helper.rb application_helper.rb.bak") : ( puts "no app/helpers/application_helper.rb")}
-        inside("app/assets/javascripts") {(File.file? "javascripts.js") ? (run  "mv javascripts.js javascripts.js.bak") : ( puts "no javascript.js")}
-        inside("app/assets/stylesheets") {(File.file? "javascripts.css") ? (run  "mv javascripts.css javascripts.css.bak") : ( puts "no javascript.css")}
-        inside("config/initializers") {(File.file? "omniauth.rb") ? (run  "mv omniauth.rb omniauth.rb.bak") : (puts "new omniauth.rb created")}
-        inside("config/initializers") {(File.file? "mongoid.rb") ? (run  "mv mongoid.rb omniauth.rb.bak") : (puts "new mongoid.rb created")}
-        inside("config/initializers") {(File.file? "ckeditor.rb") ? (run  "mv ckeditor.rb ckeditor.rb.bak") : (puts "new ckeditor.rb created")}
+        # 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("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? "javascripts.js") ? (FileUtils.mv 'javascripts.js', 'javascripts.js.bak') : ( say "no javascript.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? "ckeditor.rb") ? (FileUtils.mv 'ckeditor.rb ckeditor.rb.bak') : (say "no ckeditor.rb ")}
         directory "app"
         directory "spec"
+        directory "db"
+        directory "config"
+        directory "dot"
+        # 
+        # CHECK IF EXISTING CODE THEN REQUIRED MANUAL MIGRATION
+        # If no javascripts.js or css (New application), then can use javascript.js or css from org files.
+        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? "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", :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? "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')}
+        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')}
       end
       # routes created each line as reversed order button up in routes
       def setup_routes
@@ -78,6 +99,7 @@ module Jinda
 		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"
@@ -92,13 +114,14 @@ module Jinda
 	  end
 
       def setup_env
-        run "mv README.md README.md.bak"
+        FileUtils.mv "README.md", "README.md.bak"
         create_file 'README.md', ''
-        copy_file 'install.sh', 'install.sh'
-        inject_into_file 'config/application.rb', :after => 'require "active_resource/railtie"' do
-          "\nrequire 'mongoid/railtie'\n"
-          "\nrequire 'rexml/document'\n"
-        end
+        # 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{
   # Jinda default
@@ -110,19 +133,19 @@ 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
-  config.action_mailer.smtp_settings = {
-    :address              => "smtp.gmail.com",
-    :port                 => 587,
-    :user_name            => 'user@gmail.com',
-    :password             => 'secret',
-    :authentication       => 'plain',
-    :enable_starttls_auto => true  }
-  config.action_mailer.raise_delivery_errors = true
-  config.action_mailer.perform_deliveries = true
+  # config.action_mailer.delivery_method = :smtp
+  # config.action_mailer.smtp_settings = {
+  #   :address              => "smtp.gmail.com",
+  #   :port                 => 587,
+  #   :user_name            => 'user@gmail.com',
+  #   :password             => 'secret',
+  #   :authentication       => 'plain',
+  #   :enable_starttls_auto => true  }
+  # config.action_mailer.raise_delivery_errors = true
+  # config.action_mailer.perform_deliveries = true
 }
         end
         initializer "jinda.rb" do
@@ -133,7 +156,7 @@ DEFAULT_HEADER = 'Jinda'
 DEFAULT_DESCRIPTION = 'Rails Application Generator'
 DEFAULT_KEYWORDS = %w[Jinda Rails ruby Generator]
 GMAP = false
-ADSENSE = true
+# ADSENSE = true
 NEXT = "Next >"
 # comment IMAGE_LOCATION to use cloudinary (specify params in config/cloudinary.yml)
 IMAGE_LOCATION = "upload"
@@ -171,22 +194,18 @@ Mongoid::Config.belongs_to_required_by_default = false
 "\nRails.application.config.assets.precompile += %w( disable_enter_key.js )\n"
         end
       end
-      def gen_user
-        # copy_file "seeds.rb","db/seeds.rb"
-      end
-
 
       def finish
-        puts "\n"
-        puts "Jinda gem ready for next configuration install.\n"
-        puts "    (or short cut with sh install.sh)\n" 
-        puts "Normally you will use  the following command:\n"
-        puts "----------------------------------------\n"
-        puts "bundle install\n"
-        puts "rails generate jinda:config\n"
-        puts "rake jinda:seed\n"
-        puts 
-        puts "----------------------------------------\n"
+        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"
+        say "rails generate jinda:config\n"
+        say "rake jinda:seed\n"
+        say 
+        say "----------------------------------------\n"
       end
     end
   end

data/lib/generators/jinda/rspec_generator.rb

@@ -11,7 +11,7 @@ module Jinda
         empty_directory "spec/support" 
         empty_directory "spec/model"
         empty_directory "spec/routing"
-        run "mv .rspec .rspec.bak"
+        copy_file ".rspec", ".rspec.bak"
         run "guard init"
         copy_file ".rspec",".rspec"
       end

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

@@ -0,0 +1,173 @@
+# Jinda
+Rails Application Generator using Freemind
+
+* [jinda](https://github.com/kul1/jinda)
+  - ![jinda-screen](https://user-images.githubusercontent.com/3953832/41832753-0143339a-7813-11e8-9ef9-c1601443c604.png)
+
+## Additional Extension themes also available at 
+* [jinda_adminlte](https://github.com/kul1/jinda_adminlte)
+  - ![j18-screen](https://user-images.githubusercontent.com/3953832/34298172-faa7e962-e6e1-11e7-93e2-19dfd4ab42af.png)
+
+* [jinda_adminbsb](https://github.com/kul1/jinda_adminbsb)
+  - ![jinda-bsb](https://user-images.githubusercontent.com/3953832/34320779-bb0980d2-e7c6-11e7-855c-fafc23487ba5.png)
+
+## Prerequisites
+
+These versions works for sure but others may do.
+
+* Ruby 2.5.5
+* Rails 5.2.3
+* MongoDB 6
+* Freemind 1.0.1
+
+## Convention
+
+* database is MongoDB
+* images stored in upload directory, unset IMAGE_LOCATION in `initializer/jinda.rb` to use Cloudinary
+* mail use Gmail SMTP, config in `config/application.rb`
+* authentication use omniauth-identity
+
+## Sample Application
+
+Supposed we want to create ecommerce web site, first create a Rails
+app without ActiveRecord
+
+    $ rails new YOURAPP -BOTJ
+
+## Add jinda to your Gemfile:
+
+    gem 'jinda', '~> 0.3.9'
+
+For Development (most updated)
+
+    gem 'jinda', github:'kul1/jinda'
+
+depend on your operating system, you may need to uncomment
+
+    gem 'therubyracer', :platforms => :ruby
+
+install gems
+
+    $ bundle
+
+generate jinda application
+
+    $ rails generate jinda:install
+
+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
+
+    Please make sure mongod is running then create admin user
+
+    $ rails jinda:seed
+
+now the application is ready, start it as any Rails application
+
+    $ rails server
+
+go to http://localhost:3000, click *Sign In* on the left menu, and enter user name `admin` and password `secret`
+
+![login](https://user-images.githubusercontent.com/3953832/41832924-d868f8f0-7813-11e8-93bb-19c0357cf604.png)
+
+Now open file `app/jinda/index.mm` using Freemind
+
+![index mm](https://user-images.githubusercontent.com/3953832/34680350-7906fbe8-f45e-11e7-8df5-969b4c735c6e.png)
+
+The 3 main branches are
+
+* models - this defines all the models to use in the application
+* services - this defines services which will be come the menu on the left of the screen. There will be 2 levels; the first sub branch is the main menu (modules) and the second sub branch is the sub menu (services)
+* roles - this defines role for all users
+
+### models
+
+Fiirst, we need to create some product so we click on models we'll see 2 models person and address. These are sample only. You can delete them or modify them however you want. We'll take a look at them first
+
+![models](https://user-images.githubusercontent.com/3953832/34681380-50b27dd6-f461-11e7-8472-3a14d76e0f16.png)
+
+The first sub branch (e.g. person) is the model name. According to Rails convention, this should be a singular word. The next sub branch are columns in the database. Let's take a look at each:
+
+* `fname` - this create a column (field) called fname which is a String by default
+* `sex: integer` - this create a column called sex, it is integer so must be explicity defined. The next sub branch (1: male) is disregarded by Jinda so we can put whatever we want. Here I just put some reminder.
+* `belongs_to :address` - here we have ![pen](https://cloud.githubusercontent.com/assets/3953832/25600038/3a4ffb66-2f0b-11e7-9f03-b875e550eefe.png)
+ icon. this means whatever text on this line will be added as is to the model Jinda generates. You use this to specify anything you want such as  association, index, remarks in code, etc. according to mongoid gem. To draw the icon, rest mouse on the branch and hit &ltAlt-I&gt.
+* `dob: date` - use any type that mongoid provides.
+* `photo` - for file field, just use String here. Jinda will receive the binary file and store in file system or cloudinary then generate a url link to it.
+
+In this example we just want a product model, so delete the person and address model and add a product branch like so
+
+![freemind1](https://user-images.githubusercontent.com/3953832/34680349-78f1eea6-f45e-11e7-8e43-50d9025bb449.png)
+
+Save the mind map then run:
+
+    rake jinda:update
+
+This will create file `app/models/product.rb`. In this file, note the comment lines   `# jinda begin` and ` # jinda end`. Everything inside these comments will get overwritten when you change the models branch in the mind map so if you need to put anything inside here, use the mind map instead. You can add anything outside these comment lines which will be preserved when doing jinda:update.
+
+### services
+
+Next we'll add some product into the database, we'll first take a look at the services branch, which already has 3 sub branches; users, admins, and devs. Unlike models person and address branches, these branches are actively used by the system so I recommend that you leave them alone. Let's open the users branch
+
+![image](https://cloud.githubusercontent.com/assets/3953832/25599895/ecf46466-2f09-11e7-82aa-81ade6b9cd83.png)
+
+The text `users:User` on the sub branch has these implications:
+
+* `users` correspond to `app/controllers/users_controller.rb` which already exist when you do rails generate jinda:install. New branch will create new controller if not exist. In Jinda term, this will be called module.
+* `User` will create entry in main menu on the left of the screen. You don't see it in the screenshot above because it's controlled by the sub branch `role:m` which means this menu only available for login member. If you already signed in as admin, you should see it now.
+
+The next sub branches has the following:
+
+* `role: m` - means that this module (menu) is available only to user who has role m (if you open the role branch now will see that role m is member). All registered user has role m by default. User who is not log on would not be able to access this module.
+* `link:info: /users` - means that this is a link, the format is link: *submenu label* : *url* where submenu label is the text to show in the submenu and url is the link to go to, in this case, it woud go to http://localhost:3000/users which will perform index action of UsersController.
+* `user:edit` the branch that do not start with role:, rule:, nor link: will be a Jinda service. You will then specify the sequence of the execution as in this example there are 3 sub branches - enter_user, update_user, and rule:login? Let's take a look at them:
+
+* `enter_user:edit` - the first step is to display a form to input user information, this is accompanied by icon ![image](https://cloud.githubusercontent.com/assets/3953832/25599946/47c32cf6-2f0a-11e7-80a8-2c02c6294c9a.png)
+ which means user interface screen. and will correspond to a view file `app/views/users/user/enter_user.html.erb` where `/users` comes from the module name (the sub branch of services), `/user` comes from the service name (the sub branch of users), and `enter_user.html.erb` comes from the first part of this branch. The `edit` after the colon is just a description of this step. This branch also has sub branch `rule:login? && own_xmain?` which specify rule for this step that the user must be login and can continue this task if he is the one who started it. *task* in here means each instance of service.
+* `update_user` - this icon ![image](https://cloud.githubusercontent.com/assets/3953832/25599976/87b69ad2-2f0a-11e7-9aba-1bd4e9546d3e.png) means to execute method update_user within `users_controller.rb`
+
+Armed with this knowledge, we are ready to add new product into our application like so:
+
+![add_enter](https://cloud.githubusercontent.com/assets/3953832/25600158/582d1fbe-2f0c-11e7-9bde-01a195a45b6c.png)
+
+
+To generate controller and views we save this mind map and run
+
+    rake jinda:update
+
+open file `app/views/products/add/enter.html.erb` you'll see some sample view already in there but commented. edit the file so it look like this
+
+
+![product_enter](https://cloud.githubusercontent.com/assets/3953832/25600363/e5cc8282-2f0d-11e7-81f7-273c9bdc1a63.png)
+
+
+Note that we do not specify form_tag and submit_tag, these will be supplied by Jinda.
+
+then open file `app/controllers/products_controller.rb` and add `create` method as follow. The method name has to be correspond to the ![bookmark](http://songrit.googlecode.com/files/bookmark.png) branch.
+
+![products_controller](http://songrit.googlecode.com/files/products_controller.png)
+
+## Testing
+
+run following command:
+
+    rails generate jinda:rspec
+    guard init
+    guard
+
+![rspec](https://user-images.githubusercontent.com/3953832/34680352-7931d426-f45e-11e7-9f40-8b85b94c61bf.png)
+
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/lib/generators/jinda/templates/app/controllers/{sessions_controller.rb → jinda_org/sessions_controller.rb}

@@ -4,6 +4,10 @@ class SessionsController < ApplicationController
     @title= 'Sign In'
   end
 
+  def failure
+    redirect_to login_path, alert: "Authentication failed, please try again."
+  end
+
   # to refresh the page, must know BEFOREHAND that the action needs refresh
   # then use attribute 'data-ajax'=>'false'
   # see app/views/sessions/new.html.erb for sample

data/lib/generators/jinda/templates/app/jinda/template/view.html.erb

@@ -1,23 +1,27 @@
-<%#
-  doc = Doc.new :issue_on=> Date.today, :process_at => Time.now
+<%
+  doc = Jinda::Doc.new :issue_on=> Date.today, :process_at => Time.now
 %>
-<%#= fields_for doc do |f| %>
-  <%#= f.label :rnum, "Reference number" %>
-  <%#= f.text_field :rnum %>
+<%= fields_for doc do |f| %>
+
+    <%= f.select :x, [["SELECTION 1", 1], ["SELECTION  2", 2], ["SELECTION  3", 3]] %>
+
+
+  <%= f.label :x, "Reference number" %>
+  <%= f.text_field :x %>
   <!--div>
-    <%#= f.label :confidential, "Confidentiality" , :class=>"ui-input-text" %>
-    <%#= f.select :confidential, [['normal',0],['secret',1],['top secret',2]],{},"data-native-menu"=>"false" %>
+    <%= f.label :w, "Confidential" , :class=>"ui-input-text" %>
+    <%= f.select :w, [['normal',0],['secret',1],['top secret',2]],{},"data-native-menu"=>"false" %>
   </div-->
-  <%#= f.label :issue_on, "Dated" %>
-  <%#= f.date_field :issue_on, "blackDays"=>[0,6] %>
-  <%#= f.label :summary, "Summary" %>
-  <%#= f.text_area :summary, :cols=>50, :rows=>6 %>
-  <%#= f.label :dscan, "Attached document" %>
-  <%#= f.file_field :dscan %>
-<%# end %>
-<%#= label_tag :hotel, "Ungroup field" %>
-<%#= text_field_tag :hotel %>
+  <%= f.label :issue_on, "Dated" %>
+  <%= f.date_field :issue_on, "blackDays"=>[0,6] %>
+  <%= f.label :y, "Summary" %>
+  <%= f.text_area :summary, :cols=>50, :rows=>6 %>
+  <%= f.label :dscan, "Attached document" %>
+  <%= f.file_field :dscan %>
+<% end %>
+<%= label_tag :z, "Ungroup field" %>
+<%= text_field_tag :z %>
 <!--div>
-  <%#= label_tag :done1, "Logic field", :class=>"ui-input-text" %>
-  <%#= select_tag :done1, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
+  <%= label_tag :yes, "Logic field", :class=>"ui-input-text" %>
+  <%= select_tag :yes, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
 </div-->

data/lib/generators/jinda/templates/app/models/jinda/doc.rb

@@ -1,31 +1,22 @@
-# -*- encoding : utf-8 -*-
+# encoding: utf-8
 class Jinda::Doc
   include Mongoid::Document
+  # jinda begin
   include Mongoid::Timestamps
-  field :name, :type => String
-  field :filename, :type => String
-  field :content_type, :type => String
-  field :data_text, :type => String
-  field :url, :type => String
-  field :basename, :type => String
-  field :cloudinary, :type => Boolean
-  belongs_to :xmain, :class_name => "Jinda::Xmain"
-  belongs_to :runseq, :class_name => "Jinda::Runseq"
-  belongs_to :user, :class_name => "Jinda::User"
-  belongs_to :service, :class_name => "Jinda::Service"
-  field :ip, :type => String
-  field :ma_display, :type => Boolean
-  field :ma_secured, :type => Boolean
-
-  def self.search(q, page, per_page=PER_PAGE)
-    paginate :per_page=>per_page, :page => page, :conditions =>
-      ["content_type=? AND data_text LIKE ? AND (ma_secured=? OR ma_user_id=?)",
-      "output", "%#{q}%", false, session[:user_id] ],
-      :order=>'ma_xmain_id DESC', :select=>'DISTINCT ma_xmain_id'
-  end
-  def self.search_ma_secured(q, page, per_page=PER_PAGE)
-    paginate :per_page=>per_page, :page => page, :conditions =>
-      ["content_type=? AND data_text LIKE ?", "output", "%#{q}%" ],
-      :order=>'ma_xmain_id DESC', :select=>'DISTINCT ma_xmain_id'
-  end
+  field :a, :type => String
+  field :b, :type => String
+  field :c, :type => String
+  field :d, :type => String
+  field :x, :type => String
+  field :y, :type => String
+  field :z, :type => String
+  field :s, :type => String
+  field :t, :type => String
+  field :u, :type => String
+  field :w, :type => String
+  field :yes, :type => Boolean
+  field :dscan, :type => String
+  field :process_at, :type => Date
+  field :issue_on, :type => Date
+  # jinda end
 end

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

@@ -13,15 +13,15 @@
 
   %h2 Recently tested with:
   %ul  
-    %li Rubygems 2.5.0
-    %li Rails 5.2.3
-    %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record 
-    %li (rails new YOURAPP -BOT)
+    %li Rubygems 2.6.3
+    %li Rails 6.0.0
+    %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record --skip-javascript --skip-turbolinks 
+    %li (rails new YOURAPP -BOTJ)
 
 
   %h2 Installation
   %ul
-    %li add gem 'jinda', '0.3.5'
+    %li add gem 'jinda', '0.4.0'
     %li bundle
     %li rails generate jinda:install
     %li (run all with "sh install.sh" )

data/lib/generators/jinda/templates/{seeds.rb → db/seeds.rb}

@@ -1,6 +1,6 @@
 unless Identity.where(code:"admin").exists?
   identity= Identity.create :code => "admin", :email => "admin@test.com", :password => "secret",
     :password_confirmation => "secret"
-  User.create :provider => "identity", :uid => identity.id.to_s, :code => identity.code,
+  Jinda::User.create :provider => "identity", :uid => identity.id.to_s, :code => identity.code,
     :email => identity.email, :role => "M,A,D"
 end

data/lib/jinda/ template/view.html.erb

@@ -0,0 +1,27 @@
+<%
+  doc = Jinda::Doc.new :issue_on=> Date.today, :process_at => Time.now
+%>
+<%= fields_for doc do |f| %>
+
+    <%= f.select :x, [["SELECTION 1", 1], ["SELECTION  2", 2], ["SELECTION  3", 3]] %>
+
+
+  <%= f.label :x, "Reference number" %>
+  <%= f.text_field :x %>
+  <!--div>
+    <%= f.label :w, "Confidential" , :class=>"ui-input-text" %>
+    <%= f.select :w, [['normal',0],['secret',1],['top secret',2]],{},"data-native-menu"=>"false" %>
+  </div-->
+  <%= f.label :issue_on, "Dated" %>
+  <%= f.date_field :issue_on, "blackDays"=>[0,6] %>
+  <%= f.label :y, "Summary" %>
+  <%= f.text_area :summary, :cols=>50, :rows=>6 %>
+  <%= f.label :dscan, "Attached document" %>
+  <%= f.file_field :dscan %>
+<% end %>
+<%= label_tag :z, "Ungroup field" %>
+<%= text_field_tag :z %>
+<!--div>
+  <%= label_tag :yes, "Logic field", :class=>"ui-input-text" %>
+  <%= select_tag :yes, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
+</div-->

data/lib/jinda/app/jinda/template/view.html.erb

@@ -0,0 +1,27 @@
+<%
+  doc = Jinda::Doc.new :issue_on=> Date.today, :process_at => Time.now
+%>
+<%= fields_for doc do |f| %>
+
+    <%= f.select :x, [["SELECTION 1", 1], ["SELECTION  2", 2], ["SELECTION  3", 3]] %>
+
+
+  <%= f.label :x, "Reference number" %>
+  <%= f.text_field :x %>
+  <!--div>
+    <%= f.label :w, "Confidential" , :class=>"ui-input-text" %>
+    <%= f.select :w, [['normal',0],['secret',1],['top secret',2]],{},"data-native-menu"=>"false" %>
+  </div-->
+  <%= f.label :issue_on, "Dated" %>
+  <%= f.date_field :issue_on, "blackDays"=>[0,6] %>
+  <%= f.label :y, "Summary" %>
+  <%= f.text_area :summary, :cols=>50, :rows=>6 %>
+  <%= f.label :dscan, "Attached document" %>
+  <%= f.file_field :dscan %>
+<% end %>
+<%= label_tag :z, "Ungroup field" %>
+<%= text_field_tag :z %>
+<!--div>
+  <%= label_tag :yes, "Logic field", :class=>"ui-input-text" %>
+  <%= select_tag :yes, options_for_select([['Yes', 'y'], ['No', 'n']],'y'), 'data-role'=>"slider" %>
+</div-->

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-	VERSION = "0.3.5"
+	VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,74 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.0
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.7.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.7.3
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -147,26 +79,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.11
-- !ruby/object:Gem::Dependency
-  name: dotenv-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
 description: 'Generate Rails workflow from mind map: Freemind'
 email:
 - 1.0@kul.asia
@@ -184,8 +96,7 @@ files:
 - lib/generators/jinda/install_generator.rb
 - lib/generators/jinda/minitest_generator.rb
 - lib/generators/jinda/rspec_generator.rb
-- lib/generators/jinda/templates/.env
-- lib/generators/jinda/templates/app/assets/config/manifest.js
+- lib/generators/jinda/templates/README.md
 - lib/generators/jinda/templates/app/assets/images/4dcity-old.ico
 - lib/generators/jinda/templates/app/assets/images/4dcity.ico
 - lib/generators/jinda/templates/app/assets/images/account.png
@@ -242,7 +153,7 @@ files:
 - lib/generators/jinda/templates/app/assets/images/user.png
 - lib/generators/jinda/templates/app/assets/images/user_admin_gear.png
 - lib/generators/jinda/templates/app/assets/images/view_code.png
-- lib/generators/jinda/templates/app/assets/javascripts/application.js
+- lib/generators/jinda/templates/app/assets/javascripts/application-org.js
 - lib/generators/jinda/templates/app/assets/javascripts/application.js-jqm
 - lib/generators/jinda/templates/app/assets/javascripts/cable.js
 - lib/generators/jinda/templates/app/assets/javascripts/disable_enter_key.js
@@ -253,8 +164,8 @@ files:
 - lib/generators/jinda/templates/app/assets/javascripts/jquery.mobile.datebox.js
 - lib/generators/jinda/templates/app/assets/javascripts/jquery.mobile.splitview.js
 - lib/generators/jinda/templates/app/assets/stylesheets/app.scss
-- lib/generators/jinda/templates/app/assets/stylesheets/application.css
-- lib/generators/jinda/templates/app/assets/stylesheets/application.css.scss
+- lib/generators/jinda/templates/app/assets/stylesheets/application-org.css
+- lib/generators/jinda/templates/app/assets/stylesheets/application-org.css.scss
 - lib/generators/jinda/templates/app/assets/stylesheets/articles.scss
 - lib/generators/jinda/templates/app/assets/stylesheets/fonts/sarabun.eot
 - lib/generators/jinda/templates/app/assets/stylesheets/fonts/sarabun.ttf
@@ -295,22 +206,21 @@ files:
 - lib/generators/jinda/templates/app/assets/stylesheets/social.scss
 - lib/generators/jinda/templates/app/channels/application_cable/channel.rb
 - lib/generators/jinda/templates/app/channels/application_cable/connection.rb
-- lib/generators/jinda/templates/app/controllers/admins_controller.rb
-- lib/generators/jinda/templates/app/controllers/application_controller.rb
-- lib/generators/jinda/templates/app/controllers/articles_controller.rb
-- lib/generators/jinda/templates/app/controllers/comments_controller.rb
 - lib/generators/jinda/templates/app/controllers/ctrs_controller.rb-gem-test
-- lib/generators/jinda/templates/app/controllers/devs_controller.rb
-- lib/generators/jinda/templates/app/controllers/identities_controller.rb
-- lib/generators/jinda/templates/app/controllers/jinda_controller.rb
-- lib/generators/jinda/templates/app/controllers/password_resets.rb
-- lib/generators/jinda/templates/app/controllers/password_resets_controller.rb
-- lib/generators/jinda/templates/app/controllers/sessions_controller.rb
-- lib/generators/jinda/templates/app/controllers/sitemap_controller.rb
-- lib/generators/jinda/templates/app/controllers/users_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/admins_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/application_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/articles_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/comments_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/devs_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/identities_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/jinda_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/password_resets.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/password_resets_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/sessions_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/sitemap_controller.rb
+- lib/generators/jinda/templates/app/controllers/jinda_org/users_controller.rb
 - lib/generators/jinda/templates/app/helpers/admins_helper.rb
 - lib/generators/jinda/templates/app/helpers/application_helper.rb
-- lib/generators/jinda/templates/app/helpers/application_helper.rb.bak
 - lib/generators/jinda/templates/app/helpers/articles_helper.rb
 - lib/generators/jinda/templates/app/helpers/basic_helper.rb
 - lib/generators/jinda/templates/app/helpers/comments_helper.rb
@@ -322,7 +232,6 @@ files:
 - lib/generators/jinda/templates/app/jinda/index.mm
 - lib/generators/jinda/templates/app/jinda/template/linkview.haml
 - lib/generators/jinda/templates/app/jinda/template/view.html.erb
-- lib/generators/jinda/templates/app/jobs/application_job.rb
 - lib/generators/jinda/templates/app/mailers/application_mailer.rb
 - lib/generators/jinda/templates/app/mailers/jinda_mailer.rb
 - lib/generators/jinda/templates/app/mailers/user_mailer.rb
@@ -416,8 +325,9 @@ files:
 - lib/generators/jinda/templates/app/views/users/index.haml
 - lib/generators/jinda/templates/app/views/users/pwd/enter.html.erb
 - lib/generators/jinda/templates/app/views/users/user/enter_user.html.erb
-- lib/generators/jinda/templates/cloudinary.yml
-- lib/generators/jinda/templates/dot.rspec
+- lib/generators/jinda/templates/config/cloudinary.yml
+- lib/generators/jinda/templates/db/seeds.rb
+- lib/generators/jinda/templates/dot/dot.env
 - lib/generators/jinda/templates/install.sh
 - lib/generators/jinda/templates/jinda.yml
 - lib/generators/jinda/templates/public/404.html
@@ -426,7 +336,6 @@ files:
 - lib/generators/jinda/templates/public/assets/images/logo.png
 - lib/generators/jinda/templates/public/favicon.ico
 - lib/generators/jinda/templates/public/robots.txt
-- lib/generators/jinda/templates/seeds.rb
 - lib/generators/jinda/templates/spec/controllers/sessions_controller_spec.rb
 - lib/generators/jinda/templates/spec/features/userlogins_spec.rb
 - lib/generators/jinda/templates/spec/models/user_spec.rb
@@ -439,6 +348,8 @@ files:
 - lib/generators/jinda/templates/test/integration/jinda_routes_test.rb
 - lib/generators/jinda/templates/test/test_helper.rb
 - lib/jinda.rb
+- lib/jinda/ template/view.html.erb
+- lib/jinda/app/jinda/template/view.html.erb
 - lib/jinda/gemhelpers.rb
 - lib/jinda/helpers.rb
 - lib/jinda/railtie.rb
@@ -456,14 +367,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: 'Rails workflow from mind map: Freemind'

data/lib/generators/jinda/templates/app/assets/config/manifest.js

@@ -1,3 +0,0 @@
-//= link_tree ../images
-//= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css

data/lib/generators/jinda/templates/app/helpers/application_helper.rb.bak

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/lib/generators/jinda/templates/app/jobs/application_job.rb

@@ -1,2 +0,0 @@
-class ApplicationJob < ActiveJob::Base
-end

data/lib/generators/jinda/templates/dot.rspec

@@ -1,3 +0,0 @@
---require rails_helper
---color
---format doc