archival 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3848687ae065595e19f5b75bb50927318e81df6d6b878541b2ef44138f9d31
-  data.tar.gz: 7a48ab3c689dcbb886f2441216750729ec892e40d6dc0a39197fba17eb9c4ab2
+  metadata.gz: dd9c755847bfaabb7c6dee0882426534c44c7130a8cbfe84a45b755bca91088a
+  data.tar.gz: 3bbd4cb0b322db5eff11b85d9afc9f76e4cdbe1bc166c530f015583369c7f141
 SHA512:
-  metadata.gz: '039d5ae09373d249e90fd850e7bd68970ae5ad3c394ed452016e4acaca4df5063d1aab818a09f9a365af9e3277b777257c27d2c4cc365b7d8daafcb33842e8a3'
-  data.tar.gz: 6246274ed1209a20819616480c7a1ffde1422b1a68bf5e728a3b637e61ac8675e2bc8fafa8a003cedac455e11ca21e5f22ef9039de96d95f1fc5dcab0f93111b
+  metadata.gz: db20449d88ba3394580bd5efebd259a7479bd423fea6983a4790e21d124d831490f4e9f4bea3fe97411cc2b72898e93534be2b34d122e6c93e47290381cd74b3
+  data.tar.gz: f25b29c4fdb0b676dcee6156ab571877764ead475cac70944c6e81a1f5c445b3ebaf07b7266087b3163209184cf2c9dc50f33797105b8abb3a8e2564a19861c2

data/.rubocop.yml

@@ -30,7 +30,7 @@ Metrics/BlockLength:
   Max: 150
 
 Metrics/ClassLength:
-  Max: 200
+  Max: 250
 
 Metrics/CyclomaticComplexity:
   Max: 10

data/archival.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'archival'
-  s.version     = '0.0.8'
+  s.version     = '0.0.9'
   s.summary     = 'An incredibly simple CMS for durable websites'
   s.description = 'https://jesseditson.com/the-simplest-cms-part-1'
   s.authors     = ['Jesse Ditson']

data/bin/bundle

@@ -73,7 +73,7 @@ m = Module.new do
 
     requirement = bundler_gem_version.approximate_recommendation
 
-    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+    return requirement unless Gem.rubygems_version < Gem::Version.new("2.7.0")
 
     requirement += ".a" if bundler_gem_version.prerelease?
 

data/lib/archival/builder.rb

@@ -3,17 +3,23 @@
 require 'liquid'
 require 'tomlrb'
 require 'redcarpet'
+require 'fileutils'
+require 'tags/asset'
 
 module Archival
   class DuplicateKeyError < StandardError
   end
 
+  class DuplicateStaticFileError < StandardError
+  end
+
   class Builder
     attr_reader :page_templates
 
     def initialize(config, *_args)
       @config = config
       refresh_config
+      Asset.helper_port = @config.helper_port
     end
 
     def pages_dir
@@ -221,14 +227,40 @@ module Archival
       # in dev, they will be copied as they change.
       @config.assets_dirs.each do |asset_dir|
         asset_path = File.join(@config.build_dir, asset_dir)
-        next if @config.dev_mode || !File.exist?(asset_path)
+        next if @config.dev_mode && File.exist?(asset_path)
+
+        source_path = File.join(@config.root, asset_dir)
+        next unless File.exist?(source_path)
 
-        FileUtils.copy_entry File.join(@config.root, asset_dir), asset_path
+        FileUtils.copy_entry source_path, asset_path
       end
+
+      copy_static
     end
 
     private
 
+    def copy_static
+      static_dir = File.join(@config.root, @config.static_dir)
+
+      # same for the static dir, but just the content.
+      return unless File.exist?(static_dir)
+
+      copied_static_files = Set[Dir.children(@config.build_dir)]
+      Dir.children(static_dir).each do |child|
+        raise DuplicateStaticFileError if copied_static_files.include?(child)
+
+        copied_static_files << child
+        asset_path = File.join(@config.build_dir, child)
+        next if @config.dev_mode && File.exist?(asset_path)
+
+        source_path = File.join(static_dir, child)
+        next unless File.exist?(source_path)
+
+        FileUtils.copy_entry source_path, asset_path
+      end
+    end
+
     def dev_mode_content
       "<script src=\"http://localhost:#{@config.helper_port}/js/archival-helper.js\" type=\"application/javascript\"></script>" # rubocop:disable Layout/LineLength
     end

data/lib/archival/config.rb

@@ -4,8 +4,8 @@ require 'tomlrb'
 
 module Archival
   class Config
-    attr_reader :pages_dir, :objects_dir, :assets_dirs, :root, :build_dir,
-                :helper_port, :dev_mode
+    attr_reader :pages_dir, :objects_dir, :static_dir, :assets_dirs, :root,
+                :build_dir, :helper_port, :dev_mode
 
     def initialize(config = {})
       @root = config['root'] || Dir.pwd
