j1-template 2020.0.25 → 2021.0.4

data/lib/j1/utils/exec.rb

@@ -17,7 +17,7 @@ module J1
         err = stderr.read.strip
 
         [stdin, stdout, stderr].each(&:close)
-        [process.value, out + err]
+        [process.value, out + ';' + err]
       end
 
     end

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2020.0.25'
+  VERSION = '2021.0.4'
 end

data/lib/j1_app.rb

@@ -12,14 +12,10 @@
 
 # Require RubyGems
 # ------------------------------------------------------------------------------
-require 'active_support'
-require 'active_support/core_ext'
-
 require 'uuid'
 require 'date'
 
 require 'json'
-# require 'yaml'
 require 'safe_yaml'
 require 'rest-client'
 

data/lib/j1_app/j1_auth_manager/auth_manager.rb

@@ -35,7 +35,7 @@
 #  Product/Info:
 #  https://jekyll.one
 #
-#  Copyright (C) 2020 Juergen Adams
+#  Copyright (C) 2021 Juergen Adams
 #
 #  J1 Template is licensed under the MIT License.
 #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/j1_app/j1_auth_manager/commands.rb

@@ -1,7 +1,7 @@
 module J1App
   class Commands
 
-    FILES = %w(Rakefile config.ru .gitignore dotenv).freeze
+    FILES = %w(Rakefile config.ru .gitignore).freeze
     VARS  = %w(client_id client_secret team_id org_name).freeze
 
     def self.execute_command(*args)

data/lib/j1_app/j1_auth_manager/error_pages.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 #
 # J1 Template is licensed under the MIT License
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/j1_app/j1_auth_manager/helpers_disqus.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 #
 # J1 Template is licensed under the MIT License
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/j1_app/j1_auth_manager/helpers_facebook.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 #
 # J1 Template is licensed under the MIT License
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/j1_app/j1_auth_manager/helpers_github.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 #
 # J1 Template is licensed under the MIT License
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/j1_app/j1_auth_manager/helpers_patreon.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 #
 # J1 Template is licensed under the MIT License
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/j1_app/j1_auth_manager/helpers_twitter.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 #
 # J1 Template is licensed under the MIT License
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/j1_app/j1_auth_manager/warden_omniauth.rb

@@ -8,7 +8,7 @@
 #  Product/Info:
 #  https://jekyll.one
 #
-#  Copyright (C) 2020 Juergen Adams
+#  Copyright (C) 2021 Juergen Adams
 #
 #  J1 Template is licensed under the MIT License.
 #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/j1_app/omniauth/strategies/disqus.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 # Copyright (C) 2012 Mark Dodwell
 #
 # J1 Template is licensed under the MIT License

data/lib/j1_app/omniauth/strategies/facebook.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 # Copyright (C) 2012 Mark Dodwell
 #
 # J1 Template is licensed under the MIT License

data/lib/j1_app/omniauth/strategies/github.rb

@@ -6,7 +6,7 @@
 #  Product/Info:
 #  https://jekyll.one
 #
-#  Copyright (C) 2020 Juergen Adams
+#  Copyright (C) 2021 Juergen Adams
 #
 #  J1 Template is licensed under the MIT License.
 #  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE

data/lib/j1_app/omniauth/strategies/patreon.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 # Copyright (C) 2012 Mark Dodwell
 #
 # J1 Template is licensed under the MIT License

data/lib/j1_app/omniauth/strategies/twitter.rb

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 # Copyright (C) 2012 Mark Dodwell
 #
 # J1 Template is licensed under the MIT License

data/lib/starter_web/Gemfile

@@ -6,7 +6,7 @@
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 #
 # J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -50,11 +50,11 @@ ruby RUBY_VERSION
 # ------------------------------------------------------------------------------
 # Use Jekyll version from RubyGems
 #
-gem 'jekyll', '~> 4.0'
+gem 'jekyll', '~> 4.2'
 
-# Theme Rubies, default: J1 Template (NOT used for the developmnet system)
+# Theme Rubies, default: J1 Template (NOT used for the development system)
 #
-gem 'j1-template', '~> 2020.0.25'
+gem 'j1-template', '= 2021.0.4'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -74,11 +74,15 @@ gem 'nokogiri-pretty', '>= 0.1.0'
 gem 'htmlbeautifier', '>= 1.2.1'
 
 # ------------------------------------------------------------------------------
-# Additional Gem for Asciidoctor (template|plugin support)
+# Gem needed to compress JS and JSON files
+#
+gem 'uglifier', '~> 4.2'
+gem 'json-minify', '~> 0.0.3'
+
+# ------------------------------------------------------------------------------
+# Gem needed to run JS to create Lunr the index
 #
