nesta 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e14e3ed99700277225c068df787864f52f19385f08469d91bf1a8f4073e24568
-  data.tar.gz: 84e9c0fb31ba8b380b0ce86f9edc6f660fd8a8f9474ad28400e7c921fd745c01
+  metadata.gz: 7080f8e4c8c7b993aaaf2f1f2ea59edbefd0b49ef73218a8f20d6877880b18c2
+  data.tar.gz: 806b5caf9fbfc69221087bd98254e282ddb5ba0e4288ee835d3af22fc879ab9f
 SHA512:
-  metadata.gz: e39c4ada00a1ac3b4be18b6887240a670d4f1c050023771dc71fa6703bbb315bac54f959053788dc7018761a5bfc3e1fe387486e856629a785ae3098c8203704
-  data.tar.gz: 4da9e195b6679df8c9f2c9ec3a07b780409b2a68f6cffe66feab9276a0ee90b987b7221a13d5f363c0b700c3d5b8d956e9b6a5753a0aa81058e1e10458ced75f
+  metadata.gz: 17a405a098acca204751044cff182ee6484c93c373b7266a2c194345736438b71366b05cd04ea8d64e7949c9ab071e01cde387a1c68d1190a2087d211fa45060
+  data.tar.gz: 8d37d4b2b1fb4df23d57403da16c865db06a4a899a942a594cfac47212f998c52ef330ae9091149e1858c06f390f2ed9e4ef94621b115c52f04ed821d0cc9b7d

data/.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2", "head"]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

data/{CHANGES → CHANGELOG.md}

@@ -1,4 +1,26 @@
-= 0.14.0 / (23 March 2023)
+# Changelog
+
+## 0.15.0 (11 July 2023)
+
+ * Upgrade to Sinatra 3. (Graham Ashton)
+
+ * The `models.rb` file has been long and unnecessarily hard to navigate
+   for too long. It has been split up into multiple files, one for each
+   class. (Graham Ashton, suggested by Lilith River)
+
+ * Remove support for the BlueCloth markdown library. Nesta uses Tilt
+   for rendering Markdown, and BlueCloth support has been removed in
+   Tilt 2.2.0. See rtomayko/tilt#382 for details.
+
+   If your site uses BlueCloth, remove your call to `Tilt.prefer`,
+   and Nesta will use its default Markdown processor. See Nesta's docs
+   on [configuring the Markdown processor] for more details.
+
+   [configuring the Markdown processor]: https://nestacms.com/docs/creating-content/changing-the-markdown-processor
+
+   (Graham Ashton)
+
+## 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,
@@ -71,7 +93,7 @@
  * The breadcrumb_label helper method (deprecated in 0.9.3) has been removed.
    (Graham Ashton)
 
-= 0.13.0 / (28 September 2022)
+## 0.13.0 (28 September 2022)
 
  * Update dependencies in order to support Ruby 3.0 and above.
    (Graham Ashton)
@@ -97,7 +119,7 @@
  * Stopped the test suite from executing external commands during tests.
    (Graham Ashton)
 
-= 0.12.0 / (30 June 2020)
+## 0.12.0 (30 June 2020)
 
  * Upgrade to Sinatra 2 and Rack 2. (Graham Ashton)
 
@@ -113,12 +135,12 @@
  * Stop running the test suite under Ruby 2.3 and 2.4, both of which
    have reached end-of-life. (Graham Ashton)
 
-= 0.11.1 / (26 March 2015)
+## 0.11.1 (26 March 2015)
 
  * Tighten dependency on Tilt, as version 2.x is incompatible.
    (Graham Ashton)
 
-= 0.11.0 / (16 March 2015)
+## 0.11.0 (16 March 2015)
 
  * Allow Haml pages to use the built-in Markdown filter again, by
    including the haml-contrib gem.
@@ -161,7 +183,7 @@
 
  * Support for Ruby 2.2. (Graham Ashton)
 
-= 0.10.0 / (25 April 2014)
+## 0.10.0 (25 April 2014)
 
  * Upgraded the default theme to a responsive design, using Google's
    Roboto Slab web font. (Graham Ashton)
@@ -285,7 +307,7 @@
    this list. See GitHub for the full list of commits.
    https://github.com/gma/nesta/compare/v0.9.13...v0.10.0
 
-= 0.9.13 / (3 March 2012)
+## 0.9.13 (3 March 2012)
 
  * The nesta script has a new command; edit. You can pass it the path
    to a file within your content/pages folder and it will open the file
@@ -343,9 +365,9 @@
  * Bug fix: Summaries on Haml pages were not marked up as paragraphs.
    See #75.
 
-= 0.9.12 / (Released then pulled, due to rubygems [still] being a total mess)
+## 0.9.12 (Released then pulled, due to rubygems [still] being a total mess)
 
-= 0.9.11 / (22 September 2011)
+## 0.9.11 (22 September 2011)
 
  * Use Tilt to render the Markdown, Textile and Haml in content/pages.
    RDiscount is now the default Markdown processor. To continue using
