nesta 0.12.0 → 0.14.0

data/lib/nesta/static/site.rb

@@ -0,0 +1,104 @@
+require 'rake'
+
+require_relative './html_file'
+
+module Nesta
+  module Static
+    class Site
+      def initialize(build_dir, domain, logger = nil)
+        @build_dir = build_dir
+        @domain = domain
+        @logger = logger
+        @app = Nesta::App.new
+        set_app_root
+      end
+
+      def render_pages
+        Nesta::Page.find_all.each do |page|
+          target = HtmlFile.new(@build_dir, page).filename
+          source = page.filename
+          task = Rake::FileTask.define_task(target => source) do
+            save_markup(target, render(page.abspath, target, source))
+          end
+          task.invoke
+        end
+      end
+
+      def render_not_found
+        path_info = '/404'
+        source = 'no-such-file.md'
+        target = File.join(@build_dir, '404.html')
+        markup = render(path_info, target, source, expected_code: 404)
+        save_markup(target, markup)
+      end
+
+      def render_atom_feed
+        filename = 'articles.xml'
+        path_info = "/#{filename}"
+        description = 'Atom feed'
+        target = File.join(@build_dir, filename)
+        markup = render(path_info, target, description)
+        save_markup(target, markup)
+      end
+
+      def render_sitemap
+        filename = File.join(@build_dir, 'sitemap.xml')
+        save_markup(filename, render('/sitemap.xml', filename, 'site'))
+      end
+
+      def render_templated_assets
+        Nesta::Config.build.fetch('templated_assets', []).each do |path|
+          filename = File.join(@build_dir, path)
+          save_markup(filename, render(path, filename, path))
+        end
+      end
+
+      private
+
+      def log(message)
+        @logger.call(message) if @logger
+      end
+
+      def set_app_root
+        root = ::File.expand_path('.')
+        ['Gemfile', ].each do |expected|
+          if ! File.exist?(File.join(root, 'config', 'config.yml'))
+            message = "is this a Nesta site? (expected './#{expected}')"
+            raise RuntimeError, message
+          end
+        end
+        Nesta::App.root = root
+      end
+
+      def rack_environment(abspath)
+        {
+          'REQUEST_METHOD' => 'GET',
+          'SCRIPT_NAME' => '',
+          'PATH_INFO' => abspath,
+          'QUERY_STRING' => '',
+          'SERVER_NAME' => @domain,
+          'SERVER_PROTOCOL' => 'https',
+          'rack.url_scheme' => 'https',
+          'rack.input' => StringIO.new,
+          'rack.errors' => STDERR
+        }
+      end
+
+      def render(abspath, filename, description, expected_code: 200)
+        http_code, headers, body = @app.call(rack_environment(abspath))
+        if http_code != expected_code
+          raise RuntimeError, "Can't render #{filename} from #{description}"
+        end
+        body.join
+      end
+
+      def save_markup(filename, content)
+        FileUtils.mkdir_p(File.dirname(filename))
+        if (! File.exist?(filename)) || (open(filename, 'r').read != content)
+          open(filename, 'w') { |output| output.write(content) }
+          log("Rendered #{filename}")
+        end
+      end
+    end
+  end
+end

data/lib/nesta/system_command.rb

@@ -0,0 +1,15 @@
+module Nesta
+  class SystemCommand
+    def run(*args)
+      system(*args)
+      if ! $?.success?
+        message = if $?.exitstatus == 127
+                    "#{args[0]} not found"
+                  else
+                    "'#{args.join(' ')}' failed with status #{$?.exitstatus}"
+                  end
+        Nesta.fail_with(message)
+      end
+    end
+  end
+end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.12.0'
+  VERSION = '0.14.0'
 end

data/lib/nesta.rb

@@ -1,9 +1,12 @@
 module Nesta
   def self.deprecated(name, message)
-    if Nesta::App.environment != :test
-      $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
-    end
+    $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
+  end
+
+  def self.fail_with(message)
+    $stderr.puts "Error: #{message}"
+    exit 1
   end
 end
 
-require 'nesta/plugin'
+require File.expand_path('nesta/plugin', File.dirname(__FILE__))

data/nesta.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Graham Ashton"]
   s.email       = ["graham@effectif.com"]
-  s.homepage    = "http://nestacms.com"
+  s.homepage    = "https://nestacms.com"
   s.summary     = %q{Ruby CMS, written in Sinatra}
   s.description = <<-EOF
 Nesta is a lightweight Content Management System, written in Ruby using
