nesta 0.11.1 → 0.13.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nesta
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Graham Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: haml-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +48,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -81,117 +87,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mr-sparkle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: webrat
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '0'
 description: |
   Nesta is a lightweight Content Management System, written in Ruby using
   the Sinatra web framework. Nesta has the simplicity of a static site
@@ -211,10 +231,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
-- ".hound.yml"
-- ".rspec"
-- ".travis.yml"
+- ".gitmodules"
 - CHANGES
 - Gemfile
 - Gemfile.lock
@@ -229,18 +248,19 @@ files:
 - lib/nesta.rb
 - lib/nesta/app.rb
 - lib/nesta/commands.rb
-- lib/nesta/commands/command.rb
 - lib/nesta/commands/demo.rb
 - lib/nesta/commands/demo/content.rb
 - lib/nesta/commands/edit.rb
 - lib/nesta/commands/new.rb
 - lib/nesta/commands/plugin.rb
 - lib/nesta/commands/plugin/create.rb
+- lib/nesta/commands/template.rb
 - lib/nesta/commands/theme.rb
 - lib/nesta/commands/theme/create.rb
 - lib/nesta/commands/theme/enable.rb
 - lib/nesta/commands/theme/install.rb
 - lib/nesta/config.rb
+- lib/nesta/config_file.rb
 - lib/nesta/env.rb
 - lib/nesta/helpers.rb
 - lib/nesta/models.rb
@@ -248,34 +268,10 @@ files:
 - lib/nesta/overrides.rb
 - lib/nesta/path.rb
 - lib/nesta/plugin.rb
+- lib/nesta/system_command.rb
 - lib/nesta/version.rb
 - nesta.gemspec
 - scripts/import-from-mephisto
-- smoke-test.sh
-- spec/atom_spec.rb
-- spec/commands/demo/content_spec.rb
-- spec/commands/edit_spec.rb
-- spec/commands/new_spec.rb
-- spec/commands/plugin/create_spec.rb
-- spec/commands/system_spec.rb
-- spec/commands/theme/create_spec.rb
-- spec/commands/theme/enable_spec.rb
-- spec/commands/theme/install_spec.rb
-- spec/config_spec.rb
-- spec/fixtures/nesta-plugin-test/Gemfile
-- spec/fixtures/nesta-plugin-test/Rakefile
-- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test.rb
-- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test/init.rb
-- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test/version.rb
-- spec/fixtures/nesta-plugin-test/nesta-plugin-test.gemspec
-- spec/model_factory.rb
-- spec/models_spec.rb
-- spec/overrides_spec.rb
-- spec/page_spec.rb
-- spec/path_spec.rb
-- spec/plugin_spec.rb
-- spec/sitemap_spec.rb
-- spec/spec_helper.rb
 - templates/Gemfile
 - templates/Rakefile
 - templates/config.ru
@@ -295,6 +291,36 @@ files:
 - templates/themes/views/layout.haml
 - templates/themes/views/master.sass
 - templates/themes/views/page.haml
+- test/fixtures/nesta-plugin-test/Gemfile
+- test/fixtures/nesta-plugin-test/Rakefile
+- test/fixtures/nesta-plugin-test/lib/nesta-plugin-test.rb
+- test/fixtures/nesta-plugin-test/lib/nesta-plugin-test/init.rb
+- test/fixtures/nesta-plugin-test/lib/nesta-plugin-test/version.rb
+- test/fixtures/nesta-plugin-test/nesta-plugin-test.gemspec
+- test/integration/atom_feed_test.rb
+- test/integration/commands/demo/content_test.rb
+- test/integration/commands/edit_test.rb
+- test/integration/commands/new_test.rb
+- test/integration/commands/plugin/create_test.rb
+- test/integration/commands/theme/create_test.rb
+- test/integration/commands/theme/enable_test.rb
+- test/integration/commands/theme/install_test.rb
+- test/integration/default_theme_test.rb
+- test/integration/overrides_test.rb
+- test/integration/route_handlers_test.rb
+- test/integration/sitemap_test.rb
+- test/integration_test_helper.rb
+- test/support/model_factory.rb
+- test/support/temporary_files.rb
+- 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/path_test.rb
+- test/unit/plugin_test.rb
+- test/unit/system_command_test.rb
 - views/analytics.haml
 - views/atom.haml
 - views/categories.haml