@@ -372,7 +394,7 @@
    within the content folder by crafting a relative path containing
    the string '../' (Louis Nyffenegger).
 
-= 0.9.10 / (9 September 2011)
+## 0.9.10 (9 September 2011)
 
  * Load Nesta plugins from gems. Any gem whose name begins with
    nesta-plugin- can be used in a project by adding it to the project's
@@ -390,7 +412,7 @@
    the Sass rendering engine by default, which allows it to find .sass
    files within the gem if no matching files are found locally.
 
-= 0.9.9 / (24 August 2011)
+## 0.9.9 (24 August 2011)
 
  * Bug fix: What a debacle this is turning into. The new Nesta::Env
    class must be required before the code in 'nesta/app' is loaded.
@@ -398,7 +420,7 @@
    via config.ru. Running Nesta any other way lead to an immediate
    crash.
 
-= 0.9.8 / (22 August 2011)
+## 0.9.8 (22 August 2011)
 
  * Bug fix: The Sinatra app's root directory wasn't set which meant
    that Nesta couldn't always find the ./public directory (such as when
@@ -409,12 +431,12 @@
    Nesta::Env class. In 0.9.6 I forgot to actually set Nesta::App.root
    as well, which was a big mistake. Whoops.
 
-= 0.9.7 / (19 August 2011)
+## 0.9.7 (19 August 2011)
 
  * No code changes from 0.9.6; version number increased to allow new gem
    to be deployed to rubygems.org.
 
-= 0.9.6 / (18 August 2011) [never released due to packaging bug]
+## 0.9.6 (18 August 2011) [never released due to packaging bug]
 
  * Nesta no longer cares whether you write your Sass stylesheets in the
    original indented Sass format or the default SCSS syntax (which is a
@@ -440,7 +462,7 @@
    Nesta::App.root would be before requiring nesta/app. Fixed by
    creating Nesta::Env and moving root to there instead.
 
-= 0.9.5 / (1 May 2011)
+## 0.9.5 (1 May 2011)
 
  * Added --version option to nesta command (Christopher Lindblom).
 
@@ -466,14 +488,14 @@
    within Haml templates. See https://github.com/gma/nesta/pull/18
    (Carl Furrow).
 
-= 0.9.4 / 18 February 2011
+## 0.9.4 (18 February 2011)
 
  * Updated the link colours in the default theme.
 
  * Set the default encoding to UTF-8. Without it Heroku would sometimes
    fail to render pages (issue 14).
 
-= 0.9.3 / 18 January 2011
+## 0.9.3 (18 January 2011)
 
  * The route and view for serving the home page (/) has been removed,
    and the home page must now be created as an index page in
@@ -515,7 +537,7 @@
  * Bug fix: Don't output empty <li> tags for nested submenus that are
    beneath the requested number of levels.
 
-= 0.9.2 / 10 January 2011
+## 0.9.2 (10 January 2011)
 
  * Made the FileModel.metadata method public, to allow for custom
    metadata at the top of each page. (Wynn Netherland)
@@ -525,7 +547,7 @@
 
  * Added templates required by `nesta theme:create`.
 
-= 0.9.1 / 31 December 2010
+## 0.9.1 (31 December 2010)
 
  * Re-implemented the default theme, using semantic HTML5 and
    Andy Clarke's Universal Internet Explorer 6 CSS. Named the previous
@@ -538,15 +560,16 @@
  * Moved the navigation helpers into the Nesta::Navigation::Renderers
    module.
 
-= 0.9.0 / 20 December 2010
+## 0.9.0 (20 December 2010)
 
  * Packaged Nesta as a gem for the first time, instead of as a template
    site that can be cloned, edited and deployed. Added the `nesta`
    command for generating new sites and managing themes.
 
-= Previous versions / from 26 November 2008
+## Previous versions (from 26 November 2008)
 
  * Prior to 0.9.0 Nesta was distributed as a git repository that could
    be forked, edited and deployed. The only change log for these
-   versions is the Git commit history.
+   versions is the commit history:
+
    https://github.com/gma/nesta/commits/master

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nesta (0.14.0)
+    nesta (0.15.0)
       RedCloth (~> 4.2)
       haml (>= 3.1, < 6.0)
       haml-contrib (>= 1.0)
@@ -9,7 +9,7 @@ PATH
       rake
       rdiscount (~> 2.1)
       sass-embedded (~> 1.58)
-      sinatra (~> 2.0)
+      sinatra (~> 3.0)
       tilt (~> 2.0)
 
 GEM
@@ -53,15 +53,15 @@ GEM
       rb-fsevent (>= 0.9)
       rb-inotify (>= 0.8)
       unicorn (>= 4.5)
-    mustermann (2.0.2)
+    mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.14.2)
+    nokogiri (1.14.3)
       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-protection (3.0.5)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)
