nesta 0.9.13 → 0.10.0

data/config.ru

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

data/lib/nesta.rb

@@ -6,4 +6,4 @@ module Nesta
   end
 end
 
-require "nesta/plugin"
+require 'nesta/plugin'

data/lib/nesta/app.rb

@@ -4,7 +4,6 @@ require 'sass'
 
 require File.expand_path('../nesta', File.dirname(__FILE__))
 require File.expand_path('env', File.dirname(__FILE__))
-require File.expand_path('cache', File.dirname(__FILE__))
 require File.expand_path('config', File.dirname(__FILE__))
 require File.expand_path('models', File.dirname(__FILE__))
 require File.expand_path('helpers', File.dirname(__FILE__))
@@ -16,17 +15,19 @@ Encoding.default_external = 'utf-8' if RUBY_VERSION =~ /^1.9/
 
 module Nesta
   class App < Sinatra::Base
-    register Sinatra::Cache
-
     set :root, Nesta::Env.root
     set :views, File.expand_path('../../views', File.dirname(__FILE__))
-    set :cache_enabled, Config.cache
-    set :haml, { :format => :html5 }
+    set :haml, { format: :html5 }
 
     helpers Overrides::Renderers
     helpers Navigation::Renderers
     helpers View::Helpers
 
+    def cache(content)
+      Nesta.deprecated('cache', "it's no longer required - remove it from app.rb")
+      content
+    end
+
     before do
       if request.path_info =~ Regexp.new('./$')
         redirect to(request.path_info.sub(Regexp.new('/$'), ''))
@@ -47,7 +48,7 @@ module Nesta
     Overrides.load_theme_app
 
     get '/robots.txt' do
-      content_type 'text/plain', :charset => 'utf-8'
+      content_type 'text/plain', charset: 'utf-8'
       <<-EOF
 # robots.txt
 # See http://en.wikipedia.org/wiki/Robots_exclusion_standard
@@ -55,33 +56,35 @@ module Nesta
     end
 
     get '/css/:sheet.css' do
-      content_type 'text/css', :charset => 'utf-8'
-      cache stylesheet(params[:sheet].to_sym)
+      content_type 'text/css', charset: 'utf-8'
+      stylesheet(params[:sheet].to_sym)
     end
 
-    get %r{/attachments/([\w/.-]+)} do |file|
+    get %r{/attachments/([\w/.@-]+)} do |file|
       file = File.join(Nesta::Config.attachment_path, params[:captures].first)
       if file =~ /\.\.\//
         not_found
-      else 
-        send_file(file, :disposition => nil)
+      else
+        send_file(file, disposition: nil)
       end
     end
 
     get '/articles.xml' do
-      content_type :xml, :charset => 'utf-8'
+      content_type :xml, charset: 'utf-8'
       set_from_config(:title, :subtitle, :author)
       @articles = Page.find_articles.select { |a| a.date }[0..9]
-      cache haml(:atom, :format => :xhtml, :layout => false)
+      haml(:atom, format: :xhtml, layout: false)
     end
 
     get '/sitemap.xml' do
-      content_type :xml, :charset => 'utf-8'
-      @pages = Page.find_all
+      content_type :xml, charset: 'utf-8'
+      @pages = Page.find_all.reject do |page|
+        page.draft? or page.flagged_as?('skip-sitemap')
+      end
       @last = @pages.map { |page| page.last_modified }.inject do |latest, page|
         (page > latest) ? page : latest
       end
-      cache haml(:sitemap, :format => :xhtml, :layout => false)
+      haml(:sitemap, format: :xhtml, layout: false)
     end
 
     get '*' do
@@ -91,7 +94,7 @@ module Nesta
       raise Sinatra::NotFound if @page.nil?
       @title = @page.title
       set_from_page(:description, :keywords)
-      cache haml(@page.template, :layout => @page.layout)
+      haml(@page.template, layout: @page.layout)
     end
   end
 end

data/lib/nesta/commands.rb

@@ -204,8 +204,8 @@ end
             output = ''
             file.each_line do |line|
               if line =~ /^end/
-                output << '  s.add_dependency("nesta", ">= 0.9.11")' + "\n"
-                output << '  s.add_development_dependency("rake")' + "\n"
+                output << '  gem.add_dependency("nesta", ">= 0.9.11")' + "\n"
+                output << '  gem.add_development_dependency("rake")' + "\n"
               end
               output << line
             end
@@ -247,7 +247,10 @@ end
           make_directories
           copy_templates(
             'themes/README.md' => "#{@theme_path}/README.md",
-            'themes/app.rb' => "#{@theme_path}/app.rb"
+            'themes/app.rb' => "#{@theme_path}/app.rb",
+            'themes/views/layout.haml' => "#{@theme_path}/views/layout.haml",
+            'themes/views/page.haml' => "#{@theme_path}/views/page.haml",
+            'themes/views/master.sass' => "#{@theme_path}/views/master.sass"
           )
         end
       end

