Merge pull request #91 from SeeClickFix/sawyer/update/tp-198470-update-nanoc-to-v4

[TP-198470] Update to Nanoc v4

Author: ssawyer1024

.ruby-version

@@ -1 +1 @@
-2.4.1
+3.1.4

.tool-versions

@@ -0,0 +1 @@
+ruby 3.1.4

Gemfile

@@ -4,11 +4,12 @@ gem 'builder'
 gem 'coderay'
 gem 'kramdown', '~> 2.3.1'
 gem 'mime-types', '~> 1.16'
-gem 'nanoc', '~> 3.7.3'
+gem 'nanoc', '~> 4'
 gem 'nokogiri'
 gem 'pygments.rb'
 gem 'rake', '~> 12.3.3'
 gem 'yajl-ruby'
+gem 'webrick'
 
 group :development do
   gem 'adsf'

Gemfile.lock

@@ -1,29 +1,96 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    adsf (1.4.2)
-      rack (>= 1.0.0, < 3.0.0)
-    builder (3.2.3)
-    coderay (1.1.2)
-    cri (2.15.9)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    adsf (1.5.2)
+      rack (>= 1.0.0, < 4.0.0)
+      rackup (~> 2.1)
+    base64 (0.2.0)
+    builder (3.3.0)
+    coderay (1.1.3)
+    colored (1.2)
+    concurrent-ruby (1.3.5)
+    cri (2.15.12)
+    ddmetrics (1.1.0)
+    ddplugin (1.0.3)
+    diff-lcs (1.5.1)
     fssm (0.2.10)
-    kramdown (2.3.1)
+    immutable-ruby (0.2.0)
+      concurrent-ruby (~> 1.1)
+      sorted_set (~> 1.0)
+    json_schema (0.21.0)
+    kramdown (2.3.2)
       rexml
+    memo_wise (1.10.0)
+    method_source (1.1.0)
     mime-types (1.25.1)
-    mini_portile2 (2.8.0)
-    multi_json (1.14.1)
-    nanoc (3.7.5)
-      cri (~> 2.3)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.8)
+    nanoc (4.13.3)
+      addressable (~> 2.5)
+      colored (~> 1.2)
+      nanoc-checking (~> 1.0, >= 1.0.2)
+      nanoc-cli (= 4.13.3)
+      nanoc-core (= 4.13.3)
+      nanoc-deploying (~> 1.0)
+      parallel (~> 1.12)
+      tty-command (~> 0.8)
+      tty-which (~> 0.4)
+    nanoc-checking (1.0.5)
+      nanoc-cli (~> 4.12, >= 4.12.5)
+      nanoc-core (~> 4.12, >= 4.12.5)
+    nanoc-cli (4.13.3)
+      cri (~> 2.15)
+      diff-lcs (~> 1.3)
+      nanoc-core (= 4.13.3)
+      pry
+      zeitwerk (~> 2.1)
+    nanoc-core (4.13.3)
+      base64 (~> 0.2)
+      concurrent-ruby (~> 1.1)
+      ddmetrics (~> 1.0)
+      ddplugin (~> 1.0)
+      immutable-ruby (~> 0.1)
+      json_schema (~> 0.19)
+      memo_wise (~> 1.5)
+      slow_enumerator_tools (~> 1.0)
+      tty-platform (~> 0.2)
+      zeitwerk (~> 2.1)
+    nanoc-deploying (1.0.2)
+      nanoc-checking (~> 1.0)
+      nanoc-cli (~> 4.11, >= 4.11.15)
+      nanoc-core (~> 4.11, >= 4.11.15)
+    nokogiri (1.18.1)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    pygments.rb (1.2.1)
-      multi_json (>= 1.0.0)
-    racc (1.6.0)
-    rack (2.2.3.1)
+    parallel (1.26.3)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (6.0.1)
+    pygments.rb (3.0.0)
+    racc (1.8.1)
+    rack (3.1.8)
+    rackup (2.2.1)
+      rack (>= 3)
     rake (12.3.3)
-    rexml (3.2.5)
+    rbtree (0.4.6)
+    rexml (3.4.0)
+    set (1.1.1)
+    slow_enumerator_tools (1.1.0)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    tty-color (0.6.0)
+    tty-command (0.10.1)
+      pastel (~> 0.8)
+    tty-platform (0.3.0)
+    tty-which (0.5.0)
+    webrick (1.9.1)
     yajl-ruby (1.4.3)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -35,11 +102,12 @@ DEPENDENCIES
   fssm
   kramdown (~> 2.3.1)
   mime-types (~> 1.16)
-  nanoc (~> 3.7.3)
+  nanoc (~> 4)
   nokogiri
   pygments.rb
   rake (~> 12.3.3)
+  webrick
   yajl-ruby
 
 BUNDLED WITH
-   1.16.2
+   2.2.33

README.md

@@ -105,7 +105,11 @@ smart enough not to try to compile unchanged files:
 You can setup whatever you want to view the files.  If you have the adsf
 gem, however (I hope so, it was in the Gemfile), you can start Webrick:
 
-    $ nanoc view
+    $ nanoc view -p [port]
+
+You can provide a port number other than 3000 if you don't want to have to
+stop an existing (SCF?) rails instance. eg. "-p 3030" will allow viewing on
+port 3030.
 
 Compilation times got you down?  Use `autocompile`!
 

Rules

@@ -36,7 +36,7 @@ compile '*' do
 end
 
 route '/static/*' do
-  item.identifier[7..-2]
+  item.identifier.to_s.sub(/\A\/static/, '')
 end
 
 route '/CNAME/' do

config.yaml

@@ -19,6 +19,9 @@ index_filenames: [ 'index.html' ]
 # before and after the last site compilation.
 enable_output_diff: false
 
+# Required for Nanoc3->4
+string_pattern_type: legacy
+
 # The data sources where nanoc loads its data from. This is an array of
 # hashes; each array element represents a single data source. By default,
 # there is only a single data source that reads data from the “content/” and
@@ -27,7 +30,8 @@ data_sources:
   -
     # The type is the identifier of the data source. By default, this will be
     # `filesystem_unified`.
-    type: filesystem_unified
+    type: filesystem
+    identifier_type: legacy
 
     # The path where items should be mounted (comparable to mount points in
     # Unix-like systems). This is “/” by default, meaning that items will have
@@ -41,5 +45,7 @@ data_sources:
     layouts_root: /
 
   -
-    type: static
+    type: filesystem
     items_root: /static
+    content_dir: 'static'
+    layouts_dir: null

lib/static.rb

@@ -1,8 +1,8 @@
 require 'digest/sha1'
 
-module Nanoc3::DataSources
+module Nanoc::DataSources
 
-  class Static < Nanoc3::DataSource
+  class Static < Nanoc::DataSource
 
     identifier :static
 
@@ -19,12 +19,12 @@ def items
           :extension => File.extname(filename)[1..-1],
           :filename  => filename,
         }
-        identifier = filename[(prefix.length+1)..-1] + '/'
+        identifier = Nano::Identifier.new(filename[(prefix.length+1)..-1] + '/', type: :legacy)
 
         mtime      = File.mtime(filename)
         checksum   = checksum_for(filename)
 
-        Nanoc3::Item.new(
+        new_item(
           filename,
           attributes,
           identifier,