nesta 0.9.4 → 0.9.5

data/CHANGES

@@ -1,3 +1,32 @@
+= 0.9.5 / (1 May 2011)
+
+ * Added --version option to nesta command (Christopher Lindblom).
+
+ * Upgraded Haml and Sass to version 3.1 (Andrew Nesbitt).
+
+ * Updated the URL from which the Disqus JavaScript is loaded
+   (Sidharta Surya Kusnanto).
+
+ * Bug fix: Don't use parent's heading in page title if parent's heading
+   is blank (Christopher Lindblom).
+
+ * Bug fix: Removed trailing whitespace inside <a> tags generated by
+   the display_menu() helper.
+
+ * Updated the URL from which Disqus JavaScript is loaded
+   (Sidharta Surya Kusnanto).
+
+ * Bug fix: Made article_summaries render summaries for the pages
+   passed into it (Robert Syme).
+
+ * Bug fix: Empty files in the content directory would cause the site to
+   crash - they are now served properly.
+
+ * Bug fix: When pages written in Haml were included on a category page
+   the default theme didn't provide access to Sinatra's helper methods
+   within Haml templates. See https://github.com/gma/nesta/pull/18
+   (Carl Furrow).
+
 = 0.9.4 / 18 February 2011
 
  * Updated the link colours in the default theme.

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.4)
+    nesta (0.9.5)
       RedCloth (~> 4.2)
-      haml (~> 3.0)
+      haml (~> 3.1)
       maruku (>= 0.6.0)
+      sass (~> 3.1)
       shotgun (>= 0.8)
       sinatra (= 1.1.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.3)
-    haml (3.0.25)
+    RedCloth (4.2.7)
+    haml (3.1.1)
     hoe (2.6.2)
       rake (>= 0.8.7)
       rubyforge (>= 2.0.4)