@@ -17,6 +17,7 @@ module Archival
       )
       @helper_port = config['helper_port'] || manifest['helper_port'] || 2701
       @assets_dirs = config['assets_dirs'] || manifest['assets'] || []
+      @static_dir = config['static_dir'] || manifest['static'] || 'static'
       @dev_mode = config[:dev_mode] || false
     end
 

data/lib/archival/helper_server.rb

@@ -44,16 +44,23 @@ module Archival
     MAGIC_GUID = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
 
     def handle_request(client, req, method, path)
-      if method == 'GET' && path.start_with?('/js/')
-        # For static paths, just serve the files they refer to.
+      if method == 'GET' && path.start_with?('/js/archival-helper.js')
+        # For this special file, serve it from the helper dir
         http_response(client, type: 'application/javascript') do
-          serve_static(client, path)
+          serve_static(client, path, @helper_dir)
         end
         client.close
       elsif (matches = req.match(/^Sec-WebSocket-Key: (\S+)/))
         websocket_key = matches[1]
         # puts "Websocket handshake detected with key: #{websocket_key}"
         connect_socket(client, websocket_key)
+      elsif method == 'GET'
+        # For static paths, just serve the files they refer to.
+        # TODO: mime type should be inferred from file type
+        http_response(client, type: 'application/javascript') do
+          serve_static(client, path)
+        end
+        client.close
       else
         client.close
       end
@@ -99,8 +106,9 @@ module Archival
 
       # Our server only supports single-frame, text messages.
       # Raise an exception if the client tries to send anything else.
-      raise "We don't support continuations" unless fin
-      raise 'We only support opcode 1' unless opcode == 1
+      raise 'Archival dev server does not support continuations' unless fin
+      # Some browsers send this regardless, so ignore it to keep the noise down.
+      return unless opcode == 1
 
       second_byte = @socket.getbyte
       is_masked = second_byte & 0b10000000
@@ -139,8 +147,8 @@ module Archival
       @socket.write output.pack("CCA#{message.size}")
     end
 
-    def serve_static(client, path)
-      buffer = File.open(File.join(@helper_dir, path)).read
+    def serve_static(client, path, base = @build_dir)
+      buffer = File.open(File.join(base, path)).read
       buffer.sub! '$PORT', @port.to_s
       client.print buffer
     end
@@ -150,6 +158,7 @@ module Archival
       type = config[:type] ||= 'text/html'
       client.print "HTTP/1.1 #{status}\r\n"
       client.print "Content-Type: #{type}\r\n"
+      client.print "Access-Control-Allow-Origin: *\r\n"
       client.print "\r\n"
       yield
     end

data/lib/archival/listen.rb

@@ -72,6 +72,11 @@ module Archival
       @config.assets_dirs.each do |dir|
         return :assets if child?(File.join(@config.root, dir), file)
       end
+
+      # a static file was changed - copy or delete those too.
+      return :assets if child?(File.join(@config.root, @config.static_dir),
+                               file)
+
       # other special files
       return :layout if child?(File.join(@config.root, 'layout'), file)
       return :config if ['manifest.toml',
@@ -89,6 +94,8 @@ module Archival
         end
         builder.update_assets(changes[:assets]) if changes[:assets].length
         if changes[:assets].length || changes[:layouts] || changes[:config]
+          # TODO: optimization: this could operate on the known subset of
+          # changes instead...
           builder.full_rebuild
         end
         builder.write_all

data/lib/archival/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Archival
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/tags/asset.rb

@@ -24,12 +24,22 @@ class Asset < Liquid::Tag
     # This is defaulted to the pages dir, because it represents the structure
     # of our website. Asset directories are copied as siblings at runtime.
     @@root_dir ||= File.join(Dir.pwd, 'pages')
+
+    @attributes = {}
+
+    markup.scan(Liquid::TagAttributes) do |key, value|
+      @attributes[key] = parse_expression(value)
+    end
   end
 
   def self.root_dir=(dir)
     @@root_dir = dir
   end
 
+  def self.helper_port=(port)
+    @@helper_port = port
+  end
+
   def render_to_output_buffer(context, output)
     unless @@root_dir
       raise AssetError,
@@ -42,7 +52,12 @@ class Asset < Liquid::Tag
     end
     template_path = File.dirname(context['template_path'])
     abs_asset_path = Pathname.new(File.join(@@root_dir, @path))
-    output << abs_asset_path.relative_path_from(template_path).to_s
+    asset_path = abs_asset_path.relative_path_from(template_path).cleanpath.to_s
+    output << if @attributes['serve'] == true
+                "http://localhost:#{@@helper_port}/#{asset_path}"
+              else
+                asset_path
+              end
     output
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archival",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "An incredibly simple CMS for durable websites",
   "bin": "build.rb",
   "directories": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archival
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jesse Ditson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: An incredibly simple CMS for durable websites