jinda 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c493bb3f9ec9c0d77fe441c37484ea0a345cb39eb0dc196bf52e1eee46414adf
-  data.tar.gz: 6cbaad855b865abda8351eea97336b322a0e9a9652b3a3ae8d1e8b51e6c6b89a
+  metadata.gz: 4cb7f6788d0aa3fad4ce0d9eaf1e009f300722759d6b0ee8b00d3b7031eb321f
+  data.tar.gz: 9749137e534dee5922b5d819663e1c0919c3f1c70554afa8a75cd0f289085f19
 SHA512:
-  metadata.gz: 344e5084a67024897045c73004309f873a406dfee3e6a563779df47d432c1238abc8432f6eeae80ec3c9569cf36943be14f0bc4f00aefb72a49d6690835d6856
-  data.tar.gz: 260da9dd4da82cccba3bbcf58b8b78a75d536c29e45d912c4def129539e98c3825b1b86058c16dc4d3210d0da44ad239438fdfbc393f78b0c4492f324d18a88f
+  metadata.gz: 4ab68ff5f87f44070c6ea77512ca66aa5e177c38fceae95f38d1a7db825e02acda6b1a9d5faca555c6efe0837dc5a6a153d0a505105768e9cc97d190ba9eab6c
+  data.tar.gz: 9fdd89eb551c389c55211e73edef1aa8318d638dbe5a7b437a10a235600975b0afe43b4df17912400481b7363fda3610c9956865e591fedf11d9cca42faf8052

data/README.md

@@ -1,8 +1,7 @@
 # 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)
+  -![Screen Shot 2019-09-07 at 1 00 03 PM](https://user-images.githubusercontent.com/3953832/64478408-f5feb500-d175-11e9-9d07-8b41f3c47924.png)
 
 ## Additional Extension themes also available at 
 * [jinda_adminlte](https://github.com/kul1/jinda_adminlte)
@@ -16,7 +15,7 @@ Rails Application Generator using Freemind
 These versions works for sure but others may do.
 
 * Ruby 2.6.3
-* Rails 6.0.0
+* Rails 6.0.1
 * MongoDB 6
 * Freemind 1.0.1
 
@@ -29,6 +28,10 @@ These versions works for sure but others may do.
 
 ## Sample Application
 
+### Sample Jinda in Docker
+
+* https://github.com/kul1/b-255523-jd
+
 Supposed we want to create ecommerce web site, first create a Rails
 app without ActiveRecord
 

data/lib/generators/jinda/install_generator.rb

@@ -15,19 +15,20 @@ module Jinda
         gem 'mongoid-paperclip', require: 'mongoid_paperclip'
         gem 'meta-tags'
         gem 'jquery-turbolinks'
-        gem 'mongo', '~> 2.5.1'
+        gem 'mongo', '~> 2.7.0'
         gem 'bson', '~> 4.0'
-        gem 'mongoid', git: 'https://github.com/mongodb/mongoid.git', branch: 'master'
+        gem 'mongoid', '~> 6.0'
         gem 'nokogiri' # use for jinda/doc
-        gem 'haml', git: 'https://github.com/haml/haml'
-        gem 'haml-rails'
+        gem 'haml', '~> 5.1', '>= 5.1.2'
+        gem 'haml-rails', '~> 1.0'
         gem 'mail'
         gem 'prawn'
         gem 'redcarpet'
         gem 'bcrypt'
-        gem 'omniauth-identity'
-        gem 'omniauth-facebook'
-	    gem 'omniauth-google-oauth2'
+        gem 'omniauth', '1.8.1'
+        gem 'omniauth-identity', '1.1.1'
+        gem 'omniauth-facebook', '5.0.0'
+        gem 'omniauth-google-oauth2', '0.5.3'
         gem 'omniauth-rails_csrf_protection'
         gem 'dotenv-rails'
         gem 'cloudinary'
@@ -72,9 +73,9 @@ module Jinda
         # 
         # 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/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')}

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

@@ -0,0 +1,4 @@
+//= link_tree ../images
+//= link_directory ../stylesheets .css
+//= link application.js
+

data/lib/generators/jinda/templates/app/assets/javascripts/{application-org.js → application.js}

@@ -19,6 +19,6 @@
 //= require iscroll
 //= require jinda
 //  require turbolinks
-//= require disable_enter_key.js
+//  require disable_enter_key.js
 
 

data/lib/generators/jinda/templates/app/assets/stylesheets/{application-org.css.scss → application.css}

@@ -8,8 +8,8 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- * require_tree .
- * require_self
+ *= require_tree .
+ *= require_self
  *= require normalize-rails
  */
 

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

@@ -14,7 +14,7 @@
   %h2 Recently tested with:
   %ul  
     %li Rubygems 2.6.3
-    %li Rails 6.0.0
+    %li Rails 6.0.1
     %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record --skip-javascript --skip-turbolinks 
     %li (rails new YOURAPP -BOTJ)
 

data/lib/jinda/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - lib/generators/jinda/minitest_generator.rb
 - lib/generators/jinda/rspec_generator.rb
 - lib/generators/jinda/templates/README.md
+- lib/generators/jinda/templates/app/assets/config/manifest.js
 - 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
@@ -153,10 +154,10 @@ 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-org.js
+- lib/generators/jinda/templates/app/assets/javascripts/application.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
+- lib/generators/jinda/templates/app/assets/javascripts/disable_enter_key.js-org
 - lib/generators/jinda/templates/app/assets/javascripts/iscroll-wrapper.js
 - lib/generators/jinda/templates/app/assets/javascripts/iscroll.js
 - lib/generators/jinda/templates/app/assets/javascripts/jinda.js
@@ -164,8 +165,7 @@ 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-org.css
-- lib/generators/jinda/templates/app/assets/stylesheets/application-org.css.scss
+- lib/generators/jinda/templates/app/assets/stylesheets/application.css
 - 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

data/lib/generators/jinda/templates/app/assets/stylesheets/application-org.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
- * vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */