amber 0.2.6 → 0.3.8

data/lib/amber/render/asset.rb

@@ -14,6 +14,10 @@ module Amber
         '.scss' => {:method => 'render_sass', :new_suffix => '.css', :args => [:scss]}
       }
 
+      SOURCE_MAP = {
+        '.css' => ['.sass', '.scss']
+      }
+
       def self.render(src_file, dst_file)
         unless Dir.exists?(File.dirname(dst_file))
           FileUtils.mkdir_p(File.dirname(dst_file))
@@ -27,6 +31,10 @@ module Amber
           File.open(new_dst_file,'w') do |w|
             w.write(content)
           end
+        elsif File.basename(src_file) == '.htaccess'
+          # existing htaccess file must be copied, not linked, since
+          # the render will change its contents.
+          FileUtils.cp(src_file, dst_file)
         else
           File.link(src_file, dst_file)
         end
@@ -34,10 +42,19 @@ module Amber
         Amber.log_exception(exc)
       end
 
+      #
+      # Render assets in a single directory (does not walk
+      # directory tree). Files prefixed with an _ are treated
+      # as partials and not rendered.
+      #
       def self.render_dir(src_dir, dst_dir)
         Dir.chdir(src_dir) do
           Dir.glob('*').each do |file|
-            next if File.directory?(file) || file =~ /^\./
+            if File.directory?(file) ||
+              file =~ /^\./ ||
+              file =~ /^_/
+              next
+            end
             src_file = File.join(src_dir, file)
             dst_file = File.join(dst_dir, file)
             render(src_file, dst_file)
@@ -46,10 +63,19 @@ module Amber
       end
 
       def self.render_sass(src_file, syntax)
-        engine = Sass::Engine.new(File.read(src_file), :syntax => syntax)
+        engine = Sass::Engine.new(
+          File.read(src_file),
+          :syntax => syntax,
+          :load_paths => [File.dirname(src_file)],
+          :style => self.sass_render_style
+        )
         engine.render
       end
 
+      def self.sass_render_style
+        Amber::env == :production ? :compact : :nested
+      end
+
     end
   end
 end

data/lib/amber/render/helpers/blog_helper.rb

@@ -0,0 +1,35 @@
+module Amber
+  module Render
+    module BlogHelper
+
+      def recent_summaries(options={}, &block)
+        limit = options[:limit] || @site.pagination_size
+        order = options[:order] || :posted_at
+        direction = options[:direction] || :desc
+        partial = options[:partial]
+        if options[:path]
+          @site.find_page(options[:path])
+        else
+          root = @site.root
+        end
+        if root
+          pages = root.all_children.order_by(order, :direction => direction).limit(limit)
+          haml do
+            pages.each do |page|
+              if block
+                yield page
+              else
+                render_page_summary(page)
+              end
+            end
+          end
+        end
+      end
+
+      #@def news_feed_link
+      #  link_to(image_tag('/img/feed-icon-14x14.png'), "/#{I18n.locale}/news.atom")
+      #end
+
+    end
+  end
+end

data/lib/amber/render/helpers/date_helper.rb

@@ -0,0 +1,14 @@
+module Amber
+  module Render
+    module HtmlHelper
+      def time_tag(date_or_time, *args, &block)
+        options  = args.last.is_a?(Hash) ? args.pop : {}
+        format   = options.delete(:format) || :long
+        content  = args.first || I18n.l(date_or_time, :format => format)
+        #datetime = date_or_time.acts_like?(:time) ? date_or_time.xmlschema : date_or_time.iso8601
+        datetime = date_or_time.iso8601
+        content_tag(:time, content, {:datetime => datetime}.merge(options), &block)
+      end
+    end
+  end
+end

data/lib/amber/render/helpers/haml_helper.rb

@@ -51,4 +51,13 @@ module HamlHelper
     end
   end
 
+  def content_tag(name, content_or_options_with_block = nil, options = nil, &block)
+    if block_given?
+      options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
+      capture_haml { haml(name, options, &block) }
+    else
+      capture_haml { haml_tag(name, content_or_options_with_block, options) }
+    end
+  end
+
 end

data/lib/amber/render/helpers/html_helper.rb

@@ -2,9 +2,18 @@ module Amber
   module Render
     module HtmlHelper
 
+      #
+      # return html markup suitable for setting the href base
+      # of the document. If this is added to the document's HEAD,
+      # then relative urls will work as expected even though the
+      # url path does not end with a '/'
+      #
       def html_head_base
