nesta 0.9.13 → 0.10.0

data/lib/nesta/navigation.rb

@@ -2,10 +2,10 @@ module Nesta
   module Navigation
     module Renderers
       def display_menu(menu, options = {})
-        defaults = { :class => nil, :levels => 2 }
+        defaults = { class: nil, levels: 2 }
         options = defaults.merge(options)
         if options[:levels] > 0
-          haml_tag :ul, :class => options[:class] do
+          haml_tag :ul, class: options[:class] do
             menu.each do |item|
               display_menu_item(item, options)
             end
@@ -17,14 +17,14 @@ module Nesta
         if item.respond_to?(:each)
           if (options[:levels] - 1) > 0
             haml_tag :li do
-              display_menu(item, :levels => (options[:levels] - 1))
+              display_menu(item, levels: (options[:levels] - 1))
             end
           end
         else
-          html_class = current_item?(item) ? "current" : nil
-          haml_tag :li, :class => html_class do
-            haml_tag :a, :<, :href => url(item.abspath) do
-              haml_concat item.heading
+          html_class = current_item?(item) ? current_menu_item_class : nil
+          haml_tag :li, class: html_class do
+            haml_tag :a, :<, href: path_to(item.abspath) do
+              haml_concat link_text(item)
             end
           end
         end
@@ -41,25 +41,45 @@ module Nesta
       end
 
       def display_breadcrumbs(options = {})
-        haml_tag :ul, :class => options[:class] do
+        haml_tag :ul, class: options[:class] do
           breadcrumb_ancestors[0...-1].each do |page|
             haml_tag :li do
-              haml_tag :a, :<, :href => url(page.abspath) do
-                haml_concat breadcrumb_label(page)
+              haml_tag :a, :<, href: path_to(page.abspath), itemprop: 'url' do
+                haml_tag :span, :<, itemprop: 'title' do
+                  haml_concat link_text(page)
+                end
               end
             end
           end
-          haml_tag(:li) { haml_concat breadcrumb_label(@page) }
+          haml_tag(:li, class: current_breadcrumb_class) do
+            haml_concat link_text(@page)
+          end
         end
       end
 
+      def link_text(page)
+        page.link_text
+      rescue LinkTextNotSet
+        return 'Home' if page.abspath == '/'
+        raise
+      end
+
       def breadcrumb_label(page)
-        (page.abspath == '/') ? 'Home' : page.heading
+        Nesta.deprecated('breadcrumb_label', 'use link_text')
+        link_text(page)
       end
 
       def current_item?(item)
         request.path == item.abspath
       end
+
+      def current_menu_item_class
+        'current'
+      end
+
+      def current_breadcrumb_class
+        nil
+      end
     end
   end
 end

data/lib/nesta/overrides.rb

@@ -29,15 +29,15 @@ module Nesta
     end
 
     def self.load_local_app
-      require Nesta::Path.local("app")
-    rescue LoadError
+      app_file = Nesta::Path.local('app.rb')
+      require app_file if File.exist?(app_file)
     end
     
     def self.load_theme_app
       if Nesta::Config.theme
-        require Nesta::Path.themes(Nesta::Config.theme, "app")
+        app_file = Nesta::Path.themes(Nesta::Config.theme, 'app.rb')
+        require app_file if File.exist?(app_file)
       end
-    rescue LoadError
     end
 
     private
@@ -49,7 +49,7 @@ module Nesta
         [local_view_path, theme_view_path].each do |path|
           engines.each do |engine|
             if template_exists?(engine, path, template)
-              return { :views => path }, engine
+              return { views: path }, engine
             end
           end
         end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.9.13'
+  VERSION = '0.10.0'
 end

data/nesta.gemspec

@@ -31,20 +31,19 @@ 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('sass', '~> 3.1')
-  s.add_dependency('rdiscount', '~> 1.6')
+  s.add_dependency('haml', '>= 3.1')
+  s.add_dependency('sass', '>= 3.1')
+  s.add_dependency('rdiscount', '~> 2.1')
   s.add_dependency('RedCloth', '~> 4.2')
-  s.add_dependency('sinatra', '~> 1.3')
-  s.add_dependency('rack', '~> 1.1')
-  
+  s.add_dependency('sinatra', '~> 1.4')
+  s.add_dependency('rack', '>= 1.3')
+
   # Useful in development
-  s.add_dependency('shotgun', '>= 0.8')
+  s.add_development_dependency('mr-sparkle', '>= 0.0.2')
 
   # Test libraries
-  s.add_development_dependency('hpricot', '0.8.4')
   s.add_development_dependency('rack-test', '0.6.1')
-  s.add_development_dependency('rspec', '1.3.0')
-  s.add_development_dependency('rspec_hpricot_matchers', '1.0')
+  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')
 end

data/smoke-test.sh

