nesta 0.11.1 → 0.12.0

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/version.rb

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

data/nesta.gemspec

@@ -24,8 +24,6 @@ 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) }
@@ -33,19 +31,20 @@ EOF
 
   s.add_dependency('haml', '>= 3.1')
   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,31 @@
+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
+
+  before do
+    Nesta::Commands::Demo::Content.demo_repository = '../../fixtures/demo-content.git'
+  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'
+
+      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
+      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'] = 'touch'
+    edited_file = 'path/to/page.md'
+    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'
+    end
+  end
+end

data/test/integration/commands/new_test.rb

@@ -0,0 +1,120 @@
+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
+
+  def gemfile_source
+    File.read(project_path('Gemfile'))
+  end
+
+  def rakefile_source
+    File.read(project_path('Rakefile'))
+  end
+
+  after do
+    remove_temp_directory
+  end
+
+  describe 'without options' do
+    it 'creates the content directories' do
+      Nesta::Commands::New.new(project_root).execute
+      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
+      assert_exists_in_project 'content/pages/index.haml'
+    end
+
+    it 'creates the rackup file' do
+      Nesta::Commands::New.new(project_root).execute
+      assert_exists_in_project 'config.ru'
+    end
+
+    it 'creates the config.yml file' do
+      Nesta::Commands::New.new(project_root).execute
+      assert_exists_in_project 'config/config.yml'
+    end
+
+    it 'creates a Gemfile' do
+      Nesta::Commands::New.new(project_root).execute
+      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.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)
+    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
+    end
+  end
+
+  describe 'with --vlad option' do
+    it 'adds vlad to Gemfile' do
+      Nesta::Commands::New.new(project_root, 'vlad' => '').execute
+      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
+      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
+      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

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

@@ -0,0 +1,128 @@
+require 'test_helper'
+require_relative '../../../../lib/nesta/commands'
+
+describe 'nesta plugin:create' do
+  include TemporaryFiles
+
+  def working_directory
+    temp_path('plugins')
+  end
+
+  before do
+    FileUtils.mkdir_p(working_directory)
+  end
+
+  after do
+    remove_temp_directory
+  end
+
+  def plugin_name
+    'my-feature'
+  end
+
+  def gem_name
+    "nesta-plugin-#{plugin_name}"
+  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
+    end
+  end
+
+  def assert_exists_in_plugin(path)
+    full_path = File.join(gem_name, path)
+    assert File.exist?(full_path), "#{path} not found in plugin"
+  end
+
+  def assert_file_contains(path, pattern)
+    assert_match pattern, File.read(File.join(gem_name, path))
+  end
+
+  it "creates the gem's directory" do
+    create_plugin { assert File.directory?(gem_name), 'gem directory not found' }
+  end
+
+  it 'creates README.md file' do
+    create_plugin { assert_exists_in_plugin('README.md') }
+  end
+
+  it 'includes installation instructions in README.md' do
+    create_plugin do
+      assert_file_contains('README.md', /echo 'gem "#{gem_name}"' >> Gemfile/)
+    end
+  end
+
+  it 'creates .gitignore file' do
+    create_plugin { assert_exists_in_plugin('.gitignore') }
+  end
+
+  it 'creates the gemspec' do
+    create_plugin do
+      gemspec = "#{gem_name}.gemspec"
+      assert_exists_in_plugin(gemspec)
+      assert_file_contains(gemspec, %r{require "#{gem_name}/version"})
+      assert_file_contains(gemspec, %r{Nesta::Plugin::My::Feature::VERSION})
+    end
+  end
+
+  it 'creates a Gemfile' do
+    create_plugin { assert_exists_in_plugin('Gemfile') }
+  end
+
+  it 'creates Rakefile for packaging the gem' do
+    create_plugin { assert_exists_in_plugin('Rakefile') }
+  end
+
+  it "creates default folder for Ruby files" do
+    create_plugin do
+      code_directory = File.join(gem_name, 'lib', gem_name)
+      assert File.directory?(code_directory), 'directory for code not found'
+    end
+  end
+
+  it 'creates file required when gem loaded' do
+    create_plugin do
+      path = "#{File.join('lib', gem_name)}.rb"
+      assert_exists_in_plugin(path)
+      assert_file_contains(path, %r{require "#{gem_name}/version"})
+    end
+  end
+
+  it 'creates version.rb' do
+    create_plugin do
+      version = File.join('lib', gem_name, 'version.rb')
+      assert_exists_in_plugin(version)
+      assert_file_contains version, <<-EOF
+module Nesta
+  module Plugin
+    module My
+      module Feature
+        VERSION = '0.1.0'
+      end
+    end
+  end
+end
+      EOF
+    end
+  end
+
+  it 'creates skeleton code for the plugin in init.rb' do
+    create_plugin do
+      init = File.join('lib', gem_name, 'init.rb')
+      assert_exists_in_plugin(init)
+
+      assert_file_contains init, <<-MODULE
+module Nesta
+  module Plugin
+    module My::Feature
+        MODULE
+
+      assert_file_contains init, 'helpers Nesta::Plugin::My::Feature::Helpers'
+    end
+  end
+end