nesta 0.9.11 → 0.9.13

data/lib/nesta/commands.rb

@@ -50,10 +50,28 @@ module Nesta
       end
     end
 
+    class Edit
+      include Command
+
+      def initialize(*args)
+        @filename = Nesta::Config.page_path(args.shift)
+      end
+
+      def execute
+        editor = ENV.fetch('EDITOR')
+      rescue IndexError
+        $stderr.puts "No editor: set EDITOR environment variable"
+      else
+        system(editor, @filename)
+      end
+    end
+
     class New
       include Command
 
-      def initialize(path, options = {})
+      def initialize(*args)
+        path = args.shift
+        options = args.shift || {}
         path.nil? && (raise UsageError.new('path not specified'))
         if File.exist?(path)
           raise RuntimeError.new("#{path} already exists") 
@@ -104,7 +122,7 @@ module Nesta
       class Content
         include Command
 
-        def initialize
+        def initialize(*args)
           @dir = 'content-demo'
         end
 
@@ -135,7 +153,8 @@ module Nesta
 
     module Plugin
       class Create
-        def initialize(name)
+        def initialize(*args)
+          name = args.shift
           name.nil? && (raise UsageError.new('name not specified'))
           @name = name
           @gem_name = "nesta-plugin-#{name}"
@@ -210,7 +229,9 @@ end
       class Create
         include Command
 
-        def initialize(name, options = {})
+        def initialize(*args)
+          name = args.shift
+          options = args.shift || {}
           name.nil? && (raise UsageError.new('name not specified'))
           @name = name
           @theme_path = Nesta::Path.themes(@name)
@@ -234,7 +255,9 @@ end
       class Install
         include Command
 
-        def initialize(url, options = {})
+        def initialize(*args)
+          url = args.shift
+          options = args.shift || {}
           url.nil? && (raise UsageError.new('URL not specified'))
           @url = url
           @name = File.basename(url, '.git').sub(/nesta-theme-/, '')
@@ -243,14 +266,20 @@ end
         def execute
           system('git', 'clone', @url, "themes/#{@name}")
           FileUtils.rm_r(File.join("themes/#{@name}", '.git'))
-          enable(@name)
+          enable
+        end
+
+        def enable
+          Enable.new(@name).execute
         end
       end
 
       class Enable
         include Command
 
-        def initialize(name, options = {})
+        def initialize(*args)
+          name = args.shift
+          options = args.shift || {}
           name.nil? && (raise UsageError.new('name not specified'))
           @name = name
         end

data/lib/nesta/config.rb

@@ -1,7 +1,4 @@
-require "yaml"
-
-require "rubygems"
-require "sinatra"
+require 'yaml'
 
 module Nesta
   class Config
@@ -68,7 +65,7 @@ module Nesta
 
     def self.from_yaml(setting)
       if can_use_yaml?
-        self.yaml_conf ||= YAML::load(IO.read(yaml_path))
+        self.yaml_conf ||= YAML::load(ERB.new(IO.read(yaml_path)).result)
         rack_env_conf = self.yaml_conf[Nesta::App.environment.to_s]
         (rack_env_conf && rack_env_conf[setting]) || self.yaml_conf[setting]
       end

data/lib/nesta/helpers.rb

