nesta 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f7a279baf5e3392482afcd20db4e9a0dad93bd96
-  data.tar.gz: 99e8396b1cf4d3895adab3cf9290845bd7142ee8
+SHA256:
+  metadata.gz: a79722f3a6494862b4365151dd2300b0eccece20b6cb711298c753763926d9ea
+  data.tar.gz: 4eca7c5b41e3103500237791960658ca8a3b0d1bf50e83860d74d531dd40fb17
 SHA512:
-  metadata.gz: 66f8714a375bc4cf7e801ca9f8f1f6f24a103736763a4b87e850c58ff983344999543e260b1dbb3add73a8ebae935e08109828fac06a649c4958fb9c3f2c2c8c
-  data.tar.gz: 44ee76299e95a5a329fc8fd6679d8d3be9d7a0eac5c4ef321029c7038b56024ed100a0890937ba045dc46836e96ca1c6d7f3f023b4f0d0444b85a84c69e53b34
+  metadata.gz: 36a89f709fa69d85e340a93ef44ca6fa43a31f54585d0da3c7ca359ed40dddd1003374a75feb0350bd53403595df0f71e513255a16e13dce0568c434fca62d9e
+  data.tar.gz: b3c443a50646d62b70247743c6157433a946d98566b72631284217458e218908720c2ce3bf01534630458cb35cd4c3045d187861385ad3ada43256f74e55f054

data/.gitmodules

@@ -0,0 +1,6 @@
+[submodule "test/fixtures/demo-content.git"]
+	path = test/fixtures/demo-content.git
+	url = https://github.com/gma/nesta-demo-content.git
+[submodule "test/fixtures/nesta-theme-test"]
+	path = test/fixtures/nesta-theme-test.git
+	url = https://github.com/gma/nesta-theme-test.git

data/.travis.yml

@@ -1,6 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.5
+  - 2.6
+  - 2.7
+before_script:
+  - git config --global user.email "continuous-integration@nestacms.com"
+  - git config --global user.name "Nesta CI"
+script: bundle exec rake test
+env:
+  - REPORTER=default

data/CHANGES

@@ -1,3 +1,19 @@
+= 0.12.0 / (30 June 2020)
+
+ * Upgrade to Sinatra 2 and Rack 2. (Graham Ashton)
+
+ * Upgrade from tilt 1.4 to 2.0. (Graham Ashton)
+
+ * Replace the deprecated sass gem with sassc. (Brad Weslake)
+
+ * Port the test suite from RSpec and Webrat to Minitest and Capybara.
+   (Graham Ashton)
+
+ * Silence deprecation warnings produced under Ruby 2.7. (Graham Ashton)
+
+ * 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)
 
  * Tighten dependency on Tilt, as version 2.x is incompatible.
@@ -288,7 +304,7 @@
  * 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
    running on Heroku).
-   
+
    The modifications made in 0.9.6 to make Nesta easier to mount inside
    another Rack application moved Nesta::App.root to the (new)
    Nesta::Env class. In 0.9.6 I forgot to actually set Nesta::App.root
@@ -360,7 +376,7 @@
 
 = 0.9.3 / 18 January 2011
 
- * The route and view for serving the home page (/) has been removed, 
+ * 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
    content/pages.
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nesta.gemspec
 gemspec

data/Gemfile.lock

@@ -1,86 +1,102 @@
 PATH
   remote: .
   specs:
-    nesta (0.11.1)
+    nesta (0.12.0)
       RedCloth (~> 4.2)
       haml (>= 3.1)
       haml-contrib (>= 1.0)
-      rack (>= 1.3)
+      rack (~> 2.0)
       rdiscount (~> 2.1)