@@ -332,33 +358,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: nesta
-rubygems_version: 2.4.5
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Ruby CMS, written in Sinatra
-test_files:
-- spec/atom_spec.rb
-- spec/commands/demo/content_spec.rb
-- spec/commands/edit_spec.rb
-- spec/commands/new_spec.rb
-- spec/commands/plugin/create_spec.rb
-- spec/commands/system_spec.rb
-- spec/commands/theme/create_spec.rb
-- spec/commands/theme/enable_spec.rb
-- spec/commands/theme/install_spec.rb
-- spec/config_spec.rb
-- spec/fixtures/nesta-plugin-test/Gemfile
-- spec/fixtures/nesta-plugin-test/Rakefile
-- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test.rb
-- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test/init.rb
-- spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test/version.rb
-- spec/fixtures/nesta-plugin-test/nesta-plugin-test.gemspec
-- spec/model_factory.rb
-- spec/models_spec.rb
-- spec/overrides_spec.rb
-- spec/page_spec.rb
-- spec/path_spec.rb
-- spec/plugin_spec.rb
-- spec/sitemap_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  enabled: true

data/.rspec

@@ -1 +0,0 @@
---color

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.1

data/lib/nesta/commands/command.rb

@@ -1,58 +0,0 @@
-module Nesta
-  module Commands
-    class UsageError < RuntimeError; end
-
-    module Command
-      def run_process(*args)
-        system(*args)
-        if ! $?.success?
-          message = if $?.exitstatus == 127
-                      "#{args[0]} not found"
-                    else
-                      "'#{args.join(' ')}' failed with status #{$?.exitstatus}"
-                    end
-          $stderr.puts "Error: #{message}"
-          exit 1
-        end
-      end
-
-      def fail(message)
-        $stderr.puts "Error: #{message}"
-        exit 1
-      end
-
-      def template_root
-        File.expand_path('../../../templates', File.dirname(__FILE__))
-      end
-
-      def copy_template(src, dest)
-        FileUtils.mkdir_p(File.dirname(dest))
-        template = ERB.new(File.read(File.join(template_root, src)), nil, "-")
-        File.open(dest, 'w') { |file| file.puts template.result(binding) }
-      end
-
-      def copy_templates(templates)
-        templates.each { |src, dest| copy_template(src, dest) }
-      end
-
-      def update_config_yaml(pattern, replacement)
-        configured = false
-        File.open(Nesta::Config.yaml_path, 'r+') do |file|
-          output = ''
-          file.each_line do |line|
-            if configured
-              output << line
-            else
-              output << line.sub(pattern, replacement)
-              configured = true if line =~ pattern
-            end
-          end
-          output << "#{replacement}\n" unless configured
-          file.pos = 0
-          file.print(output)
-          file.truncate(file.pos)
-        end
-      end
-    end
-  end
-end

data/smoke-test.sh

@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# This script just makes it easy to test that Nesta can install a new
-# site, launch it, and that it runs properly on supported versions of
-# Ruby.
-#
-# It assumes you've got the relevant versions of Ruby installed locally
-# via chruby.
-
-
-source /usr/local/opt/chruby/share/chruby/chruby.sh
-
-RUBIES="ruby-2.0.0-p598 ruby-2.1.5 ruby-2.2.1"
-
-
-## Functions
-
-log()
-{
-    cat <<-EOF
-
-###############################################################################
-##
-## $1
-##
-###############################################################################
-
-EOF
-}
-
-nesta_version()
-{
-    grep VERSION lib/nesta/version.rb | sed -e 's/ //g' | cut -f 2 -d "'"
-}
-
-gem_file()
-{
-    echo "nesta-$(nesta_version).gem"
-}
-
-run_with_ruby()
-{
-    chruby-exec $RUBY_VERSION -- $@
-}
-
-get_ruby()
-{
-    # Why not just use RUBY_VERSION? Because tmux can prevent child
-    # processes from changing the local version if the RBENV_VERSION
-    # variable is set in another session. If we don't notice we'll think
-    # we've been testing Nesta under multiple versions, but in fact
-    # we'll just have been testing it under the same copy of Ruby every
-    # time.
-    run_with_ruby ruby --version | cut -f 2 -d ' '
-}
-
-run_tests()
-{
-    run_with_ruby bundle install
-    run_with_ruby bundle exec rake spec
-}
-
-build_and_install()
-{
-    echo rm -f pkg/$(gem_file)
-    run_with_ruby bundle exec rake install
-}
-
-site_folder()
-{
-    echo "test-site-${RUBY_VERSION}"
-}
-
-create_and_test_new_site()
-{
-    run_with_ruby bundle exec nesta new $(site_folder)
-    cd $(site_folder)
-    run_with_ruby bundle install
-    run_with_ruby bundle exec nesta demo:content
-
-    log "Starting server in $(site_folder)"
-    set +e
-    run_with_ruby bundle exec mr-sparkle
-    set -e
-
-    cd - >/dev/null
-    rm -rf $(site_folder)
-}
-
-
-## Main program
-
-set -e
-[ "$DEBUG" ] && set -x
-
-for RUBY_VERSION in $RUBIES; do
-    log "Rebuilding nesta gem with Ruby $(get_ruby)"
-
-    run_tests
-    build_and_install
-    create_and_test_new_site
-
-    read -p "Was Ruby ${RUBY_VERSION} okay? Press return to continue..."
-done
-
-rm -f .ruby-version
-log "Reset Ruby version to $(get_ruby)"

