nesta 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f57754ef13ef4b4533c03ab454b2114fb35d3e168d20107c1fb39941d6af4b92
-  data.tar.gz: 9aa4a9b8e0715d77c1ec515a114f63827e8a117e1f3b807755a59d0c0eba0c45
+  metadata.gz: 12864a6defdd473b703fe553e3693bf1f697054ac2765fd7f22464f6525e5867
+  data.tar.gz: 1a3bfcb203d9862a10ef9691286187ef2c91f3c880bd56bea99f8f34ab0f83a4
 SHA512:
-  metadata.gz: effa2dcecf9d3ed0de395102c893d9f1571171b4bc4d63968911f3538c27bd8ef15692df2586239e2986d1b32e4bd4ef23513245c2cd89d0d159df3d9bf79903
-  data.tar.gz: c0f318224b4f70322af4d30b55e517b1d790b3087129eb0601d434eabf79cc65e3b8ae24262f7300812a0414dd5402d2969d0f11be1f5d0516afe1ad7474d27c
+  metadata.gz: ee6c78cb3046d5f93eb2dacb76107e173a51ad18d422e6195691a3fab70eac946704d984b0262febaaa69c688af761805678d67c9eedff60e992f3f56ce9c9c7
+  data.tar.gz: c410d3cdb2504abbd3d55b83a2799638a12d7806db20798ef00813d5fe630750f5ea74828d3b457c719fd2db822d284e3270351834a070aaf14400c1db44dfd1

data/.github/workflows/tests.yml

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

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## 0.18.0 (19 November 2024)
+
+* Update Sinatra to 4.1, to fix a vulnerability.
+
+  Note that this is the same security alert that I believed I was fixing when I
+  released Nesta 0.17.0. In actual fact, at that point the latest version of
+  Sinatra (4.0.0) didn't yet include a fix.
+
+  (Graham Ashton)
+
+## 0.17.0 (6 November 2024)
+
+ * Update Sinatra to verion 4.0, to fix a vulnerability. This has also
+   required a jump to Rack 3. (Graham Ashton)
+
+ * Update Sass parser to sass-embedded 1.80, which (due to changes in CSS 4)
+   deprecates the global colour functions and the @import statement. Any Sass
+   code that uses these features will need updating before Dart Sass 3.0 is
+   released. The Sass maintainers are saying we've got about two years.
+
+   In the meantime Sass will print deprecation warnings, some of which give
+   hints on how you might update your code.
+
+   See the Nesta commit history for an example of the kind of changes that are
+   required, and these pages for more details:
+
+   - https://sass-lang.com/documentation/breaking-changes/color-functions/
+   - https://sass-lang.com/documentation/breaking-changes/import/
+
+   This update has also forced us to drop support for Ruby 3.0, which is no
+   longer supported by the sass-embedded gem.
+
+   (Graham Ashton)
+
 ## 0.16.0 (11 April 2024)
 
  * Update Google Analytics JS code to GA4. (Matthew Bass)

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nesta.gemspec
 gemspec
-
-# gem (RUBY_VERSION =~ /^1/) ? 'debugger' : 'byebug'

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    nesta (0.16.0)
+    nesta (0.18.0)
       RedCloth (~> 4.2)
       haml (>= 3.1, < 6.0)
       haml-contrib (>= 1.0)
-      rack (~> 2)
+      rack (~> 3)
       rake
       rdiscount (~> 2.1)
       sass-embedded (~> 1.58)
-      sinatra (~> 3.1)
+      sinatra (~> 4.0)
       tilt (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.3.3)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+    RedCloth (4.3.4)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
-    builder (3.2.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
     byebug (11.1.3)
     capybara (2.18.0)
       addressable
@@ -28,8 +30,10 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    ffi (1.15.5)
-    google-protobuf (3.22.2)
+    ffi (1.17.0)
+    google-protobuf (4.28.3)
+      bigdecimal
+      rake (>= 13)
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
@@ -40,10 +44,11 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.5)
-    minitest (5.18.0)
-    minitest-reporters (1.6.0)
+    logger (1.6.1)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
+    minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
@@ -53,38 +58,44 @@ GEM
       rb-fsevent (>= 0.9)
       rb-inotify (>= 0.8)
       unicorn (>= 4.5)
