nesta 0.9.2 → 0.9.3

data/spec/models_spec.rb

@@ -45,13 +45,45 @@ describe "Page", :shared => true do
   end
   
   it "should be findable" do
-    create_page(:heading => "Apple", :path => "the-apple")
+    create_page(:heading => 'Apple', :path => 'the-apple')
     Nesta::Page.find_all.should have(1).item
   end
 
   it "should find by path" do
-    create_page(:heading => "Banana", :path => "banana")
-    Nesta::Page.find_by_path("banana").heading.should == "Banana"
+    create_page(:heading => 'Banana', :path => 'banana')
+    Nesta::Page.find_by_path('banana').heading.should == 'Banana'
+  end
+  
+  it "should find index page by path" do
+    create_page(:heading => 'Banana', :path => 'banana/index')
+    Nesta::Page.find_by_path('banana').heading.should == 'Banana'
+  end
+
+  describe "for home page" do
+    it "should set title to heading and site title" do
+      create_page(:heading => 'Home', :path => 'index')
+      Nesta::Page.find_by_path('/').title.should == 'Home - My blog'
+    end
+
+    it "should respect title metadata" do
+      create_page(:path => 'index', :metadata => { 'title' => 'Specific title' })
+      Nesta::Page.find_by_path('/').title.should == 'Specific title'
+    end
+
+    it "should set title to site title by default" do
+      create_page(:path => 'index')
+      Nesta::Page.find_by_path('/').title.should == 'My blog'
+    end
+
+    it "should set permalink to empty string" do
+      create_page(:path => 'index')
+      Nesta::Page.find_by_path('/').permalink.should == ''
+    end
+
+    it "should set abspath to /" do
+      create_page(:path => 'index')
+      Nesta::Page.find_by_path('/').abspath.should == '/'
+    end
   end
   
   it "should not find nonexistent page" do
@@ -72,43 +104,80 @@ describe "Page", :shared => true do
     File.stub!(:mtime).and_return(Time.new)
     Nesta::Page.find_by_path("a-page").heading.should == "Version 2"
   end
+
+  it "should have default priority of 0 in category" do
+    page = create_page(:metadata => { 'categories' => 'some-page' })
+    page.priority('some-page').should == 0
+    page.priority('another-page').should be_nil
+  end
+
+  it "should read priority from category metadata" do
+    page = create_page(:metadata => {
+      'categories' => ' some-page:1, another-page , and-another :-1 '
+    })
+    page.priority('some-page').should == 1
+    page.priority('another-page').should == 0
+    page.priority('and-another').should == -1
+  end
   
   describe "with assigned pages" do
     before(:each) do
       @category = create_category
-      create_article(:heading => "Article 1", :path => "article-1")
+      create_article(:heading => 'Article 1', :path => 'article-1')
       create_article(
-        :heading => "Article 2",
-        :path => "article-2",
+        :heading => 'Article 2',
+        :path => 'article-2',
         :metadata => {
-          "date" => "30 December 2008",
-          "categories" => @category.path
+          'date' => '30 December 2008',
+          'categories' => @category.path
         }
       )
       @article = create_article(
-        :heading => "Article 3",
-        :path => "article-3",
+        :heading => 'Article 3',
+        :path => 'article-3',
         :metadata => {
-          "date" => "31 December 2008",
-          "categories" => @category.path
+          'date' => '31 December 2008',
+          'categories' => @category.path
         }
       )
-      create_category(:path => "category-2",
-                      :metadata => { "categories" => @category.path })
+      @category1 = create_category(
+        :path => 'category-1',
+        :heading => 'Category 1',
+        :metadata => { 'categories' => @category.path }
+      )
+      @category2 = create_category(
+        :path => 'category-2',
+        :heading => 'Category 2',
+        :metadata => { 'categories' => @category.path }
+      )
+      @category3 = create_category(
+        :path => 'category-3',
+        :heading => 'Category 3',
+        :metadata => { 'categories' => "#{@category.path}:1" }
+      )
     end
 
     it "should find articles" do
       @category.articles.should have(2).items
     end
     
-    it "should list most recent articles first" do
+    it "should order articles by reverse chronological order" do
       @category.articles.first.path.should == @article.path
     end
     
     it "should find pages" do
