nesta 0.15.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7080f8e4c8c7b993aaaf2f1f2ea59edbefd0b49ef73218a8f20d6877880b18c2
-  data.tar.gz: 806b5caf9fbfc69221087bd98254e282ddb5ba0e4288ee835d3af22fc879ab9f
+  metadata.gz: 32a4c40ea41ed81170227708f4fa21efd9ecdc78b13aae276a28b71f70edbb8b
+  data.tar.gz: 7b437529392e034f4f2c9fe7b6df915faae5a284958ebd181aabb71462279106
 SHA512:
-  metadata.gz: 17a405a098acca204751044cff182ee6484c93c373b7266a2c194345736438b71366b05cd04ea8d64e7949c9ab071e01cde387a1c68d1190a2087d211fa45060
-  data.tar.gz: 8d37d4b2b1fb4df23d57403da16c865db06a4a899a942a594cfac47212f998c52ef330ae9091149e1858c06f390f2ed9e4ef94621b115c52f04ed821d0cc9b7d
+  metadata.gz: 51d4278434f049e7d2c67107a947960c1407bdf4b1c133da575e5f4a829f7a25d1d0c4ef16dac399ffbc25b1fa708b8f2b7787b7a9a6171f9dd60414522a7c08
+  data.tar.gz: 791f6ea80a7b87b915548d6ee6688ff3eeb187bce03a77bf7fb6811645712f285880be77c763f1b947efc06f0eb5cdf1ed6b8734b9aa411f0e75a491d0c9ed76

data/.github/workflows/tests.yml

@@ -8,10 +8,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2"]
+        ruby: ["3.1", "3.2", "3.3", "head"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,5 +1,46 @@
 # Changelog
 
+## 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)
+
+ * Upgrade to Sinatra 3.1. (なつき)
+
+ * Tilt renderers (e.g. for Markdown, Haml, or Textile) are now configurable.
+   See #146 for details. (Graham Ashton)
+
+ * Drop support for Ruby 2.7, which is no longer supported by Nokogiri,
+   which is one of Nesta's dependencies. This is understandable; Ruby
+   2.7 reached end-of-life in March 2023. (Graham Ashton)
+
+ * Bug fix: Config variables that were defined for an environment (test,
+   dev, production), but for which there was no default, were always read
+   as nil. (Matthew Bass)
+
 ## 0.15.0 (11 July 2023)
 
  * Upgrade to Sinatra 3. (Graham Ashton)

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    nesta (0.15.0)
+    nesta (0.17.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.0)
-      tilt (~> 2.0)
+      sinatra (~> 4.0)
+      tilt (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.3.2)
-    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,10 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    minitest (5.18.0)
-    minitest-reporters (1.6.0)
+    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 +57,42 @@ 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.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.16.7)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    public_suffix (5.0.1)
-    racc (1.6.2)
-    rack (2.2.6.4)
-    rack-protection (3.0.5)
-      rack
-    rack-test (2.0.2)
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (3.1.8)
+    rack-protection (4.0.0)
+      base64 (>= 0.1.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.0.5)
+    sass-embedded (1.80.6)
+      google-protobuf (~> 4.28)
+      rake (>= 13)
+    sinatra (4.0.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.5)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.0.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/RELEASING.md

@@ -8,15 +8,16 @@ the steps:
 
 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.
+   it now (e.g. run `bundle install`) and check them in together.
 
 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>'
 
-5. Generate a new site with the `nesta` command, install the demo content,
-   check that it runs okay locally.
+5. Install the gem locally (`rake install`), then generate a new site
+   with the `nesta` command. Install the demo content site, check that
+   it runs okay locally.
 
 6. If everything seems fine, run `rake release`.
 

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.rb

@@ -33,10 +33,11 @@ module Nesta
       setting = setting.to_s
       self.config ||= read_config_file(setting)
       env_config = config.fetch(Nesta::App.environment.to_s, {})