-    mustermann (3.0.0)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.16.2)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    public_suffix (5.0.1)
-    racc (1.7.3)
-    rack (2.2.8.1)
-    rack-protection (3.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rack-test (2.0.2)
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (3.1.8)
+    rack-protection (4.1.0)
+      base64 (>= 0.1.0)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
       rack (>= 1.3)
     raindrops (0.20.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     rb-kqueue (0.2.8)
       ffi (>= 0.5.0)
-    rdiscount (2.2.7)
+    rdiscount (2.2.7.3)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    sass-embedded (1.58.3)
-      google-protobuf (~> 3.21)
-      rake (>= 10.0.0)
-    sinatra (3.1.0)
+    sass-embedded (1.80.6)
+      google-protobuf (~> 4.28)
+      rake (>= 13)
+    sinatra (4.1.0)
+      logger (>= 1.6.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.1.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.1.0)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    temple (0.10.0)
-    tilt (2.1.0)
+    temple (0.10.3)
+    tilt (2.4.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)

data/README.md

@@ -1,4 +1,4 @@
-# Lightweight file-based CMS and Static Site Generator
+# File Based CMS and Static Site Generator
 
 Nesta is a lightweight CMS for building content sites and blogs, written in
 [Sinatra].
@@ -54,27 +54,23 @@ your site:
 ## 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]).
-
-If you like Nesta you can keep up with developments by following [@nestacms]
-on Twitter, and on [the blog].
+help with anything feel free to [file an issue], or contact me on Mastodon
+([@gma@hachyderm.io]).
 
+[file an issue]: https://github.com/gma/nesta/issues/new
 [@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, 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.
+If you want to add a new feature, consider [creating an issue] so we can
+have a chat before you start coding. I might be able to chip in with ideas on
+how to approach it, or suggest that we implement it as a [plugin] (to keep Nesta
+itself lean and simple).
 
-[create an issue]: https://github.com/gma/nesta/issues/new
+[creating an issue]: https://github.com/gma/nesta/issues/new
 [plugin]: https://nestacms.com/docs/plugins
 
 -- Graham

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

@@ -35,11 +35,11 @@ module Nesta
             indent_levels << indent_level
           end
 
-          ''.tap do |code|
-            lines.each_with_index do |line, i|
-              code << '  ' * (indent_levels[i] + 2) + line
-            end
+          code = []
+          lines.each_with_index do |line, i|
+            code << '  ' * (indent_levels[i] + 2) + line
           end
+          code.join("\n")
         end
 
         def make_directories

data/lib/nesta/config_file.rb

@@ -10,7 +10,7 @@ module Nesta
 
       configured = false
       File.open(self.class.path, 'r+') do |file|
-        output = ''
+        output = []
         file.each_line do |line|
           if configured
             output << line
@@ -21,7 +21,7 @@ module Nesta
         end
         output << "#{replacement}\n" unless configured
         file.pos = 0
-        file.print(output)
+        file.print(output.join("\n"))
         file.truncate(file.pos)
       end
     end

data/lib/nesta/helpers.rb

@@ -90,7 +90,7 @@ module Nesta
       #   path_to(page.abspath, uri: true)
       #
       def path_to(page_path, options = {})
-        host = ''
+        host = []
         if options[:uri]
           host << "http#{'s' if request.ssl?}://"
           if (request.env.include?("HTTP_X_FORWARDED_HOST") or 
@@ -100,7 +100,7 @@ module Nesta
             host << request.host
           end
         end
-        uri_parts = [host]
+        uri_parts = [host.join('')]
         uri_parts << request.script_name.to_s if request.script_name
         uri_parts << page_path
         File.join(uri_parts)

data/lib/nesta/models/menu.rb

@@ -16,7 +16,7 @@ module Nesta
     end
 
     def self.for_path(path)
-      path.sub!(Regexp.new('^/'), '')
+      path = path.sub(Regexp.new('^/'), '')
       if path.empty?
         full_menu
       else

data/lib/nesta/static/site.rb

@@ -61,8 +61,8 @@ module Nesta
 
       def set_app_root
         root = ::File.expand_path('.')
-        ['Gemfile', ].each do |expected|
-          if ! File.exist?(File.join(root, 'config', 'config.yml'))
+        ['Gemfile', File.join('config', 'config.yml')].each do |expected|
+          if ! File.exist?(File.join(root, expected))
             message = "is this a Nesta site? (expected './#{expected}')"
             raise RuntimeError, message
           end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.16.0'
+  VERSION = '0.18.0'
 end

data/nesta.gemspec

@@ -31,12 +31,12 @@ EOF
 
   s.add_dependency('haml', '>= 3.1', '< 6.0')
   s.add_dependency('haml-contrib', '>= 1.0')
-  s.add_dependency('rack', '~> 2')
+  s.add_dependency('rack', '~> 3')
   s.add_dependency('rake')
   s.add_dependency('rdiscount', '~> 2.1')
   s.add_dependency('RedCloth', '~> 4.2')
   s.add_dependency('sass-embedded', '~> 1.58')
-  s.add_dependency('sinatra', '~> 3.1')
+  s.add_dependency('sinatra', '~> 4.0')
   s.add_dependency('tilt', '~> 2.1')
 
   # Useful in development

data/templates/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'nesta'
 <% if @options['vlad'] %>gem 'vlad', '2.1.0'
@@ -7,5 +7,3 @@ gem 'vlad-git', '2.2.0'<% end %>
 group :development do
   gem 'mr-sparkle'
 end
-
-# gem 'debugger'

data/test/integration/default_theme_test.rb

@@ -86,7 +86,7 @@ describe 'Default theme' do
       with_temp_content_directory do
         model = create_page_and_menu
         visit model.path
-        assert_has_css "ul.menu li[class='current']:contains('#{model.link_text}')"
+        assert_has_css "ul.menu li.current:contains('#{model.link_text}')"
       end
     end
 
@@ -100,7 +100,7 @@ describe 'Default theme' do
       with_temp_content_directory do
         model = create_page_and_menu
         visit "/prefix/#{model.path}"
-        assert_has_css "ul.menu li[class='current']:contains('#{model.link_text}')"
+        assert_has_css "ul.menu li.current:contains('#{model.link_text}')"
       end
     end
   end

data/test/support/temporary_files.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module TemporaryFiles
   TEMP_DIR = File.expand_path('tmp', File.join(File.dirname(__FILE__), '..'))
 
@@ -21,7 +23,8 @@ module TemporaryFiles
 
   def in_temporary_project(*args, &block)
     FileUtils.mkdir_p(File.join(project_root, 'config'))
-    File.open(File.join(project_root, 'config', 'config.yml'), 'w').close
+    FileUtils.touch(File.join(project_root, 'Gemfile'))
+    FileUtils.touch(File.join(project_root, 'config', 'config.yml'))
     Dir.chdir(project_root) { yield project_root }
   ensure
     remove_temp_directory

data/views/master.sass

@@ -1,5 +1,7 @@
-@import "mixins.sass"
-@import "normalize"
+@use "sass:color"
+
+@use "mixins" as *
+@use "normalize"
 
 body
   font: $size1 "Roboto Slab", serif
@@ -74,7 +76,7 @@ blockquote
   border-left: 5px solid $tint
   
   font-style: italic
-  color: adjust-color($base-color, $red: 55, $green: 55, $blue: 55)
+  color: color.adjust($base-color, $red: 55, $green: 55, $blue: 55)
   
 pre
   display: block

data/views/mixins.sass

@@ -12,14 +12,16 @@ $vertical-margin: 1.5em
 
 // Colour settings
 
+@use "sass:color"
+
 $base-color: #313126
 $tint: #EEEEC6
 $border-color: #D7C28B
 $link-color: #4786fd
-$visited-link-color: darken($link-color, 5%)
-$hover-link-color: darken($link-color, 15%)
-$active-link-color: darken($link-color, 20%)
-$nav-link-color: desaturate(lighten($link-color, 10%), 25%)
+$visited-link-color: color.adjust($link-color, $lightness: -5%)
+$hover-link-color: color.adjust($link-color, $lightness: -15%)
+$active-link-color: color.adjust($link-color, $lightness: -20%)
+$nav-link-color: color.scale(color.adjust($link-color, $lightness: 10%), $saturation: -25%)
 $meta-color: #87877D
 
 @function empx($em, $base: 16px)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nesta
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Graham Ashton
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-11 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -50,14 +49,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +119,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -354,7 +353,6 @@ files:
 homepage: https://nestacms.com
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -369,8 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Ruby CMS, written in Sinatra
 test_files: []