nesta 0.9.2 → 0.9.3

data/CHANGES

@@ -1,3 +1,45 @@
+= 0.9.3 / 18 January 2011
+
+ * The route and view for serving the home page (/) has been removed, 
+   and the home page must now be created as an index page in
+   content/pages.
+
+   You will have to create `content/pages/index.haml` manually when
+   upgrading. Running `nesta new mysite.com` will create a
+   `content/pages/index.haml` file that is suitable for a blog.
+
+ * The URL /my-page can be served from `pages/my-page/index.mdown` as
+   well as pages/my-page.mdown (index pages can also be created with
+   Textile or Haml, just like any other page).
+
+ * The description and keywords settings have been removed from
+   config.yml as they can now be set on `content/pages/index.haml`.
+
+ * Added the Title metadata key to override a page's default title tag.
+
+ * Specify the sort order of pages that are listed on a category page.
+   Optionally append a colon and a number to a path in the 'Categories'
+   metadata to control the sort order of pages listed on the category
+   page.
+
+   See these files for the syntax:
+   https://github.com/gma/nesta-demo-content/tree/master/pages/examples
+
+ * Support arbitrarily deep hierarchies when generating the breadcrumb
+   (see the new helper method added to Nesta::Navigation).
+
+ * Dropped the --heroku switch (Heroku runs fine without it and there is
+   less chance that committing config.yml to your repository will be an
+   issue now that Nesta sites live in their own repositories).
+
+ * Re-implemented /articles.xml and /sitemap.xml in Haml, dropping the
+   dependency on builder. This side steps a bug in Ruby 1.9.1, so Nesta
+   can now run on 1.9.1 again. Also fixed a validity error in the Atom
+   feed.
+
+ * Bug fix: Don't output empty <li> tags for nested submenus that are
+   beneath the requested number of levels.
+
 = 0.9.2 / 10 January 2011
 
  * Made the FileModel.metadata method public, to allow for custom

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.2)
+    nesta (0.9.3)
       RedCloth (~> 4.2)
-      builder (~> 3.0)
       haml (~> 3.0)
       maruku (>= 0.6.0)
       shotgun (>= 0.8)
@@ -13,7 +12,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.3)
-    builder (3.0.0)
     haml (3.0.25)
     hoe (2.6.2)
       rake (>= 0.8.7)
@@ -45,7 +43,6 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth (~> 4.2)
-  builder (~> 3.0)
   haml (~> 3.0)
   hpricot (= 0.8.3)
   maruku (>= 0.6.0)

data/bin/nesta

@@ -22,7 +22,6 @@ COMMANDS
 
 OPTIONS FOR new
     --git                 Create a new git repository for the project.
-    --heroku              Include the heroku:config rake task.
     --vlad                Include config/deploy.rb.
 
 EOF
@@ -33,7 +32,6 @@ exit 0
       opts = GetoptLong.new(
         ['--git', GetoptLong::NO_ARGUMENT],
         ['--help', '-h', GetoptLong::NO_ARGUMENT],
-        ['--heroku', GetoptLong::NO_ARGUMENT],
         ['--vlad', GetoptLong::NO_ARGUMENT]
       )
       options = {}

data/lib/nesta/app.rb

@@ -1,5 +1,4 @@
 require 'sinatra/base'
-require 'builder'
 require 'haml'
 require 'sass'
 
@@ -38,14 +37,6 @@ module Nesta
         end
       end
   
-      def set_title(page)
-        if page.respond_to?(:parent) && page.parent
-          @title = "#{page.heading} - #{page.parent.heading}"
-        else
-          @title = "#{page.heading} - #{Nesta::Config.title}"
-        end
-      end
-  
       def no_widow(text)
         text.split[0...-1].join(" ") + " #{text.split[-1]}"
       end
@@ -99,6 +90,18 @@ module Nesta
           haml_tag :link, :href => "/css/#{name}.css", :rel => "stylesheet"
         end
       end
+
+      def latest_articles(count = 8)
+        Nesta::Page.find_articles[0..count - 1]
+      end
+
+      def article_summaries(articles)
+        haml(
+          :summaries,
+          :layout => false,
+          :locals => { :pages => latest_articles }
+        )
+      end
     end
 
     not_found do
@@ -111,23 +114,6 @@ module Nesta
       haml(:error)
     end unless Nesta::App.environment == :development
 
-    # If you want to change Nesta's behaviour, you have two options:
-    #
-    # 1. Create an app.rb file in your project's root directory.
-    # 2. Make a theme or a plugin, and put the relevant code in there.
-    #
-    # You can add new routes, or modify the behaviour of any of the
-    # default objects in app.rb, or replace any of the default view
-    # templates by creating replacements of the same name in a ./views
-    # folder situated in the root directory of the project for your
-    # site.
-    #
-    # Your ./views folder gets searched first when rendering a template
-    # or Sass file, then the currently configured theme is searched, and
-    # finally Nesta will check if the template exists in the views
-    # folder in the Nesta gem (which is where the default look and feel
-    # is defined).
-    #
     Overrides.load_local_app
     Overrides.load_theme_app
 