@@ -78,10 +78,10 @@ GEM
     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)
+    sinatra (3.0.5)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.5)
       tilt (~> 2.0)
     temple (0.10.0)
     tilt (2.1.0)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2022 Graham Ashton
+Copyright (c) 2008-2023 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,34 +1,37 @@
-# Nesta - a CMS for Ruby Developers
+# Lightweight file-based CMS and Static Site Generator
 
-A file-based CMS for web sites and blogs, written in [Sinatra][frank].
+Nesta is a lightweight CMS for building content sites and blogs, written in
+[Sinatra].
 
-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
-some HTML to your pages). There's no database; write your content in
-your editor. Publish by pushing to a git repository.
+Content can be written in [Markdown] or [Textile], stored in text files on your
+computer. There is no database.
 
-[frank]: http://www.sinatrarb.com/ "Sinatra"
-[markdown]: http://daringfireball.net/projects/markdown/
-[textile]: http://textism.com/tools/textile/
+You do your writing in your text editor.
+
+Publish by pushing your changes to a git repository that's setup to deploy your
+changes to the web.
+
+[Sinatra]: http://www.sinatrarb.com/ "Sinatra"
+[Markdown]: http://daringfireball.net/projects/markdown/
+[Textile]: http://textism.com/tools/textile/
 
 ## Installation
 
-Begin by installing the gem:
+Begin by [installing Ruby], then the Nesta gem:
 
     $ gem install nesta
 
-Then use the `nesta` command to generate a new site:
+Use the `nesta` command to generate a new site:
 
-    $ nesta new mysite.com --git
+    $ nesta new mysite.com --git  # a git repo is optional, but recommended
 
 Install a few dependencies, and you're away:
 
     $ cd mysite.com
     $ bundle
 
-You'll find basic configuration options for your site in
-`config/config.yml`. The defaults will work, but you'll want to tweak it
-before you go very far.
+You'll find configuration options for your site in `config/config.yml`. The
+defaults will work, but you'll want to tweak it before you go very far.
 
 That's it - you can launch a local web server in development mode using
 mr-sparkle...
@@ -36,34 +39,43 @@ mr-sparkle...
     $ bundle exec mr-sparkle config.ru
 
 ...then point your web browser at http://localhost:8080. Start editing
-the files in `content/pages` (see the [docs on writing content][] for
-full instructions).
+the files in `content/pages` (see the [docs on writing content] for full
+instructions).
+
+You can either [deploy it] behind a web server, or build a static version of
+your site:
+
+    $ nesta build  # but see config.yml for related settings
 
-[docs on writing content]: http://nestacms.com/docs/creating-content
+[installing Ruby]: https://www.ruby-lang.org/en/documentation/installation/
+[docs on writing content]: http://nestacms.com/docs/creating-content/
+[deploy it]: https://nestacms.com/docs/deployment/
 
 ## Support
 
 There's plenty of information on <http://nestacms.com>. If you need some
 help with anything feel free to file an issue, or contact me on Mastodon