@@ -29,12 +29,13 @@ EOF
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('haml', '>= 3.1')
+  s.add_dependency('haml', '>= 3.1', '< 6.0')
   s.add_dependency('haml-contrib', '>= 1.0')
-  s.add_dependency('rack', '~> 2.0')
+  s.add_dependency('rack', '~> 2')
+  s.add_dependency('rake')
   s.add_dependency('rdiscount', '~> 2.1')
   s.add_dependency('RedCloth', '~> 4.2')
-  s.add_dependency('sassc', '>= 2.2')
+  s.add_dependency('sass-embedded', '~> 1.58')
   s.add_dependency('sinatra', '~> 2.0')
   s.add_dependency('tilt', '~> 2.0')
 
@@ -46,5 +47,4 @@ EOF
   s.add_development_dependency('capybara', '~> 2.0')
   s.add_development_dependency('minitest', '~> 5.0')
   s.add_development_dependency('minitest-reporters')
-  s.add_development_dependency('rake')
 end

data/templates/config/config.yml

@@ -12,7 +12,7 @@ subtitle: "(change this text in config/config.yml)"
 #
 # author:
 #   name: Your Name
-#   uri: http://yourhomepage.com
+#   uri: https://yourdomain.com
 #   email: you@yourdomain.com
 
 # You can stick with the default look and feel, or use a theme. Themes are
@@ -21,7 +21,7 @@ subtitle: "(change this text in config/config.yml)"
 #
 # theme: name-of-theme
 
-# If you want to use the Disqus service (http://disqus.com) to display
+# If you want to use the Disqus service (https://disqus.com) to display
 # comments on your site, register a Disqus account and then specify your
 # site's short name here. A comment form will automatically be added to
 # the bottom of your pages.
@@ -65,3 +65,29 @@ content: content
 # production:
 #   content: /var/apps/nesta/shared/content
 #   google_analytics_code: "UA-???????-?"
+
+# The following settings control the behaviour of the `nesta build`
+# command, which is used to generate a "static" version of your site.
+# It's optional, but allows you to deploy your site on hosting providers
+# that serve pre-prepared HTML and CSS files (instead of generating them
+# in real-time with a web server).
+#
+# You can either set the `domain` key here, or specify it on the command
+# line with the `--domain` switch. Nesta needs to know your site's
+# domain name so that it can generate the correct URLs in sitemap.xml,
+# and in your Atom feed.
+#
+# The templated_assets setting is a list of the things that Nesta
+# generates for you, other from all the page in your content directory.
+# The example below is for a site that has two stylesheets, both of
+# which are converted from .sass or .scss files in your ./views folder.
+#
+# If you're not using Sass and are just editing CSS files directly, you
+# can keep them in your ./public folder and Nesta's build command will
+# find them automatically.
+#
+# build:
+#   domain: yourdomain.com
+#   templated_assets:
+#     - /css/master.css
+#     - /css/local.css

data/templates/themes/README.md

@@ -4,4 +4,4 @@
 <%= @name %> is a theme for Nesta, a [Ruby CMS](nesta), designed by
 <insert your name here>.
 
-[nesta]: http://nestacms.com
+[nesta]: https://nestacms.com

data/templates/themes/views/master.sass

@@ -1,3 +1,3 @@
 // Master Sass stylesheet
-// http://sass-lang.com/
+// https://sass-lang.com/
 

data/test/integration/atom_feed_test.rb

@@ -18,7 +18,7 @@ describe 'Atom feed' do
     it "uses Atom's XML namespace" do
       with_temp_content_directory do
         visit_feed
-        assert_has_xpath '//feed[@xmlns="http://www.w3.org/2005/Atom"]'
+        assert_has_xpath '//feed[@xmlns="https://www.w3.org/2005/Atom"]'
       end
     end
 

