j1-template 2021.0.1 → 2021.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb4ea556df1c2514cded65555531b7add3ae38beec9740e551a4986e88540caa
-  data.tar.gz: 8ea1e5d4c28e135b48eace616080dc70471059094298be0d10c98b1af49d23dc
+  metadata.gz: 78b9b8ca348f5542404ec5d83801c27390a39b1fc631fab75820bf0b378d1466
+  data.tar.gz: 55df56b251e33da3732819465b7333392eef5cb127ebd4930812e63e3eb0cdec
 SHA512:
-  metadata.gz: 3506edd17e1231f53a8723d7f97aafe65ce741037108c8f1d5545c247cc456c65faa775712b8e94f4738ecb99ebd24492cbee04435d0b20f777fa85a12111ee7
-  data.tar.gz: 8e4f75ce3de082e7663cab7ab77226875ec2ad2e4f9505a5acece5ee2cee97fb890f14339a049764f19f3119ddf24d63eb3e56810555031265199506cf68e0b7
+  metadata.gz: dd52c15615836184a449e7eb4585dd1e2d20430a4a96081189276aba60459a74c58d97d1d03ac80ea777ad856fd4a509f5b8da5e495016b09a25d8cd96c01c8a
+  data.tar.gz: 5bd1b8621ef7e4454cf27ce12e433808d1fbbd6b1cf2320bce5a907f2262e27b596a19d24aa9e6c12575b2ac501a77892968569b00165a991e9656fb2cf556ea

data/assets/data/quicklinks.html

@@ -40,8 +40,8 @@ regenerate:                             true
 {% assign navigator_settings      = modules.navigator.settings %}
 {% assign cookie_defaults         = modules.defaults.cookiebar.defaults %}
 {% assign cookie_settings         = modules.cookiebar.settings %}
-{% assign quick_search_defaults   = modules.defaults.jekyll_search.defaults %}
-{% assign quick_search_settings   = modules.jekyll_search.settings %}
+{% assign quick_search_defaults   = modules.defaults.lunr_search.defaults %}
+{% assign quick_search_settings   = modules.lunr_search.settings %}
 
 {% comment %} Control Center disabled
 --------------------------------------------------------------------------------

data/assets/themes/j1/adapter/js/j1.js