-      @category.pages.should have(1).item
+      @category.pages.should have(3).items
+    end
+
+    it "should sort pages by priority" do
+      @category.pages.index(@category3).should == 0
     end
     
+    it "should order pages by heading if priority not set" do
+      pages = @category.pages
+      pages.index(@category1).should < pages.index(@category2)
+    end
+
     it "should not find pages scheduled in the future" do
       future_date = (Time.now + 86400).strftime("%d %B %Y")
       article = create_article(:heading => "Article 4",
@@ -141,6 +210,46 @@ describe "Page", :shared => true do
     end
   end
   
+  it "should be able to find parent page" do
+    category = create_category(:path => 'parent')
+    article = create_article(:path => 'parent/child')
+    article.parent.should == category
+  end
+    
+  describe "(with deep index page)" do
+    it "should be able to find index parent" do
+      home = create_category(:path => 'index', :heading => 'Home')
+      category = create_category(:path => 'parent')
+      category.parent.should == home
+      home.parent.should be_nil
+    end
+
+    it "should be able to find parent of index" do
+      category = create_category(:path => "parent")
+      index = create_category(:path => "parent/child/index")
+      index.parent.should == category
+    end
+
+    it "should be able to find permalink of index" do
+      index = create_category(:path => "parent/child/index")
+      index.permalink.should == 'child'
+    end
+  end
+
+  describe "(with missing nested page)" do
+    it "should consider grandparent to be parent" do
+      grandparent = create_category(:path => 'grandparent')
+      child = create_category(:path => 'grandparent/parent/child')
+      child.parent.should == grandparent
+    end
+
+    it "should consider grandparent home page to be parent" do
+      home = create_category(:path => 'index')
+      child = create_category(:path => 'parent/child')
+      child.parent.should == home
+    end
+  end
+
   describe "when assigned to categories" do
     before(:each) do
       create_category(:heading => "Apple", :path => "the-apple")
@@ -154,7 +263,7 @@ describe "Page", :shared => true do
       @article.should be_in_category("the-apple")
       @article.should be_in_category("banana")
     end
-    
+
     it "should sort categories by heading" do
       @article.categories.first.heading.should == "Apple"
     end
@@ -165,12 +274,6 @@ describe "Page", :shared => true do
     end
   end
   
-  it "should be able to find parent page" do
-    category = create_category(:path => "parent")
-    article = create_article(:path => "parent/child")
-    article.parent.should == category
-  end
-  
   it "should set parent to nil when at root" do
     create_category(:path => "top-level").parent.should be_nil
   end
@@ -215,23 +318,23 @@ describe "Page", :shared => true do
   
   describe "with metadata" do
     before(:each) do
-      @layout = "my_layout"
-      @template = "my_template"
-      @date = "07 September 2009"
-      @keywords = "things, stuff"
-      @description = "Page about stuff"
+      @layout = 'my_layout'
+      @template = 'my_template'
+      @date = '07 September 2009'
+      @keywords = 'things, stuff'
+      @description = 'Page about stuff'
       @summary = 'Multiline\n\nsummary'
-      @read_more = "Continue at your leisure"
-      @skillz = "ruby, guitar, bowstaff"
+      @read_more = 'Continue at your leisure'
+      @skillz = 'ruby, guitar, bowstaff'
       @article = create_article(:metadata => {
-        "layout" => @layout,
-        "template" => @template,
-        "date" => @date.gsub("September", "Sep"),
-        "description" => @description,
-        "keywords" => @keywords,
-        "summary" => @summary,
-        "read more" => @read_more,
-        "skillz" => @skillz
+        'layout' => @layout,
+        'template' => @template,
+        'date' => @date.gsub('September', 'Sep'),
+        'description' => @description,
+        'keywords' => @keywords,
+        'summary' => @summary,
+        'read more' => @read_more,
+        'skillz' => @skillz
       })
     end
 
@@ -243,16 +346,16 @@ describe "Page", :shared => true do
       @article.template.should == @template.to_sym
     end
     
-    it "should set permalink from filename" do
-      @article.permalink.should == "my-article"
+    it "should set permalink to basename of filename" do
+      @article.permalink.should == 'my-article'
     end
     
     it "should set path from filename" do
-      @article.path.should == "article-prefix/my-article"
+      @article.path.should == 'article-prefix/my-article'
     end
     
     it "should retrieve heading" do
-      @article.heading.should == "My article"
+      @article.heading.should == 'My article'
     end
     
     it "should be possible to convert an article to HTML" do

data/spec/page_spec.rb

@@ -81,6 +81,14 @@ describe "The home page" do
   
   before(:each) do
     stub_configuration
+    template_path = File.expand_path(
+        'templates', File.dirname(File.dirname(__FILE__)))
+    create_category(
+      :path => 'index',
+      :ext => :haml,
+      :heading => 'Home',
+      :content => File.read(File.join(template_path, 'index.haml'))
+    )
     create_category
   end
   
@@ -106,32 +114,17 @@ describe "The home page" do
     last_response.should be_ok
   end
   
-  it "should display title and subtitle in title tag" do
-    do_get
-    body.should have_tag("title", "My blog - about stuff")
-  end
-  
-  it "should display site title in h1 tag" do
+  it "should display site title in hgroup tag" do
     pending "Hpricot doesn't support HTML5"
     body.should have_tag('hgroup h1', /My blog/)
   end
   
-  it "should display site subtitle in heading tag" do
+  it "should display site subtitle in hgroup tag" do
     pending "Hpricot doesn't support HTML5"
     do_get
     body.should have_tag('hgroup h2', /about stuff/)
   end
   
-  it "should set description meta tag" do
-    do_get
-    body.should have_tag("meta[@name=description][@content='great web site']")
-  end
-  
-  it "should set keywords meta tag" do
-    do_get
-    body.should have_tag("meta[@name=keywords][@content='home, page']")
-  end
-  
   describe "when articles have no summary" do
     before(:each) do
       create_article
@@ -164,7 +157,7 @@ describe "The home page" do
     end
     
     it "should display article summary if available" do
-      body.should have_tag("p", @summary.split('\n\n').first)
+      body.should have_tag('p', @summary.split('\n\n').first)
     end
     
     it "should display read more link" do
@@ -180,15 +173,15 @@ describe "An article" do
   
   before(:each) do
     stub_configuration
-    @date = "07 September 2009"
-    @keywords = "things, stuff"
-    @description = "Page about stuff"
+    @date = '07 September 2009'
+    @keywords = 'things, stuff'
+    @description = 'Page about stuff'
     @summary = 'Multiline\n\nsummary'
     @article = create_article(:metadata => {
-      "date" => @date.gsub("September", "Sep"),
-      "description" => @description,
-      "keywords" => @keywords,
-      "summary" => @summary,
+      'date' => @date.gsub('September', 'Sep'),
+      'description' => @description,
+      'keywords' => @keywords,
+      'summary' => @summary
     })
   end
   
@@ -218,31 +211,31 @@ describe "An article" do
 
   it "should display the heading" do
     do_get
-    body.should have_tag("h1", "My article")
+    body.should have_tag('h1', 'My article')
   end
 
-  it "should not display category links" do
+  it "should use heading for title tag" do
     do_get
-    body.should_not have_tag("div.breadcrumb div.categories", /filed in/)
+    body.should have_tag('title', 'My article - My blog')
   end
 
   it "should display the date" do
     do_get
-    body.should have_tag("time", @date)
+    body.should have_tag('time', @date)
   end
 
   it "should display the content" do
     do_get
-    body.should have_tag("p", "Content goes here")
+    body.should have_tag('p', 'Content goes here')
   end
   
   describe "that is assigned to categories" do
     before(:each) do
-      create_category(:heading => "Apple", :path => "the-apple")
-      @category = create_category(:heading => "Banana", :path => "banana")
+      create_category(:heading => 'Apple', :path => 'the-apple')
+      @category = create_category(:heading => 'Banana', :path => 'banana')
       @article = create_article(
         :path => "#{@category.path}/article",
-        :metadata => { "categories" => "banana, the-apple" }
+        :metadata => { 'categories' => 'banana, the-apple' }
       )
     end
     
@@ -302,12 +295,17 @@ describe "A page" do
   
   describe "that has meta data" do
     before(:each) do
+      @title = 'Different title'
       @content = "Page content"
       @description = "Page about stuff"
       @keywords = "things, stuff"
       @category = create_category(
         :content => "# My category\n\n#{@content}",
-        :metadata => { "description" => @description, "keywords" => @keywords }
+        :metadata => {
+          'title' => @title,
+          'description' => @description,
+          'keywords' => @keywords
+        }
       )
     end
 
@@ -321,7 +319,12 @@ describe "A page" do
     
     it "should display the heading" do
       do_get
-      body.should have_tag("h1", @category.heading)
+      body.should have_tag('h1', @category.heading)
+    end
+
+    it "should use title metadata to set heading" do
+      do_get
+      body.should have_tag('title', @title)
     end
 
     it "should display the content" do
@@ -329,6 +332,31 @@ describe "A page" do
       body.should have_tag("p", @content)
     end
 
+    describe "with associated pages" do
+      before(:each) do
+        @category1 = create_category(
+          :path => 'category1',
+          :heading => 'Category 1',
+          :metadata => {
+            'categories' => 'category-prefix/my-category:-1'
+          }
+        )
+        @category2 = create_category(
+          :path => 'category2',
+          :heading => 'Category 2',
+          :metadata => {
+            'categories' => 'category-prefix/my-category:1'
+          }
+        )
+      end
+
+      it "should list highest priority pages at the top" do
+        do_get
+        body.should have_tag('li:nth-child(1) h1 a', 'Category 2')
+        body.should have_tag('li:nth-child(2) h1 a', 'Category 1')
+      end
+    end
+
     describe "with associated articles" do
       before(:each) do
         @article = create_article(

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
-require "rubygems"
-require "spec"
-require "spec/interop/test"
-require "rack/test"
-require "rspec_hpricot_matchers"
-require "sinatra"
+require 'rubygems'
+require 'spec'
+require 'spec/interop/test'
+require 'rack/test'
+require 'rspec_hpricot_matchers'
+require 'sinatra'
 
 Test::Unit::TestCase.send :include, Rack::Test::Methods
 
@@ -18,10 +18,10 @@ module Nesta
   end
 end
 
-require File.expand_path("../lib/nesta/app", File.dirname(__FILE__))
+require File.expand_path('../lib/nesta/app', File.dirname(__FILE__))
 
 module FixtureHelper
-  FIXTURE_DIR = File.expand_path("fixtures", File.dirname(__FILE__))
+  FIXTURE_DIR = File.expand_path('fixtures', File.dirname(__FILE__))
 
   def create_fixtures_directory
     FileUtils.mkdir_p(FixtureHelper::FIXTURE_DIR)
@@ -62,11 +62,9 @@ module ConfigSpecHelper
   end
   
   def stub_configuration(options = {})
-    stub_config_key("title", "My blog", options)
-    stub_config_key("subtitle", "about stuff", options)
-    stub_config_key("description", "great web site", options)
-    stub_config_key("keywords", "home, page", options)
-    content_path = File.join(FixtureHelper::FIXTURE_DIR, "content")
-    stub_config_key("content", content_path, options.merge(:rack_env => true))
+    stub_config_key('title', 'My blog', options)
+    stub_config_key('subtitle', 'about stuff', options)
+    content_path = File.join(FixtureHelper::FIXTURE_DIR, 'content')
+    stub_config_key('content', content_path, options.merge(:rack_env => true))
   end
 end

data/templates/Rakefile

@@ -9,27 +9,3 @@ begin
   Vlad.load(:scm => :git, :app => nil, :web => nil)
 rescue LoadError
 end<% end %>
-<% if @options['heroku'] %>
-require 'nesta/config'
-require 'nesta/models'
-
-namespace :heroku do
-  desc "Set Heroku config vars from config.yml"
-  task :config do
-    Nesta::App.environment = ENV['RACK_ENV'] || 'production'
-    settings = {}
-    Nesta::Config.settings.map do |variable|
-      value = Nesta::Config.send(variable)
-      value && settings["NESTA_#{variable.upcase}"] = value
-    end
-    if Nesta::Config.author
-      Nesta::Config.author_settings.map do |author_var|
-        value = Nesta::Config.author[author_var]
-        if value
-        value && settings["NESTA_AUTHOR__#{author_var.upcase}"] = value
-      end
-    end
-    params = settings.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
-    system("heroku config:add #{params}")
-  end
-end<% end %>

data/templates/config/config.yml

@@ -4,12 +4,6 @@
 title: "My Site"
 subtitle: "(change this text in config/config.yml)"
 
-# If you want to set the descrition or keywords meta tags on your site's
-# home page, do it here.
-#
-# description: "Set this to something that describes your home page"
-# keywords: "enter 3 or 4, comma separated, keywords"
-
 # You should really specify your content's author when generating an
 # 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:

data/templates/index.haml

@@ -0,0 +1 @@
+%section.articles= article_summaries(latest_articles)

data/views/atom.haml

@@ -0,0 +1,28 @@
+!!! XML
+%feed(xmlns='http://www.w3.org/2005/Atom')
+  %title(type='text')= @title
+  %generator(uri='http://effectif.com/nesta') Nesta
+  %id= atom_id
+  %link(href="#{base_url}/articles.xml" rel='self')
+  %link(href=base_url rel='alternate')
+  %subtitle(type='text')= @subtitle
+  - if @articles[0]
+    %updated= @articles[0].date(:xmlschema)
+  - if @author
+    %author
+      - if @author['name']
+        %name= @author['name']
+      - if @author['uri']
+        %uri= @author['uri']
+      - if @author['email']
+        %email= @author['email']
+  - @articles.each do |article|
+    %entry
+      %title= article.heading
+      %link{ :href => url_for(article), :type => 'text/html', :rel => 'alternate' }
+      %id= atom_id(article)
+      %content(type='html')&= find_and_preserve(absolute_urls(article.body))
+      %published= article.date(:xmlschema)
+      %updated= article.date(:xmlschema)
+      - article.categories.each do |category|
+        %category{ :term => category.permalink }

data/views/master.sass

@@ -84,6 +84,13 @@ pre
 img
   border: none
 
+nav.breadcrumb
+  margin-top: $vertical-rhythm
+  color: $meta-color
+  padding: 0.5em 0
+
+  font-size: 0.909em
+
 // Layout
 
 article, aside, footer, header, nav, section
@@ -94,13 +101,6 @@ div#container
   margin: 0 auto
   padding: 1em 1em 0 1em
 
-  nav.breadcrumb
-    margin-top: $vertical-rhythm
-    color: $meta-color
-    padding: 0.5em 0
-    
-    font-size: 0.909em
-  
   div#content
     position: relative
     width: $content-width
@@ -138,17 +138,34 @@ a
     color: $active-link-color
     border-bottom-color: $active-link-color
 
+nav.breadcrumb    
+  ul
+    margin: 0
+  li
+    display: inline
+    list-style: none
+    &::after
+      content: " > "
+    &:last-child::after
+      content: ""
+
+nav.breadcrumb,
 nav.categories,
 div.feed,
 article p.meta
   a
     color: $nav-link-color
-    border-bottom-color: $background-color
   &:hover a
     color: $link-color
   a:hover
     color: $hover-link-color
 
+nav.categories,
+div.feed,
+article p.meta
+  a
+    border-bottom-color: $background-color
+
 article p.meta
   a
     @include transition(border-bottom-color 0.5s 0 ease)

data/views/page.haml

@@ -1,10 +1,5 @@
 %nav.breadcrumb
-  %a(href="/") Home
-  >
-  - if @page.parent
-    %a(href="#{@page.parent.abspath}")= @page.parent.heading
-    >
-  = @page.heading
+  - display_breadcrumbs
 
 #content
   %article(role="main")

data/views/sitemap.haml

@@ -0,0 +1,11 @@
+!!! XML
+%urlset(xmlns="http://www.sitemaps.org/schemas/sitemap/0.9")
+  %url
+    %loc= base_url
+    %changefreq daily
+    %priority 1.0
+    %lastmod= @last.xmlschema
+  - @pages.each do |page|
+    %url
+      %loc= url_for(page)
+      %lastmod= page.last_modified.xmlschema