-      sass (>= 3.1)
-      sinatra (~> 1.4)
-      tilt (~> 1.4)
+      sassc (>= 2.2)
+      sinatra (~> 2.0)
+      tilt (~> 2.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    diff-lcs (1.2.5)
-    ffi (1.9.8)
-    haml (4.0.6)
+    RedCloth (4.3.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
+    builder (3.2.4)
+    byebug (11.1.3)
+    capybara (2.18.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (>= 2.0, < 4.0)
+    ffi (1.13.1)
+    haml (5.1.2)
+      temple (>= 0.8.0)
       tilt
     haml-contrib (1.0.0.1)
       haml (>= 3.2.0.alpha.13)
-    hoe (3.13.1)
-      rake (>= 0.8, < 11.0)
-    kgio (2.9.3)
+    kgio (2.11.3)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mini_portile (0.6.2)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.1)
+    minitest-reporters (1.4.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     mr-sparkle (0.3.0)
       listen (~> 1.0)
       rb-fsevent (>= 0.9)
       rb-inotify (>= 0.8)
       unicorn (>= 4.5)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rack (1.6.0)
-    rack-protection (1.5.3)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    public_suffix (4.0.5)
+    rack (2.2.3)
+    rack-protection (2.0.8.1)
       rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    raindrops (0.13.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    raindrops (0.19.1)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.3)
-      ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    sass (3.4.13)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    test-unit (1.2.3)
-      hoe (>= 1.5.1)
-    tilt (1.4.1)
-    unicorn (4.8.3)
+    rdiscount (2.2.0.1)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sinatra (2.0.8.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.8.1)
+      tilt (~> 2.0)
+    temple (0.8.2)
+    tilt (2.0.10)
+    unicorn (5.5.5)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  mr-sparkle (>= 0.0.2)
+  byebug
+  capybara (~> 2.0)
+  minitest (~> 5.0)
+  minitest-reporters
+  mr-sparkle
   nesta!
-  rack-test (= 0.6.1)
-  rspec (~> 2.14.0)
-  test-unit (= 1.2.3)
-  webrat (~> 0.7.3)
+  rake
+
+BUNDLED WITH
+   2.1.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014 Graham Ashton
+Copyright (c) 2008-2020 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/RELEASING.md

@@ -10,13 +10,12 @@ the steps:
 2. Update the `CHANGES` file with a summary of significant changes since
    the previous release.
 
-3. Update the versions of Ruby used in `.travis.yml` and
-   `smoke-test.sh`. If not, commit and push. Verify that all relevant
-   versions of Ruby have been installed locally, with `chruby`.
+3. Check the versions of Ruby used in `.travis.yml` are up to date. If new
+   Ruby versions need testing, update the config and re-run the Travis build.
 
-4. Run `smoke-test.sh`.
+4. Generate a new site with the `nesta` command, install the demo content,
+   check that it runs okay locally.
 
-5. Once you're confident the freshly generated sites work okay in the
-   previous step, run `rake release`.
+5. If everything seems fine, run `rake release`.
 
 6. Publish an announcement blog post and email the list.

data/Rakefile

@@ -5,7 +5,24 @@ Bundler.require(:default, :test)
 
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+namespace :test do
+  task :set_load_path do
+    $LOAD_PATH.unshift File.expand_path('test')
+  end
 
-task :default => :spec
+  def load_tests(directory)
+    Rake::FileList["test/#{directory}/*_test.rb"].each { |f| require_relative f }
+  end
+
+  task units: :set_load_path do
+    load_tests('unit')
+  end
+
+  task integrations: :set_load_path do
+    load_tests('integration')
+  end
+end
+
+task test: 'test:set_load_path' do
+  load_tests('**')
+end

data/lib/nesta/app.rb

@@ -1,6 +1,6 @@
 require 'sinatra/base'
 require 'haml'
-require 'sass'
+require 'sassc'
 
 require File.expand_path('../nesta', File.dirname(__FILE__))
 require File.expand_path('env', File.dirname(__FILE__))
@@ -55,13 +55,9 @@ module Nesta
       stylesheet(params[:sheet].to_sym)
     end
 
-    get %r{/attachments/([\w/.@-]+)} do |file|
-      file = File.join(Nesta::Config.attachment_path, params[:captures].first)
-      if file =~ /\.\.\//
-        not_found
-      else
-        send_file(file, disposition: nil)
-      end
+    get '/attachments/*' do |path|
+      filename = File.join(Nesta::Config.attachment_path, path)
+      send_file(filename, disposition: nil)
     end
 
     get '/articles.xml' do

data/lib/nesta/commands/command.rb

@@ -11,8 +11,7 @@ module Nesta
                     else
                       "'#{args.join(' ')}' failed with status #{$?.exitstatus}"
                     end
-          $stderr.puts "Error: #{message}"
-          exit 1
+          fail(message)
         end
       end
 

data/lib/nesta/commands/demo/content.rb

@@ -6,24 +6,42 @@ module Nesta
       class Content
         include Command
 
+        @demo_repository = 'git://github.com/gma/nesta-demo-content.git'
+        class << self
+          attr_accessor :demo_repository
+        end
+
         def initialize(*args)
           @dir = 'content-demo'
         end
 
         def clone_or_update_repository
-          repository = 'git://github.com/gma/nesta-demo-content.git'
           path = Nesta::Path.local(@dir)
           if File.exist?(path)
             FileUtils.cd(path) { run_process('git', 'pull', 'origin', 'master') }
           else
-            run_process('git', 'clone', repository, path)
+            run_process('git', 'clone', self.class.demo_repository, path)
           end
         end
 
+        def exclude_path
+          Nesta::Path.local('.git/info/exclude')
+        end
+
+        def in_git_repo?
+          File.directory?(Nesta::Path.local('.git'))
+        end
+
+        def demo_repo_ignored?
+          File.read(exclude_path).split.any? { |line| line == @dir }
+        rescue Errno::ENOENT
+          false
+        end
+
         def configure_git_to_ignore_repo
-          excludes = Nesta::Path.local('.git/info/exclude')
-          if File.exist?(excludes) && File.read(excludes).scan(@dir).empty?
-            File.open(excludes, 'a') { |file| file.puts @dir }
+          if in_git_repo? && ! demo_repo_ignored?
+            FileUtils.mkdir_p(File.dirname(exclude_path))
+            File.open(exclude_path, 'a') { |file| file.puts @dir }
           end
         end
 

data/lib/nesta/commands/theme/install.rb

@@ -7,21 +7,23 @@ module Nesta
         include Command
 
         def initialize(*args)
-          url = args.shift
+          @url = args.shift
+          @url.nil? && (raise UsageError.new('URL not specified'))
           options = args.shift || {}
-          url.nil? && (raise UsageError.new('URL not specified'))
-          @url = url
-          @name = File.basename(url, '.git').sub(/nesta-theme-/, '')
+        end
+
+        def theme_name
+          File.basename(@url, '.git').sub(/nesta-theme-/, '')
         end
 
         def execute
-          run_process('git', 'clone', @url, "themes/#{@name}")
-          FileUtils.rm_r(File.join("themes/#{@name}", '.git'))
+          run_process('git', 'clone', @url, "themes/#{theme_name}")
+          FileUtils.rm_r(File.join("themes/#{theme_name}", '.git'))
           enable
         end
 
         def enable
-          Enable.new(@name).execute
+          Enable.new(theme_name).execute
         end
       end
     end

data/lib/nesta/helpers.rb

@@ -42,6 +42,20 @@ module Nesta
         end
       end
 
+      # Returns the current page's heading or the site's title, if we
+      # don't have a current page, or the page doesn't have a heading
+      # defined.
+      #
+      # Useful in templates that generate links to social sharing sites,
+      # which need a suitable description for the page being shared or
+      # bookmarked.
+      #
+      def heading_or_site_title
+        @page && @page.heading
+      rescue Nesta::HeadingNotSet
+        @title
+      end
+
       def format_date(date)
         date.strftime("%d %B %Y")
       end

data/lib/nesta/models.rb

@@ -1,10 +1,19 @@
 require 'time'
 
-Tilt.register Tilt::MarukuTemplate, 'mdown', 'md'
-Tilt.register Tilt::KramdownTemplate, 'mdown', 'md'
-Tilt.register Tilt::BlueClothTemplate, 'mdown', 'md'
-Tilt.register Tilt::RDiscountTemplate, 'mdown', 'md'
-Tilt.register Tilt::RedcarpetTemplate, 'mdown', 'md'
+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
@@ -13,7 +22,7 @@ module Nesta
 
   class FileModel
     FORMATS = [:mdown, :md, :haml, :textile]
-    @@page_cache = {}
+    @@model_cache = {}
     @@filename_cache = {}
 
     attr_reader :filename, :mtime
@@ -52,26 +61,21 @@ module Nesta
     end
 
     def self.needs_loading?(path, filename)
-      @@page_cache[path].nil? || File.mtime(filename) > @@page_cache[path].mtime
+      @@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)
-        @@page_cache[path] = self.new(filename)
+        @@model_cache[path] = self.new(filename)
       end
-      @@page_cache[path]
+      @@model_cache[path]
     end
 
     def self.purge_cache
-      @@page_cache = {}
+      @@model_cache = {}
       @@filename_cache = {}
     end
 
-    def self.menu_items
-      Nesta.deprecated('Page.menu_items', 'see Menu.top_level and Menu.for_path')
-      Menu.top_level
-    end
-
     def initialize(filename)
       @filename = filename
       @format = filename.split('.').last.to_sym
@@ -84,16 +88,20 @@ module Nesta
       @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
-      page_path = @filename.sub(Nesta::Config.page_path, '')
+      file_path = @filename.sub(self.class.model_path, '')
       if index_page?
-        File.dirname(page_path)
+        File.dirname(file_path)
       else
-        File.join(File.dirname(page_path), File.basename(page_path, '.*'))
+        File.join(File.dirname(file_path), File.basename(file_path, '.*'))
       end
     end
 
@@ -206,10 +214,6 @@ module Nesta
       end.sort { |x, y| y.date <=> x.date }
     end
 
-    def ==(other)
-      other.respond_to?(:path) && (self.path == other.path)
-    end
-
     def draft?
       flagged_as?('draft')
     end