jinda 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34a83590140593e5245b54ea6edbfadc73dd4adaea05877d9743b64f06cd36e5
-  data.tar.gz: 644da69d744877a19d598a49ef21bb14bc8895cd17cd80122f5f2b9d03691519
+  metadata.gz: c9a75e9044c742215b4a88279c71bf994b083791e8b2968307cd9fd1272cd630
+  data.tar.gz: 45b023769cd651c2b20310f01298d9477705604ea2b0dfece5312f7abcff11c6
 SHA512:
-  metadata.gz: ae032fad6e397859dc90b213ddb8dd9a26facfc4d9dd547370b7ed69ed53f393c4a79a21d6e562b014e842f680dcea0c7188271caee124dbcb0aa4f27fba2b02
-  data.tar.gz: 155e54f906475400106f8761596a7b8a7c63c7b27d46f9697fd4474306b2d5c1e5fdf5365040127d990114f20ce9166dc9d7c8644cc9d53b299ea21bd042da0e
+  metadata.gz: 884f1007b8642e2e42d01b66811444279c4c9b01f1cb52e1baa9833f2677883a89c046172b459db665c3d86b97a9f57bc416b015e382f6d62ff2b6c640039f59
+  data.tar.gz: e91ce213262754eaee44bcc6270113bf66429f4232c9380622eb0060eae31a976fa711a45999e2dd7bad665de7b9e3aa242f24a120637f88c301cefb2931d256

data/README.md

@@ -36,7 +36,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.3.4'
+    gem 'jinda', '~> 0.3.5'
 
 For Development (most updated)
 
@@ -58,6 +58,8 @@ 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/lib/generators/jinda/config_generator.rb

@@ -80,8 +80,11 @@ end
         puts "-----------------------------------------\n"
         puts "rails jinda:seed\n"
         puts "-----------------------------------------\n"
-        puts "      To config rspect run:"
+        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"
@@ -91,7 +94,7 @@ end
         puts "-----------------------------------------\n"
         puts "      To login with facebook"
         puts "-----------------------------------------\n"
-				puts "Please config. in .env or restore from .env-bak \n"
+		puts "Please config. in .env or restore from .env-bak \n"
         puts "-----------------------------------------\n"
       end
     end

data/lib/generators/jinda/install_generator.rb

@@ -54,15 +54,15 @@ module Jinda
       end
 
       def setup_app
-        inside("public") { run "mv index.html index.html.bak" }
-        inside("app/views/layouts") { run "mv application.html.erb application.html.erb.bak" }
-        inside("app/controllers") { run "mv application_controller.rb application_controller.rb.bak" }
-        inside("app/helpers") { run "mv application_helper.rb application_helper.rb.bak" }
-        inside("app/assets/javascripts") { run "mv application.js application.js.bak" }
-        inside("app/assets/stylesheets") { run "mv application.css application.css.bak" }
-        inside("config/initializers") {(File.file? "omniauth.rb") ? (mv omniauth.rb omniauth.rb.bak) : (puts "new omniauth.rb created")}
-        inside("config/initializers") {(File.file? "mongoid.rb") ? (mv mongoid.rb omniauth.rb.bak) : (puts "new mongoid.rb created")}
-        inside("config/initializers") {(File.file? "ckeditor.rb") ? (mv ckeditor.rb ckeditor.rb.bak) : (puts "new ckeditor.rb created")}
+        # 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")}
         directory "app"
         directory "spec"
       end
@@ -94,6 +94,7 @@ module Jinda
       def setup_env
         run "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"
@@ -174,14 +175,17 @@ Mongoid::Config.belongs_to_required_by_default = false
         # copy_file "seeds.rb","db/seeds.rb"
       end
 
+
       def finish
         puts "\n"
         puts "Jinda gem ready for next configuration install.\n"
-        puts "Please run the following command:\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"
       end
     end

data/lib/generators/jinda/templates/app/assets/javascripts/application.js

@@ -12,13 +12,13 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jqm/jquery.mobile.splitview
-//= require jqm/jquery.mobile-1.2.1
-//= require jqm/jquery.mobile.datebox
-//= require jqm/iscroll-wrapper
-//= require jqm/iscroll
-//= require jqm/jinda
+//= require jquery.mobile.splitview
+//= require jquery.mobile-1.2.1
+//= require jquery.mobile.datebox
+//= require iscroll-wrapper
+//= require iscroll
+//= require jinda
 //  require turbolinks
-//= require jqm/disable_enter_key.js
+//= require disable_enter_key.js
 
 

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