-(@gma@hachyderm.io) or Twitter (@grahamashton).
+([@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][].
+If you like Nesta you can keep up with developments by following [@nestacms]
+on Twitter, and on [the blog].
 
-[@nestacms]: http://twitter.com/nestacms
-[the blog]: http://nestacms.com/blog
+[@gma@hachyderm.io]: https://hachyderm.io/@gma
+[@grahamashton]: https://twitter.com/grahamashton
+[@nestacms]: https://twitter.com/nestacms
+[the blog]: https://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 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.
+If you want to add a new feature, please [create an issue] to discuss it before
+you start coding. I might suggest that we implement it as a [plugin] (to keep
+Nesta itself lean and simple), or be able to chip in with ideas on how to
+approach it.
 
-[plugin]: http://nestacms.com/docs/plugins
+[create an issue]: https://github.com/gma/nesta/issues/new
+[plugin]: https://nestacms.com/docs/plugins
 
--- Graham ([@grahamashton][] on Twitter).
+-- Graham
 
-[@grahamashton]: http://twitter.com/grahamashton

data/RELEASING.md

@@ -10,7 +10,7 @@ the steps:
    the version number in `Gemfile.lock` to be updated too, so regenerate
    it now and check them in together.
 
-3. Update the `CHANGES` file with a summary of significant changes since
+3. Update the `CHANGLOG.md` file with a summary of significant changes since
    the previous release.
 
 4. Commit these changes with a commit message of 'Bump version to <version>'

data/lib/nesta/models/file_model.rb

@@ -0,0 +1,191 @@
+def register_template_handler(class_name, *extensions)
+  Tilt.register Tilt.const_get(class_name), *extensions
+rescue LoadError
+  # Only one of the Markdown processors needs to be available, so we can
+  # safely ignore these load errors.
+end
+
+register_template_handler :MarukuTemplate, 'mdown', 'md'
+register_template_handler :KramdownTemplate, 'mdown', 'md'
+register_template_handler :RDiscountTemplate, 'mdown', 'md'
+register_template_handler :RedcarpetTemplate, 'mdown', 'md'
+
+
+module Nesta
+  class MetadataParseError < RuntimeError; end
+
+  class FileModel
+    FORMATS = [:mdown, :md, :haml, :textile]
+    @@model_cache = {}
+    @@filename_cache = {}
+
+    attr_reader :filename, :mtime
+
+    class CaseInsensitiveHash < Hash
+      def [](key)
+        super(key.to_s.downcase)
+      end
+    end
+
+    def self.model_path(basename = nil)
+      Nesta::Config.content_path(basename)
+    end
+
+    def self.find_all
+      file_pattern = File.join(model_path, "**", "*.{#{FORMATS.join(',')}}")
+      Dir.glob(file_pattern).map do |path|
+        relative = path.sub("#{model_path}/", "")
+        load(relative.sub(/\.(#{FORMATS.join('|')})/, ""))
+      end
+    end
+
+    def self.find_file_for_path(path)
+      if ! @@filename_cache.has_key?(path)
+        FORMATS.each do |format|
+          [path, File.join(path, 'index')].each do |basename|
+            filename = model_path("#{basename}.#{format}")
+            if File.exist?(filename)
+              @@filename_cache[path] = filename
+              break
+            end
+          end
+        end
+      end
+      @@filename_cache[path]
+    end
+
+    def self.needs_loading?(path, filename)
+      @@model_cache[path].nil? || File.mtime(filename) > @@model_cache[path].mtime
+    end
+
+    def self.load(path)
+      if (filename = find_file_for_path(path)) && needs_loading?(path, filename)
+        @@model_cache[path] = self.new(filename)
+      end
+      @@model_cache[path]
+    end
+
+    def self.purge_cache
+      @@model_cache = {}
+      @@filename_cache = {}
+    end
+
+    def initialize(filename)
+      @filename = filename
+      @format = filename.split('.').last.to_sym
+      if File.zero?(filename)
+        @metadata = {}
+        @markup = ''
+      else
+        @metadata, @markup = parse_file
+      end
+      @mtime = File.mtime(filename)
+    end
+
+    def ==(other)
+      other.respond_to?(:path) && (self.path == other.path)
+    end
+
+    def index_page?
+      @filename =~ /\/?index\.\w+$/
+    end
+
+    def abspath
+      file_path = @filename.sub(self.class.model_path, '')
+      if index_page?
+        File.dirname(file_path)
+      else
+        File.join(File.dirname(file_path), File.basename(file_path, '.*'))
+      end
+    end
+
+    def path
+      abspath.sub(/^\//, '')
+    end
+
+    def permalink
+      File.basename(path)
+    end
+
+    def layout
+      (metadata('layout') || 'layout').to_sym
+    end
+
+    def template
+      (metadata('template') || 'page').to_sym
+    end
+
+    def to_html(scope = Object.new)
+      convert_to_html(@format, scope, markup)
+    end
+
+    def last_modified
+      @last_modified ||= File.stat(@filename).mtime
+    end
+
+    def description
+      metadata('description')
+    end
+
+    def keywords
+      metadata('keywords')
+    end
+
+    def metadata(key)
+      @metadata[key]
+    end
+
+    def flagged_as?(flag)
+      flags = metadata('flags')
+      flags && flags.split(',').map { |name| name.strip }.include?(flag)
+    end
+
+    def parse_metadata(first_paragraph)
+      is_metadata = first_paragraph.split("\n").first =~ /^[\w ]+:/
+      raise MetadataParseError unless is_metadata
+      metadata = CaseInsensitiveHash.new
+      first_paragraph.split("\n").each do |line|
+        key, value = line.split(/\s*:\s*/, 2)
+        next if value.nil?
+        metadata[key.downcase] = value.chomp
+      end
+      metadata
+    end
+
+    private
+
+    def markup
+      @markup
+    end
+
+    def parse_file
+      contents = File.open(@filename).read
+    rescue Errno::ENOENT
+      raise Sinatra::NotFound
+    else
+      first_paragraph, remaining = contents.split(/\r?\n\r?\n/, 2)
+      begin
+        return parse_metadata(first_paragraph), remaining
+      rescue MetadataParseError
+        return {}, contents
+      end
+    end
+
+    def add_p_tags_to_haml(text)
+      contains_tags = (text =~ /^\s*%/)
+      if contains_tags
+        text
+      else
+        text.split(/\r?\n/).inject('') do |accumulator, line|
+          accumulator << "%p #{line}\n"
+        end
+      end
+    end
+
+    def convert_to_html(format, scope, text)
+      text = add_p_tags_to_haml(text) if @format == :haml
+      template = Tilt[format].new { text }
+      template.render(scope)
+    end
+  end
+end

data/lib/nesta/models/menu.rb

@@ -0,0 +1,67 @@
+module Nesta
+  class Menu
+    INDENT = " " * 2
+
+    def self.full_menu
+      menu = []
+      menu_file = Nesta::Config.content_path('menu.txt')
+      if File.exist?(menu_file)
+        File.open(menu_file) { |file| append_menu_item(menu, file, 0) }
+      end
+      menu
+    end
+
+    def self.top_level
+      full_menu.reject { |item| item.is_a?(Array) }
+    end
+
+    def self.for_path(path)
+      path.sub!(Regexp.new('^/'), '')
+      if path.empty?
+        full_menu
+      else
+        find_menu_item_by_path(full_menu, path)
+      end
+    end
+
+    private_class_method def self.append_menu_item(menu, file, depth)
+      path = file.readline
+    rescue EOFError
+    else
+      page = Page.load(path.strip)
+      current_depth = path.scan(INDENT).size
+      if page
+        if current_depth > depth
+          sub_menu_for_depth(menu, depth) << [page]
+        else
+          sub_menu_for_depth(menu, current_depth) << page
+        end
+      end
+      append_menu_item(menu, file, current_depth)
+    end
+
+    private_class_method def self.sub_menu_for_depth(menu, depth)
+      sub_menu = menu
+      depth.times { sub_menu = sub_menu[-1] }
+      sub_menu
+    end
+
+    private_class_method def self.find_menu_item_by_path(menu, path)
+      item = menu.detect do |item|
+        item.respond_to?(:path) && (item.path == path)
+      end
+      if item
+        subsequent = menu[menu.index(item) + 1]
+        item = [item]
+        item << subsequent if subsequent.respond_to?(:each)
+      else
+        sub_menus = menu.select { |menu_item| menu_item.respond_to?(:each) }
+        sub_menus.each do |sub_menu|
+          item = find_menu_item_by_path(sub_menu, path)
+          break if item
+        end
+      end
+      item
+    end
+  end
+end

data/lib/nesta/models/page.rb

@@ -0,0 +1,167 @@
+module Nesta
+  class HeadingNotSet < RuntimeError; end
+  class LinkTextNotSet < RuntimeError; end
+
+  class Page < FileModel
+    def self.model_path(basename = nil)
+      Nesta::Config.page_path(basename)
+    end
+
+    def self.find_by_path(path)
+      page = load(path)
+      page && page.hidden? ? nil : page
+    end
+
+    def self.find_all
+      super.select { |p| ! p.hidden? }
+    end
+
+    def self.find_articles
+      find_all.select do |page|
+        page.date && page.date < DateTime.now
+      end.sort { |x, y| y.date <=> x.date }
+    end
+
+    def draft?
+      flagged_as?('draft')
+    end
+
+    def hidden?
+      draft? && Nesta::App.production?
+    end
+
+    def heading
+      regex = case @format
+        when :mdown, :md
+          /^#\s*(.*?)(\s*#+|$)/
+        when :haml
+          /^\s*%h1\s+(.*)/
+        when :textile
+          /^\s*h1\.\s+(.*)/
+        end
+      markup =~ regex
+      Regexp.last_match(1) or raise HeadingNotSet, "#{abspath} needs a heading"
+    end
+
+    def link_text
+      metadata('link text') || heading
+    rescue HeadingNotSet
+      raise LinkTextNotSet, "Need to link to '#{abspath}' but can't get link text"
+    end
+
+    def title
+      metadata('title') || link_text
+    rescue LinkTextNotSet
+      return Nesta::Config.title if abspath == '/'
+      raise
+    end
+
+    def date(format = nil)
+      @date ||= if metadata("date")
+        if format == :xmlschema
+          Time.parse(metadata("date")).xmlschema
+        else
+          DateTime.parse(metadata("date"))
+        end
+      end
+    end
+
+    def atom_id
+      metadata('atom id')
+    end
+
+    def read_more
+      metadata('read more') || Nesta::Config.read_more
+    end
+
+    def summary
+      if summary_text = metadata("summary")
+        summary_text.gsub!('\n', "\n")
+        convert_to_html(@format, Object.new, summary_text)
+      end
+    end
+
+    def body_markup
+      case @format
+        when :mdown, :md
+          markup.sub(/^#[^#].*$\r?\n(\r?\n)?/, '')
+        when :haml
+          markup.sub(/^\s*%h1\s+.*$\r?\n(\r?\n)?/, '')
+        when :textile
+          markup.sub(/^\s*h1\.\s+.*$\r?\n(\r?\n)?/, '')
+      end
+    end
+
+    def body(scope = Object.new)
+      convert_to_html(@format, scope, body_markup)
+    end
+
+    def categories
+      paths = category_strings.map { |specifier| specifier.sub(/:-?\d+$/, '') }
+      valid_paths(paths).map { |p| Page.find_by_path(p) }
+    end
+
+    def priority(category)
+      category_string = category_strings.detect do |string|
+        string =~ /^#{category}([,:\s]|$)/
+      end
+      category_string && category_string.split(':', 2)[-1].to_i
+    end
+
+    def parent
+      if abspath == '/'
+        nil
+      else
+        parent_path = File.dirname(path)
+        while parent_path != '.' do
+          parent = Page.load(parent_path)
+          return parent unless parent.nil?
+          parent_path = File.dirname(parent_path)
+        end
+        return categories.first unless categories.empty?
+        Page.load('index')
+      end
+    end
+
+    def pages
+      in_category = Page.find_all.select do |page|
+        page.date.nil? && page.categories.include?(self)
+      end
+      in_category.sort do |x, y|
+        by_priority = y.priority(path) <=> x.priority(path)
+        if by_priority == 0
+          x.link_text.downcase <=> y.link_text.downcase
+        else
+          by_priority
+        end
+      end
+    end
+
+    def articles
+      Page.find_articles.select { |article| article.categories.include?(self) }
+    end
+
+    def receives_comments?
+      ! date.nil?
+    end
+
+    private
+
+    def category_strings
+      strings = metadata('categories')
+      strings.nil? ? [] : strings.split(',').map { |string| string.strip }
+    end
+
+    def valid_paths(paths)
+      page_dir = Nesta::Config.page_path
+      paths.select do |path|
+        FORMATS.detect do |format|
+          [path, File.join(path, 'index')].detect do |candidate|
+            File.exist?(File.join(page_dir, "#{candidate}.#{format}"))
+          end
+        end
+      end
+    end
+  end
+
+end

data/lib/nesta/models.rb

@@ -1,423 +1,5 @@
-require 'time'
-
 require 'rdiscount'
 
-def register_template_handler(class_name, *extensions)
-  Tilt.register Tilt.const_get(class_name), *extensions
-rescue LoadError
-  # Only one of the Markdown processors needs to be available, so we can
-  # safely ignore these load errors.
-end
-
-register_template_handler :MarukuTemplate, 'mdown', 'md'
-register_template_handler :KramdownTemplate, 'mdown', 'md'
-register_template_handler :BlueClothTemplate, 'mdown', 'md'
-register_template_handler :RDiscountTemplate, 'mdown', 'md'
-register_template_handler :RedcarpetTemplate, 'mdown', 'md'
-
-module Nesta
-  class HeadingNotSet < RuntimeError; end
-  class LinkTextNotSet < RuntimeError; end
-  class MetadataParseError < RuntimeError; end
-
-  class FileModel
-    FORMATS = [:mdown, :md, :haml, :textile]
-    @@model_cache = {}
-    @@filename_cache = {}
-
-    attr_reader :filename, :mtime
-
-    class CaseInsensitiveHash < Hash
-      def [](key)
-        super(key.to_s.downcase)
-      end
-    end
-
-    def self.model_path(basename = nil)
-      Nesta::Config.content_path(basename)
-    end
-
-    def self.find_all
-      file_pattern = File.join(model_path, "**", "*.{#{FORMATS.join(',')}}")
-      Dir.glob(file_pattern).map do |path|
-        relative = path.sub("#{model_path}/", "")
-        load(relative.sub(/\.(#{FORMATS.join('|')})/, ""))
-      end
-    end
-
-    def self.find_file_for_path(path)
-      if ! @@filename_cache.has_key?(path)
-        FORMATS.each do |format|
-          [path, File.join(path, 'index')].each do |basename|
-            filename = model_path("#{basename}.#{format}")
-            if File.exist?(filename)
-              @@filename_cache[path] = filename
-              break
-            end
-          end
-        end
-      end
-      @@filename_cache[path]
-    end
-
-    def self.needs_loading?(path, filename)
-      @@model_cache[path].nil? || File.mtime(filename) > @@model_cache[path].mtime
-    end
-
-    def self.load(path)
-      if (filename = find_file_for_path(path)) && needs_loading?(path, filename)
-        @@model_cache[path] = self.new(filename)
-      end
-      @@model_cache[path]
-    end
-
-    def self.purge_cache
-      @@model_cache = {}
-      @@filename_cache = {}
-    end
-
-    def initialize(filename)
-      @filename = filename
-      @format = filename.split('.').last.to_sym
-      if File.zero?(filename)
-        @metadata = {}
-        @markup = ''
-      else
-        @metadata, @markup = parse_file
-      end
-      @mtime = File.mtime(filename)
-    end
-
-    def ==(other)
-      other.respond_to?(:path) && (self.path == other.path)
-    end
-
-    def index_page?
-      @filename =~ /\/?index\.\w+$/
-    end
-
-    def abspath
-      file_path = @filename.sub(self.class.model_path, '')
-      if index_page?
-        File.dirname(file_path)
-      else
-        File.join(File.dirname(file_path), File.basename(file_path, '.*'))
-      end
-    end
-
-    def path
-      abspath.sub(/^\//, '')
-    end
-
-    def permalink
-      File.basename(path)
-    end
-
-    def layout
-      (metadata('layout') || 'layout').to_sym
-    end
-
-    def template
-      (metadata('template') || 'page').to_sym
-    end
-
-    def to_html(scope = Object.new)
-      convert_to_html(@format, scope, markup)
-    end
-
-    def last_modified
-      @last_modified ||= File.stat(@filename).mtime
-    end
-
-    def description
-      metadata('description')
-    end
-
-    def keywords
-      metadata('keywords')
-    end
-
-    def metadata(key)
-      @metadata[key]
-    end
-
-    def flagged_as?(flag)
-      flags = metadata('flags')
-      flags && flags.split(',').map { |name| name.strip }.include?(flag)
-    end
-
-    def parse_metadata(first_paragraph)
-      is_metadata = first_paragraph.split("\n").first =~ /^[\w ]+:/
-      raise MetadataParseError unless is_metadata
-      metadata = CaseInsensitiveHash.new
-      first_paragraph.split("\n").each do |line|
-        key, value = line.split(/\s*:\s*/, 2)
-        next if value.nil?
-        metadata[key.downcase] = value.chomp
-      end
-      metadata
-    end
-
-    private
-      def markup
-        @markup
-      end
-
-      def parse_file
-        contents = File.open(@filename).read
-      rescue Errno::ENOENT
-        raise Sinatra::NotFound
-      else
-        first_paragraph, remaining = contents.split(/\r?\n\r?\n/, 2)
-        begin
-          return parse_metadata(first_paragraph), remaining
-        rescue MetadataParseError
-          return {}, contents
-        end
-      end
-
-      def add_p_tags_to_haml(text)
-        contains_tags = (text =~ /^\s*%/)
-        if contains_tags
-          text
-        else
-          text.split(/\r?\n/).inject('') do |accumulator, line|
-            accumulator << "%p #{line}\n"
-          end
-        end
-      end
-
-      def convert_to_html(format, scope, text)
-        text = add_p_tags_to_haml(text) if @format == :haml
-        template = Tilt[format].new { text }
-        template.render(scope)
-      end
-  end
-
-  class Page < FileModel
-    def self.model_path(basename = nil)
-      Nesta::Config.page_path(basename)
-    end
-
-    def self.find_by_path(path)
-      page = load(path)
-      page && page.hidden? ? nil : page
-    end
-
-    def self.find_all
-      super.select { |p| ! p.hidden? }
-    end
-
-    def self.find_articles
-      find_all.select do |page|
-        page.date && page.date < DateTime.now
-      end.sort { |x, y| y.date <=> x.date }
-    end
-
-    def draft?
-      flagged_as?('draft')
-    end
-
-    def hidden?
-      draft? && Nesta::App.production?
-    end
-
-    def heading
-      regex = case @format
-        when :mdown, :md
-          /^#\s*(.*?)(\s*#+|$)/
-        when :haml
-          /^\s*%h1\s+(.*)/
-        when :textile
-          /^\s*h1\.\s+(.*)/
-        end
-      markup =~ regex
-      Regexp.last_match(1) or raise HeadingNotSet, "#{abspath} needs a heading"
-    end
-
-    def link_text
-      metadata('link text') || heading
-    rescue HeadingNotSet
-      raise LinkTextNotSet, "Need to link to '#{abspath}' but can't get link text"
-    end
-
-    def title
-      metadata('title') || link_text
-    rescue LinkTextNotSet
-      return Nesta::Config.title if abspath == '/'
-      raise
-    end
-
-    def date(format = nil)
-      @date ||= if metadata("date")
-        if format == :xmlschema
-          Time.parse(metadata("date")).xmlschema
-        else
-          DateTime.parse(metadata("date"))
-        end
-      end
-    end
-
-    def atom_id
-      metadata('atom id')
-    end
-
-    def read_more
-      metadata('read more') || Nesta::Config.read_more
-    end
-
-    def summary
-      if summary_text = metadata("summary")
-        summary_text.gsub!('\n', "\n")
-        convert_to_html(@format, Object.new, summary_text)
-      end
-    end
-
-    def body_markup
-      case @format
-        when :mdown, :md
-          markup.sub(/^#[^#].*$\r?\n(\r?\n)?/, '')
-        when :haml
-          markup.sub(/^\s*%h1\s+.*$\r?\n(\r?\n)?/, '')
-        when :textile
-          markup.sub(/^\s*h1\.\s+.*$\r?\n(\r?\n)?/, '')
-      end
-    end
-
-    def body(scope = Object.new)
-      convert_to_html(@format, scope, body_markup)
-    end
-
-    def categories
-      paths = category_strings.map { |specifier| specifier.sub(/:-?\d+$/, '') }
-      valid_paths(paths).map { |p| Page.find_by_path(p) }
-    end
-
-    def priority(category)
-      category_string = category_strings.detect do |string|
-        string =~ /^#{category}([,:\s]|$)/
-      end
-      category_string && category_string.split(':', 2)[-1].to_i
-    end
-
-    def parent
-      if abspath == '/'
-        nil
-      else
-        parent_path = File.dirname(path)
-        while parent_path != '.' do
-          parent = Page.load(parent_path)
-          return parent unless parent.nil?
-          parent_path = File.dirname(parent_path)
-        end
-        return categories.first unless categories.empty?
-        Page.load('index')
-      end
-    end
-
-    def pages
-      in_category = Page.find_all.select do |page|
-        page.date.nil? && page.categories.include?(self)
-      end
-      in_category.sort do |x, y|
-        by_priority = y.priority(path) <=> x.priority(path)
-        if by_priority == 0
-          x.link_text.downcase <=> y.link_text.downcase
-        else
-          by_priority
-        end
-      end
-    end
-
-    def articles
-      Page.find_articles.select { |article| article.categories.include?(self) }
-    end
-
-    def receives_comments?
-      ! date.nil?
-    end
-
-    private
-      def category_strings
-        strings = metadata('categories')
-        strings.nil? ? [] : strings.split(',').map { |string| string.strip }
-      end
-
-      def valid_paths(paths)
-        page_dir = Nesta::Config.page_path
-        paths.select do |path|
-          FORMATS.detect do |format|
-            [path, File.join(path, 'index')].detect do |candidate|
-              File.exist?(File.join(page_dir, "#{candidate}.#{format}"))
-            end
-          end
-        end
-      end
-  end
-
-  class Menu
-    INDENT = " " * 2
-
-    def self.full_menu
-      menu = []
-      menu_file = Nesta::Config.content_path('menu.txt')
-      if File.exist?(menu_file)
-        File.open(menu_file) { |file| append_menu_item(menu, file, 0) }
-      end
-      menu
-    end
-
-    def self.top_level
-      full_menu.reject { |item| item.is_a?(Array) }
-    end
-
-    def self.for_path(path)
-      path.sub!(Regexp.new('^/'), '')
-      if path.empty?
-        full_menu
-      else
-        find_menu_item_by_path(full_menu, path)
-      end
-    end
-
-    private_class_method def self.append_menu_item(menu, file, depth)
-      path = file.readline
-    rescue EOFError
-    else
-      page = Page.load(path.strip)
-      current_depth = path.scan(INDENT).size
-      if page
-        if current_depth > depth
-          sub_menu_for_depth(menu, depth) << [page]
-        else
-          sub_menu_for_depth(menu, current_depth) << page
-        end
-      end
-      append_menu_item(menu, file, current_depth)
-    end
-
-    private_class_method def self.sub_menu_for_depth(menu, depth)
-      sub_menu = menu
-      depth.times { sub_menu = sub_menu[-1] }
-      sub_menu
-    end
-
-    private_class_method def self.find_menu_item_by_path(menu, path)
-      item = menu.detect do |item|
-        item.respond_to?(:path) && (item.path == path)
-      end
-      if item
-        subsequent = menu[menu.index(item) + 1]
-        item = [item]
-        item << subsequent if subsequent.respond_to?(:each)
-      else
-        sub_menus = menu.select { |menu_item| menu_item.respond_to?(:each) }
-        sub_menus.each do |sub_menu|
-          item = find_menu_item_by_path(sub_menu, path)
-          break if item
-        end
-      end
-      item
-    end
-  end
-end
+require_relative './models/file_model'
+require_relative './models/menu'
+require_relative './models/page'

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

data/nesta.gemspec

@@ -36,7 +36,7 @@ EOF
   s.add_dependency('rdiscount', '~> 2.1')
   s.add_dependency('RedCloth', '~> 4.2')
   s.add_dependency('sass-embedded', '~> 1.58')
-  s.add_dependency('sinatra', '~> 2.0')
+  s.add_dependency('sinatra', '~> 3.0')
   s.add_dependency('tilt', '~> 2.0')
 
   # Useful in development

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nesta
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Graham Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ files:
 - ".github/workflows/tests.yml"
 - ".gitignore"
 - ".gitmodules"
-- CHANGES
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -265,6 +265,9 @@ files:
 - lib/nesta/env.rb
 - lib/nesta/helpers.rb
 - lib/nesta/models.rb
+- lib/nesta/models/file_model.rb
+- lib/nesta/models/menu.rb
+- lib/nesta/models/page.rb
 - lib/nesta/navigation.rb
 - lib/nesta/overrides.rb
 - lib/nesta/path.rb
@@ -320,9 +323,9 @@ files:
 - test/support/test_configuration.rb
 - test/test_helper.rb
 - test/unit/config_test.rb
-- test/unit/file_model_test.rb
-- test/unit/menu_test.rb
-- test/unit/page_test.rb
+- test/unit/models/file_model_test.rb
+- test/unit/models/menu_test.rb
+- test/unit/models/page_test.rb
 - test/unit/path_test.rb
 - test/unit/plugin_test.rb
 - test/unit/static/assets_test.rb
@@ -366,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Ruby CMS, written in Sinatra