j1-template 2020.0.1 → 2020.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d18f32e5ab9ccde33c8aca296cbe35757142303fd7d6c3d16ebddf51ff3dd2d0
-  data.tar.gz: 7bbad0a22167049f7d9b16a4b8cb9f0d62a2418f3daa49731543ff47d1d08d29
+  metadata.gz: d7984c1650f6ccb9ef434fa65f54e85cd625bd133435fc073ba851a9cb83abe2
+  data.tar.gz: f4b738d93a3f61f97af77ffe7d052b921fe15255752eb0b11e3b2645e81db7ce
 SHA512:
-  metadata.gz: 8020d52ec42867f7a79b2404875fcc0463408a6a8add3c4430f0f46ce45c0a6cff1da40b3a7373490436454b74283dc7afa8a8564342ab7b6eb23c4fd2657635
-  data.tar.gz: ccbed08f143dd02d0d2cc7cfbb7f1ea9c7f1a55d1ec26f9dbe35f6c20225eb0fbaacc0dde338a8d09fac7c6f16578f94b80e0d33b1012971791d6cef4260bc11
+  metadata.gz: 186ea24e4f24ee80ddb74957ace1f6a42f4ba8c741f2a7ae6fe4df1400979772a1ee9fa404a883a95e4e09e7d6c6a9236352648c66e846c0885606e65d34d75d
+  data.tar.gz: df3b80e39aa47a1704ec296b3c8a87cdb9ff71f9b3866657ead7143d7a797dfeb12020d6e3283a7968a06382bab603a01852a4398dcdf1cf749fb49d2d7b92d2

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2020.0.1'
+  VERSION = '2020.0.2'
 end

data/lib/j1_app/j1_auth_manager/auth_manager.rb

@@ -53,15 +53,11 @@ module J1App
     include J1App::GithubHelpers
 
     # ==========================================================================
-    # SET project base
+    # SET j1 project home folder
     # ==========================================================================
-    # set project path to folder where 'config.ru' is located
+    # set project path (preferred set by ENV var J1_PROJECT_HOME )
     #
-    #
-    puts "FickDich: #{ARGV.join(':')}"
-
-    project_path          = J1App.work_dir
-    puu = File.dirname(Dir.pwd)
+    project_path = J1App.project_path
 
     # ==========================================================================
     # Initialize middleware resources
@@ -499,7 +495,7 @@ module J1App
             # jadams, 2019-08-08: writeCookie of 'j1.user.session' is needed to
             # track the requested_page. This cause the potential risk to
             # corrupt the cookie (now, for unknown reason)
-            # ------------------------------------------------------------------             
+            # ------------------------------------------------------------------
             writeCookie(user_session_cookie, session_json)
             j1_mw_auth_mgr_preflight.info 'write user session data: ' + "#{session_json}"
             j1_mw_auth_mgr_preflight.info 'pass to error page: access_denied'
@@ -614,25 +610,25 @@ module J1App
                   The Control Center is accessing #{provider} for user #{nickname}.<br>
                   Providing authentication data ..</p>
               </div>
-  
+
               <script>