@@ -144,15 +130,6 @@ module Nesta
       cache sass(params[:sheet].to_sym)
     end
 
-    get '/' do
-      set_common_variables
-      set_from_config(:title, :subtitle, :description, :keywords)
-      @heading = @title
-      @title = "#{@title} - #{@subtitle}"
-      @articles = Page.find_articles[0..7]
-      cache haml(:index)
-    end
-
     get %r{/attachments/([\w/.-]+)} do
       file = File.join(Nesta::Config.attachment_path, params[:captures].first)
       send_file(file, :disposition => nil)
@@ -162,7 +139,7 @@ module Nesta
       content_type :xml, :charset => 'utf-8'
       set_from_config(:title, :subtitle, :author)
       @articles = Page.find_articles.select { |a| a.date }[0..9]
-      cache builder(:atom)
+      cache haml(:atom, :format => :xhtml, :layout => false)
     end
 
     get '/sitemap.xml' do
@@ -171,15 +148,16 @@ module Nesta
       @last = @pages.map { |page| page.last_modified }.inject do |latest, page|
         (page > latest) ? page : latest
       end
-      cache builder(:sitemap)
+      cache haml(:sitemap, :format => :xhtml, :layout => false)
     end
 
     get '*' do
       set_common_variables
+      @heading = @title
       parts = params[:splat].map { |p| p.sub(/\/$/, '') }
       @page = Nesta::Page.find_by_path(File.join(parts))
       raise Sinatra::NotFound if @page.nil?
-      set_title(@page)
+      @title = @page.title
       set_from_page(:description, :keywords)
       cache haml(@page.template, :layout => @page.layout)
     end

data/lib/nesta/commands.rb

@@ -66,7 +66,7 @@ module Nesta
       end
 
       def have_rake_tasks?
-        @options['heroku'] || @options['vlad']
+        @options['vlad']
       end
 
       def create_repository
@@ -85,6 +85,7 @@ module Nesta
         templates = {
           'config.ru' => "#{@path}/config.ru",
           'config/config.yml' => "#{@path}/config/config.yml",
+          'index.haml' => "#{@path}/content/pages/index.haml",
           'Gemfile' => "#{@path}/Gemfile"
         }
         templates['Rakefile'] = "#{@path}/Rakefile" if have_rake_tasks?

data/lib/nesta/config.rb

@@ -6,8 +6,7 @@ require "sinatra"
 module Nesta
   class Config
     @settings = %w[
-      title subtitle description keywords theme disqus_short_name
-      cache content google_analytics_code
+      title subtitle theme disqus_short_name cache content google_analytics_code
     ]
     @author_settings = %w[name uri email]
     @yaml = nil

data/lib/nesta/models.rb

@@ -29,10 +29,12 @@ module Nesta
 
     def self.load(path)
       FORMATS.each do |format|
-        filename = model_path("#{path}.#{format}")
-        if File.exist?(filename) && needs_loading?(path, filename)
-          @@cache[path] = self.new(filename)
-          break
+        [path, File.join(path, 'index')].each do |basename|
+          filename = model_path("#{basename}.#{format}")
+          if File.exist?(filename) && needs_loading?(path, filename)
+            @@cache[path] = self.new(filename)
+            break
+          end
         end
       end
       @@cache[path]
@@ -54,17 +56,25 @@ module Nesta
       @mtime = File.mtime(filename)
     end
 
-    def permalink
-      File.basename(@filename, ".*")
+    def index_page?
+      @filename =~ /\/?index\.\w+$/
+    end
+
+    def abspath
+      page_path = @filename.sub(Nesta::Config.page_path, '')
+      if index_page?
+        File.dirname(page_path)
+      else
+        File.join(File.dirname(page_path), File.basename(page_path, '.*'))
+      end
     end
 
     def path
