nesta 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7080f8e4c8c7b993aaaf2f1f2ea59edbefd0b49ef73218a8f20d6877880b18c2
-  data.tar.gz: 806b5caf9fbfc69221087bd98254e282ddb5ba0e4288ee835d3af22fc879ab9f
+  metadata.gz: f57754ef13ef4b4533c03ab454b2114fb35d3e168d20107c1fb39941d6af4b92
+  data.tar.gz: 9aa4a9b8e0715d77c1ec515a114f63827e8a117e1f3b807755a59d0c0eba0c45
 SHA512:
-  metadata.gz: 17a405a098acca204751044cff182ee6484c93c373b7266a2c194345736438b71366b05cd04ea8d64e7949c9ab071e01cde387a1c68d1190a2087d211fa45060
-  data.tar.gz: 8d37d4b2b1fb4df23d57403da16c865db06a4a899a942a594cfac47212f998c52ef330ae9091149e1858c06f390f2ed9e4ef94621b115c52f04ed821d0cc9b7d
+  metadata.gz: effa2dcecf9d3ed0de395102c893d9f1571171b4bc4d63968911f3538c27bd8ef15692df2586239e2986d1b32e4bd4ef23513245c2cd89d0d159df3d9bf79903
+  data.tar.gz: c0f318224b4f70322af4d30b55e517b1d790b3087129eb0601d434eabf79cc65e3b8ae24262f7300812a0414dd5402d2969d0f11be1f5d0516afe1ad7474d27c

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.0", "3.1", "3.2", "3.3"]
     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,22 @@
 # Changelog
 
+## 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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nesta (0.15.0)
+    nesta (0.16.0)
       RedCloth (~> 4.2)
       haml (>= 3.1, < 6.0)
       haml-contrib (>= 1.0)
@@ -9,13 +9,13 @@ PATH
       rake
       rdiscount (~> 2.1)
       sass-embedded (~> 1.58)
-      sinatra (~> 3.0)
-      tilt (~> 2.0)
+      sinatra (~> 3.1)
+      tilt (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.3.2)
+    RedCloth (4.3.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
@@ -41,7 +41,7 @@ GEM
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.5)
     minitest (5.18.0)
     minitest-reporters (1.6.0)
       ansi
@@ -55,14 +55,14 @@ GEM
       unicorn (>= 4.5)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.16.2)
+      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
+    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)
       rack (>= 1.3)
     raindrops (0.20.1)
@@ -78,10 +78,10 @@ GEM
     sass-embedded (1.58.3)
       google-protobuf (~> 3.21)
       rake (>= 10.0.0)
-    sinatra (3.0.5)
+    sinatra (3.1.0)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.5)
+      rack-protection (= 3.1.0)
       tilt (~> 2.0)
     temple (0.10.0)
     tilt (2.1.0)

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/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/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/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.16.0'
 end

data/nesta.gemspec

@@ -36,8 +36,8 @@ EOF
   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', '~> 3.1')
+  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/ }

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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nesta
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Graham Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -120,28 +120,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !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.3
 signing_key: 
 specification_version: 4
 summary: Ruby CMS, written in Sinatra