nesta 0.11.1 → 0.12.0

data/test/unit/path_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+describe Nesta::Path do
+  def root
+    '/path/to/site/on/filesystem'
+  end
+
+  describe '.local' do
+    it 'returns root path of site on filesystem' do
+      with_app_root(root) do
+        assert_equal root, Nesta::Path.local
+      end
+    end
+
+    it "should return path for file within site's directory" do
+      with_app_root(root) do
+        assert_equal "#{root}/foo/bar", Nesta::Path.local('foo/bar')
+      end
+    end
+
+    it 'should combine path components' do
+      with_app_root(root) do
+        assert_equal "#{root}/foo/bar", Nesta::Path.local('foo', 'bar')
+      end
+    end
+  end
+
+  describe '.themes' do
+    it 'should return themes path' do
+      with_app_root(root) do
+        assert_equal "#{root}/themes", Nesta::Path.themes
+      end
+    end
+
+    it 'should return path for file within themes directory' do
+      with_app_root(root) do
+        assert_equal "#{root}/themes/foo/bar", Nesta::Path.themes('foo/bar')
+      end
+    end
+  end
+end

data/test/unit/plugin_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+describe Nesta::Plugin do
+  def remove_plugin_from_list_of_required_files
+    $LOADED_FEATURES.delete_if do |path|
+      path =~ /nesta-plugin-test/
+    end
+  end
+
+  def remove_plugin_constants
+    Nesta::Plugin::Test.send(:remove_const, :VERSION)
+  rescue NameError
+  end
+
+  before do
+    @plugin_lib_path = File.expand_path(
+        File.join(%w(.. fixtures nesta-plugin-test lib)), File.dirname(__FILE__))
+    $LOAD_PATH.unshift(@plugin_lib_path)
+    Nesta::Plugin.loaded.clear
+  end
+
+  after do
+    $LOAD_PATH.shift if $LOAD_PATH[0] == @plugin_lib_path
+    remove_plugin_from_list_of_required_files
+    remove_plugin_constants
+  end
+
+  it 'must be required in order to load' do
+    assert Nesta::Plugin.loaded.empty?, 'should be empty'
+  end
+
+  it 'records loaded plugins' do
+    require 'nesta-plugin-test'
+    assert_equal ['nesta-plugin-test'], Nesta::Plugin.loaded
+  end
+
+  it 'loads the plugin module' do
+    require 'nesta-plugin-test'
+    Nesta::Plugin::Test::VERSION
+  end
+
+  it 'initializes the plugin' do
+    require 'nesta-plugin-test'
+    Nesta::Plugin.initialize_plugins
+    assert Nesta::Page.respond_to?(:method_added_by_plugin), 'not initialized'
+  end
+end

data/views/master.sass

@@ -74,7 +74,7 @@ blockquote
   border-left: 5px solid $tint
   
   font-style: italic
-  color: $base-color + #555
+  color: adjust-color($base-color, $red: 55, $green: 55, $blue: 55)
   
 pre
   display: block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nesta
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Graham Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -42,16 +42,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 +81,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
@@ -212,6 +226,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitmodules"
 - ".hound.yml"
 - ".rspec"
 - ".travis.yml"
@@ -251,31 +266,6 @@ files:
 - 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 +285,37 @@ 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/silence_commands_during_tests.rb
+- test/support/temporary_files.rb
+- test/support/test_configuration.rb
+- test/test_helper.rb
+- test/unit/commands_test.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
 - views/analytics.haml
 - views/atom.haml
 - views/categories.haml
@@ -332,33 +353,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.1.2
 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/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)"