-      abspath.sub(/^\//, "")
+      abspath.sub(/^\//, '')
     end
 
-    def abspath
-      prefix = File.dirname(@filename).sub(Nesta::Config.page_path, "")
-      File.join(prefix, permalink)
+    def permalink
+      File.basename(path)
     end
 
     def layout
@@ -149,16 +159,28 @@ module Nesta
 
     def heading
       regex = case @format
-              when :mdown
-                /^#\s*(.*)/
-              when :haml
-                /^\s*%h1\s+(.*)/
-              when :textile
-                /^\s*h1\.\s+(.*)/
-              end
+        when :mdown
+          /^#\s*(.*)/
+        when :haml
+          /^\s*%h1\s+(.*)/
+        when :textile
+          /^\s*h1\.\s+(.*)/
+        end
       markup =~ regex
       Regexp.last_match(1)
     end
+  
+    def title
+      if metadata('title')
+        metadata('title')
+      elsif parent
+        "#{heading} - #{parent.heading}"
+      elsif heading
+        "#{heading} - #{Nesta::Config.title}"
+      elsif abspath == '/'
+        Nesta::Config.title
+      end
+    end
 
     def date(format = nil)
       @date ||= if metadata("date")
@@ -205,22 +227,44 @@ module Nesta
     end
 
     def categories
-      categories = metadata("categories")
-      paths = categories.nil? ? [] : categories.split(",").map { |p| p.strip }
-      valid_paths(paths).map { |p| Page.find_by_path(p) }.sort do |x, y|
+      paths = category_strings.map { |specifier| specifier.sub(/:-?\d+$/, '') }
+      pages = valid_paths(paths).map { |p| Page.find_by_path(p) }
+      pages.sort do |x, y|
         x.heading.downcase <=> y.heading.downcase
       end
     end
 
+    def priority(category)
+      category_string = category_strings.detect do |string|
+        string =~ /^#{category}([,:\s]|$)/
+      end
+      category_string && category_string.split(':', 2)[-1].to_i 
+    end
+
     def parent
-      Page.load(File.dirname(path))
+      if abspath == '/'
+        nil
+      else
+        parent_path = File.dirname(path)
+        while parent_path != '.' do
+          parent = Page.load(parent_path)
+          return parent unless parent.nil?
+          parent_path = File.dirname(parent_path)
+        end
+        Page.load('index')
+      end
     end
 
     def pages
       Page.find_all.select do |page|
         page.date.nil? && page.categories.include?(self)
       end.sort do |x, y|
-        x.heading.downcase <=> y.heading.downcase
+        by_priority = y.priority(path) <=> x.priority(path)
+        if by_priority == 0
+          x.heading.downcase <=> y.heading.downcase
+        else
+          by_priority
+        end
       end
     end
 
@@ -229,10 +273,18 @@ module Nesta
     end
 
     private
+      def category_strings
+        strings = metadata('categories')
+        strings.nil? ? [] : strings.split(',').map { |string| string.strip }
+      end
+
       def valid_paths(paths)
+        page_dir = Nesta::Config.page_path
         paths.select do |path|
           FORMATS.detect do |format|
-            File.exist?(File.join(Nesta::Config.page_path, "#{path}.#{format}"))
+            [path, File.join(path, 'index')].detect do |candidate|
+              File.exist?(File.join(page_dir, "#{candidate}.#{format}"))
+            end
           end
         end
       end

data/lib/nesta/navigation.rb

@@ -14,16 +14,47 @@ module Nesta
       end
 
       def display_menu_item(item, options = {})
-        haml_tag :li do
-          if item.respond_to?(:each)
-            display_menu(item, :levels => (options[:levels] - 1))
-          else
+        if item.respond_to?(:each)
+          if (options[:levels] - 1) > 0
+            haml_tag :li do
+              display_menu(item, :levels => (options[:levels] - 1))
+            end
+          end
+        else
+          haml_tag :li do
             haml_tag :a, :href => item.abspath do
               haml_concat item.heading
             end
           end
         end
       end
+
+      def breadcrumb_ancestors
+        ancestors = []
+        page = @page
+        while page
+          ancestors << page
+          page = page.parent
+        end
+        ancestors.reverse
+      end
+
+      def display_breadcrumbs(options = {})
+        haml_tag :ul, :class => options[:class] do
+          breadcrumb_ancestors[0...-1].each do |page|
+            haml_tag :li do
+              haml_tag :a, :href => page.abspath do
+                haml_concat breadcrumb_label(page)
+              end
+            end
+          end
+          haml_tag(:li) { haml_concat breadcrumb_label(@page) }
+        end
+      end
+
+      def breadcrumb_label(page)
+        (page.abspath == '/') ? 'Home' : page.heading
+      end
     end
   end
 end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/nesta.gemspec

@@ -31,7 +31,6 @@ EOF
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('builder', '~> 3.0')
   s.add_dependency('haml', '~> 3.0')
   s.add_dependency('maruku', '>= 0.6.0')
   s.add_dependency('RedCloth', '~> 4.2')

data/spec/commands_spec.rb

@@ -44,6 +44,10 @@ describe "nesta" do
         should_exist('content/pages')
       end
 
+      it "should create the home page" do
+        should_exist('content/pages/index.haml')
+      end
+
       it "should create the rackup file" do
         should_exist('config.ru')
       end
@@ -82,22 +86,6 @@ describe "nesta" do
       end
     end
 
-    describe "--heroku" do
-      before(:each) do
-        Nesta::Commands::New.new(@project_path, 'heroku' => '').execute
-      end
-
-      it "should add heroku to Gemfile" do
-        gemfile_source.should match(/gem 'heroku'/)
-      end
-
-      it "should add the heroku:config Rake task" do
-        should_exist('Rakefile')
-        rakefile_source.should match(/namespace :heroku/)
-        rakefile_source.should match(/task :config/)
-      end
-    end
-
     describe "--vlad" do
       before(:each) do
         Nesta::Commands::New.new(@project_path, 'vlad' => '').execute