nesta 0.11.1 → 0.13.0

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

@@ -1,11 +1,9 @@
-require File.expand_path('../command', File.dirname(__FILE__))
+require File.expand_path('../../config_file', File.dirname(__FILE__))
 
 module Nesta
   module Commands
     module Theme
       class Enable
-        include Command
-
         def initialize(*args)
           name = args.shift
           options = args.shift || {}
@@ -13,8 +11,8 @@ module Nesta
           @name = name
         end
 
-        def execute
-          update_config_yaml(/^\s*#?\s*theme:.*/, "theme: #{@name}")
+        def execute(process)
+          Nesta::ConfigFile.new.set_value('theme', @name)
         end
       end
     end

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

@@ -1,27 +1,25 @@
-require File.expand_path('../command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     module Theme
       class Install
-        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 execute
-          run_process('git', 'clone', @url, "themes/#{@name}")
-          FileUtils.rm_r(File.join("themes/#{@name}", '.git'))
-          enable
+        def theme_name
+          File.basename(@url, '.git').sub(/nesta-theme-/, '')
+        end
+
+        def execute(process)
+          process.run('git', 'clone', @url, "themes/#{theme_name}")
+          FileUtils.rm_rf(File.join("themes/#{theme_name}", '.git'))
+          enable(process)
         end
 
-        def enable
-          Enable.new(@name).execute
+        def enable(process)
+          Enable.new(theme_name).execute(process)
         end
       end
     end

data/lib/nesta/commands.rb

@@ -4,10 +4,18 @@ require 'fileutils'
 require File.expand_path('env', File.dirname(__FILE__))
 require File.expand_path('app', File.dirname(__FILE__))
 require File.expand_path('path', File.dirname(__FILE__))
+require File.expand_path('system_command', File.dirname(__FILE__))
 require File.expand_path('version', File.dirname(__FILE__))
 
 require File.expand_path('commands/demo', File.dirname(__FILE__))
 require File.expand_path('commands/edit', File.dirname(__FILE__))
 require File.expand_path('commands/new', File.dirname(__FILE__))
 require File.expand_path('commands/plugin', File.dirname(__FILE__))
+require File.expand_path('commands/template', File.dirname(__FILE__))
 require File.expand_path('commands/theme', File.dirname(__FILE__))
+
+module Nesta
+  module Commands
+    class UsageError < RuntimeError; end
+  end
+end

data/lib/nesta/config_file.rb

@@ -0,0 +1,25 @@
+module Nesta
+  class ConfigFile
+    def set_value(key, value)
+      pattern = /^\s*#?\s*#{key}:.*/
+      replacement = "#{key}: #{value}"
+
+      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

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

data/lib/nesta/navigation.rb

@@ -70,7 +70,7 @@ module Nesta
       end
 
       def current_item?(item)
-        request.path == item.abspath
+        request.path_info == item.abspath
       end
 
       def current_menu_item_class

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.11.1'
+  VERSION = '0.13.0'
 end

data/lib/nesta.rb

@@ -4,6 +4,11 @@ module Nesta
       $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
     end
   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

@@ -24,28 +24,27 @@ Implementing your site's design is easy, but Nesta also has a small
 selection of themes to choose from.
 EOF
 
-  s.rubyforge_project = "nesta"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   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', '>= 1.3')
+  s.add_dependency('rack', '~> 2.0')
   s.add_dependency('rdiscount', '~> 2.1')
   s.add_dependency('RedCloth', '~> 4.2')
-  s.add_dependency('sass', '>= 3.1')
-  s.add_dependency('sinatra', '~> 1.4')
-  s.add_dependency('tilt', '~> 1.4')
+  s.add_dependency('sassc', '>= 2.2')
+  s.add_dependency('sinatra', '~> 2.0')
+  s.add_dependency('tilt', '~> 2.0')
 
   # Useful in development
-  s.add_development_dependency('mr-sparkle', '>= 0.0.2')
+  s.add_development_dependency('mr-sparkle')
 
   # Test libraries
-  s.add_development_dependency('rack-test', '0.6.1')
-  s.add_development_dependency('rspec', '~> 2.14.0')
-  s.add_development_dependency('test-unit', '1.2.3')
-  s.add_development_dependency('webrat', '~> 0.7.3')
+  s.add_development_dependency('byebug')
+  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

@@ -8,7 +8,7 @@ subtitle: "(change this text in config/config.yml)"
 # Atom feed. Specify at least one of name, uri or email, and Nesta will
 # include it in your feed. See the Atom spec for more info:
 #
-# http://www.atomenabled.org/developers/syndication/atom-format-spec.php#element.feed
+# https://tools.ietf.org/html/rfc4287#section-4.1.1
 #
 # author:
 #   name: Your Name

data/test/integration/atom_feed_test.rb

@@ -0,0 +1,178 @@
+require 'integration_test_helper'
+
+describe 'Atom feed' do
+  include Nesta::IntegrationTest
+
+  def visit_feed
+    visit '/articles.xml'
+  end
+
+  describe 'site' do
+    it 'renders successfully' do
+      with_temp_content_directory do
+        visit_feed
+        assert_equal 200, page.status_code
+      end
+    end
+
+    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"]'
+      end
+    end
+
+    it 'has an ID element' do
+      with_temp_content_directory do
+        visit_feed
+        assert page.has_selector?('id:contains("tag:www.example.com,2009:/")')
+      end
+    end
+
+    it 'has an alternate link element' do
+      with_temp_content_directory do
+        visit_feed
+        assert_has_xpath(
+          '//feed/link[@rel="alternate"][@href="http://www.example.com/"]')
+      end
+    end
+
+    it 'has a self link element' do
+      with_temp_content_directory do
+        visit_feed
+        assert_has_xpath(
+          '//feed/link[@rel="self"][@href="http://www.example.com/articles.xml"]')
+      end
+    end
+
+    it 'has title and subtitle' do
+      site_config = {
+        'title' => 'My blog',
+        'subtitle' => 'about stuff',
+      }
+      stub_config(temp_content.merge(site_config)) do
+        visit_feed
+        assert_has_xpath '//feed/title[@type="text"]', text: 'My blog'
+        assert_has_xpath '//feed/subtitle[@type="text"]', text: 'about stuff'
+      end
+    end
+
+    it 'includes the author details' do
+      author_config = temp_content.merge('author' => {
+        'name' => 'Fred Bloggs',
+        'uri' => 'http://fredbloggs.com',
+        'email' => 'fred@fredbloggs.com'
+      })
+      stub_config(temp_content.merge(author_config)) do
+        visit_feed
+        assert_has_xpath '//feed/author/name', text: 'Fred Bloggs'
+        assert_has_xpath '//feed/author/uri', text: 'http://fredbloggs.com'
+        assert_has_xpath '//feed/author/email', text: 'fred@fredbloggs.com'
+      end
+    end
+  end
+
+  describe 'site with articles' do
+    it 'only lists latest 10' do
+      with_temp_content_directory do
+        11.times { create(:article) }
+        visit_feed
+      end
+      assert page.has_selector?('entry', count: 10), 'expected 10 articles'
+    end
+  end
+
+  def with_category(options = {})
+    with_temp_content_directory do
+      model = create(:category, options)
+      visit_feed
+      yield(model)
+    end
+  end
+
+  def with_article(options = {})
+    with_temp_content_directory do
+      article = create(:article, options)
+      visit_feed
+      yield(article)
+    end
+  end
+
+  def with_article_in_category(options = {})
+    with_temp_content_directory do
+      category = create(:category, options)
+      article_options = options.merge(metadata: {
+        'categories' => category.path
+      })
+      article = create(:article, article_options)
+      visit_feed
+      yield(article, category)
+    end
+  end
+
+  describe 'article' do
+    it 'sets the title' do
+      with_article do |article|
+        assert_has_xpath '//entry/title', text: article.heading
+      end
+    end
+
+    it 'links to the HTML version' do
+      with_article do |article|
+        url = "http://www.example.com/#{article.path}"
+        assert_has_xpath(
+          "//entry/link[@href='#{url}'][@rel='alternate'][@type='text/html']")
+      end
+    end
+
+    it 'defines unique ID' do
+      with_article do |article|
+        assert_has_xpath(
+          '//entry/id', text: "tag:www.example.com,2008-12-29:#{article.abspath}")
+      end
+    end
+
+    it 'uses pre-defined ID if specified' do
+      with_article(metadata: { 'atom id' => 'use-this-id' }) do
+        assert_has_xpath '//entry/id', text: 'use-this-id'
+      end
+    end
+
+    it 'specifies date published' do
+      with_article do
+        assert_has_xpath '//entry/published', text: '2008-12-29T00:00:00+00:00'
+      end
+    end
+
+    it 'specifies article categories' do
+      with_article_in_category do |article, category|
+        assert_has_xpath "//category[@term='#{category.permalink}']"
+      end
+    end
+
+    it 'has article content' do
+      with_article do
+        assert_has_xpath '//entry/content[@type="html"]', text: 'Content'
+      end
+    end
+
+    it 'includes hostname in URLs' do
+      with_article(content: '[a link](/foo)') do
+        url = 'http://www.example.com/foo'
+        assert_has_xpath '//entry/content', text: url
+      end
+    end
+
+    it 'does not include article heading in content' do
+      with_article do |article|
+        assert page.has_no_selector?("summary:contains('#{article.heading}')")
+      end
+    end
+
+    it 'does not include pages with no date in feed' do
+      with_category(path: 'no-date') do
+        assert page.has_no_selector?('entry id:contains("no-date")')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require 'test_helper'
+require_relative '../../../../lib/nesta/commands'
+
+describe 'nesta demo:content' do
+  include TemporaryFiles
+
+  before 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(process_stub)
+
+      yaml = File.read(File.join(project_root, 'config', 'config.yml'))
+      assert_match /content: content-demo/, yaml
+    end
+  end
+
+  it 'ensures demo repository is ignored by git' do
+    in_temporary_project do
+      FileUtils.mkdir('.git')
+      Nesta::Commands::Demo::Content.new.execute(process_stub)
+      assert_match /content-demo/, File.read(project_path('.git/info/exclude'))
+    end
+  end
+end

data/test/integration/commands/edit_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+require_relative '../../../lib/nesta/commands'
+
+describe 'nesta edit' do
+  include TestConfiguration
+
+  after do
+    remove_temp_directory
+  end
+
+  it 'launches the editor' do
+    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
+      command = Nesta::Commands::Edit.new(edited_file)
+      command.execute(process)
+    end
+  end
+end

data/test/integration/commands/new_test.rb

@@ -0,0 +1,91 @@
+require 'test_helper'
+require_relative '../../../lib/nesta/commands'
+
+describe 'nesta new' do
+  include TemporaryFiles
+
+  def gemfile_source
+    File.read(project_path('Gemfile'))
+  end
+
+  def rakefile_source
+    File.read(project_path('Rakefile'))
+  end
+
+  after 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(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(process_stub)
+      assert_exists_in_project 'content/pages/index.haml'
+    end
+
+    it 'creates the rackup file' do
+      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(process_stub)
+      assert_exists_in_project 'config/config.yml'
+    end
+
+    it 'creates a Gemfile' do
+      Nesta::Commands::New.new(project_root).execute(process_stub)
+      assert_exists_in_project 'Gemfile'
+      assert_match /gem 'nesta'/, gemfile_source
+    end
+  end
+
+  describe 'with --git option' do
+    it 'creates a .gitignore file' do
+      command = Nesta::Commands::New.new(project_root, 'git' => '')
+      command.execute(process_stub)
+      assert_match /\.bundle/, File.read(project_path('.gitignore'))
+    end
+
+    it 'creates a git repo' do
+      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(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(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(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
+    end
+  end
+end