jinda 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77b09fb0c4f82a435bf3e198bd977bce89d4b8a332a4e843a270b739982580bb
-  data.tar.gz: 485e4b47276604181271e18e78486ce0fddb6552c22e81b9106e0de35a74ca46
+  metadata.gz: c493bb3f9ec9c0d77fe441c37484ea0a345cb39eb0dc196bf52e1eee46414adf
+  data.tar.gz: 6cbaad855b865abda8351eea97336b322a0e9a9652b3a3ae8d1e8b51e6c6b89a
 SHA512:
-  metadata.gz: 3eee618a0fafa9d96b2d66b15f56a3de29b5f2e160c0b1202b5300c69ae55abb3e3ca24dee5c6abc61c22bc6a0ae91fac5b62c07c3723276cdc1b66eaae4ce71
-  data.tar.gz: 3c854dc6b6e971193e59cfa5b66cf3a38752f0769fe5d7649c33c5af39d6c52388044f47f3921ce35ef1e37d7928219d2823171cf4fac07c9a1c73130810c1fa
+  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.5
-* Rails 5.2.3
+* Ruby 2.6.3
+* Rails 6.0.0
 * MongoDB 6
 * Freemind 1.0.1
 
@@ -36,7 +36,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.3.9'
+    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") ? (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
+    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
-        # 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
-}
-        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', '6.1.0'
+        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'
@@ -75,17 +75,17 @@ 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? "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')}
+        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,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"