@@ -1198,13 +1198,24 @@ var j1 = (function () {
     // writeCookie()
     // Write 'data' to a cookie 'name'. If not exists, the cookie gets
     // created. Returns 'true' if cookie was written, otherwise 'false'.
+    // -------------------------------------------------------------------------
+    // NOTE:
+    //    https://web.dev/samesite-cookies-explained/
+    //    https://developer.mozilla.org/de/docs/Web/HTTP/Headers/Set-Cookie/SameSite
+    //    https://www.smarketer.de/blog/chrome-update-80-cookies/
+    // -------------------------------------------------------------------------
+    // TODO:
+    //    Change attribute "Secure" to true, if HTTPS is used.
+    //    Checks and config changes are to be done.
+    // -------------------------------------------------------------------------
     //
-    writeCookie: function (options /*name, data, [path, expires, secure]*/) {
+    writeCookie: function (options /*name, data, [path, expires, SameSite, secure]*/) {
       var defaults = {
-          name: '',
           data: {},
-          path: '/',
+          name: '',
           expires: 0,
+          path: '/',
+          SameSite: 'Strict',
           secure: false
       };
       var settings = $.extend(defaults, options);
@@ -1225,18 +1236,28 @@ var j1 = (function () {
         data_encoded          = window.btoa(data_json);
 
         if (settings.expires > 0) {
-          Cookies.set(settings.name, data_encoded, { expires: settings.expires });
+          Cookies.set(settings.name, data_encoded, {
+            expires: settings.expires,
+            SameSite: settings.SameSite
+          });
         } else {
-          Cookies.set(settings.name, data_encoded);
+          Cookies.set(settings.name, data_encoded, {
+            SameSite: settings.SameSite
+          });
         }
       } else {
         cookie_data   = settings.data;
         data_json     = JSON.stringify(settings.data);
         data_encoded  = window.btoa(data_json);
         if (settings.expires > 0) {
-          Cookies.set(settings.name, data_encoded, { expires: settings.expires });
+          Cookies.set(settings.name, data_encoded, {
+            expires: settings.expires,
+            SameSite: settings.SameSite
+          });
         } else {
-          Cookies.set(settings.name, data_encoded);
+          Cookies.set(settings.name, data_encoded, {
+            SameSite: settings.SameSite
+          });
         }
       }
 

data/assets/themes/j1/modules/iframeResizer/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2013-2019 David J. Bradshaw
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2013-2019 David J. Bradshaw
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/assets/themes/j1/modules/lightbox/LICENSE

@@ -1,22 +1,22 @@
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Lokesh Dhakar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Lokesh Dhakar
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/assets/themes/j1/modules/twemoji/js/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Twitter, Inc and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2018 Twitter, Inc and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/assets/themes/j1/modules/twemoji/js/picker/LICENSE

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 xLs51
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2015 xLs51
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/exe/j1

@@ -17,6 +17,8 @@ Mercenary.program(:j1) do |p|
     c.description 'Generates a starter site scaffold in PATH'
     c.option 'force', '--force', 'Force a site to be created even the PATH already exists'
     c.option "skip-bundle", "--skip-bundle", "Skip 'bundle install'"
+    c.option "skip-patches", "--skip-patches", "Skip to install any PATCHES buildin with J1"
+    c.option "system", "--system", "Run 'bundle install' for the Ruby SYSTEM gem folder"
     c.action do |args, options|
       J1::Commands::Generate.process(args, options)
     end

data/lib/j1/commands/generate.rb

@@ -1,4 +1,6 @@
 require 'erb'
+require 'rbconfig'
+require 'fileutils'
 
 module J1
   module Commands
@@ -11,7 +13,8 @@ module J1
             c.description 'Generates a starter site scaffold in PATH'
             c.option 'force', '--force', 'Force a site to be created even the PATH already exists'
             c.option 'skip-bundle', '--skip-bundle', "Skip 'bundle install'"
-
+            c.option "skip-patches", "--skip-patches", "Skip to install any PATCHES buildin with J1"
+            c.option "system", "--system", "Run 'bundle install' for the Ruby SYSTEM gem folder"
             c.action do |args, options|
               J1::Commands::Generate.process(args, options)
             end
@@ -19,6 +22,10 @@ module J1
 
         end
 
+        def is_windows?
+          RbConfig::CONFIG["host_os"] =~ %r!mswin|mingw|cygwin!i
+        end
+
         def process(args, options = {})
           raise ArgumentError, 'You must specify a path.' if args.empty?
           new_blog_path = File.expand_path(args.join(' '), Dir.pwd)
@@ -48,7 +55,6 @@ module J1
         end
 
         # Internal: Gets the filename of the sample post to be created
-        #
         # Returns the filename of the sample post, as a String
         def initialized_post_name
           "collections/posts/public/featured/_posts/#{Time.now.strftime("%Y-%m-%d")}-welcome-to-j1-template.adoc"
@@ -56,53 +62,12 @@ module J1
 
         private
 
-        def gemfile_contents
-          <<-RUBY
-          source "https://rubygems.org"
-          #ruby RUBY_VERSION
-
-          # Hello! This is where you manage which Jekyll version is used to run.
-          # When you want to use a different version, change it below, save the
-          # file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
-          #
-          #     bundle exec jekyll serve
-          #
-          # This will help ensure the proper Jekyll version is running.
-          # Happy Jekylling!
-          # jadams
-          #gem "jekyll", "#{Jekyll::VERSION}"
-          gem "jekyll", "~> 3.8"
-
-          # This is the default theme for generate Jekyll sites. You may change this to anything you like.
-          gem "minima", "~> 2.0"
-
-          # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-          # uncomment the line below. To upgrade, run `bundle update github-pages`.
-          # gem "github-pages", group: :jekyll_plugins
-
-          # If you have any plugins, put them here!
-          group :jekyll_plugins do
-             gem "jekyll-feed", "~> 0.6"
-          end
-
-          # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-          gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-          RUBY
-        end
-
         def create_site(new_blog_path)
           create_sample_files new_blog_path
 
           File.open(File.expand_path(initialized_post_name, new_blog_path), 'w') do |f|
             f.write(scaffold_post_content)
           end
-
- # jadams, do NOT generate a buildin Gemfile
- #
- #         File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f|
- #           f.write(gemfile_contents)
- #         end
         end
 
         def preserve_source_location?(path, options)
@@ -125,23 +90,33 @@ module J1
         # After a generate blog has been created, print a success notification and
         # then automatically execute bundle install from within the generate blog dir
         # unless the user opts to generate a blank blog or skip 'bundle install'.
-
         def after_install(path, options = {})
           unless options['skip-bundle']
-            bundle_install path
+            bundle_install(path, options)
+            unless options['skip-patches']
+              patch_install(options)
+            else
+              J1.logger.info "Install patches skipped ..."
+            end
           end
           unless options['force']
             J1.logger.info "Generated Jekyll site installed in folder #{path}"
           else
             J1.logger.info "Generated Jekyll site force installed in folder #{path}"
           end
-          J1.logger.info 'Installation of RubyGems (bundle) skipped' if options['skip-bundle']
+          J1.logger.info 'Installation (bundle) of RubyGems skipped' if options['skip-bundle']
         end
 
-        def bundle_install(path)
+        def bundle_install(path, options)
           J1::External.require_with_graceful_fail 'bundler'
           J1.logger.info "Running bundle install in #{path} ..."
           Dir.chdir(path) do
+            if options['system']
+              J1.logger.info "Install bundle in Ruby gem SYSTEM folder ..."
+            else
+              J1.logger.info "Install bundle in USER gem folder ~/.gem ..."
+              process, output = J1::Utils::Exec.run('bundle', 'config', 'set', '--local', 'path', '~/.gem')
+            end
             process, output = J1::Utils::Exec.run('bundle', 'install')
             output.to_s.each_line do |line|
               J1.logger.info('Bundler:', line.strip) unless line.to_s.empty?
@@ -149,6 +124,31 @@ module J1
             raise SystemExit unless process.success?
           end
         end
+
+        def patch_install(options)
+          if is_windows?
+            curr_path = File.expand_path(File.dirname(File.dirname(__FILE__)))
+            patch_gem = 'eventmachine-1.2.7-x64-mingw32'
+            patch_source_path = curr_path + '/../patches/rubygems' + '/' + patch_gem + '/lib/2.6'
+
+            J1.logger.info "Install patches in USER gem folder ~/.gem ..."
+            process, output = J1::Utils::Exec.run('gem', 'env', 'gempath')
+            raise SystemExit unless process.success?
+
+            result = output.split(';')
+            user_path = result[0]
+            system_path = result[1]
+            if options['system']
+              J1.logger.info "Install patches on path #{system_path} ..."
+            else
+              J1.logger.info "Install patches on path #{user_path} ..."
+              src = patch_source_path
+              dest = user_path + '/gems/' + patch_gem + '/lib'
+              FileUtils.cp_r(src, dest)
+            end
+          end
+        end
+
       end
     end
   end

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 = '2021.0.1'
+  VERSION = '2021.0.2'
 end

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)