@@ -13,21 +13,15 @@
  *= require normalize-rails
  */
 
-@import "jqm/jquery.mobile-1.2.1";
-@import "jqm/jquery.mobile.splitview";
-@import "jqm/jquery.mobile.grids.collapsible";
-@import "jqm/jquery.mobile.datebox.css";
-@import "jqm/sarabun";
-@import "jqm/jinda";
-@import "jqm/kul-4.2";
-@import "jqm/articles";
-@import "jqm/app.scss";
+@import "jquery.mobile-1.2.1";
+@import "jquery.mobile.splitview";
+@import "jquery.mobile.grids.collapsible";
+@import "jquery.mobile.datebox.css";
+@import "sarabun";
+@import "jinda";
+@import "kul-4.2";
+@import "articles";
+@import "app.scss";
 @import "font-awesome-sprockets";
 @import "font-awesome";
-@import "jqm/social";
-
-
-
-
-
-
+@import "social";

data/lib/generators/jinda/templates/app/controllers/application_controller.rb

@@ -1,6 +1,8 @@
 class ApplicationController < ActionController::Base
   # https://www.cookieshq.co.uk/posts/easy-seo-metatags-with-rails-4#a-word-about-turbolinks
   before_action :prepare_meta_tags, if: -> { request.get? }
+  # CSRF protection is turned on with the protect_from_forgery method. 
+  protect_from_forgery unless: -> { request.format.json? }
   def prepare_meta_tags(options={})
     site_name   = DEFAULT_TITLE
     title       = [controller_name, action_name].join(" ")

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

@@ -21,14 +21,16 @@
 
   %h2 Installation
   %ul
-    %li add gem 'jinda', '0.3.4'
+    %li add gem 'jinda', '0.3.5'
     %li bundle
     %li rails generate jinda:install
+    %li (run all with "sh install.sh" )
     %li bundle
     %li rails generate jinda:config
     %li rails jinda:seed, will create initial user:password admin:secret
     %li when update app/jinda/index.mm, run rake jinda:update
 
+
   %h2 Option: Themes available: Jinda_adminbsb, Jinda_adminlte
   %ul 
     %li To install gem 'jinda_adminlte' 

data/lib/generators/jinda/templates/install.sh

@@ -0,0 +1,7 @@
+bundle
+rails g jinda:install
+bundle
+rails g jinda:config
+rails jinda:seed
+rspec
+

data/lib/generators/jinda/templates/spec/controllers/sessions_controller_spec.rb

@@ -4,13 +4,13 @@
 # 3. Test whatever code is attached to the callback
 # require 'spec_helper'
 require 'rails_helper'
-describe SessionsController do
+describe SessionsController, type: :controller do
 
-	describe "Google" do
+	describe "Google"  do
 
 		before do
 	
-			request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:google_oauth2]
+			@request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:google_oauth2]
 			visit '/auth/google_oauth2'
 		end
 
@@ -52,7 +52,7 @@ describe SessionsController do
 	describe "Facebook" do
 
 		before do
-			request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:facebook]
+			@request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:facebook]
 			visit '/auth/facebook'
 		end
 

data/lib/generators/jinda/templates/spec/spec_helper.rb

@@ -19,7 +19,7 @@ RSpec.configure do |config|
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
 # https://github.com/DatabaseCleaner/database_cleaner #
-  config.use_transactional_fixtures = false
+#  config.use_transactional_fixtures = false
 	# https://stackoverflow.com/questions/15148585/undefined-method-visit-when-using-rspec-and-capybara-in-rails
 	config.include Capybara::DSL
 

data/lib/generators/jinda/templates/spec/support/omniauth_macros.rb

@@ -1,7 +1,10 @@
 # in spec/support/omniauth_macro.rb
 module OmniauthMacros
+require 'omniauth'
+  #To enable all request to OmniAuth short circuited to use below mock authentication hash the  /auth/provider will redirect immediately to /auth/provider/call back
+  # https://github.com/omniauth/omniauth/wiki/Integration-Testing
+  OmniAuth.config.test_mode = true
 