data/lib/nesta/config.rb

@@ -2,8 +2,17 @@ require 'yaml'
 
 module Nesta
   class Config
+    class NotDefined < KeyError; end
+
     @settings = %w[
-      title subtitle theme disqus_short_name cache content google_analytics_code
+      cache
+      content
+      disqus_short_name
+      google_analytics_code
+      read_more
+      subtitle
+      theme
+      title
     ]
     @author_settings = %w[name uri email]
     @yaml = nil
@@ -11,11 +20,20 @@ module Nesta
     class << self
       attr_accessor :settings, :author_settings, :yaml_conf
     end
-    
+
+    def self.fetch(key, *default)
+      from_environment(key.to_s)
+    rescue NotDefined
+      begin
+        from_yaml(key.to_s)
+      rescue NotDefined
+        default.empty? && raise || (return default.first)
+      end
+    end
+
     def self.method_missing(method, *args)
-      setting = method.to_s
-      if settings.include?(setting)
-        from_environment(setting) || from_yaml(setting)
+      if settings.include?(method.to_s)
+        fetch(method, nil)
       else
         super
       end
@@ -27,7 +45,14 @@ module Nesta
         variable = "NESTA_AUTHOR__#{setting.upcase}"
         ENV[variable] && environment_config[setting] = ENV[variable]
       end
-      environment_config.empty? ? from_yaml("author") : environment_config
+      environment_config.empty? ? from_yaml('author') : environment_config
+    rescue NotDefined
+      nil
+    end
+
+    def self.cache
+      Nesta.deprecated('Nesta::Config.cache',
+                       'see http://nestacms.com/docs/deployment/page-caching')
     end
     
     def self.content_path(basename = nil)
@@ -45,9 +70,16 @@ module Nesta
     def self.yaml_path
       File.expand_path('config/config.yml', Nesta::App.root)
     end
-    
+
+    def self.read_more
+      fetch('read_more', 'Continue reading')
+    end
+
     def self.from_environment(setting)
-      value = ENV["NESTA_#{setting.upcase}"]
+      value = ENV.fetch("NESTA_#{setting.upcase}")
+    rescue KeyError
+      raise NotDefined.new(setting)
+    else
       overrides = { "true" => true, "false" => false }
       overrides.has_key?(value) ? overrides[value] : value
     end
@@ -63,15 +95,20 @@ module Nesta
     end
     private_class_method :can_use_yaml?
 
+    def self.from_hash(hash, setting)
+      hash.fetch(setting) { raise NotDefined.new(setting) }
+    end
+    private_class_method :from_hash
+
     def self.from_yaml(setting)
-      if can_use_yaml?
-        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]
+      raise NotDefined.new(setting) unless can_use_yaml?
+      self.yaml_conf ||= YAML::load(ERB.new(IO.read(yaml_path)).result)
+      env_config = self.yaml_conf.fetch(Nesta::App.environment.to_s, {})
+      begin
+        from_hash(env_config, setting)
+      rescue NotDefined
+        from_hash(self.yaml_conf, setting)
       end
-    rescue Errno::ENOENT  # config file not found
-      raise unless Nesta::App.environment == :test
-      nil
     end
     private_class_method :from_yaml
     

data/lib/nesta/helpers.rb

@@ -25,7 +25,7 @@ module Nesta
       end
 
       def absolute_urls(text)