-        href = (['..'] * @page.path.count).join('/')
-        "<base href=\"#{href}\" />"
+        if @page
+          "<base href=\"#{amber_path(@page)}/\" />"
+        else
+          ""
+        end
       end
 
       #
@@ -44,7 +53,7 @@ module Amber
           page = @site.find_page(name_without_anchor)
           if page
             label ||= page.nav_title
-            path = page_path(page) + anchor
+            path = amber_path(page) + anchor
           else
             puts "warning: dead link to `#{name_without_anchor}` from page `/#{I18n.locale}/#{@page.path.join('/')}`"
             label ||= name_without_anchor
@@ -60,14 +69,27 @@ module Amber
       end
 
       #
-      # returns the shortest possible path. this would be nice to support some day, but more difficult with statically rendered sites.
+      # returns the ideal full url path for a page or path (expressed as an array).
       #
-      def page_path(page, locale=I18n.locale)
-        if page.prop(locale, :alias)
-          "/#{locale}/#{page.prop(locale, :alias).first}/#{page.name}"
+      def amber_path(page_or_array, locale=I18n.locale)
+        page = nil
+        if page_or_array.is_a? Array
+          page = @site.find_page_by_path(page_or_array)
+        elsif page_or_array.is_a? StaticPage
+          page = page_or_array
+        end
+        if page.nil?
+          return ''
+        end
+        full_path = []
+        full_path << @site.path_prefix if @site.path_prefix
+        full_path << locale # always do this?
+        if page.aliases(locale).any?
+          full_path += page.aliases(locale).first
         else
-          "/#{locale}/#{page.path.join('/')}"
+          full_path += page.path
         end
+        "/" + full_path.join('/')
       end
 
     end

data/lib/amber/render/helpers/navigation_helper.rb

@@ -30,12 +30,12 @@ module Amber
           first = 'first'
           if options[:include_home]
             active = current_page_path.empty? ? 'active' : ''
-            yield({:class => [first, active].compact.join(' '), :href => menu_item_path(@site.menu), :label => menu_item_title(@site.menu)})
+            yield({:class => [first, active].compact.join(' '), :href => amber_path(@site.menu.path), :label => menu_item_title(@site.menu)})
             first = nil
           end
           @site.menu.each do |item|
             active = current_page_path.first == item.name ? 'active' : ''
-            yield({:class => [first, active].compact.join(' '), :href => menu_item_path(item), :label => menu_item_title(item)})
+            yield({:class => [first, active].compact.join(' '), :href => amber_path(item.path), :label => menu_item_title(item)})
             first = nil
           end
         end
