j1-template 2021.0.13 → 2021.1.1

data/assets/themes/j1/modules/{util/js/log4javascript.js → log4javascript/js/log4javascript.min.js}

@@ -13,6 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+ /**
+ * log4javascript
+ *
+ * log4javascript is a logging framework for JavaScript based on log4j
+ * for Java. This file contains all core log4javascript code and is the only
+ * file required to use log4javascript, unless you require support for
+ * document.domain, in which case you will also need console.html, which must be
+ * stored in the same directory as the main log4javascript.js file.
+ *
+ * Author: Tim Down <tim@log4javascript.org>
+ * Version: 1.4.13
+ * Edition: log4javascript
+ * Build date: 23 May 2015
+ * Website: http://log4javascript.org
+ */
+
 (function(factory,root){if(typeof define=="function"&&define.amd){define(factory);}else if(typeof module!="undefined"&&typeof exports=="object"){module.exports=factory();}else{root.log4javascript=factory();}})(function(){if(!Array.prototype.push){Array.prototype.push=function(){for(var i=0,len=arguments.length;i<len;i++){this[this.length]=arguments[i];}
 return this.length;};}
 if(!Array.prototype.shift){Array.prototype.shift=function(){if(this.length>0){var firstItem=this[0];for(var i=0,len=this.length-1;i<len;i++){this[i]=this[i+1];}

data/exe/j1

@@ -17,7 +17,7 @@ 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 "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)

data/lib/j1/commands/generate.rb

@@ -13,7 +13,7 @@ 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 "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)
@@ -93,10 +93,10 @@ module J1
         def after_install(path, options = {})
           unless options['skip-bundle']
             bundle_install(path, options)
-            unless options['skip-patches']
+            unless options['skip-_patches']
               patch_install(options)
             else
-              J1.logger.info "Install patches skipped ..."
+              J1.logger.info "Install _patches skipped ..."
             end
           end
           unless options['force']
@@ -127,29 +127,52 @@ module J1
 
         def patch_install(options)
           if is_windows?
+            major, minor = RUBY_VERSION.split('.')
+            lib_version = major + '.' + minor
             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'
+            patch_gem_eventmachine = 'eventmachine-1.2.7-x64-mingw32'
+            patch_gem_execjs = 'execjs-2.7.0'
+            patch_eventmachine_source_path = curr_path + '/patches/rubygems' + '/' + patch_gem_eventmachine + '/lib/' + lib_version
+            patch_execjs_source_path = curr_path + '/patches/rubygems' + '/' + patch_gem_execjs + '/lib/execjs/external_runtime.rb'
 
-            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 in SYSTEM folder ..."
               J1.logger.info "Install patches on path #{system_path} ..."
-              dest = system_path + '/gems/' + patch_gem + '/lib'
+              dest = system_path + '/gems/' + patch_gem_eventmachine + '/lib'
             else
+              J1.logger.info "Install patches in USER gem folder ~/.gem ..."
               J1.logger.info "Install patches on path #{user_path} ..."
-              dest = user_path + '/gems/' + patch_gem + '/lib'
+              dest = user_path + '/gems/' + patch_gem_eventmachine + '/lib'
             end
-            src = patch_source_path
+            src = patch_eventmachine_source_path
             FileUtils.cp_r(src, dest)
+
+            if lib_version === '2.7'
+              if options['system']
+#               J1.logger.info "Install patches on path #{system_path} ..."
+                dest = system_path + '/gems/' + patch_gem_execjs + '/lib/execjs'
+              else
+#               J1.logger.info "Install patches on path #{user_path} ..."
+                dest = user_path + '/gems/' + patch_gem_execjs + '/lib/execjs'
+              end
+              src = patch_execjs_source_path
+              FileUtils.cp(src, dest)
+            end
+
           end
         end
 
+        def install_patch(options)
+        end
+
+
       end
     end
   end

data/lib/j1/patches/rubygems/execjs-2.7.0/lib/execjs/external_runtime.rb

@@ -0,0 +1,246 @@
+require "tmpdir"
+require "execjs/runtime"
+
+module ExecJS
+  class ExternalRuntime < Runtime
+    class Context < Runtime::Context
+      def initialize(runtime, source = "", options = {})
+        source = encode(source)
+
+        @runtime = runtime
+        @source  = source
+
+        # Test compile context source
+        exec("")
+      end
+
+      def eval(source, options = {})
+        source = encode(source)
+
+        if /\S/ =~ source
+          exec("return eval(#{::JSON.generate("(#{source})", quirks_mode: true)})")
+        end
+      end
+
+      def exec(source, options = {})
+        source = encode(source)
+        source = "#{@source}\n#{source}" if @source != ""
+        source = @runtime.compile_source(source)
+
+        tmpfile = write_to_tempfile(source)
+
+        if ExecJS.cygwin?
+          filepath = `cygpath -m #{tmpfile.path}`.rstrip
+        else
+          filepath = tmpfile.path
+        end
+
+        begin
+          extract_result(@runtime.exec_runtime(filepath), filepath)
+        ensure
+          File.unlink(tmpfile)
+        end
+      end
+
+      def call(identifier, *args)
+        eval "#{identifier}.apply(this, #{::JSON.generate(args)})"
+      end
+
+      protected
+        # See Tempfile.create on Ruby 2.1
+        def create_tempfile(basename)
+          tmpfile = nil
+          Dir::Tmpname.create(basename) do |tmpname|
+            mode    = File::WRONLY | File::CREAT | File::EXCL
+            tmpfile = File.open(tmpname, mode, 0600)
+          end
+          tmpfile
+        end
+
+        def write_to_tempfile(contents)
+          tmpfile = create_tempfile(['execjs', 'js'])
+          tmpfile.write(contents)
+          tmpfile.close
+          tmpfile
+        end
+
+        def extract_result(output, filename)
+          status, value, stack = output.empty? ? [] : ::JSON.parse(output, create_additions: false)
+          if status == "ok"
+            value
+          else
+            stack ||= ""
+            real_filename = File.realpath(filename)
+            stack = stack.split("\n").map do |line|
+              line.sub(" at ", "")
+                  .sub(real_filename, "(execjs)")
+                  .sub(filename, "(execjs)")
+                  .strip
+            end
+            stack.reject! { |line| ["eval code", "eval@[native code]"].include?(line) }
+            stack.shift unless stack[0].to_s.include?("(execjs)")
+            error_class = value =~ /SyntaxError:/ ? RuntimeError : ProgramError
+            error = error_class.new(value)
+            error.set_backtrace(stack + caller)
+            raise error
+          end
+        end
+    end
+
+    attr_reader :name
+
+    def initialize(options)
+      @name        = options[:name]
+      @command     = options[:command]
+      @runner_path = options[:runner_path]
+      @encoding    = options[:encoding]
+      @deprecated  = !!options[:deprecated]
+      @binary      = nil
+
+      @popen_options = {}
+      @popen_options[:external_encoding] = @encoding if @encoding
+      @popen_options[:internal_encoding] = ::Encoding.default_internal || 'UTF-8'
+
+      if @runner_path
+        instance_eval generate_compile_method(@runner_path)
+      end
+    end
+
+    def available?
+      require 'json'
+      binary ? true : false
+    end
+
+    def deprecated?
+      @deprecated
+    end
+
+    private
+      def binary
+        @binary ||= which(@command)
+      end
+
+      def locate_executable(command)
+        commands = Array(command)
+        if ExecJS.windows? && File.extname(command) == ""
+          ENV['PATHEXT'].split(File::PATH_SEPARATOR).each { |p|
+            commands << (command + p)
+          }
+        end
+
+        commands.find { |cmd|
+          if File.executable? cmd
+            cmd
+          else
+            path = ENV['PATH'].split(File::PATH_SEPARATOR).find { |p|
+              full_path = File.join(p, cmd)
+              File.executable?(full_path) && File.file?(full_path)
+            }
+            path && File.expand_path(cmd, path)
+          end
+        }
+      end
+
+    protected
+      def generate_compile_method(path)
+        <<-RUBY
+        def compile_source(source)
+          <<-RUNNER
+          #{IO.read(path)}
+          RUNNER
+        end
+        RUBY
+      end
+
+      def json2_source
+        @json2_source ||= IO.read(ExecJS.root + "/support/json2.js")
+      end
+
+      def encode_source(source)
+        encoded_source = encode_unicode_codepoints(source)
+        ::JSON.generate("(function(){ #{encoded_source} })()", quirks_mode: true)
+      end
+
+      def encode_unicode_codepoints(str)
+        str.gsub(/[\u0080-\uffff]/) do |ch|
+          "\\u%04x" % ch.codepoints.to_a
+        end
+      end
+
+      if ExecJS.windows?
+        def exec_runtime(filename)
+          path = Dir::Tmpname.create(['execjs', 'json']) {}
+          begin
+            command = binary.split(" ") << filename
+            `#{shell_escape(*command)} 2>&1 > #{path}`
+            output = File.open(path, 'rb', **@popen_options) { |f| f.read }
+          ensure
+            File.unlink(path) if path
+          end
+
+          if $?.success?
+            output
+          else
+            raise exec_runtime_error(output)
+          end
+        end
+
+        def shell_escape(*args)
+          # see http://technet.microsoft.com/en-us/library/cc723564.aspx#XSLTsection123121120120
+          args.map { |arg|
+            arg = %Q("#{arg.gsub('"','""')}") if arg.match(/[&|()<>^ "]/)
+            arg
+          }.join(" ")
+        end
+      elsif RUBY_ENGINE == 'jruby'
+        require 'shellwords'
+
+        def exec_runtime(filename)
+          command = "#{Shellwords.join(binary.split(' ') << filename)} 2>&1"
+          io = IO.popen(command, **@popen_options)
+          output = io.read
+          io.close
+
+          if $?.success?
+            output
+          else
+            raise exec_runtime_error(output)
+          end
+        end
+      else
+        def exec_runtime(filename)
+          io = IO.popen(binary.split(' ') << filename, **(@popen_options.merge({err: [:child, :out]})))
+          output = io.read
+          io.close
+
+          if $?.success?
+            output
+          else
+            raise exec_runtime_error(output)
+          end
+        end
+      end
+      # Internally exposed for Context.
+      public :exec_runtime
+
+      def exec_runtime_error(output)
+        error = RuntimeError.new(output)
+        lines = output.split("\n")
+        lineno = lines[0][/:(\d+)$/, 1] if lines[0]
+        lineno ||= 1
+        error.set_backtrace(["(execjs):#{lineno}"] + caller)
+        error
+      end
+
+      def which(command)
+        Array(command).find do |name|
+          name, args = name.split(/\s+/, 2)
+          path = locate_executable(name)
+
+          next unless path
+
+          args ? "#{path} #{args}" : path
+        end
+      end
+  end
+end

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2021.0.13'
+  VERSION = '2021.1.1'
 end

data/lib/j1_app.rb

@@ -12,7 +12,7 @@
 
 # Require RubyGems
 # ------------------------------------------------------------------------------
-require 'uuid'
+# require 'uuid'
 require 'date'
 
 require 'json'

data/lib/j1_app/j1_auth_manager/auth_manager.rb

@@ -88,8 +88,12 @@ module J1App
     # ==========================================================================
     # Initialize J1 logger settings
     # ==========================================================================
-    uuid = UUID.new.generate
-    page_id = uuid[25, 37]
+#   uuid = UUID.new.generate
+#   page_id = uuid[25, 37]
+
+    chars = [('a'..'z'), ('A'..'Z'), ('0'..'9')].map(&:to_a).flatten
+    page_id = (0...11).map { chars[rand(chars.length)] }.join
+
     MDC.put('pageID', page_id)
     MDC.put('path', '/')
 
@@ -152,6 +156,8 @@ module J1App
     use Rack::Session::Cookie,
         http_only: true,   # if set to 'true', make session cookie visible to the browser (document) for HTTP
         key: 'j1.app.session',
+#       same_site: 'None',
+        same_site: 'Lax',
         secret: ENV['J1_SESSION_SECRET'] || SecureRandom.hex
 
     # use Rack::Cache do |config|

data/lib/j1_app/j1_site_manager/static_site.no-cross-origin.rb

@@ -0,0 +1,94 @@
+module J1App
+  class SiteManager < Sinatra::Base
+
+    # ==========================================================================
+    # Sinatra Framework settings
+    # ==========================================================================
+
+    # NOTE: https://stackoverflow.com/questions/7847536/sinatra-in-facebook-iframe
+    #
+    #set :protection, :except => :frame_options
+
+    # Check: http://sinatrarb.com/intro.html
+    #
+    #set :static_cache_control, [:public, :max_age => 10]
+
+    # Sinatra extension 'sinatra-cross_origin' to enable CORS
+    # See: https://github.com/britg/sinatra-cross_origin
+    # Resource Sharing (CORS). 
+    # See more on cross domain resource sharing with:
+    #   https://developer.mozilla.org/En/HTTP_access_control
+    # --------------------------------------------------------------------------
+    # register Sinatra::CrossOrigin
+    # configure do
+    #   enable :cross_origin
+    # end
+
+    # Additional (response) headers  managed by Sinatra extension
+    # 'sinatra-cross_origin'
+    # NOTE: for the static content 'Access-Control-Allow-Origin'
+    # is NOT needed
+    # --------------------------------------------------------------------------
+    # before do
+    #   response.headers['Access-Control-Allow-Origin']   = '*'
+    #   response.headers['X-Powered-By']                  = 'J1 Template'
+    # end
+
+    # OPTION BLOCK for Sinatra extension 'sinatra-cross_origin'
+    # Send a HTTP 200 response on the CORS preflight request (browser)
+    # --------------------------------------------------------------------------
+    # options "*" do
+    #   response.headers["Allow"]                         = "GET, POST, OPTIONS"
+    #   response.headers["Access-Control-Allow-Headers"]  = "Authorization, Content-Type, Accept, X-User-Email, X-Auth-Token, X-Page-ID, X-Powered-By"
+    #   200
+    # end
+
+    # Register static content
+    # --------------------------------------------------------------------------
+    register Sinatra::Index
+    root = File.expand_path(J1App.destination, J1App.project_path)
+    set :public_folder, root
+    use_static_index "index.html"
+
+    error 400 do
+      four_oh_oh = File.expand_path(settings.public_folder + "/400.html", Dir.pwd)
+      File.read(four_oh_oh) if File.exist?(four_oh_oh)
+    end
+
+    error 401 do
+      four_oh_one = File.expand_path(settings.public_folder + "/401.html", Dir.pwd)
+      File.read(four_oh_one) if File.exist?(four_oh_one)
+    end
+
+    error 403 do
+      four_oh_three = File.expand_path(settings.public_folder + "/403.html", Dir.pwd)
+      File.read(four_oh_three) if File.exist?(four_oh_three)
+    end
+
+    error 404 do
+      four_oh_four = File.expand_path(settings.public_folder + "/404.html", Dir.pwd)
+      File.read(four_oh_four) if File.exist?(four_oh_four)
+    end
+
+    error 500 do
+      five_oh_oh = File.expand_path(settings.public_folder + "/500.html", Dir.pwd)
+      File.read(five_oh_oh) if File.exist?(five_oh_oh)
+    end
+
+    error 501 do
+      five_oh_one = File.expand_path(settings.public_folder + "/501.html", Dir.pwd)
+      File.read(five_oh_one) if File.exist?(five_oh_one)
+    end
+
+    error 502 do
+      five_oh_two = File.expand_path(settings.public_folder + "/502.html", Dir.pwd)
+      File.read(five_oh_two) if File.exist?(five_oh_two)
+    end
+
+    error 533 do
+      five_three_three = File.expand_path(settings.public_folder + "/533.html", Dir.pwd)
+      File.read(five_three_three) if File.exist?(five_three_three)
+    end
+
+  end
+end