@@ -0,0 +1,102 @@
+#!/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 rbenv.
+
+
+RUBIES="1.9.3-p392 2.0.0-p353 2.1.0 2.1.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"
+}
+
+get_ruby()
+{
+    # Why not just use RUBY_VERSION? Because tmux can prevent rbenv 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.
+    ruby --version | cut -f 2 -d ' '
+}
+
+run_tests()
+{
+    bundle install
+    bundle exec rake spec
+}
+
+build_and_install()
+{
+    echo rm -f pkg/$(gem_file)
+    bundle install
+    bundle exec rake install
+}
+
+site_folder()
+{
+    echo "test-site-${RUBY_VERSION}"
+}
+
+create_and_test_new_site()
+{
+    bundle exec nesta new $(site_folder)
+    cd $(site_folder)
+    echo "gem 'haml-contrib'" >> Gemfile
+    bundle install
+    bundle exec nesta demo:content
+
+    log "Starting server in $(site_folder)"
+    set +e
+    bundle exec mr-sparkle
+    set -e
+
+    cd - >/dev/null
+    rm -rf $(site_folder)
+}
+
+
+## Main program
+
+set -e
+[ -n "$DEBUG" ] && set -x
+
+for RUBY_VERSION in $RUBIES; do
+    rbenv local $RUBY_VERSION
+    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

@@ -4,7 +4,7 @@ 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", {
@@ -14,41 +14,41 @@ describe "atom feed" do
     })
     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
-    body.should have_tag("/feed[@xmlns=http://www.w3.org/2005/Atom]")
+    assert_xpath("//feed[@xmlns='http://www.w3.org/2005/Atom']")
   end
-  
+
   it "should have an ID element" do
-    body.should have_tag("/feed/id", "tag:example.org,2009:/")
+    assert_selector("id:contains('tag:example.org,2009:/')")
   end
-  
+
   it "should have an alternate link element" do
-    body.should have_tag("/feed/link[@rel=alternate][@href='http://example.org/']")
+    assert_xpath("//feed/link[@rel='alternate'][@href='http://example.org/']")
   end
 
   it "should have a self link element" do
-    body.should have_tag(
-        "/feed/link[@rel=self][@href='http://example.org/articles.xml']")
+    assert_xpath(
+        "//feed/link[@rel='self'][@href='http://example.org/articles.xml']")
   end
-  
+
   it "should have title and subtitle" do
-    body.should have_tag("/feed/title[@type=text]", "My blog")
-    body.should have_tag("/feed/subtitle[@type=text]", "about stuff")
+    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
-    body.should have_tag("/feed/author/name", "Fred Bloggs")
-    body.should have_tag("/feed/author/uri", "http://fredbloggs.com")
-    body.should have_tag("/feed/author/email", "fred@fredbloggs.com")
+    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
@@ -58,81 +58,84 @@ describe "atom feed" do
       @category = create_category
       11.times do |i|
         @articles << create_article(
-          :heading => "Article #{i + 1}",
-          :path => "article-#{i + 1}",
-          :metadata => {
+          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)"
+          content: "Blah blah\n\n## #{@heading}\n\n[link](/foo)"
         )
       end
       @article = @articles.last
       get "/articles.xml"
     end
-    
+
     it "should set title" do
-      body.should have_tag("entry/title", "Article 11")
+      assert_xpath("//entry/title", content: "Article 11")
     end
-    
+
     it "should link to the HTML version" do
       url = "http://example.org/#{@article.path}"
-      body.should have_tag(
-          "entry/link[@href='#{url}'][@rel=alternate][@type='text/html']")
+      assert_xpath(
+          "//entry/link[@href='#{url}'][@rel='alternate'][@type='text/html']")
     end
-    
+
     it "should define unique ID" do
-      body.should have_tag(
-          "entry/id", "tag:example.org,2009-01-11:#{@article.abspath}")
+      assert_xpath(
+        "//entry/id",
+        content: "tag:example.org,2009-01-11:#{@article.abspath}"
+      )
     end
-    
+
     it "should specify date published" do
-      body.should have_tag("entry/published", "2009-01-11T00:00:00+00:00")
+      assert_xpath("//entry/published", content: "2009-01-11T00:00:00+00:00")
     end
 
     it "should specify article categories" do
-      body.should have_tag("category[@term=#{@category.permalink}]")
+      assert_xpath("//category[@term='#{@category.permalink}']")
     end
 
     it "should have article content" do
