nesta 0.12.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a79722f3a6494862b4365151dd2300b0eccece20b6cb711298c753763926d9ea
-  data.tar.gz: 4eca7c5b41e3103500237791960658ca8a3b0d1bf50e83860d74d531dd40fb17
+  metadata.gz: e14e3ed99700277225c068df787864f52f19385f08469d91bf1a8f4073e24568
+  data.tar.gz: 84e9c0fb31ba8b380b0ce86f9edc6f660fd8a8f9474ad28400e7c921fd745c01
 SHA512:
-  metadata.gz: 36a89f709fa69d85e340a93ef44ca6fa43a31f54585d0da3c7ca359ed40dddd1003374a75feb0350bd53403595df0f71e513255a16e13dce0568c434fca62d9e
-  data.tar.gz: b3c443a50646d62b70247743c6157433a946d98566b72631284217458e218908720c2ce3bf01534630458cb35cd4c3045d187861385ad3ada43256f74e55f054
+  metadata.gz: e39c4ada00a1ac3b4be18b6887240a670d4f1c050023771dc71fa6703bbb315bac54f959053788dc7018761a5bfc3e1fe387486e856629a785ae3098c8203704
+  data.tar.gz: 4da9e195b6679df8c9f2c9ec3a07b780409b2a68f6cffe66feab9276a0ee90b987b7221a13d5f363c0b700c3d5b8d956e9b6a5753a0aa81058e1e10458ced75f

data/.github/workflows/tests.yml

@@ -0,0 +1,21 @@
+---
+name: run-tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1", "3.2", "head"]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake test
+        env:
+          REPORTER: default

data/.gitignore

@@ -6,6 +6,7 @@
 /.rbenv-version
 /.ruby-version
 /.rvmrc
