jinda 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76d2836b5b18613dae1ff51def80af23dede4971b15dc2a3ab496a3de47ed6f3
-  data.tar.gz: d2cf9f9d7b056d78b3bfa926a8f17a5c1de07b81824b147ccb357c4811cebd78
+  metadata.gz: 77b09fb0c4f82a435bf3e198bd977bce89d4b8a332a4e843a270b739982580bb
+  data.tar.gz: 485e4b47276604181271e18e78486ce0fddb6552c22e81b9106e0de35a74ca46
 SHA512:
-  metadata.gz: 666874fdbc5cc18c25fc71b8330147f404c16337aae38300c7187395373eb6fdbdc9d90079d6b0a8e039e0dc1451dab96ec3eb16213fc7ffb6ab9caf0cff1542
-  data.tar.gz: d3fa88121a7f044ff2c56bd7fa997224ebc50bddd2f6c9edefd859f59c98aa1ee452ed7a3a0b06cf419071daace32e203175727ddcff76bb04552cd52c9bfb64
+  metadata.gz: 3eee618a0fafa9d96b2d66b15f56a3de29b5f2e160c0b1202b5300c69ae55abb3e3ca24dee5c6abc61c22bc6a0ae91fac5b62c07c3723276cdc1b66eaae4ce71
+  data.tar.gz: 3c854dc6b6e971193e59cfa5b66cf3a38752f0769fe5d7649c33c5af39d6c52388044f47f3921ce35ef1e37d7928219d2823171cf4fac07c9a1c73130810c1fa

data/README.md

@@ -15,7 +15,7 @@ Rails Application Generator using Freemind
 
 These versions works for sure but others may do.
 
-* Ruby 2.5.0
+* Ruby 2.5.5
 * Rails 5.2.3
 * 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.3.9'
 
 For Development (most updated)
 

data/lib/generators/jinda/install_generator.rb

@@ -55,20 +55,37 @@ module Jinda
 
       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") : ( puts "no seeds.rb")}
-        inside("app/views/layouts") {(File.file? "application.html.erb") ? (FileUtils.mv 'application.html.erb', 'application.html.erb.bak') : ( puts "no app/views/layout/ application.html.erb")}
-        inside("app/controllers") {(File.file? "application_controller.rb") ? (FileUtils.mv 'application_controller.rb', 'application_controller.rb.bak' ) : ( puts "no app/controller/application_controller.rb")}
-        inside("app/helpers") {(File.file? "application_helper.rb") ? (FileUtils.mv 'application_helper.rb', 'application_helper.rb.bak') : ( puts "no app/helpers/application_helper.rb")}
-        inside("app/assets/javascripts") {(File.file? "javascripts.js") ? (FileUtils.mv 'javascripts.js', 'javascripts.js.bak') : ( puts "no javascript.js")}
-        inside("app/assets/stylesheets") {(File.file? "javascripts.css") ? (FileUtils.mv 'javascripts.css', 'javascripts.css.bak') : ( puts "no javascript.css")}
-        inside("config/initializers") {(File.file? "omniauth.rb") ? (FileUtils.mv 'omniauth.rb', 'omniauth.rb.bak') : (puts "no omniauth.rb")}
-        # inside("config/initializers") {(File.file? "mongoid.rb") ? (FileUtils.mv 'mongoid.rb', 'mongoid.rb.bak') : (puts "no mongoid.rb")}
-        # inside("config/initializers") {(File.file? "ckeditor.rb") ? (FileUtils.mv 'ckeditor.rb ckeditor.rb.bak') : (puts "no ckeditor.rb ")}
+          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
@@ -99,10 +116,11 @@ module Jinda
         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
-          "\nrequire 'mongoid/railtie'\n"
-          "\nrequire 'rexml/document'\n"
-        end
+        # 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
@@ -114,19 +132,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
@@ -137,7 +155,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"
@@ -175,22 +193,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
-        # FileUtils.cp "db/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/templates/README.md

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