-      body.should have_tag(
-          "entry/content[@type=html]", /<h2[^>]*>#{@heading}<\/h2>/)
+      assert_xpath "//entry/content[@type='html']" do |a|
+       a.should contain "<h2>#{@heading}</h2>"
+      end
     end
-    
+
     it "should include hostname in URLs" do
-      body.should have_tag("entry/content",
-                           Regexp.new('href=.+http:\/\/example.org\/foo'))
+      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_tag("entry/summary", /#{@article.heading}/)
+      body.should_not have_selector("summary:contains('#{@article.heading}')")
     end
-    
+
     it "should list the latest 10 articles" do
-      body.should have_tag("entry", :count => 10)
-      body.should_not have_tag("entry/title", @articles.first.heading)
+      assert_selector("entry", count: 10)
     end
   end
-  
+
   describe "page with no date" do
     before(:each) do
-      create_category(:path => "no-date")
+      create_category(path: "no-date")
       get "/articles.xml"
     end
 
     it "should not appear in feed" do
-      body.should_not have_tag("entry/id", /tag.*no-date/)
+      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 => {
+      create_article(metadata: {
         "date" => "1 January 2009",
         "atom id" => "use-this-id"
       })
       get "/articles.xml"
-      body.should have_tag("entry/id", "use-this-id")
+      assert_xpath("//entry/id", content: "use-this-id")
     end
   end
 end

data/spec/commands_spec.rb

@@ -63,7 +63,7 @@ describe "nesta" do
     describe "--git" do
       before(:each) do
         @command = Nesta::Commands::New.new(@project_path, 'git' => '')
-        @command.stub!(:system)
+        @command.stub(:system)
       end
 
       it "should create a .gitignore file" do
@@ -111,13 +111,13 @@ describe "nesta" do
     before(:each) do
       @config_path = project_path('config/config.yml')
       FileUtils.mkdir_p(File.dirname(@config_path))
-      Nesta::Config.stub!(:yaml_path).and_return(@config_path)
+      Nesta::Config.stub(:yaml_path).and_return(@config_path)
       create_config_yaml('content: path/to/content')
-      Nesta::App.stub!(:root).and_return(@project_path)
+      Nesta::App.stub(:root).and_return(@project_path)
       @repo_url = 'git://github.com/gma/nesta-demo-content.git'
       @demo_path = project_path('content-demo')
       @command = Nesta::Commands::Demo::Content.new
-      @command.stub!(:system)
+      @command.stub(:system)
     end
 
     it "should clone the repository" do
@@ -169,10 +169,10 @@ describe "nesta" do
 
   describe "edit" do
     before(:each) do
-      Nesta::Config.stub!(:content_path).and_return('content')
+      Nesta::Config.stub(:content_path).and_return('content')
       @page_path = 'path/to/page.mdown'
       @command = Nesta::Commands::Edit.new(@page_path)
-      @command.stub!(:system)
+      @command.stub(:system)
     end
 
     it "should launch the editor" do
@@ -185,7 +185,7 @@ describe "nesta" do
     it "should not try and launch an editor if environment not setup" do
       ENV.delete('EDITOR')
       @command.should_not_receive(:system)
-      $stderr.stub!(:puts)
+      $stderr.stub(:puts)
       @command.execute
     end
   end
@@ -199,7 +199,7 @@ describe "nesta" do
       Dir.mkdir(@plugins_path)
       Dir.chdir(@plugins_path)
       @command = Nesta::Commands::Plugin::Create.new(@name)
-      @command.stub!(:system)
+      @command.stub(:system)
     end
 
     after(:each) do
@@ -258,8 +258,8 @@ describe "nesta" do
       it "should specify plugin gem's dependencies" do
         @command.execute
         text = File.read(@gem_spec)
-        text.should include('s.add_dependency("nesta", ">= 0.9.11")')
-        text.should include('s.add_development_dependency("rake")')
+        text.should include('gem.add_dependency("nesta", ">= 0.9.11")')
+        text.should include('gem.add_development_dependency("rake")')
       end
     end
   end
@@ -270,8 +270,8 @@ describe "nesta" do
       @theme_dir = 'themes/mine'
       FileUtils.mkdir_p(File.join(@theme_dir, '.git'))
       @command = Nesta::Commands::Theme::Install.new(@repo_url)
-      @command.stub!(:enable)
-      @command.stub!(:system)
+      @command.stub(:enable)
+      @command.stub(:system)
     end
 
     after(:each) do
@@ -301,7 +301,7 @@ describe "nesta" do
         @other_theme_dir = 'themes/mytheme'
         FileUtils.mkdir_p(File.join(@other_theme_dir, '.git'))
         @command = Nesta::Commands::Theme::Install.new(@repo_url)
-        @command.stub!(:enable)
+        @command.stub(:enable)
       end
 
       after(:each) do
@@ -319,7 +319,7 @@ describe "nesta" do
   describe "theme:enable" do
     before(:each) do
       config = temp_path('config.yml')
-      Nesta::Config.stub!(:yaml_path).and_return(config)
+      Nesta::Config.stub(:yaml_path).and_return(config)
       @name = 'mytheme'
       @command = Nesta::Commands::Theme::Enable.new(@name)
     end
@@ -362,7 +362,7 @@ describe "nesta" do
     end
 
     before(:each) do
-      Nesta::App.stub!(:root).and_return(TempFileHelper::TEMP_DIR)
+      Nesta::App.stub(:root).and_return(TempFileHelper::TEMP_DIR)
       @name = 'my-new-theme'
       Nesta::Commands::Theme::Create.new(@name).execute
     end
@@ -381,9 +381,15 @@ describe "nesta" do
       should_exist('app.rb')
     end
 
-    it "should create public and view directories" do
+    it "should create public and views directories" do
       should_exist("public/#{@name}")
       should_exist('views')
     end
+
+    it "should copy the default view templates into views" do
+      %w(layout.haml page.haml master.sass).each do |file|
+        should_exist("views/#{file}")
+      end
+    end
   end
 end