-OmniAuth.config.test_mode = true
   omniauth_hash = { 'provider' => 'google_oauth2',
                     'uid' => '105362273761620533373',
                     'info' => {

data/lib/jinda/helpers.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/core_ext'
+
 # -*- encoding : utf-8 -*-
 # This helper handle 
 # 1. Read xml from mm file to run core program: 
@@ -21,9 +24,6 @@
 #
 ################################################################################
 
-require 'active_support'
-require 'active_support/core_ext'
-
 
 module Jinda
   module Helpers

data/lib/jinda/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -243,18 +243,19 @@ files:
 - 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.js.bak
+- 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/jqm/application.js-jqm
-- lib/generators/jinda/templates/app/assets/javascripts/jqm/disable_enter_key.js
-- lib/generators/jinda/templates/app/assets/javascripts/jqm/iscroll-wrapper.js
-- lib/generators/jinda/templates/app/assets/javascripts/jqm/iscroll.js
-- lib/generators/jinda/templates/app/assets/javascripts/jqm/jinda.js
-- lib/generators/jinda/templates/app/assets/javascripts/jqm/jquery.mobile-1.2.1.js
-- lib/generators/jinda/templates/app/assets/javascripts/jqm/jquery.mobile.datebox.js
-- lib/generators/jinda/templates/app/assets/javascripts/jqm/jquery.mobile.splitview.js
-- lib/generators/jinda/templates/app/assets/stylesheets/application.css.bak
+- lib/generators/jinda/templates/app/assets/javascripts/disable_enter_key.js
+- 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
+- lib/generators/jinda/templates/app/assets/javascripts/jquery.mobile-1.2.1.js
+- 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/articles.scss
 - lib/generators/jinda/templates/app/assets/stylesheets/fonts/sarabun.eot
 - lib/generators/jinda/templates/app/assets/stylesheets/fonts/sarabun.ttf
 - lib/generators/jinda/templates/app/assets/stylesheets/fonts/sarabun.woff
@@ -283,23 +284,19 @@ files:
 - lib/generators/jinda/templates/app/assets/stylesheets/images/icons-36-black.png
 - lib/generators/jinda/templates/app/assets/stylesheets/images/icons-36-white.png
 - lib/generators/jinda/templates/app/assets/stylesheets/images/indicator.gif
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/app.scss
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/application.scss-jqm
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/articles.scss
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/jinda.css
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/jquery.mobile-1.2.1.css
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/jquery.mobile.datebox.css
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/jquery.mobile.grids.collapsible.css
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/jquery.mobile.splitview.css
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/kul-4.2.css
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/kul-4.2.min.css
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/sarabun.css
-- lib/generators/jinda/templates/app/assets/stylesheets/jqm/social.scss
+- lib/generators/jinda/templates/app/assets/stylesheets/jinda.css
+- lib/generators/jinda/templates/app/assets/stylesheets/jquery.mobile-1.2.1.css
+- lib/generators/jinda/templates/app/assets/stylesheets/jquery.mobile.datebox.css
+- lib/generators/jinda/templates/app/assets/stylesheets/jquery.mobile.grids.collapsible.css
+- lib/generators/jinda/templates/app/assets/stylesheets/jquery.mobile.splitview.css
+- lib/generators/jinda/templates/app/assets/stylesheets/kul-4.2.css
+- lib/generators/jinda/templates/app/assets/stylesheets/kul-4.2.min.css
+- lib/generators/jinda/templates/app/assets/stylesheets/sarabun.css
+- 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/application_controller.rb.bak
 - 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
@@ -421,6 +418,7 @@ files:
 - 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/install.sh
 - lib/generators/jinda/templates/jinda.yml
 - lib/generators/jinda/templates/public/404.html
 - lib/generators/jinda/templates/public/422.html
@@ -465,8 +463,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'Rails workflow from mind map: Freemind'

data/lib/generators/jinda/templates/app/assets/javascripts/application.js.bak

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
-// vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require rails-ujs
-//= require turbolinks
-//= require_tree .

data/lib/generators/jinda/templates/app/assets/stylesheets/jqm/application.scss-jqm

@@ -1,32 +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, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, 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 top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- * require_tree .
- * require_self
- *= require normalize-rails
- */
-
-@import "jqm/jquery.mobile-1.2.1";
-@import "jqm/jquery.mobile.splitview";
-@import "jqm/jquery.mobile.grids.collapsible";
-@import "jqm/jquery.mobile.datebox.css";
-@import "jqm/sarabun";
-@import "jqm/jinda";
-@import "jqm/kul-4.2";
-@import "jqm/articles";
-@import "jqm/rouge";
-@import "font-awesome-sprockets";
-@import "font-awesome";
-
-
-
-
-
-

data/lib/generators/jinda/templates/app/controllers/application_controller.rb.bak

@@ -1,2 +0,0 @@
-class ApplicationController < ActionController::Base
-end