@@ -28,7 +29,8 @@ GEM
     rspec_hpricot_matchers (1.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
-    shotgun (0.8)
+    sass (3.1.1)
+    shotgun (0.9)
       rack (>= 1.0)
     sinatra (1.1.2)
       rack (~> 1.1)
@@ -36,20 +38,15 @@ GEM
     syntax (1.0.0)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
-    tilt (1.2.1)
+    tilt (1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth (~> 4.2)
-  haml (~> 3.0)
   hpricot (= 0.8.3)
-  maruku (>= 0.6.0)
   nesta!
   rack-test (= 0.5.7)
   rspec (= 1.3.0)
   rspec_hpricot_matchers (= 1.0)
-  shotgun (>= 0.8)
-  sinatra (= 1.1.2)
   test-unit (= 1.2.3)

data/README.md

@@ -24,7 +24,7 @@ Then use the `nesta` command to generate a new site:
 Install a few dependencies, and you're away:
 
     $ cd mysite.com
-    $ bundle install
+    $ bundle
 
 You'll find basic configuration options for your site in
 `config/config.yml`. The defaults will work, but you'll want to tweak it
@@ -36,7 +36,7 @@ shotgun...
     $ bundle exec shotgun config.ru
 
 ...then point your web browser at http://localhost:9393. Start editing
-the files in `content/pages` (see [Creating Your Content][content] for
-full instructions).
+the files in `content/pages` (see the [Writing content][content] docs
+for full instructions).
 
-[content]: http://effectif.com/nesta/creating-content
+[content]: http://nestacms.com/docs/creating-content

data/bin/nesta

@@ -12,6 +12,7 @@ USAGE: #{File.basename($0)} [GLOBAL OPTIONS] <command> [COMMAND OPTIONS]
 
 GLOBAL OPTIONS
     --help, -h            Display this message.
+    --version, -v         Display version number.
 
 COMMANDS
     new <path>            Create a new Nesta project.
@@ -28,10 +29,16 @@ EOF
 exit 0
     end
 
+    def self.version
+      puts "Nesta #{Nesta::VERSION}"
+      exit 0
+    end
+
     def self.parse_command_line
       opts = GetoptLong.new(
         ['--git', GetoptLong::NO_ARGUMENT],
         ['--help', '-h', GetoptLong::NO_ARGUMENT],
+        ['--version', '-v', GetoptLong::NO_ARGUMENT],
         ['--vlad', GetoptLong::NO_ARGUMENT]
       )
       options = {}
@@ -39,6 +46,8 @@ exit 0
         case opt 
         when '--help'
           usage
+        when '--version'
+          version
         else
           options[opt.sub(/^--/, '')] = arg
         end

data/lib/nesta/app.rb

@@ -98,11 +98,7 @@ module Nesta
       end
 
       def article_summaries(articles)
-        haml(
-          :summaries,
-          :layout => false,
-          :locals => { :pages => latest_articles }
-        )
+        haml(:summaries, :layout => false, :locals => { :pages => articles })
       end
     end
 

data/lib/nesta/models.rb

@@ -52,7 +52,12 @@ module Nesta
     def initialize(filename)
       @filename = filename
       @format = filename.split(".").last.to_sym
-      parse_file
+      if File.zero?(filename)
+        @metadata = {}
+        @markup = ''
+      else
+        @metadata, @markup = parse_file
+      end
       @mtime = File.mtime(filename)
     end
 
@@ -86,14 +91,7 @@ module Nesta
     end
 
     def to_html(scope = nil)
-      case @format
-      when :mdown
-        Maruku.new(markup).to_html
-      when :haml
-        Haml::Engine.new(markup).to_html(scope || Object.new)
-      when :textile
-        RedCloth.new(markup).to_html
-      end
+      convert_to_html(@format, scope, markup)
     end
 
     def last_modified
@@ -113,29 +111,41 @@ module Nesta
     end
 
     private
-    def markup
-      @markup
-    end
+      def markup
+        @markup
+      end
 
-    def paragraph_is_metadata(text)
-      text.split("\n").first =~ /^[\w ]+:/
-    end
+      def metadata?(text)
+        text.split("\n").first =~ /^[\w ]+:/
+      end
 
-    def parse_file
-      first_para, remaining = File.open(@filename).read.split(/\r?\n\r?\n/, 2)
-      @metadata = {}
-      if paragraph_is_metadata(first_para)
-        @markup = remaining
-        for line in first_para.split("\n") do
-          key, value = line.split(/\s*:\s*/, 2)
-          @metadata[key.downcase] = value.chomp
-        end
+      def parse_file
+        contents = File.open(@filename).read
+      rescue Errno::ENOENT
+        raise Sinatra::NotFound
       else
-        @markup = [first_para, remaining].join("\n\n")
+        first_paragraph, remaining = contents.split(/\r?\n\r?\n/, 2)
+        metadata = {}
+        if metadata?(first_paragraph)
+          first_paragraph.split("\n").each do |line|
+            key, value = line.split(/\s*:\s*/, 2)
+            metadata[key.downcase] = value.chomp
+          end
+        end
+        markup = metadata?(first_paragraph) ? remaining : contents
+        return metadata, markup
+      end
+
+      def convert_to_html(format, scope, text)
+        case format
+          when :mdown
+            Maruku.new(text).to_html
+          when :haml
+            Haml::Engine.new(text).to_html(scope)
+          when :textile
+            RedCloth.new(text).to_html
+          end
       end
-    rescue Errno::ENOENT  # file not found
-      raise Sinatra::NotFound
-    end
   end
 
   class Page < FileModel
@@ -173,7 +183,7 @@ module Nesta
     def title
       if metadata('title')
         metadata('title')
-      elsif parent
+      elsif parent && (! parent.heading.nil?)
         "#{heading} - #{parent.heading}"
       elsif heading
         "#{heading} - #{Nesta::Config.title}"
@@ -212,18 +222,16 @@ module Nesta
       end
     end
 
-    def body
-      case @format
-      when :mdown
-        body_text = markup.sub(/^#[^#].*$\r?\n(\r?\n)?/, "")
-        Maruku.new(body_text).to_html
-      when :haml
-        body_text = markup.sub(/^\s*%h1\s+.*$\r?\n(\r?\n)?/, "")
-        Haml::Engine.new(body_text).render
-      when :textile
-        body_text = markup.sub(/^\s*h1\.\s+.*$\r?\n(\r?\n)?/, "")
-        RedCloth.new(body_text).to_html
-      end
+    def body(scope = nil)
+      body_text = case @format
+        when :mdown
+          markup.sub(/^#[^#].*$\r?\n(\r?\n)?/, "")
+        when :haml
+          markup.sub(/^\s*%h1\s+.*$\r?\n(\r?\n)?/, "")
+        when :textile
+          markup.sub(/^\s*h1\.\s+.*$\r?\n(\r?\n)?/, "")
+        end
+      convert_to_html(@format, scope, body_text)
     end
 
     def categories
@@ -256,9 +264,10 @@ module Nesta
     end
 
     def pages
-      Page.find_all.select do |page|
+      in_category = Page.find_all.select do |page|
         page.date.nil? && page.categories.include?(self)
-      end.sort do |x, y|
+      end
+      in_category.sort do |x, y|
         by_priority = y.priority(path) <=> x.priority(path)
         if by_priority == 0
           x.heading.downcase <=> y.heading.downcase

data/lib/nesta/navigation.rb

@@ -22,7 +22,7 @@ module Nesta
           end
         else
           haml_tag :li do
-            haml_tag :a, :href => item.abspath do
+            haml_tag :a, :<, :href => item.abspath do
               haml_concat item.heading
             end
           end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/nesta.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Graham Ashton"]
   s.email       = ["graham@effectif.com"]
-  s.homepage    = "http://effectif.com/nesta"
+  s.homepage    = "http://nestacms.com"
   s.summary     = %q{Ruby CMS, written in Sinatra}
   s.description = <<-EOF
 Nesta is a lightweight Content Management System, written in Ruby using
@@ -31,7 +31,8 @@ EOF
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('haml', '~> 3.0')
+  s.add_dependency('haml', '~> 3.1')
+  s.add_dependency('sass', '~> 3.1')
   s.add_dependency('maruku', '>= 0.6.0')
   s.add_dependency('RedCloth', '~> 4.2')
   s.add_dependency('sinatra', '1.1.2')

data/spec/models_spec.rb

@@ -285,6 +285,16 @@ describe "Page", :shared => true do
     end
   end
   
+  describe "with no content" do
+    it "should produce no HTML output" do
+      create_article do |path|
+        file = File.open(path, 'w')
+        file.close
+      end
+      Nesta::Page.find_all.first.to_html.should == ''
+    end
+  end
+
   describe "without metadata" do
     before(:each) do
       create_article

data/spec/page_spec.rb

@@ -392,7 +392,7 @@ describe "A page" do
     it "should display Disqus comments" do
       do_get
       body.should have_tag('#disqus_thread')
-      body.should have_tag('script[@src*="mysite/embed.js"]')
+      body.should have_tag('script[@src*="mysite.disqus.com/embed.js"]')
     end
   end
 end
@@ -420,6 +420,23 @@ describe "A Haml page" do
     get "/a-page"
     body.should have_tag("div", "23 November 2010")
   end
+
+  it "should access helpers when rendering articles on a category page" do
+    category = create_page(
+      :path => "a-page",
+      :heading => "First heading",
+      :content => "Blah blah"
+    )
+    create_article(
+      :path => "an-article",
+      :ext => :haml,
+      :heading => "First heading",
+      :metadata => { :categories => category.path },
+      :content => "%h1 Second heading\n\n%div= format_date(Date.new(2010, 11, 23))"
+    )
+    get "/a-page"
+    body.should have_tag("div", "23 November 2010")
+  end
 end
 
 describe "attachments" do

data/views/comments.haml

@@ -1,8 +1,9 @@
 - if short_name = Nesta::Config.disqus_short_name
   #disqus_thread
     - if Sinatra::Application.environment == :development
-      %script(type="text/javascript")
+      :javascript
         var disqus_developer = true;
-    %script(type="text/javascript" src="http://disqus.com/forums/#{short_name}/embed.js")
+    %script{:type => 'text/javascript', :src => "http://#{short_name}.disqus.com/embed.js", :async => true}
+
     %noscript
-      %a(href="http://disqus.com/forums/#{short_name}/?url=ref") View comments.
+      %a(href="http://#{short_name}.disqus.com/embed.js?url=ref") View comments.

data/views/footer.haml

@@ -2,7 +2,4 @@
   %p
     Powered by Nesta, a
     = succeed "." do
-      %a(href="http://effectif.com/nesta") Ruby CMS
-    Design by
-    = succeed "." do
-      %a(href="http://effectif.com") Graham Ashton
+      %a(href="http://nestacms.com") Ruby CMS

data/views/page.haml

@@ -6,13 +6,13 @@
     ~ @page.to_html(self)
 
     %section.pages
-      = haml :summaries, :layout => false, :locals => { :pages => @page.pages }
+      = article_summaries(@page.pages)
 
     - unless @page.articles.empty?
       %section.articles
         %header
           %h1= "Articles on #{@page.heading}"
-        = haml :summaries, :layout => false, :locals => { :pages => @page.articles, :heading => :h3 }
+        = article_summaries(@page.articles)
 
     = haml :page_meta, :layout => false, :locals => { :page => @page }
 

data/views/summaries.haml

@@ -7,7 +7,7 @@
             %h1
               %a(href="#{page.abspath}")= page.heading
           - if page.summary.nil? || page.summary.empty?
-            ~ page.body
+            ~ page.body(self)
           - else
             ~ page.summary
             %p.read_more

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: nesta
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 4
-  version: 0.9.4
+  prerelease: 
+  version: 0.9.5
 platform: ruby
 authors: 
 - Graham Ashton
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +00:00
+date: 2011-05-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,145 +20,120 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+        version: "3.1"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: sass
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.1"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 4
-        - 2
         version: "4.2"
   type: :runtime
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: shotgun
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
         version: "0.8"
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 3
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 7
         version: 0.5.7
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec_hpricot_matchers
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 3
         version: 1.2.3
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 description: |
   Nesta is a lightweight Content Management System, written in Ruby using
   the Sinatra web framework. Nesta has the simplicity of a static site
@@ -246,7 +217,7 @@ files:
 - views/sitemap.haml
 - views/summaries.haml
 has_rdoc: true
-homepage: http://effectif.com/nesta
+homepage: http://nestacms.com
 licenses: []
 
 post_install_message: 
@@ -259,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3842425981722162999
+      hash: -1498426163218200978
       segments: 
       - 0
       version: "0"
@@ -268,14 +239,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3842425981722162999
+      hash: -1498426163218200978
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nesta
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Ruby CMS, written in Sinatra