+/checksums
 /config/config.yml
 /config/deploy.rb
 /db/*.db

data/.gitmodules

@@ -1,6 +0,0 @@
-[submodule "test/fixtures/demo-content.git"]
-	path = test/fixtures/demo-content.git
-	url = https://github.com/gma/nesta-demo-content.git
-[submodule "test/fixtures/nesta-theme-test"]
-	path = test/fixtures/nesta-theme-test.git
-	url = https://github.com/gma/nesta-theme-test.git

data/CHANGES

@@ -1,3 +1,102 @@
+= 0.14.0 / (23 March 2023)
+
+ * Nesta can now be used as a Static Site Generator (SSG) with its new
+   `nesta build` command! Server Side Rendering (SSR) is still supported,
+   as is development with a local web server.
+
+   Back in the days when Heroku allowed us to deploy Nesta on their
+   platform for free, there really didn't seem to be any point in
+   converting a site to a bunch of static HTML and CSS files. If you
+   enabled the appropriate HTTP cache-control headers, Heroku would
+   automatically cache an entire site in memory, so there was no real
+   performance benefit. That's why Nesta never had SSG support, even
+   though everybody seemed to think it was cool.
+
+   But Heroku is not free any more. And there's a wide choice of hosting
+   platforms for static site generators. So why not?
+
+   See the docs for full details, but in short:
+
+   - If you run `bundle exec nesta build`, Nesta will generate a static
+     copy of your site in a ./dist directory.
+
+   - You might want to add ./dist to your .gitignore file.
+
+   - There are a couple of new config settings in config.yml.
+
+   - You can configure hosting platforms like Netlify, AWS Amplify,
+     Vercel (and others) to redeploy your site by running the build
+     command when you push changes to your git repository.
+
+   This was fun to implement. (Graham Ashton)
+
+ * Sass and SCSS files are now rendered with Dart Sass (the main implementation
+   of Sass). We had been using the (now deprecated) libsass library.
+
+   Sass has changed a bit since libsass was current, so you may need to make
+   some small changes to your stylesheets. Documentation that should help with
+   those changes can be found here:
+
+   https://sass-lang.com/documentation/breaking-changes
+
+ * Replace Nesta's custom template-locating code with Sinatra's #find_template
+   method. (Graham Ashton, suggested by Lilith River)
+
+ * Update multiple dependencies to fix security vulnerabilities; see commit
+   history for details. (Graham Ashton)
+
+ * Built-in support for configuring Nesta via environment variables has been
+   dropped. (Graham Ashton)
+
+   Should you still want to configure Nesta via the environment you can
+   use Erb in `config.yml`, like this:
+
+       some_value: <%= ENV.fetch('NESTA_VARIABLE') %>
+
+ * During a tidy up of the config file code, the `yaml_conf` attribute on
+   the Nesta::Config class has been renamed to `config`. This is unlikely
+   to affect you, but if it does just change the name. (Graham Ashton)
+
+ * The `yaml_path` attribute on the Nesta::Config class has been moved
+   to `Nesta::ConfigFile.path`. Again, I can't imagine why anybody would
+   have written code that used it, but it's a breaking change so I'm
+   mentioning it. (Graham Ashton)
+
+ * Support for loading plugins from a local directory (which was deprecated
+   in version 0.9.10) has been removed. (Graham Ashton)
+
+ * The local_stylesheet? helper method (deprecated in 0.9.1) has been
+   removed. (Graham Ashton)
+
+ * The breadcrumb_label helper method (deprecated in 0.9.3) has been removed.
+   (Graham Ashton)
+
+= 0.13.0 / (28 September 2022)
+
+ * Update dependencies in order to support Ruby 3.0 and above.
+   (Graham Ashton)
+
+ * Upgrade multiple dependencies to fix security vulnerabilities.
+   (Graham Ashton)
+
+ * Switch Git repository URLs to HTTPS (fixes the demo:content command).
+   (Graham Ashton)
+
+ * Update dependency on Haml; Nesta currently requires a version lower
+   than 6.0. (Graham Ashton)
+
+ * Refactor: Extracted logic for running external processes into
+   a new `Nesta::SystemCommand` class. (Graham Ashton)
+
+ * Refactor: Created a new `Nesta::Commands::Template` class for
+   commands that create files from templates. (Graham Ashton)
+
+ * Refactor: Move logic for editing the config file from within Nesta's
+   commands into new `Nesta::ConfigFile` class. (Graham Ashton)
+
+ * Stopped the test suite from executing external commands during tests.
+   (Graham Ashton)
+
 = 0.12.0 / (30 June 2020)
 
  * Upgrade to Sinatra 2 and Rack 2. (Graham Ashton)

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    nesta (0.12.0)
+    nesta (0.14.0)
       RedCloth (~> 4.2)
-      haml (>= 3.1)
+      haml (>= 3.1, < 6.0)
       haml-contrib (>= 1.0)
-      rack (~> 2.0)
+      rack (~> 2)
+      rake
       rdiscount (~> 2.1)
-      sassc (>= 2.2)
+      sass-embedded (~> 1.58)
       sinatra (~> 2.0)
       tilt (~> 2.0)
 
@@ -15,8 +16,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
     builder (3.2.4)
     byebug (11.1.3)
@@ -27,21 +28,22 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    ffi (1.13.1)
-    haml (5.1.2)
+    ffi (1.15.5)
+    google-protobuf (3.22.2)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     haml-contrib (1.0.0.1)
       haml (>= 3.2.0.alpha.13)
-    kgio (2.11.3)
+    kgio (2.11.4)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    minitest-reporters (1.4.2)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.1)
+    minitest (5.18.0)
+    minitest-reporters (1.6.0)
       ansi
       builder
       minitest (>= 5.0)
@@ -51,36 +53,39 @@ GEM
       rb-fsevent (>= 0.9)
       rb-inotify (>= 0.8)
       unicorn (>= 4.5)
-    mustermann (1.1.1)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.5)
-    rack (2.2.3)
-    rack-protection (2.0.8.1)
+    nokogiri (1.14.2)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    public_suffix (5.0.1)
+    racc (1.6.2)
+    rack (2.2.6.4)
+    rack-protection (2.2.4)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    raindrops (0.19.1)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    raindrops (0.20.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb-kqueue (0.2.5)
+    rb-kqueue (0.2.8)
       ffi (>= 0.5.0)
-    rdiscount (2.2.0.1)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sinatra (2.0.8.1)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
+    rdiscount (2.2.7)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sass-embedded (1.58.3)
+      google-protobuf (~> 3.21)
+      rake (>= 10.0.0)
+    sinatra (2.2.4)
+      mustermann (~> 2.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.4)
       tilt (~> 2.0)
-    temple (0.8.2)
-    tilt (2.0.10)
-    unicorn (5.5.5)
+    temple (0.10.0)
+    tilt (2.1.0)
+    unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     xpath (3.2.0)
@@ -96,7 +101,6 @@ DEPENDENCIES
   minitest-reporters
   mr-sparkle
   nesta!
-  rake
 
 BUNDLED WITH
-   2.1.4
+   2.4.6

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2020 Graham Ashton
+Copyright (c) 2008-2022 Graham Ashton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,6 @@
 # Nesta - a CMS for Ruby Developers
 
-A CMS for small web sites and blogs, written in [Sinatra][frank].
+A file-based CMS for web sites and blogs, written in [Sinatra][frank].
 
 Content can be written in [Markdown][markdown] or [Textile][textile] and
 stored in text files (though you can also use Haml if you need to add
@@ -44,9 +44,8 @@ full instructions).
 ## Support
 
 There's plenty of information on <http://nestacms.com>. If you need some
-help with anything just jump on the [mailing list][] and ask.
-
-[mailing list]: http://nestacms.com/support
+help with anything feel free to file an issue, or contact me on Mastodon
+(@gma@hachyderm.io) or Twitter (@grahamashton).
 
 If you like Nesta you can keep up with developments by following [@nestacms][]
 on Twitter, and on [the blog][].
@@ -54,21 +53,17 @@ on Twitter, and on [the blog][].
 [@nestacms]: http://twitter.com/nestacms
 [the blog]: http://nestacms.com/blog
 
+![Tests](https://github.com/gma/nesta/actions/workflows/tests.yml/badge.svg)
+
 ## Contributing
 
-If you want to add a new feature, I recommend that you post a quick
-message to the [mailing list][] before you start coding. I'm likely to
-suggest that we implement it as a [plugin][] (to keep Nesta itself lean
-and simple), so you might save yourself some time if we chat about a
-good approach before you start.
+If you want to add a new feature, I recommend that you file an issue to discuss
+it before you start coding. I'm likely to suggest that we implement it as a
+[plugin][] (to keep Nesta itself lean and simple), so you might save yourself
+some time if we chat about a good approach before you start.
 
 [plugin]: http://nestacms.com/docs/plugins
 
-If you think you've found a bug, please bring that up on the [mailing
-list][] too, rather than creating an issue on GitHub straight away.
-You'll probably get a faster response on the mailing list, as I'm the
-only person who'll see your new issue.
-
 -- Graham ([@grahamashton][] on Twitter).
 
 [@grahamashton]: http://twitter.com/grahamashton

data/RELEASING.md

@@ -3,19 +3,21 @@
 When it comes time to release a new version of the Nesta gem, these are
 the steps:
 
-1. Bump the version number in `lib/nesta/version.rb`. This will cause
+1. Check the versions of Ruby used in `.github/workflows` are up to date. If
+   new Ruby versions need testing, update the config and re-run the build.
+
+2. Bump the version number in `lib/nesta/version.rb`. This will cause
    the version number in `Gemfile.lock` to be updated too, so regenerate
    it now and check them in together.
 
-2. Update the `CHANGES` file with a summary of significant changes since
+3. Update the `CHANGES` file with a summary of significant changes since
    the previous release.
 
-3. Check the versions of Ruby used in `.travis.yml` are up to date. If new
-   Ruby versions need testing, update the config and re-run the Travis build.
+4. Commit these changes with a commit message of 'Bump version to <version>'
 
-4. Generate a new site with the `nesta` command, install the demo content,
+5. Generate a new site with the `nesta` command, install the demo content,
    check that it runs okay locally.
 
-5. If everything seems fine, run `rake release`.
+6. If everything seems fine, run `rake release`.
 
-6. Publish an announcement blog post and email the list.
+7. Publish an announcement blog post and email the list.

data/Rakefile

@@ -15,11 +15,11 @@ namespace :test do
   end
 
   task units: :set_load_path do
-    load_tests('unit')
+    load_tests('unit/**')
   end
 
   task integrations: :set_load_path do
-    load_tests('integration')
+    load_tests('integration/**')
   end
 end
 

data/bin/nesta

@@ -24,6 +24,7 @@ COMMANDS
     theme:install <url>   Install a theme from a git repository.
     theme:enable <name>   Make the theme active, updating config.yml.
     theme:create <name>   Makes a template for a new theme in ./themes.
+    build [path]          Build static copy of site (path defaults to ./dist)
 
 OPTIONS FOR new
     --git                 Create a new git repository for the project.
@@ -41,6 +42,7 @@ EOF
     def self.parse_command_line
       opts = GetoptLong.new(
         ['--bash-completion', GetoptLong::NO_ARGUMENT],
+        ['--domain', GetoptLong::REQUIRED_ARGUMENT],
         ['--git', GetoptLong::NO_ARGUMENT],
         ['--help', '-h', GetoptLong::NO_ARGUMENT],
         ['--version', '-v', GetoptLong::NO_ARGUMENT],
@@ -91,7 +93,7 @@ EOF
       rescue NameError
         usage
       else
-        command_cls.new(ARGV[0], options).execute
+        command_cls.new(ARGV[0], options).execute(Nesta::SystemCommand.new)
       end
     rescue RuntimeError => e
       $stderr.puts "ERROR: #{e}"
@@ -118,7 +120,7 @@ _nesta() {
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    opts="new 'demo:content' edit 'plugin:create' 'theme:install' 'theme:enable' 'theme:create'"
+    opts="new 'demo:content' edit 'plugin:create' 'theme:install' 'theme:enable' 'theme:create' build"
 
     case "${cur}" in
         theme:*)
@@ -172,6 +174,7 @@ _1st_arguments=(
   'theme\:install:Install a theme from a git repository'
   'theme\:enable:Make the theme active, updating config.yml'
   'theme\:create:Makes a template for a new theme in ./themes'
+  'build\:Build static copy of site'
 )
 
 local expl

data/config/deploy.rb.sample

@@ -1,5 +1,5 @@
 set :application, "nesta"
-set :repository, "git://github.com/gma/nesta.git"
+set :repository, "https://github.com/gma/nesta.git"
 
 # Set :user if you want to connect (via ssh) to your server using a
 # different username. You will also need to include the user in :domain

data/lib/nesta/app.rb

@@ -1,6 +1,5 @@
 require 'sinatra/base'
 require 'haml'
-require 'sassc'
 
 require File.expand_path('../nesta', File.dirname(__FILE__))
 require File.expand_path('env', File.dirname(__FILE__))
@@ -18,6 +17,7 @@ module Nesta
     set :root, Nesta::Env.root
     set :views, File.expand_path('../../views', File.dirname(__FILE__))
     set :haml, { format: :html5 }
+    set :public_folder, 'public'
 
     helpers Overrides::Renderers
     helpers Navigation::Renderers
@@ -90,5 +90,4 @@ module Nesta
   end
 end
 
-Nesta::Plugin.load_local_plugins
 Nesta::Plugin.initialize_plugins

data/lib/nesta/commands/build.rb

@@ -0,0 +1,38 @@
+require 'rake'
+
+require_relative '../static/assets'
+require_relative '../static/site'
+
+module Nesta
+  module Commands
+    class Build
+      DEFAULT_DESTINATION = "dist"
+
+      attr_accessor :domain
+
+      def initialize(build_dir = nil, options = {})
+        @build_dir = build_dir || DEFAULT_DESTINATION
+        if @build_dir == Nesta::App.settings.public_folder
+          raise RuntimeError.new("#{@build_dir} is already used, for assets")
+        end
+        @domain = options['domain'] || configured_domain_name
+      end
+
+      def configured_domain_name
+        Nesta::Config.build.fetch('domain', 'localhost')
+      end
+
+      def execute(process)
+        logger = Proc.new { |message| puts message }
+        site = Nesta::Static::Site.new(@build_dir, @domain, logger)
+        site.render_pages
+        site.render_not_found
+        site.render_atom_feed
+        site.render_sitemap
+        site.render_templated_assets
+        Nesta::Static::Assets.new(@build_dir, logger).copy_attachments
+        Nesta::Static::Assets.new(@build_dir, logger).copy_public_folder
+      end
+    end
+  end
+end

data/lib/nesta/commands/demo/content.rb

@@ -1,12 +1,10 @@
-require File.expand_path('../command', File.dirname(__FILE__))
+require File.expand_path('../../config_file', File.dirname(__FILE__))
 
 module Nesta
   module Commands
     module Demo
       class Content
-        include Command
-
-        @demo_repository = 'git://github.com/gma/nesta-demo-content.git'
+        @demo_repository = 'https://github.com/gma/nesta-demo-content.git'
         class << self
           attr_accessor :demo_repository
         end
@@ -15,12 +13,12 @@ module Nesta
           @dir = 'content-demo'
         end
 
-        def clone_or_update_repository
+        def clone_or_update_repository(process)
           path = Nesta::Path.local(@dir)
           if File.exist?(path)
-            FileUtils.cd(path) { run_process('git', 'pull', 'origin', 'master') }
+            FileUtils.cd(path) { process.run('git', 'pull', 'origin', 'master') }
           else
-            run_process('git', 'clone', self.class.demo_repository, path)
+            process.run('git', 'clone', self.class.demo_repository, path)
           end
         end
 
@@ -45,10 +43,10 @@ module Nesta
           end
         end
 
-        def execute
-          clone_or_update_repository
+        def execute(process)
+          clone_or_update_repository(process)
           configure_git_to_ignore_repo
-          update_config_yaml(/^\s*#?\s*content:.*/, "content: #{@dir}")
+          Nesta::ConfigFile.new.set_value('content', @dir)
         end
       end
     end