-# gem 'slim', '~> 3.0.7'
-# gem 'thread_safe', '~> 0.3.5'
-gem 'middleman-core', '~> 4.2', '>= 4.2.1'
+gem 'execjs', '~> 2.7'
 
 # ------------------------------------------------------------------------------
 # Timezone support (multi-platform)
@@ -117,18 +121,6 @@ group :jekyll_plugins do
   gem 'jekyll-sass-converter', '>= 1.5.1'
 end
 
-# ------------------------------------------------------------------------------
-# Additional Gem for Docker support
-#
-# gem 'parallel', '~> 1.15'
-# gem 'i18n', '0.9.5'
-
-# ------------------------------------------------------------------------------
-# Debugger specific RubyGems
-#
-# gem 'debase', '0.2.3'
-# gem 'ruby-debug-ide', '0.7.0.beta7'
-
 # ------------------------------------------------------------------------------
 # Web Application specific RubyGems
 #
@@ -174,6 +166,7 @@ end
 # gem 'passenger', '>= 5.3'
 gem "puma", '>= 4.3.1'
 
+
 # ------------------------------------------------------------------------------
 # If J1 is transformed into a (Rack and Sinatra based) Web
 # application, the site can be secured using user authentication
@@ -186,18 +179,19 @@ gem 'rack-protection', '~> 2.0'
 gem 'rack-ssl-enforcer', '~> 0.2'
 gem 'rest-client', '~> 2.0'
 
-gem 'omniauth', '>= 1.3.0'
+gem 'omniauth', '>= 1.3'
 gem 'omniauth-oauth2', '~> 1.4'
 
 gem 'sinatra', '~> 2.0'
-gem 'sinatra-cross_origin', '~> 0.3.1'
+# gem 'sinatra-cross_origin', '~> 0.3.1'
 
 gem 'warden', '~> 1.2'
 
 # ------------------------------------------------------------------------------
 # Gem needed for J1 logger based on log4r (middleware)
 #
-gem 'log4r', '~> 1.1.10'
+#gem 'log4r', '~> 1.1.10'
+gem 'log4r', '~> 1.1', '>= 1.1.10'
 gem 'uuid', '~> 2.3', '>= 2.3.8'
 gem 'date', '~> 2.0'
 
@@ -210,13 +204,7 @@ gem 'date', '~> 2.0'
 #
 gem 'scss_lint', '~> 0.56.0'
 gem 'sass', '~> 3.5.0'
-gem 'bump', '~> 0.5.4'
-
-# ------------------------------------------------------------------------------
-# Gem needed to compress JS and JSON files
-# Gem uglifier is an dependency of middleman-core
-# gem 'uglifier', '~> 3.2.0'
-gem 'json-minify', '~> 0.0.3'
+gem 'bump', '~> 0.8'
 
 # ------------------------------------------------------------------------------
 # END

data/lib/starter_web/_config.yml

@@ -1,11 +1,11 @@
 # ------------------------------------------------------------------------------
 # ~/_config.yml
-# Development configuration for J1 Template
+# Global Jekyll site configuration
 #
 # Product/Info:
 # https://jekyll.one
 #
-# Copyright (C) 2020 Juergen Adams
+# Copyright (C) 2021 Juergen Adams
 #
 # J1 Template is licensed under the MIT License.
 # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
@@ -53,13 +53,13 @@ environment:                            production
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2020.0.25
+version:                                2021.0.4
 
 # version
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template
 #
-copyright:                              J1 · Copyright © 2020
+copyright:                              J1 · Copyright © 2021
 
 # ==============================================================================
 # 2. THEME configuration
@@ -347,7 +347,7 @@ base_path:                              ""
 #
 protocol:                               http
 host:                                   localhost
-port:                                   4444
+port:                                   40000
 timezone:                               Europe/Berlin
 encoding:                               UTF-8
 
@@ -608,18 +608,14 @@ defaults:
     values:
       layout:                           page
       author:                           J1 Team
-
       toc:                              true
-      fam:                              true
-      fam_menu_id:                      page_ctrl
-      scrollbar:                        false
-      flowtext:                         true                                    # TODO: check what this property is doing
-
+      fam_menu_id:                      page_ctrl_simple
+      resources:                        toccer
       analytics:                        false
       advertising:                      false
       comments:                         false