data/spec/atom_spec.rb

@@ -1,141 +0,0 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
-require File.expand_path('model_factory', File.dirname(__FILE__))
-
-describe "atom feed" do
-  include ModelFactory
-  include RequestSpecHelper
-
-  before(:each) do
-    stub_configuration
-    stub_config_key("author", {
-      "name" => "Fred Bloggs",
-      "uri" => "http://fredbloggs.com",
-      "email" => "fred@fredbloggs.com"
-    })
-    get "/articles.xml"
-  end
-
-  after(:each) do
-    remove_temp_directory
-  end
-
-  it "should render successfully" do
-    last_response.should be_ok
-  end
-
-  it "should use Atom's XML namespace" do
-    assert_xpath("//feed[@xmlns='http://www.w3.org/2005/Atom']")
-  end
-
-  it "should have an ID element" do
-    assert_selector("id:contains('tag:example.org,2009:/')")
-  end
-
-  it "should have an alternate link element" do
-    assert_xpath("//feed/link[@rel='alternate'][@href='http://example.org/']")
-  end
-
-  it "should have a self link element" do
-    assert_xpath(
-        "//feed/link[@rel='self'][@href='http://example.org/articles.xml']")
-  end
-
-  it "should have title and subtitle" do
-    assert_xpath("//feed/title[@type='text']", content: "My blog")
-    assert_xpath("//feed/subtitle[@type='text']", content: "about stuff")
-  end
-
-  it "should include the author details" do
-    assert_xpath("//feed/author/name", content: "Fred Bloggs")
-    assert_xpath("//feed/author/uri", content: "http://fredbloggs.com")
-    assert_xpath("//feed/author/email", content: "fred@fredbloggs.com")
-  end
-
-  describe "for article" do
-    before(:each) do
-      @heading = "Heading"
-      @articles = []
-      @category = create_category
-      11.times do |i|
-        @articles << create_article(
-          heading: "Article #{i + 1}",
-          path: "article-#{i + 1}",
-          metadata: {
-            "categories" => @category.path,
-            "date" => "#{i + 1} January 2009"
-          },
-          content: "Blah blah\n\n## #{@heading}\n\n[link](/foo)"
-        )
-      end
-      @article = @articles.last
-      get "/articles.xml"
-    end
-
-    it "should set title" do
-      assert_xpath("//entry/title", content: "Article 11")
-    end
-
-    it "should link to the HTML version" do
-      url = "http://example.org/#{@article.path}"
-      assert_xpath(
-          "//entry/link[@href='#{url}'][@rel='alternate'][@type='text/html']")
-    end
-
-    it "should define unique ID" do
-      assert_xpath(
-        "//entry/id",
-        content: "tag:example.org,2009-01-11:#{@article.abspath}"
-      )
-    end
-
-    it "should specify date published" do
-      assert_xpath("//entry/published", content: "2009-01-11T00:00:00+00:00")
-    end
-
-    it "should specify article categories" do
-      assert_xpath("//category[@term='#{@category.permalink}']")
-    end
-
-    it "should have article content" do
-      assert_xpath "//entry/content[@type='html']" do |a|
-       a.should contain "<h2>#{@heading}</h2>"
-      end
-    end
-
-    it "should include hostname in URLs" do
-      assert_xpath("//entry/content") do |c|
-        c.should contain 'http://example.org/foo'
-      end
-    end
-
-    it "should not include article heading in content" do
-      body.should_not have_selector("summary:contains('#{@article.heading}')")
-    end
-
-    it "should list the latest 10 articles" do
-      assert_selector("entry", count: 10)
-    end
-  end
-
-  describe "page with no date" do
-    before(:each) do
-      create_category(path: "no-date")
-      get "/articles.xml"
-    end
-
-    it "should not appear in feed" do
-      body.should_not have_selector("entry id:contains('no-date')")
-    end
-  end
-
-  describe "article with atom ID" do
-    it "should use pre-defined ID" do
-      create_article(metadata: {
-        "date" => "1 January 2009",
-        "atom id" => "use-this-id"
-      })
-      get "/articles.xml"
-      assert_xpath("//entry/id", content: "use-this-id")
-    end
-  end
-end