data/lib/nesta/commands/edit.rb

@@ -1,20 +1,16 @@
-require File.expand_path('command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     class Edit
-      include Command
-
       def initialize(*args)
         @filename = Nesta::Config.page_path(args.shift)
       end
 
-      def execute
+      def execute(process)
         editor = ENV.fetch('EDITOR')
       rescue IndexError
         $stderr.puts "No editor: set EDITOR environment variable"
       else
-        run_process(editor, @filename)
+        process.run(editor, @filename)
       end
     end
   end

data/lib/nesta/commands/new.rb

@@ -1,10 +1,6 @@
-require File.expand_path('command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     class New
-      include Command
-
       def initialize(*args)
         path = args.shift
         options = args.shift || {}
@@ -26,18 +22,19 @@ module Nesta
         @options['vlad']
       end
 
-      def create_repository
+      def create_repository(process)
         FileUtils.cd(@path) do
           File.open('.gitignore', 'w') do |file|
-            file.puts %w[._* .*.swp .bundle .DS_Store .sass-cache].join("\n")
+            lines = %w[._* .*.swp .bundle .DS_Store .sass-cache dist]
+            file.puts lines.join("\n")
           end
-          run_process('git', 'init')
-          run_process('git', 'add', '.')
-          run_process('git', 'commit', '-m', 'Initial commit')
+          process.run('git', 'init')
+          process.run('git', 'add', '.')
+          process.run('git', 'commit', '-m', 'Initial commit')
         end
       end
 
-      def execute
+      def execute(process)
         make_directories
         templates = {
           'config.ru' => "#{@path}/config.ru",
@@ -49,8 +46,10 @@ module Nesta
         if @options['vlad']
           templates['config/deploy.rb'] = "#{@path}/config/deploy.rb"
         end
-        copy_templates(templates)
-        create_repository if @options['git']
+        templates.each do |src, dest|
+          Nesta::Commands::Template.new(src).copy_to(dest, binding)
+        end
+        create_repository(process) if @options['git']
       end
     end
   end

data/lib/nesta/commands/plugin/create.rb

@@ -1,11 +1,7 @@
-require File.expand_path('../command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     module Plugin
       class Create
-        include Command
-
         def initialize(*args)
           name = args.shift
           name.nil? && (raise UsageError.new('name not specified'))
@@ -54,9 +50,9 @@ module Nesta
           File.join(@gem_name, path)
         end
 
-        def execute
+        def execute(process)
           make_directories
-          copy_templates(
+          {
             'plugins/README.md' => gem_path('README.md'),
             'plugins/gitignore' => gem_path('.gitignore'),
             'plugins/plugin.gemspec' => gem_path("#{@gem_name}.gemspec"),
@@ -65,10 +61,12 @@ module Nesta
             'plugins/lib/version.rb' => gem_path("lib/#{@gem_name}/version.rb"),
             'plugins/lib/init.rb' => gem_path("lib/#{@gem_name}/init.rb"),
             'plugins/Rakefile' => gem_path('Rakefile')
-          )
+          }.each do |src, dest|
+            Nesta::Commands::Template.new(src).copy_to(dest, binding)
+          end
           Dir.chdir(@gem_name) do
-            run_process('git', 'init')
-            run_process('git', 'add', '.')
+            process.run('git', 'init')
+            process.run('git', 'add', '.')
           end
         end