-      indexed:                          true                                    # TODO: check what property
-      exclude_from_search:              false                                   # controls the (lunr) indexer
+      scrollbar:                        false
+      indexed:                          true
 
       robots:
         index:                          true
@@ -650,19 +646,14 @@ defaults:
 
     values:
       layout:                           post
+      scrollbar:                        false
       author:                           J1 Team
-
       toc:                              true
-      fam:                              true
-      fam_menu_id:                      open_toc
-      scrollbar:                        false
-      flowtext:                         false                                   # TODO: check what this property is doing
-
+      fam_menu_id:                      page_ctrl_simple
+      resources:                        toccer
       analytics:                        false
       advertising:                      false
-      comments:                         false
-      indexed:                          true                                    # TODO: check what property
-      exclude_from_search:              false                                   # controls the (lunr) indexer
+      comments:                         true
 
       robots:
         index:                          true
@@ -691,19 +682,14 @@ defaults:
 
     values:
       layout:                           post
+      scrollbar:                        false
       author:                           J1 Team
-
       toc:                              true
-      fam:                              true
-      fam_menu_id:                      open_toc
-      scrollbar:                        false
-      flowtext:                         false                                   # TODO: check what this property is doing
-
+      fam_menu_id:                      page_ctrl_simple
+      resources:                        toccer
       analytics:                        false
       advertising:                      false
-      comments:                         false
-      indexed:                          true                                    # TODO: check what property
-      exclude_from_search:              false                                   # controls the (lunr) indexer
+      comments:                         true
 
       robots:
         index:                          true
@@ -728,19 +714,15 @@ defaults:
 
     values:
       layout:                           post
-      author:                           J1 Team
-
-      toc:                              true
-      fam:                              true
-      fam_menu_id:                      open_toc
       scrollbar:                        false
-      flowtext:                         false                                   # TODO: check what this property is doing
-
+      author:                           Wikipedia
+      resources:                        toccer
+      toc:                              true
+      fam_menu_id:                      page_ctrl_simple
+      resources:                        toccer
       analytics:                        false
       advertising:                      false
-      comments:                         true
-      indexed:                          true                                    # TODO: check what property
-      exclude_from_search:              false                                   # controls the (lunr) indexer
+      comments:                         false
 
       robots:
         index:                          false
@@ -769,19 +751,6 @@ defaults:
 
     values:
       layout:                           page
-      author:                           J1 Team
-
-      toc:                              false
-      fam:                              false
-      fam_menu_id:                      open_toc
-      scrollbar:                        false
-      flowtext:                         false                                   # TODO: check what this property is doing
-
-      analytics:                        false
-      advertising:                      false
-      comments:                         false
-      indexed:                          true                                    # TODO: check what property
-      exclude_from_search:              false                                   # controls the (lunr) indexer
 
   # ----------------------------------------------------------------------------
   # Biography (Book Shelf)
@@ -792,19 +761,6 @@ defaults:
 
     values:
       layout:                           page
-      author:                           J1 Team
-
-      toc:                              false
-      fam:                              false
-      fam_menu_id:                      open_toc
-      scrollbar:                        false
-      flowtext:                         false                                   # TODO: check what this property is doing
-
-      analytics:                        false
-      advertising:                      false
-      comments:                         false
-      indexed:                          false                                   # TODO: check what property
-      exclude_from_search:              true                                    # controls the (lunr) indexer
 
   # ----------------------------------------------------------------------------
   # Fantasy (Book Shelf)
@@ -815,19 +771,6 @@ defaults:
 
     values:
       layout:                           page
-      author:                           J1 Team
-
-      toc:                              false
-      fam:                              false
-      fam_menu_id:                      open_toc
-      scrollbar:                        false
-      flowtext:                         false                                   # TODO: check what this property is doing
-
-      analytics:                        false
-      advertising:                      false
-      comments:                         false
-      indexed:                          false                                   # TODO: check what property
-      exclude_from_search:              true                                    # controls the (lunr) indexer
 
   # ----------------------------------------------------------------------------
   # Romance (Book Shelf)
@@ -838,19 +781,7 @@ defaults:
 
     values:
       layout:                           page
-      author:                           J1 Team
-
-      toc:                              false
-      fam:                              false
-      fam_menu_id:                      open_toc
-      scrollbar:                        false
-      flowtext:                         false                                   # TODO: check what this property is doing
 
-      analytics:                        false
-      advertising:                      false
-      comments:                         false
-      indexed:                          false                                   # TODO: check what property
-      exclude_from_search:              true                                    # controls the (lunr) indexer
 
 # ==============================================================================
 # 6. LAYOUT configuration