data/test/integration/commands/build_test.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+require_relative '../../../lib/nesta/commands'
+
+describe 'nesta build' do
+  include ModelFactory
+  include TestConfiguration
+
+  def silencing_stdout(&block)
+    stdout, $stdout = $stdout, StringIO.new
+    yield
+  ensure
+    $stdout.close
+    $stdout = stdout
+  end
+
+  it 'builds HTML file from Markdown file' do
+    in_temporary_project do
+      with_temp_content_directory do
+        page = create(:page)
+        command = Nesta::Commands::Build.new('output_dir')
+
+        process = Minitest::Mock.new
+        silencing_stdout { command.execute(process) }
+
+        assert_exists_in_project File.join('output_dir', page.abspath + '.html')
+      end
+    end
+  end
+
+  it 'reads domain name from config file' do
+    domain = 'mysite.com'
+
+    in_temporary_project do
+      stub_config('build' => { 'domain' => domain }) do
+        command = Nesta::Commands::Build.new('output_dir')
+
+        assert_equal domain, command.domain
+      end
+    end
+  end
+
+  it 'overrides domain name if set on command line' do
+    domain = 'mysite.com'
+
+    in_temporary_project do
+      stub_config('build' => { 'domain' => 'ignored.com' }) do
+        command = Nesta::Commands::Build.new('output_dir', 'domain' => domain)
+
+        assert_equal domain, command.domain
+      end
+    end
+  end
+end

data/test/integration/commands/demo/content_test.rb

@@ -1,9 +1,6 @@
 require 'test_helper'
-require_relative '../../../support/silence_commands_during_tests'
 require_relative '../../../../lib/nesta/commands'
 
-Nesta::Commands::Demo::Content.send(:include, SilenceCommandsDuringTests)
-
 describe 'nesta demo:content' do
   include TemporaryFiles
 
@@ -11,10 +8,15 @@ describe 'nesta demo:content' do
     Nesta::Commands::Demo::Content.demo_repository = '../../fixtures/demo-content.git'
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   it 'clones the demo repository and configures project to use it' do
     in_temporary_project do
-      Nesta::Commands::Demo::Content.new.execute
-      assert_exists_in_project 'content-demo/pages/index.haml'
+      Nesta::Commands::Demo::Content.new.execute(process_stub)
 
       yaml = File.read(File.join(project_root, 'config', 'config.yml'))
       assert_match /content: content-demo/, yaml
@@ -24,7 +26,7 @@ describe 'nesta demo:content' do
   it 'ensures demo repository is ignored by git' do
     in_temporary_project do
       FileUtils.mkdir('.git')
-      Nesta::Commands::Demo::Content.new.execute
+      Nesta::Commands::Demo::Content.new.execute(process_stub)
       assert_match /content-demo/, File.read(project_path('.git/info/exclude'))
     end
   end

data/test/integration/commands/edit_test.rb

@@ -9,13 +9,13 @@ describe 'nesta edit' do
   end
 
   it 'launches the editor' do
-    ENV['EDITOR'] = 'touch'
+    ENV['EDITOR'] = 'vi'
     edited_file = 'path/to/page.md'