@@ -53,7 +53,7 @@ module Amber
             title = menu_item_title(item)
             if title
               yield({
-                :href => menu_item_path(item),
+                :href => amber_path(item.path),
                 :level => level,
                 :active => path_active_class(current_page_path, item),
                 :label => title
@@ -78,10 +78,6 @@ module Amber
         end
       end
 
-      def menu_item_path(item)
-        "/" + ([I18n.locale]+item.path).join('/')
-      end
-
       def menu_item_title(item)
         page = @site.find_page_by_path(item.path_str) || @site.find_page_by_name(item.name)
         if page
@@ -95,11 +91,12 @@ module Amber
       # inserts an directory index built from the page's children
       #
       # options:
-      #   :levels         -- the max levels to descend, default is 1
+      #   :levels         -- the max levels to descend (default 1)
       #   :page           -- StaticPage instance or nil
-      #   :include_toc    -- true or false
+      #   :include_toc    -- true or false (default false)
       #   :order_by       -- arguments to PageArray#order_by
-      #   :heading        -- heading level to use
+      #   :heading        -- heading level to use (default 2)
+      #   :summary        -- to show summaries or not (default true)
       #
       def child_summaries(options={})
         page = options.delete(:page) || @page
@@ -125,16 +122,7 @@ module Amber
           children.each do |child|
             child_page = child.is_a?(Amber::Menu) ? page.child(child.name) : child
             next unless child_page
-            haml "h#{heading}" do
-              haml :a, child_page.nav_title(locale), :href => page_path(child_page)
-            end
-            if summary = child_page.prop(locale, 'summary')
-              haml :p, summary
-            end
-            if options[:include_toc]
-              toc_html = render_toc(child_page, :locale => locale)
-              haml toc_html
-            end
+            render_page_summary(child_page, heading, options)
             if level < levels_max
               haml(child_summaries({
                 :page => child_page,
@@ -142,7 +130,8 @@ module Amber
                 :level => level+1,
                 :include_toc => options[:include_toc],
                 :order_by => options[:order_by],
-                :heading => heading+1
+                :heading => heading+1,
+                :summary => options[:summary]
               }))
             end
           end
@@ -151,6 +140,27 @@ module Amber
         Amber.log_exception(exc)
       end
 
+      def render_page_summary(page, heading=2, options={})
+        locale = @locals[:locale]
+        klass = options[:class] || '.page-summary'
+        haml ".#{klass}" do
+          haml "h#{heading}" do
+            haml :a, page.nav_title(locale), :href => amber_path(page)
+          end
+          if options[:summary] != false
+            if summary = page.prop(locale, 'summary')
+              haml '.summary', summary
+            elsif preview = page.prop(locale, 'preview')
+              haml '.preview', preview
+            end
+          end
+          if options[:include_toc]
+            toc_html = render_toc(page, :locale => locale)
+            haml toc_html
+          end
+        end
+      end
+
       private
 
       #
@@ -190,14 +200,3 @@ module Amber
     end
   end
 end
-
-
-=begin
-
-  def act_as(page)
-    page = site.find_page(page)
-    @current_page_path = page.path
-    page_body(page)
-  end
-
-=end

data/lib/amber/render/layout.rb

@@ -35,7 +35,8 @@ module Amber
 
       def initialize(file_path, &block)
         if file_path =~ /\.haml$/
-          @template = Tilt::HamlTemplate.new(file_path, {:format => :html5})
+          ugly = Amber.env != :test
+          @template = Tilt::HamlTemplate.new(file_path, {:format => :html5, :ugly => ugly})
         else
           @template = Tilt.new(file_path, &block)
         end

data/lib/amber/render/template.rb

@@ -14,7 +14,10 @@ module Amber
         :textile => 'render_textile',
         :md => 'render_markdown',
         :markdown => 'render_markdown',
-        :html => 'render_raw'
+        :html => 'render_raw',
+        :raw  => 'render_raw',
+        :none => 'render_none',
+        :erb => 'render_none'
       }
 
       TEXTILE_TOC_RE = /^\s*h([1-6])\.\s+(.*)/
@@ -30,7 +33,7 @@ module Amber
       def initialize(options={})
         if options[:file]
           @file = options[:file]
-          @type = type_from_file(@file)
+          @type = options[:type] || type_from_file(@file)
         elsif options[:content]
           @content = options[:content]
           @type    = options[:type]      # e.g. :haml. required if @content
@@ -39,24 +42,26 @@ module Amber
       end
 
       #
-      # returns rendered content or title, depending on render_mode
+      # returns rendered content or title, depending on render_mode.
+      # anchors are always automatically added to content headings.
       #
       def render(view, options={})
         view.locals[:_type] = @type
         render_mode = options.delete(:mode) || :content
-        toc = options.delete(:toc)
-
+        toc_option = options.delete(:toc)
         if render_mode == :title
           render_title(view)
         else
           html = render_html(view)
+          toc_renderer = RegexTableOfContents.new(html, options)
           if render_mode == :toc
-            RegexTableOfContents.new(html, options).to_toc
-          elsif toc || render_mode == :toc_and_content
-            toc = RegexTableOfContents.new(html, options)
-            %(<div id="TOC">%s</div>\n\n%s) % [toc.to_toc, toc.to_html]
+            toc_renderer.to_toc
+          elsif toc_option === false
+            toc_renderer.to_html
+          elsif toc_option || render_mode == :toc_and_content
+            %(<div id="TOC">%s</div>\n\n%s) % [toc_renderer.to_toc, toc_renderer.to_html]
           else
-            html
+            toc_renderer.to_html
           end
         end
       end
@@ -120,7 +125,11 @@ module Amber
 
       def render_haml(file_path, view)
         template = Tilt::HamlTemplate.new(file_path, {:format => :html5, :default_encoding => 'UTF-8'})
-        add_bracket_links(view, template.render(view))
+        add_bracket_links(view, template.render(view, view.locals))
+      rescue Haml::Error => ex
+        msg = "Line #{ex.line + 1} of file `#{file_path}`: #{ex.to_s}"
+        Amber::logger.error(msg)
+        return msg
       end
 
       def render_textile(view, content)
@@ -137,6 +146,10 @@ module Amber
         add_bracket_links(view, content)
       end
 
+      def render_none(view, content)
+        content
+      end
+
       def add_bracket_links(view, content)
         content = Bracketlink.bracket_link(content) do |from, to|
           view.link({from => to})

data/lib/amber/render/view.rb

@@ -9,6 +9,8 @@ require 'amber/render/helpers/html_helper'
 require 'amber/render/helpers/navigation_helper'
 require 'amber/render/helpers/haml_helper'
 require 'amber/render/helpers/language_helper'
+require 'amber/render/helpers/date_helper'
+require 'amber/render/helpers/blog_helper'
 
 module Amber
   module Render
@@ -22,6 +24,7 @@ module Amber
       include NavigationHelper
       include HamlHelper
       include LanguageHelper
+      include BlogHelper
 
       def initialize(page, site)
         @page = page
@@ -36,14 +39,18 @@ module Amber
       # more or less the same as Rails render()
       #
       # supported options:
-      #   :page    -- page path or page object to render
-      #   :file    -- renders the file specified, using suffix to determine type.
-      #   :partial -- same as :file, but disables layout
-      #   :text    -- string to render
-      #   :type    -- required for :text
+      #   :page      -- page path or page object to render
+      #   :file      -- generic file to render, disables layout or toc.
+      #                 type determined by suffix or :type
+      #   :partial   -- same as :file, but searches for files with leading _
+      #   :text      -- string to render
+      #   :type      -- the format of the input, required for :text
       #
       def render(options={}, locals={}, toc_only=false, &block)
         push_context @locals, @page
+        if options.is_a?(Hash) && options[:locals].is_a?(Hash)
+          locals   = options.delete(:locals)
+        end
         @locals    = @locals.merge(locals)
         locale     = I18n.locale = @locals[:locale]
         options    = parse_render_options(locale, options)
@@ -79,7 +86,12 @@ module Amber
 
       private
 
+      #
+      # search possible paths for the file to be rendered.
+      # called only from parse_render_options()
+      #
       def find_file(path, site, page, locale)
+        return path if File.exists?(path)
         search = [
           path,
           "#{site.pages_dir}/#{path}",
@@ -87,15 +99,22 @@ module Amber
           "#{File.dirname(page.file_path)}/#{path}",
           "#{site.config_dir}/#{path}"
         ]
+        # attempt to find a file with preferred locale
         search.each do |path|
           return path if File.exists?(path)
-          Dir["#{path}.#{locale}.*"].each do |path_with_locale|
+          Dir["#{path}.#{locale}.#{StaticPage::PAGE_SUFFIXES_GLOB}"].each do |path_with_locale|
             return path_with_locale if File.exists?(path_with_locale)
           end
-          Dir["#{path}.*"].each do |path_with_suffix|
+          Dir["#{path}.#{StaticPage::PAGE_SUFFIXES_GLOB}"].each do |path_with_suffix|
             return path_with_suffix if File.exists?(path_with_suffix)
           end
         end
+        # attempt to find a file with default locale
+        search.each do |path|
+          Dir["#{path}.#{I18n.default_locale}.#{StaticPage::PAGE_SUFFIXES_GLOB}"].each do |path_with_locale|
+            return path_with_locale if File.exists?(path_with_locale)
+          end
+        end
         raise MissingTemplate.new(path)
       end
 
@@ -132,7 +151,7 @@ module Amber
           if options[:page].is_a?(String)
             options[:page] = @site.find_page(options[:page])
           end
-          options[:href_base] ||= page_path(options[:page], locale)
+          options[:href_base] ||= amber_path(options[:page], locale)
         elsif options[:partial]
           options[:partial] = find_file(partialize(options[:partial]), @site, @page, locale)
         elsif options[:file]
@@ -142,14 +161,14 @@ module Amber
       end
 
       def should_render_toc?(locale, options, page)
-        if options[:partial].nil?
+        if options[:partial] || options[:file]
+          false
+        else
           if page.prop(locale, :toc).nil?
             true
           else
             page.prop(locale, :toc)
           end
-        else
-          false
         end
       end
 
@@ -157,7 +176,7 @@ module Amber
         if options[:page]
           Template.new(file: options[:page].content_file(locale))
         elsif options[:file]
-          Template.new(file: options[:file])
+          Template.new(file: options[:file], type: options[:type])
         elsif options[:partial]
           Template.new(file: options[:partial], partial: true)
         elsif options[:text]