nesta 0.14.0 → 0.16.0

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.14.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Graham Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-23 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: '2.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.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
@@ -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.5.3
 signing_key: 
 specification_version: 4
 summary: Ruby CMS, written in Sinatra