+    process = Minitest::Mock.new
+    process.expect(:run, true, [ENV['EDITOR'], /#{edited_file}$/])
     with_temp_content_directory do
-      FileUtils.mkdir_p(Nesta::Config.page_path(File.dirname(edited_file)))
       command = Nesta::Commands::Edit.new(edited_file)
-      command.execute
-      assert File.exist?(Nesta::Config.page_path(edited_file)), 'editor not run'
+      command.execute(process)
     end
   end
 end

data/test/integration/commands/new_test.rb

@@ -1,9 +1,6 @@
 require 'test_helper'
-require_relative '../../support/silence_commands_during_tests'
 require_relative '../../../lib/nesta/commands'
 
-Nesta::Commands::New.send(:include, SilenceCommandsDuringTests)
-
 describe 'nesta new' do
   include TemporaryFiles
 
@@ -19,30 +16,36 @@ describe 'nesta new' do
     remove_temp_directory
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   describe 'without options' do
     it 'creates the content directories' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'content/attachments'
       assert_exists_in_project 'content/pages'
     end
 
     it 'creates the home page' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'content/pages/index.haml'
     end
 
     it 'creates the rackup file' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'config.ru'
     end
 
     it 'creates the config.yml file' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'config/config.yml'
     end
 
     it 'creates a Gemfile' do
-      Nesta::Commands::New.new(project_root).execute
+      Nesta::Commands::New.new(project_root).execute(process_stub)
       assert_exists_in_project 'Gemfile'
       assert_match /gem 'nesta'/, gemfile_source
     end
@@ -51,67 +54,35 @@ describe 'nesta new' do
   describe 'with --git option' do
     it 'creates a .gitignore file' do
       command = Nesta::Commands::New.new(project_root, 'git' => '')
-      command.stub(:run_process, nil) do
-        command.execute
-        assert_match /\.bundle/, File.read(project_path('.gitignore'))
-      end
-    end
-
-    def disabling_git_hooks
-      # I (@gma) have got a git repository template setup on my computer
-      # containing git hooks that automatically run ctags in a
-      # background process whenever I run `git commit`. The hooks are
-      # copied into new repositories when I run `git init`.
-      #
-      # The generation of the ctags file (in a forked process) causes a
-      # race condition; sometimes ctags will recreate a test's project
-      # folder and git directory after the test's `after` block has
-      # deleted it. If the project directory isn't removed after each
-      # test, the New command will throw an error in the subsequent
-      # test (complaining that the project directory already exists).
-      #
-      templates = temp_path('git_template')
-      FileUtils.mkdir_p(templates)
-      ENV['GIT_TEMPLATE_DIR'] = templates
-      yield
-      ENV.delete('GIT_TEMPLATE_DIR')
-      FileUtils.rm_r(templates)
+      command.execute(process_stub)
+      assert_match /\.bundle/, File.read(project_path('.gitignore'))
     end
 
     it 'creates a git repo' do
-      disabling_git_hooks do
-        command = Nesta::Commands::New.new(project_root, 'git' => '')
-        command.execute
-        assert_exists_in_project '.git/config'
-      end
-    end
-
-    it 'commits the blank project' do
-      disabling_git_hooks do
-        command = Nesta::Commands::New.new(project_root, 'git' => '')
-        command.execute
-        Dir.chdir(project_root) do
-          assert_match /Initial commit/, `git log --pretty=oneline | head -n 1`
-        end
-      end
+      command = Nesta::Commands::New.new(project_root, 'git' => '')
+      process = Minitest::Mock.new
+      process.expect(:run, true, ['git', 'init'])
+      process.expect(:run, true, ['git', 'add', '.'])
+      process.expect(:run, true, ['git', 'commit', '-m', 'Initial commit'])
+      command.execute(process)
     end
   end
 
   describe 'with --vlad option' do
     it 'adds vlad to Gemfile' do
-      Nesta::Commands::New.new(project_root, 'vlad' => '').execute
+      Nesta::Commands::New.new(project_root, 'vlad' => '').execute(process_stub)
       assert_match /gem 'vlad', '2.1.0'/, gemfile_source
       assert_match /gem 'vlad-git', '2.2.0'/, gemfile_source
     end
 
     it 'configures the vlad rake tasks' do
-      Nesta::Commands::New.new(project_root, 'vlad' => '').execute
+      Nesta::Commands::New.new(project_root, 'vlad' => '').execute(process_stub)
       assert_exists_in_project 'Rakefile'
       assert_match /require 'vlad'/, rakefile_source
     end
 
     it 'creates deploy.rb' do
-      Nesta::Commands::New.new(project_root, 'vlad' => '').execute
+      Nesta::Commands::New.new(project_root, 'vlad' => '').execute(process_stub)
       assert_exists_in_project 'config/deploy.rb'
       deploy_source = File.read(project_path('config/deploy.rb'))
       assert_match /set :application, 'mysite.com'/, deploy_source

data/test/integration/commands/plugin/create_test.rb

@@ -24,13 +24,16 @@ describe 'nesta plugin:create' do
     "nesta-plugin-#{plugin_name}"
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   def create_plugin(&block)
     Dir.chdir(working_directory) do
       command = Nesta::Commands::Plugin::Create.new(plugin_name)
-      command.stub(:run_process, nil) do
-        command.execute
-        yield
-      end
+      command.execute(process_stub)
     end
   end
 

data/test/integration/commands/theme/create_test.rb

@@ -16,9 +16,15 @@ describe 'nesta theme:create' do
     remove_temp_directory
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   it 'creates default files in the theme directory' do
     Dir.chdir(project_root) do
-      Nesta::Commands::Theme::Create.new('theme-name').execute
+      Nesta::Commands::Theme::Create.new('theme-name').execute(process_stub)
     end
     assert_exists_in_project theme_path('README.md')
     assert_exists_in_project theme_path('app.rb')
@@ -26,7 +32,7 @@ describe 'nesta theme:create' do
 
   it 'copies default view templates into views directory' do
     Dir.chdir(project_root) do
-      Nesta::Commands::Theme::Create.new('theme-name').execute
+      Nesta::Commands::Theme::Create.new('theme-name').execute(process_stub)
     end
     %w(layout.haml page.haml master.sass).each do |template|
       assert_exists_in_project theme_path("views/#{template}")

data/test/integration/commands/theme/enable_test.rb

@@ -13,9 +13,15 @@ describe 'nesta theme:enable' do
     remove_temp_directory
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   it 'enables the theme' do
     Dir.chdir(project_root) do
-      Nesta::Commands::Theme::Enable.new('theme-name').execute
+      Nesta::Commands::Theme::Enable.new('theme-name').execute(process_stub)
       assert_match /^theme: theme-name/, File.read('config/config.yml')
     end
   end

data/test/integration/commands/theme/install_test.rb

@@ -1,9 +1,6 @@
 require 'test_helper'
-require_relative '../../../support/silence_commands_during_tests'
 require_relative '../../../../lib/nesta/commands'
 
-Nesta::Commands::Theme::Install.send(:include, SilenceCommandsDuringTests)
-
 describe 'nesta theme:install' do
   include TemporaryFiles
 
@@ -27,35 +24,42 @@ describe 'nesta theme:install' do
     remove_temp_directory
   end
 
+  def process_stub
+    Object.new.tap do |stub|
+      def stub.run(*args); end
+    end
+  end
+
   it 'clones the repository' do
+    process = Minitest::Mock.new
+    process.expect(:run, true, ['git', 'clone', repo_url, "themes/#{theme_name}"])
     in_temporary_project do
-      Nesta::Commands::Theme::Install.new(repo_url).execute
-      assert File.directory?(theme_dir), 'theme not cloned'
+      Nesta::Commands::Theme::Install.new(repo_url).execute(process)
     end
   end
 
   it "removes the theme's .git directory" do
     in_temporary_project do
-      Nesta::Commands::Theme::Install.new(repo_url).execute
+      Nesta::Commands::Theme::Install.new(repo_url).execute(process_stub)
       refute File.exist?("#{theme_dir}/.git"), '.git folder found'
     end
   end
 
   it 'enables the freshly installed theme' do
     in_temporary_project do
-      Nesta::Commands::Theme::Install.new(repo_url).execute
+      Nesta::Commands::Theme::Install.new(repo_url).execute(process_stub)
       assert_match /theme: #{theme_name}/, File.read('config/config.yml')
     end
   end
 
   it 'determines name of theme from name of repository' do
-    url = 'git://foobar.com/path/to/nesta-theme-the-name.git'
+    url = 'https://foobar.com/path/to/nesta-theme-the-name.git'
     command = Nesta::Commands::Theme::Install.new(url)
     assert_equal 'the-name', command.theme_name
   end
 
   it "falls back to name of repo when theme name doesn't match correct format" do
-    url = 'git://foobar.com/path/to/mytheme.git'
+    url = 'https://foobar.com/path/to/mytheme.git'
     command = Nesta::Commands::Theme::Install.new(url)
     assert_equal 'mytheme', command.theme_name
   end

data/test/integration/overrides_test.rb

@@ -75,7 +75,7 @@ describe 'Overriding files in gem and themes' do
       end
     end
 
-    it 'renders stylesheet in the the gem if no others found' do
+    it 'renders stylesheet in the gem if no others found' do
       in_nesta_project do
         visit '/css/master.css'
         assert_equal 200, page.status_code

data/test/integration/sitemap_test.rb

@@ -31,7 +31,7 @@ describe 'XML sitemap' do
 
   it 'has a urlset tag' do
     for_site_with_page do
-      namespace = 'http://www.sitemaps.org/schemas/sitemap/0.9'
+      namespace = 'https://www.sitemaps.org/schemas/sitemap/0.9'
       assert_has_xpath "//urlset[@xmlns='#{namespace}']"
     end
   end

data/test/support/temporary_files.rb

@@ -22,7 +22,7 @@ module TemporaryFiles
   def in_temporary_project(*args, &block)
     FileUtils.mkdir_p(File.join(project_root, 'config'))
     File.open(File.join(project_root, 'config', 'config.yml'), 'w').close
-    Dir.chdir(project_root) { yield }
+    Dir.chdir(project_root) { yield project_root }
   ensure
     remove_temp_directory
   end

data/test/support/test_configuration.rb

@@ -2,10 +2,8 @@ module TestConfiguration
   include TemporaryFiles
 
   def stub_config(config, &block)
-    Nesta::Config.stub(:yaml_exists?, true) do
-      Nesta::Config.stub(:yaml_conf, config) do
-        yield
-      end
+    Nesta::Config.instance.stub(:config, config) do
+      yield
     end
   end