-      env_config.fetch(
-        setting,
-        config.fetch(setting) { raise NotDefined.new(setting) }
-      )
+      env_config.fetch(setting) do
+        config.fetch(setting) do
+          raise NotDefined.new(setting)
+        end
+      end
     rescue NotDefined
       default.empty? && raise || (return default.first)
     end

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/file_model.rb

@@ -184,8 +184,12 @@ module Nesta
 
     def convert_to_html(format, scope, text)
       text = add_p_tags_to_haml(text) if @format == :haml
-      template = Tilt[format].new { text }
+      template = Tilt[format].new(renderer_config(@format)) { text }
       template.render(scope)
     end
+
+    def renderer_config(format)
+      {}
+    end
   end
 end

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/overrides.rb

@@ -12,23 +12,9 @@ module Nesta
         end
       end
 
-      def scss(template, options = {}, locals = {})
-        find_template(Nesta::App.settings.views, template, Tilt::ScssTemplate) do |file|
-          return Tilt.new(file).render if File.exist?(file)
-        end
-        raise IOError, "SCSS template not found: #{template}"
-      end
-
-      def sass(template, options = {}, locals = {})
-        find_template(Nesta::App.settings.views, template, Tilt::SassTemplate) do |file|
-          return Tilt.new(file).render if File.exist?(file)
-        end
-        raise IOError, "Sass template not found: #{template}"
-      end
-
       def stylesheet(template, options = {}, locals = {})
         scss(template, options, locals)
-      rescue IOError
+      rescue Errno::ENOENT
         sass(template, options, locals)
       end
     end

data/lib/nesta/version.rb

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

data/nesta.gemspec

@@ -31,13 +31,13 @@ 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.0')
-  s.add_dependency('tilt', '~> 2.0')
+  s.add_dependency('sinatra', '~> 4.0')
+  s.add_dependency('tilt', '~> 2.1')
 
   # Useful in development
   s.add_development_dependency('mr-sparkle')

data/templates/config/config.yml

@@ -44,7 +44,7 @@ content: content
 #     scroll down a bit to set it in production even if you're not deploying
 #     to your own server.
 #
-# google_analytics_code: "UA-???????-?"
+# google_analytics_code: "G-??????????"
 
 # read_more
 #     When the summary of an article is displayed on the home page, or
@@ -64,7 +64,7 @@ content: content
 
 # production:
 #   content: /var/apps/nesta/shared/content
-#   google_analytics_code: "UA-???????-?"
+#   google_analytics_code: "G-??????????"
 
 # The following settings control the behaviour of the `nesta build`
 # command, which is used to generate a "static" version of your site.

data/test/integration/default_theme_test.rb

@@ -33,7 +33,7 @@ describe 'Default theme' do
   end
 
   it 'includes Google Analytics JavaScript when configured' do
-    analytics_code = { 'google_analytics_code' => 'UA-1234' }
+    analytics_code = { 'google_analytics_code' => 'G-1234' }
     stub_config(temp_content.merge('test' => analytics_code)) do
       visit '/'
       assert_nil all('script').find { |s| s[:src].match /analytics\.js/ }
@@ -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/unit/config_test.rb

@@ -38,6 +38,12 @@ describe Nesta::Config do
     end
   end
 
+  it 'returns environment specific settings' do
+    stub_config('test' => { 'content' => 'rack_env_specific/path'}) do
+      assert_equal 'rack_env_specific/path', Nesta::Config.content
+    end
+  end
+
   it 'overrides top level settings with environment specific settings' do
     config = {
       'content' => 'general/path',

data/views/analytics.haml

@@ -1,11 +1,11 @@
 - if @google_analytics_code
   :plain
+    <!-- Google tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=#{@google_analytics_code}"></script>
     <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
 
-      ga('create', '#{@google_analytics_code}', 'auto');
-      ga('send', 'pageview');
+      gtag('config', '#{@google_analytics_code}');
     </script>

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,14 @@
 --- !ruby/object:Gem::Specification
 name: nesta
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Graham Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -50,14 +50,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,28 +120,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mr-sparkle
   requirement: !ruby/object:Gem::Requirement
@@ -369,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.20
 signing_key: 
 specification_version: 4
 summary: Ruby CMS, written in Sinatra