@@ -0,0 +1,74 @@
+module Nesta
+  module View
+    module Helpers
+      def set_from_config(*variables)
+        variables.each do |var|
+          instance_variable_set("@#{var}", Nesta::Config.send(var))
+        end
+      end
+
+      def set_from_page(*variables)
+        variables.each do |var|
+          instance_variable_set("@#{var}", @page.send(var))
+        end
+      end
+
+      def no_widow(text)
+        text.split[0...-1].join(" ") + " #{text.split[-1]}"
+      end
+
+      def set_common_variables
+        @menu_items = Nesta::Menu.for_path('/')
+        @site_title = Nesta::Config.title
+        set_from_config(:title, :subtitle, :google_analytics_code)
+        @heading = @title
+      end
+
+      def absolute_urls(text)
+        text.gsub!(/(<a href=['"])\//, '\1' + url('/'))
+        text
+      end
+
+      def nesta_atom_id_for_page(page)
+        published = page.date.strftime('%Y-%m-%d')
+        "tag:#{request.host},#{published}:#{page.abspath}"
+      end
+
+      def atom_id(page = nil)
+        if page
+          page.atom_id || nesta_atom_id_for_page(page)
+        else
+          "tag:#{request.host},2009:/"
+        end
+      end
+
+      def format_date(date)
+        date.strftime("%d %B %Y")
+      end
+
+      def local_stylesheet?
+        Nesta.deprecated('local_stylesheet?', 'use local_stylesheet_link_tag')
+        File.exist?(File.expand_path('views/local.sass', Nesta::App.root))
+      end
+
+      def local_stylesheet_link_tag(name)
+        pattern = File.expand_path("views/#{name}.s{a,c}ss", Nesta::App.root)
+        if Dir.glob(pattern).size > 0
+          haml_tag :link, :href => url("/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 => articles })
+      end
+
+      def articles_heading
+        @page.metadata('articles heading') || "Articles on #{@page.heading}"
+      end
+    end
+  end
+end

data/lib/nesta/models.rb

@@ -7,6 +7,8 @@ Tilt.register Tilt::RDiscountTemplate, 'mdown'
 Tilt.register Tilt::RedcarpetTemplate, 'mdown'
 
 module Nesta
+  class MetadataParseError < RuntimeError; end
+
   class FileModel
     FORMATS = [:mdown, :haml, :textile]
     @@cache = {}
@@ -123,33 +125,49 @@ module Nesta
       flags && flags.split(',').map { |name| name.strip }.include?(flag)
     end
 
+    def parse_metadata(first_paragraph)
+      is_metadata = first_paragraph.split("\n").first =~ /^[\w ]+:/
+      raise MetadataParseError unless is_metadata
+      metadata = CaseInsensitiveHash.new
+      first_paragraph.split("\n").each do |line|
+        key, value = line.split(/\s*:\s*/, 2)
+        next if value.nil?
+        metadata[key.downcase] = value.chomp
+      end
+      metadata
+    end
+
     private
       def markup
         @markup
       end
 
-      def metadata?(text)
-        text.split("\n").first =~ /^[\w ]+:/
-      end
-
       def parse_file
         contents = File.open(@filename).read
       rescue Errno::ENOENT
         raise Sinatra::NotFound
       else
         first_paragraph, remaining = contents.split(/\r?\n\r?\n/, 2)
-        metadata = CaseInsensitiveHash.new
-        if metadata?(first_paragraph)
-          first_paragraph.split("\n").each do |line|
-            key, value = line.split(/\s*:\s*/, 2)
-            metadata[key.downcase] = value.chomp
+        begin
+          return parse_metadata(first_paragraph), remaining
+        rescue MetadataParseError
+          return {}, contents
+        end
+      end
+
+      def tag_lines_of_haml(text)
+        tagged = (text =~ /^\s*%/)
+        if tagged
+          text
+        else
+          text.split(/\r?\n/).inject("") do |accumulator, line|
+            accumulator << "%p #{line}\n"
           end
         end
-        markup = metadata?(first_paragraph) ? remaining : contents
-        return metadata, markup
       end
 
       def convert_to_html(format, scope, text)
+        text = tag_lines_of_haml(text) if @format == :haml
         template = Tilt[format].new { text }
         template.render(scope)
       end
@@ -237,16 +255,19 @@ module Nesta
       end
     end
 
-    def body(scope = nil)
-      body_text = case @format
+    def body_markup
+      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
+    end
+
+    def body(scope = nil)
+      convert_to_html(@format, scope, body_markup)
     end
 
     def categories

data/lib/nesta/navigation.rb

@@ -21,9 +21,9 @@ module Nesta
             end
           end
         else
-          html_class = (request.path == item.abspath) ? "current" : nil
+          html_class = current_item?(item) ? "current" : nil
           haml_tag :li, :class => html_class do
-            haml_tag :a, :<, :href => item.abspath do
+            haml_tag :a, :<, :href => url(item.abspath) do
               haml_concat item.heading
             end
           end
@@ -44,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 => url(page.abspath) do
                 haml_concat breadcrumb_label(page)
               end
             end
@@ -56,6 +56,10 @@ module Nesta
       def breadcrumb_label(page)
         (page.abspath == '/') ? 'Home' : page.heading
       end
+
+      def current_item?(item)
+        request.path == item.abspath
+      end
     end
   end
 end

data/lib/nesta/overrides.rb

@@ -6,6 +6,11 @@ module Nesta
         super(template, defaults.merge(options), locals)
       end
 
+      def erb(template, options = {}, locals = {})
+        defaults, engine = Overrides.render_options(template, :erb)
+        super(template, defaults.merge(options), locals)
+      end
+
       def scss(template, options = {}, locals = {})
         defaults, engine = Overrides.render_options(template, :scss)
         super(template, defaults.merge(options), locals)

data/lib/nesta/plugin.rb

@@ -17,17 +17,19 @@ module Nesta
     end
 
     def self.load_local_plugins
+      # This approach is deprecated; plugins should now be distributed
+      # as gems. See http://nestacms.com/docs/plugins/writing-plugins
       plugins = Dir.glob(File.expand_path('../plugins/*', File.dirname(__FILE__)))
       plugins.each { |path| require_local_plugin(path) }
     end
 
-    private
-      def self.require_local_plugin(path)
-        Nesta.deprecated(
-            'loading plugins from ./plugins', "convert #{path} to a gem")
-        require File.join(path, 'lib', File.basename(path))
-      rescue LoadError => e
-        $stderr.write("Couldn't load plugins/#{File.basename(path)}: #{e}\n")
-      end
+    def self.require_local_plugin(path)
+      Nesta.deprecated(
+          'loading plugins from ./plugins', "convert #{path} to a gem")
+      require File.join(path, 'lib', File.basename(path))
+    rescue LoadError => e
+      $stderr.write("Couldn't load plugins/#{File.basename(path)}: #{e}\n")
+    end
+    private_class_method :require_local_plugin
   end
 end

data/lib/nesta/version.rb

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

data/nesta.gemspec

@@ -35,7 +35,8 @@ EOF
   s.add_dependency('sass', '~> 3.1')
   s.add_dependency('rdiscount', '~> 1.6')
   s.add_dependency('RedCloth', '~> 4.2')
-  s.add_dependency('sinatra', '1.2.6')
+  s.add_dependency('sinatra', '~> 1.3')
+  s.add_dependency('rack', '~> 1.1')
   
   # Useful in development
   s.add_dependency('shotgun', '>= 0.8')

data/spec/atom_spec.rb

@@ -32,7 +32,7 @@ describe "atom feed" do
   end
   
   it "should have an alternate link element" do
-    body.should have_tag("/feed/link[@rel=alternate][@href='http://example.org']")
+    body.should have_tag("/feed/link[@rel=alternate][@href='http://example.org/']")
   end
 
   it "should have a self link element" do

data/spec/commands_spec.rb

@@ -167,6 +167,29 @@ describe "nesta" do
     end
   end
 
+  describe "edit" do
+    before(:each) do
+      Nesta::Config.stub!(:content_path).and_return('content')
+      @page_path = 'path/to/page.mdown'
+      @command = Nesta::Commands::Edit.new(@page_path)
+      @command.stub!(:system)
+    end
+
+    it "should launch the editor" do
+      ENV['EDITOR'] = 'vi'
+      full_path = File.join('content/pages', @page_path)
+      @command.should_receive(:system).with(ENV['EDITOR'], full_path)
+      @command.execute
+    end
+
+    it "should not try and launch an editor if environment not setup" do
+      ENV.delete('EDITOR')
+      @command.should_not_receive(:system)
+      $stderr.stub!(:puts)
+      @command.execute
+    end
+  end
+
   describe "plugin:create" do
     before(:each) do
       @name = 'my-feature'
@@ -247,6 +270,7 @@ 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)
     end
 
@@ -267,16 +291,17 @@ describe "nesta" do
     end
 
     it "should enable the freshly installed theme" do
-      @command.should_receive(:enable).with('mine')
+      @command.should_receive(:enable)
       @command.execute
     end
 
-    describe "when theme URL doesn't match recommendation" do
+    describe "when theme URL doesn't match recommended pattern" do
       before(:each) do
         @repo_url = 'git://foobar.com/path/to/mytheme.git'
         @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)
       end
 
       after(:each) do

data/spec/models_spec.rb

@@ -58,6 +58,24 @@ describe "Page", :shared => true do
     Nesta::Page.find_by_path('banana').heading.should == 'Banana'
   end
 
+  it "should respond to #parse_metadata, returning hash of key/value" do
+    page = create_page(:heading => 'Banana', :path => 'banana')
+    metadata = page.parse_metadata('My key: some value')
+    metadata['my key'].should == 'some value'
+  end
+
+  it "should be parseable if metadata is invalid" do
+    dodgy_metadata = "Key: value\nKey without value\nAnother key: value"
+    create_page(:heading => 'Banana', :path => 'banana') do |path|
+      text = File.read(path)
+      File.open(path, 'w') do |file|
+        file.puts(dodgy_metadata)
+        file.write(text)
+      end
+    end
+    Nesta::Page.find_by_path('banana')
+  end
+
   describe "for home page" do
     it "should set title to heading and site title" do
       create_page(:heading => 'Home', :path => 'index')
@@ -396,6 +414,10 @@ describe "Page", :shared => true do
     it "should not include metadata in the HTML" do
       @article.to_html.should_not have_tag("p", /^Date/)
     end
+
+    it "should not include heading in body markup" do
+      @article.body_markup.should_not include("My article")
+    end
     
     it "should not include heading in body" do
       @article.body.should_not have_tag("h1", "My article")
@@ -501,12 +523,31 @@ describe "Haml page" do
   it_should_behave_like "Page"
 
   it "should set heading from first h1 tag" do
-    create_page(
+    page = create_page(
       :path => "a-page",
       :heading => "First heading",
       :content => "%h1 Second heading"
     )
-    Nesta::Page.find_by_path("a-page").heading.should == "First heading"
+    page.heading.should == "First heading"
+  end
+
+  it "should wrap <p> tags around one line summary text" do
+    page = create_page(
+      :path => "a-page",
+      :heading => "First para",
+      :metadata => { "Summary" => "Wrap me" }
+    )
+    page.summary.should include("<p>Wrap me</p>")
+  end
+
+  it "should wrap <p> tags around multiple lines of summary text" do
+    page = create_page(
+      :path => "a-page",
+      :heading => "First para",
+      :metadata => { "Summary" => 'Wrap me\nIn paragraph tags' }
+    )
+    page.summary.should include("<p>Wrap me</p>")
+    page.summary.should include("<p>In paragraph tags</p>")
   end
 end
 
@@ -518,12 +559,12 @@ describe "Textile page" do
   it_should_behave_like "Page"
 
   it "should set heading from first h1 tag" do
-    create_page(
+    page = create_page(
       :path => "a-page",
       :heading => "First heading",
       :content => "h1. Second heading"
     )
-    Nesta::Page.find_by_path("a-page").heading.should == "First heading"
+    page.heading.should == "First heading"
   end
 end