nesta 0.9.5 → 0.9.7

data/CHANGES

@@ -1,3 +1,34 @@
+= 0.9.7 / (19 August 2011)
+
+ * No code changes from 0.9.6; version number increased to allow new gem
+   to be deployed to rubygems.org.
+
+= 0.9.6 / (18 August 2011) [never released due to packaging bug]
+
+ * Nesta no longer cares whether you write your Sass stylesheets in the
+   original indented Sass format or the default SCSS syntax (which is a
+   superset of CSS). To use this functionality within your own site or
+   theme change change any calls to the existing `sass` or `scss`
+   helpers to `stylesheet`. (Isaac Cambron, Graham Ashton)
+
+ * Add an HTML class ("current") to the menu items whose path matches
+   the current page.
+
+ * Bug fix: Strip trailing # characters from Markdown headings at the
+   top of a page.
+
+ * Bug fix: Don't render the return value of local_stylesheet_link_tag
+   directly into the page (haml_tag now writes direct to the output
+   buffer).
+
+ * Bug fix: Removed trailing whitespace inside <a> tags generated by
+   the display_breadcrumbs() helper.
+
+ * Bug fix: Nesta::App.root couldn't be set until after nesta/app was
+   required. Odd that, as the only reason to want to change
+   Nesta::App.root would be before requiring nesta/app. Fixed by
+   creating Nesta::Env and moving root to there instead.
+
 = 0.9.5 / (1 May 2011)
 
  * Added --version option to nesta command (Christopher Lindblom).
@@ -13,9 +44,6 @@
  * 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).
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.5)
+    nesta (0.9.7)
       RedCloth (~> 4.2)
       haml (~> 3.1)
       maruku (>= 0.6.0)
@@ -13,7 +13,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.7)
-    haml (3.1.1)
+    haml (3.1.2)
     hoe (2.6.2)
       rake (>= 0.8.7)
       rubyforge (>= 2.0.4)
@@ -29,7 +29,7 @@ GEM
     rspec_hpricot_matchers (1.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
-    sass (3.1.1)
+    sass (3.1.5)
     shotgun (0.9)
       rack (>= 1.0)
     sinatra (1.1.2)
@@ -38,7 +38,7 @@ GEM
     syntax (1.0.0)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
-    tilt (1.3)
+    tilt (1.3.2)
 
 PLATFORMS
   ruby

data/config.ru

@@ -4,6 +4,7 @@ require 'bundler/setup'
 Bundler.require(:default)
 
 $LOAD_PATH.unshift(::File.expand_path('lib', ::File.dirname(__FILE__)))
+require 'nesta/env'
 require 'nesta/app'
 
 run Nesta::App

data/lib/nesta/app.rb

@@ -83,11 +83,11 @@ module Nesta
   
       def local_stylesheet?
         Nesta.deprecated('local_stylesheet?', 'use local_stylesheet_link_tag')
-        File.exist?(File.expand_path('views/local.sass', Nesta::App.root))
+        File.exist?(File.expand_path('views/local.sass', Nesta::Env.root))
       end
 
       def local_stylesheet_link_tag(name)
-        pattern = File.expand_path("views/#{name}.s{a,c}ss", Nesta::App.root)
+        pattern = File.expand_path("views/#{name}.s{a,c}ss", Nesta::Env.root)
         if Dir.glob(pattern).size > 0
           haml_tag :link, :href => "/css/#{name}.css", :rel => "stylesheet"
         end
@@ -125,7 +125,7 @@ module Nesta
 
     get '/css/:sheet.css' do
       content_type 'text/css', :charset => 'utf-8'
-      cache sass(params[:sheet].to_sym)
+      cache stylesheet(params[:sheet].to_sym)
     end
 
     get %r{/attachments/([\w/.-]+)} do

data/lib/nesta/config.rb

@@ -46,7 +46,7 @@ module Nesta
     end
     
     def self.yaml_path
-      File.expand_path('config/config.yml', Nesta::App.root)
+      File.expand_path('config/config.yml', Nesta::Env.root)
     end
     
     def self.from_environment(setting)

data/lib/nesta/env.rb

@@ -0,0 +1,7 @@
+module Nesta
+  class Env
+    class << self
+      attr_accessor :root
+    end
+  end
+end

data/lib/nesta/models.rb

@@ -170,7 +170,7 @@ module Nesta
     def heading
       regex = case @format
         when :mdown
-          /^#\s*(.*)/
+          /^#\s*(.*?)(\s*#+|$)/
         when :haml
           /^\s*%h1\s+(.*)/
         when :textile
@@ -194,12 +194,12 @@ module Nesta
 
     def date(format = nil)
       @date ||= if metadata("date")
-                  if format == :xmlschema
-                    Time.parse(metadata("date")).xmlschema
-                  else
-                    DateTime.parse(metadata("date"))
-                  end
-                end
+        if format == :xmlschema
+          Time.parse(metadata("date")).xmlschema
+        else
+          DateTime.parse(metadata("date"))
+        end
+      end
     end
 
     def atom_id

data/lib/nesta/navigation.rb

@@ -21,7 +21,8 @@ module Nesta
             end
           end
         else
-          haml_tag :li do
+          html_class = (request.path == item.abspath) ? "current" : nil
+          haml_tag :li, :class => html_class do
             haml_tag :a, :<, :href => item.abspath do
               haml_concat item.heading
             end
@@ -43,7 +44,7 @@ module Nesta
         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_tag :a, :<, :href => page.abspath do
                 haml_concat breadcrumb_label(page)
               end
             end

data/lib/nesta/overrides.rb

@@ -2,19 +2,25 @@ module Nesta
   module Overrides
     module Renderers
       def haml(template, options = {}, locals = {})
-        defaults = Overrides.render_options(template, :haml)
+        defaults, engine = Overrides.render_options(template, :haml)
         super(template, defaults.merge(options), locals)
       end
 
       def scss(template, options = {}, locals = {})
-        defaults = Overrides.render_options(template, :scss)
+        defaults, engine = Overrides.render_options(template, :scss)
         super(template, defaults.merge(options), locals)
       end
 
       def sass(template, options = {}, locals = {})
-        defaults = Overrides.render_options(template, :sass)
+        defaults, engine = Overrides.render_options(template, :sass)
         super(template, defaults.merge(options), locals)
       end
+
+      def stylesheet(template, options = {}, locals = {})
+        defaults, engine = Overrides.render_options(template, :sass, :scss)
+        renderer = Sinatra::Templates.instance_method(engine)
+        renderer.bind(self).call(template, defaults.merge(options), locals)
+      end
     end
 
     def self.load_local_app
@@ -34,14 +40,15 @@ module Nesta
         views && File.exist?(File.join(views, "#{template}.#{engine}"))
       end
 
-      def self.render_options(template, engine)
-        if template_exists?(engine, local_view_path, template)
-          { :views => local_view_path }
-        elsif template_exists?(engine, theme_view_path, template)
-          { :views => theme_view_path }
-        else
-          {}
+      def self.render_options(template, *engines)
+        [local_view_path, theme_view_path].each do |path|
+          engines.each do |engine|
+            if template_exists?(engine, path, template)
+              return { :views => path }, engine
+            end
+          end
         end
+        [{}, nil]
       end
 
       def self.local_view_path

data/lib/nesta/path.rb

@@ -1,11 +1,11 @@
 module Nesta
   class Path
     def self.local(*args)
-      File.expand_path(File.join(args), Nesta::App.root)
+      File.expand_path(File.join(args), Nesta::Env.root)
     end
 
     def self.themes(*args)
-      File.expand_path(File.join('themes', *args), Nesta::App.root)
+      File.expand_path(File.join('themes', *args), Nesta::Env.root)
     end
   end
 end

data/lib/nesta/version.rb

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

data/spec/commands_spec.rb

@@ -115,7 +115,7 @@ describe "nesta" do
       FileUtils.mkdir_p(File.dirname(@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::Env.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
@@ -265,7 +265,7 @@ describe "nesta" do
     end
 
     before(:each) do
-      Nesta::App.stub!(:root).and_return(FixtureHelper::FIXTURE_DIR)
+      Nesta::Env.stub!(:root).and_return(FixtureHelper::FIXTURE_DIR)
       @name = 'my-new-theme'
       Nesta::Commands::Theme::Create.new(@name).execute
     end

data/spec/models_spec.rb

@@ -455,12 +455,14 @@ describe "Markdown page" do
   it_should_behave_like "Page"
 
   it "should set heading from first h1 tag" do
-    create_page(
-      :path => "a-page",
-      :heading => "First heading",
-      :content => "# Second heading"
-    )
-    Nesta::Page.find_by_path("a-page").heading.should == "First heading"
+    page = create_page(
+      :heading => "First heading", :content => "# Second heading")
+    page.heading.should == "First heading"
+  end
+
+  it "should ignore trailing # characters in headings" do
+    article = create_article(:heading => 'With trailing #')
+    article.heading.should == 'With trailing'
   end
 end
 

data/spec/overrides_spec.rb

@@ -27,8 +27,8 @@ describe "Rendering" do
   end
 
   before(:each) do
-    @app_root = Nesta::App.root
-    Nesta::App.root = File.expand_path('fixtures/tmp', File.dirname(__FILE__))
+    @app_root = Nesta::Env.root
+    Nesta::Env.root = File.expand_path('fixtures/tmp', File.dirname(__FILE__))
     @theme = 'my-theme'
     @fixtures = []
     stub_configuration
@@ -36,9 +36,23 @@ describe "Rendering" do
   
   after(:each) do
     @fixtures.each { |path| FileUtils.rm(path) if File.exist?(path) }
-    Nesta::App.root = @app_root
+    Nesta::Env.root = @app_root
   end
     
+  describe "when rendering stylesheets" do
+    it "should render the SASS stylesheets" do
+      create_template(:local, 'master.sass', "body\n  width: 10px * 2")
+      get "/css/master.css"
+      body.should match(/width: 20px;/)
+    end
+
+    it "should render the SCSS stylesheets" do
+      create_template(:local, 'master.scss', "body {\n  width: 10px * 2;\n}")
+      get "/css/master.css"
+      body.should match(/width: 20px;/)
+    end
+  end
+
   describe "when local files exist" do
     before(:each) do
       create_template(:local, 'page.haml', '%p Local template')

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ module Nesta
   end
 end
 
+require File.expand_path('../lib/nesta/env', File.dirname(__FILE__))
 require File.expand_path('../lib/nesta/app', File.dirname(__FILE__))
 
 module FixtureHelper

data/templates/config.ru

@@ -3,7 +3,8 @@ require 'bundler/setup'
 
 Bundler.require(:default)
 
-require 'nesta/app'
+require 'nesta/env'
+Nesta::Env.root = ::File.expand_path('.', ::File.dirname(__FILE__))
 
-Nesta::App.root = ::File.expand_path('.', ::File.dirname(__FILE__))
+require 'nesta/app'
 run Nesta::App

data/views/layout.haml

@@ -14,7 +14,7 @@
       %link(rel="stylesheet" href="http://universal-ie6-css.googlecode.com/files/ie6.1.1.css" media="screen, projection")
     /[if lt IE 9]
       %script(src="//html5shim.googlecode.com/svn/trunk/html5.js")
-    = local_stylesheet_link_tag('local')
+    - local_stylesheet_link_tag('local')
     %link(href="/articles.xml" rel="alternate" type="application/atom+xml")
     = haml :analytics, :layout => false
   %body

metadata

@@ -2,7 +2,7 @@
 name: nesta
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors: 
 - Graham Ashton
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 +01:00
+date: 2011-08-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -170,6 +170,7 @@ files:
 - lib/nesta/cache.rb
 - lib/nesta/commands.rb
 - lib/nesta/config.rb
+- lib/nesta/env.rb
 - lib/nesta/models.rb
 - lib/nesta/navigation.rb
 - lib/nesta/nesta.rb
@@ -230,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1498426163218200978
+      hash: -3003652627560154656
       segments: 
       - 0
       version: "0"
@@ -239,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1498426163218200978
+      hash: -3003652627560154656
       segments: 
       - 0
       version: "0"