-        text.gsub!(/(<a href=['"])\//, '\1' + url('/'))
+        text.gsub!(/(<a href=['"])\//, '\1' + path_to('/', uri: true))
         text
       end
 
@@ -54,7 +54,7 @@ module Nesta
       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"
+          haml_tag :link, href: path_to("/css/#{name}.css"), rel: "stylesheet"
         end
       end
 
@@ -63,12 +63,39 @@ module Nesta
       end
 
       def article_summaries(articles)
-        haml(:summaries, :layout => false, :locals => { :pages => articles })
+        haml(:summaries, layout: false, locals: { pages: articles })
       end
 
       def articles_heading
         @page.metadata('articles heading') || "Articles on #{@page.heading}"
       end
+      
+      # Generates the full path to a given page, taking Rack routers and
+      # reverse proxies into account.
+      #
+      # Takes an options hash with a single option called `uri`. Set it
+      # to `true` if you'd like the publicly accessible URI for the
+      # path, rather than just the path relative to the site's root URI.
+      # The default is `false`.
+      #
+      #   path_to(page.abspath, uri: true)
+      #
+      def path_to(page_path, options = {})
+        host = ''
+        if options[:uri]
+          host << "http#{'s' if request.ssl?}://"
+          if (request.env.include?("HTTP_X_FORWARDED_HOST") or 
+              request.port != (request.ssl? ? 443 : 80))
+            host << request.host_with_port
+          else
+            host << request.host
+          end
+        end
+        uri_parts = [host]
+        uri_parts << request.script_name.to_s if request.script_name
+        uri_parts << page_path
+        File.join(uri_parts)
+      end
     end
   end
 end

data/lib/nesta/models.rb

@@ -7,11 +7,14 @@ Tilt.register Tilt::RDiscountTemplate, 'mdown'
 Tilt.register Tilt::RedcarpetTemplate, 'mdown'
 
 module Nesta
+  class HeadingNotSet < RuntimeError; end
+  class LinkTextNotSet < RuntimeError; end
   class MetadataParseError < RuntimeError; end
 
   class FileModel
     FORMATS = [:mdown, :haml, :textile]
-    @@cache = {}
+    @@page_cache = {}
+    @@filename_cache = {}
 
     attr_reader :filename, :mtime
 
@@ -33,25 +36,35 @@ module Nesta
       end
     end
 
+    def self.find_file_for_path(path)
+      if ! @@filename_cache.has_key?(path)
+        FORMATS.each do |format|
+          [path, File.join(path, 'index')].each do |basename|
+            filename = model_path("#{basename}.#{format}")
+            if File.exist?(filename)
+              @@filename_cache[path] = filename
+              break
+            end
+          end
+        end
+      end
+      @@filename_cache[path]
+    end
+
     def self.needs_loading?(path, filename)
-      @@cache[path].nil? || File.mtime(filename) > @@cache[path].mtime
+      @@page_cache[path].nil? || File.mtime(filename) > @@page_cache[path].mtime
     end
 
     def self.load(path)
-      FORMATS.each do |format|
-        [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
+      if (filename = find_file_for_path(path)) && needs_loading?(path, filename)
+        @@page_cache[path] = self.new(filename)
       end
-      @@cache[path]
+      @@page_cache[path]
     end
 
     def self.purge_cache
-      @@cache = {}
+      @@page_cache = {}
+      @@filename_cache = {}
     end
 
     def self.menu_items
@@ -155,19 +168,19 @@ module Nesta
         end
       end
 
-      def tag_lines_of_haml(text)
-        tagged = (text =~ /^\s*%/)
-        if tagged
+      def add_p_tags_to_haml(text)
+        contains_tags = (text =~ /^\s*%/)
+        if contains_tags
           text
         else
-          text.split(/\r?\n/).inject("") do |accumulator, line|
+          text.split(/\r?\n/).inject('') do |accumulator, line|
             accumulator << "%p #{line}\n"
           end
         end
       end
 
       def convert_to_html(format, scope, text)
-        text = tag_lines_of_haml(text) if @format == :haml
+        text = add_p_tags_to_haml(text) if @format == :haml
         template = Tilt[format].new { text }
         template.render(scope)
       end
@@ -215,19 +228,20 @@ module Nesta
           /^\s*h1\.\s+(.*)/
         end
       markup =~ regex
-      Regexp.last_match(1)
+      Regexp.last_match(1) or raise HeadingNotSet, "#{abspath} needs a heading"
+    end
+
+    def link_text
+      metadata('link text') || heading
+    rescue HeadingNotSet
+      raise LinkTextNotSet, "Need to link to '#{abspath}' but can't get link text"
     end
   
     def title
-      if metadata('title')
-        metadata('title')
-      elsif parent && (! parent.heading.nil?)
-        "#{heading} - #{parent.heading}"
-      elsif heading
-        "#{heading} - #{Nesta::Config.title}"
-      elsif abspath == '/'
-        Nesta::Config.title
-      end
+      metadata('title') || link_text
+    rescue LinkTextNotSet
+      return Nesta::Config.title if abspath == '/'
+      raise
     end
 
     def date(format = nil)
@@ -245,7 +259,7 @@ module Nesta
     end
 
     def read_more
-      metadata('read more') || 'Continue reading'
+      metadata('read more') || Nesta::Config.read_more
     end
 
     def summary
@@ -274,7 +288,7 @@ module Nesta
       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
+        x.link_text.downcase <=> y.link_text.downcase
       end
     end
 
@@ -306,7 +320,7 @@ module Nesta
       in_category.sort do |x, y|
         by_priority = y.priority(path) <=> x.priority(path)
         if by_priority == 0
-          x.heading.downcase <=> y.heading.downcase
+          x.link_text.downcase <=> y.link_text.downcase
         else
           by_priority
         end
@@ -317,6 +331,10 @@ module Nesta
       Page.find_articles.select { |article| article.categories.include?(self) }
     end
 
+    def receives_comments?
+      ! date.nil?
+    end
+
     private
       def category_strings
         strings = metadata('categories')