-              (function() {   
+              (function() {
                 // Register an event handler to listen for messages of the child window
                 window.addEventListener("message", receiveMessage, false);
-          
+
                 // Post a authorizing message to the parent window (Netlify CMS App)
                 // as a handshake with the parent window
                 window.opener.postMessage("authorizing:#{provider}", "*");
-          
+
                 function receiveMessage() {
                   // send message to main (parent) window (Netlify CMS App)
                   window.opener.postMessage(
                     'authorization:#{provider}:success:{"token":"#{token}","provider":"#{provider}"}'
                   )
-                } // end receiveMessage   
+                } // end receiveMessage
               })()
               </script>
-  
+
             </body>
           </html>
 IIF
@@ -805,20 +801,20 @@ IIF
             </div>
 
             <script>
-            (function() {   
+            (function() {
               // Register an event handler to listen for messages of the child window
               window.addEventListener("message", receiveMessage, false);
-        
+
               // Post a authorizing message to the parent window (Netlify CMS App)
               // as a handshake with the parent window
               window.opener.postMessage("authorizing:#{provider}", "*");
-        
+
               function receiveMessage() {
                 // send message to main (parent) window (Netlify CMS App)
                 window.opener.postMessage(
                   'authorization:#{provider}:success:{"token":"#{token}","provider":"#{provider}"}'
                 )
-              } // end receiveMessage   
+              } // end receiveMessage
             })()
             </script>
 

data/lib/j1_app/j1_auth_manager/config.rb

@@ -1,20 +1,24 @@
 module J1App
 
-  # set work dir to path
+  # set j1 project path
   #
-  def self.work_dir
-    unless ARGV.grep(/config.ru/)[0] == nil
-      # set work dir to path of ARGV argument for config.ru
-      # if app is called from commandline
+  def self.project_path
+    # set project folder to the path set by ENV var J1_PROJECT_HOME (preferred)
+    #
+    if ENV['J1_PROJECT_HOME'] != nil
+      ENV['J1_PROJECT_HOME']
+    elsif ARGV.grep(/config.ru/)[0] != nil
+      # set project folder to path of ARGV argument for config.ru if available.
+      # This will work, if the app is called from commandline (rackup)
       #
       File.dirname(ARGV.grep(/config.ru/)[0])
     else
-      # set work dir work dir if app is called from
-      # application manager (e.g. passenger)
+      # set project folder if app is called from application manager
+      # (e.g. passenger) to current work dir
       # NOTE:
       #   Unclear why File.join resolves the PATH correctly
-      #   but File.dirname doesn't
-      # File.dirname(Dir.pwd)
+      #   but File.dirname doesn't:
+      #     File.dirname(Dir.pwd)
       #
       File.join(Dir.pwd, "")
     end

data/lib/j1_app/j1_site_manager/static_site.rb

@@ -46,7 +46,7 @@ module J1App
     # Register static content
     # --------------------------------------------------------------------------
     register Sinatra::Index
-    root = File.expand_path(J1App.destination, J1App.work_dir)
+    root = File.expand_path(J1App.destination, J1App.project_path)
     set :public_folder, root
     use_static_index "index.html"
 

data/lib/starter_web/Gemfile

@@ -51,7 +51,7 @@ gem 'jekyll', '~> 4.0'
 
 # Theme Rubies, default: J1 Template
 #
-gem 'j1-template', '~> 2020.0.1'
+gem 'j1-template', '~> 2020.0.2'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -110,7 +110,7 @@ group :jekyll_plugins do
 # gem 'jekyll-gist', '>= 1.5.0'
 # gem 'jekyll-sitemap', '>= 1.2.0'
 # gem 'jekyll-redirect-from', '>= 0.13.0'
-  gem 'j1-paginator', '>= 2020.0.1'
+  gem 'j1-paginator', '>= 2020.0.2'
   gem 'jekyll-sass-converter', '>= 1.5.1'
 end
 

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            development
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2020.0.1
+version:                                2020.0.2
 
 # version
 # ------------------------------------------------------------------------------

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

@@ -176,24 +176,6 @@ var j1 = (function () {
   };
 
   // user STATE cookie (initial values)
-  // var user_state = {
-  //   'theme_css':            default_theme_css,
-  //   'theme_extension_css':  '{{themer_options.includeBootswatch}}',
-  //   'theme_name':           default_theme_name,
-  //   'theme_author':         default_theme_author,
-  //   'theme_author_url':     '{{template_config.theme_author_url}}',
-  //   'theme_link':           default_theme_link,
-  //   'theme_version':        '{{site.version}}',
-  //   'cookies_accepted':     'pending',
-  //   'whitelistedPages':     default_white_listed_pages,
-  //   'deleteOnDecline':      false,
-  //   'showConsentOnPending': false,
-  //   'stopScrolling':        true,
-  //   'session_active':       false,
-  //   'last_session_ts':      '',
-  //   'cc_authenticated':     false
-  // };
-
   var user_state = {
     'theme_css':            default_theme_css,
     'theme_extension_css':  themeExtensionCss,
@@ -308,10 +290,10 @@ var j1 = (function () {
         user_state.last_session_ts    = timestamp_now;
 
         // DANGEROUS (??): delete user session in browser using MULTI_TAB!
-        if (j1.existsCookie(cookie_names.user_session)) {
-          var bla = cookie_names.user_session;
-          j1.deleteCookie(cookie_names.user_session)
-        }
+        // if (j1.existsCookie(cookie_names.user_session)) {
+        //   var bla = cookie_names.user_session;
+        //   j1.deleteCookie(cookie_names.user_session)
+        // }
 
         j1.writeCookie({
           name: cookie_user_state_name,

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2020.0.1",
+  "version": "2020.0.2",
   "description": "J1 Template starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2020.0.1",
+  "version": "2020.0.2",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2020.0.1",
+  "version": "2020.0.2",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2020.0.1
+  version: 2020.0.2
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll