amber 0.3.8 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d45088b2c65fd274e44926886b8a70f0a645f73
-  data.tar.gz: 305ef95bcb2143c71331cfe7e702b97ee9f987f1
+  metadata.gz: 5f07ec2e5c2a86cec442c924598f935a40955a32
+  data.tar.gz: 4eaecfe55678b175942014c5e17f6e90381021b6
 SHA512:
-  metadata.gz: 5b4fc64f2b1f57cafa02c21d2392448e64de89648a9ebe54ae06b26b43febcbf5a5b663804c3b7ff3932c5553077ae82be017490ed922ba8571e5c0aaa6ba706
-  data.tar.gz: a6ab0937bad9f67492940655bfbcf1e04e9b79c48e5a9ec5761686b25a39d1c2165d0b54d19f76cf470e6e14e8b55edc30b61a446f4ca22ea8a38f49fd423f44
+  metadata.gz: efa8c04a618b8ba9052c6b4f0f1387bb750e20a3544e6afe79668cee9de9278c44168c2ce00fe70fc14c8dc4a3faebdb6a5b069e059cd913adc37373f8ade543
+  data.tar.gz: 78c14db10c74f733f0cc1899715ccbf771a3bd9b29aebdf84af8d24bd0025845ced2b0df3adfa5c7237e63619defe0932eae0280561f66f1a0051f8d8c21d3b7

data/lib/amber.rb

@@ -21,6 +21,10 @@ module Amber
   # Possible page suffixes. Only files with these suffixes are treated as pages
   PAGE_SUFFIXES = %w(haml md markdown text textile rst html html.haml)
 
+  # Possible variable file suffixes. Only files with these suffixesare treated
+  # as variable files.
+  VAR_SUFFIXES = %w(json yaml yml)
+
   DEFAULT_HOST = '127.0.0.1'
   DEFAULT_PORT = '8000'
 
@@ -56,7 +60,8 @@ require 'amber/render/layout'
 require 'amber/render/view'
 require 'amber/render/template'
 require 'amber/render/asset'
-require 'amber/render/autolink'
-require 'amber/render/bracketlink'
 require 'amber/render/table_of_contents'
 require 'amber/render/apache'
+require 'amber/render/filter/autolink'
+require 'amber/render/filter/bracketlink'
+require 'amber/render/filter/variables'

data/lib/amber/cli.rb

@@ -13,7 +13,7 @@ module Amber
       new_dir = options[:arg]
       mkdir(new_dir, nil)
       mkdir('amber', new_dir)
-      touch('amber/config.rb', new_dir)
+      copy_template_file('config.rb', 'amber', new_dir)
       touch('amber/menu.txt', new_dir)
       mkdir('amber/layouts', new_dir)
       mkdir('amber/locales', new_dir)
@@ -40,8 +40,8 @@ module Amber
       site = Site.new(@root)
       site.continue_on_error = false
       site.load_pages
-      FileUtils.mkdir_p(site.dest_dir) unless File.exists?(site.dest_dir)
-      gitkeep = File.exists?(File.join(site.dest_dir, '.gitkeep'))
+      FileUtils.mkdir_p(site.dest_dir) unless File.exist?(site.dest_dir)
+      gitkeep = File.exist?(File.join(site.dest_dir, '.gitkeep'))
       temp_render = File.join(File.dirname(site.dest_dir), 'public-tmp')
       temp_old_pages = File.join(File.dirname(site.dest_dir), 'remove-me')
       site.with_destination(temp_render) do
@@ -58,8 +58,8 @@ module Amber
       end
     ensure
       # cleanup if something goes wrong.
-      FileUtils.rm_r(temp_render) if temp_render && File.exists?(temp_render)
-      FileUtils.rm_r(temp_old_pages) if temp_old_pages && File.exists?(temp_old_pages)
+      FileUtils.rm_r(temp_render) if temp_render && File.exist?(temp_render)
+      FileUtils.rm_r(temp_old_pages) if temp_old_pages && File.exist?(temp_old_pages)
     end
 
     def server(options)
@@ -100,8 +100,8 @@ module Amber
         path = dir
         print_path = dir
       end
-      unless Dir.exists?(path)
-        if File.exists?(path)
+      unless Dir.exist?(path)
+        if File.exist?(path)
           puts "Could not make directory `#{print_path}`. File already exists."
           exit(1)
         end
@@ -112,11 +112,22 @@ module Amber
 
     def touch(file, context)
       path = File.join(context, file)
-      unless File.exists?(path)
+      unless File.exist?(path)
         FileUtils.touch(path)
         puts "* Creating `#{File.basename(context)}/#{file}`"
       end
     end
 
+    def copy_template_file(template_file, destination, context)
+      template_file_path = File.dirname(__FILE__) + "/templates/#{template_file}"
+      copy(template_file_path, destination, context)
+    end
+
+    def copy(source, destination, context)
+      destination_path = File.join(context, destination)
+      FileUtils.copy(source, destination_path)
+      puts "* Creating `#{File.basename(context)}/#{destination}/#{File.basename(source)}`"
+    end
+
   end
-end
+end

data/lib/amber/render/apache.rb

@@ -8,7 +8,7 @@ module Amber
         template = Tilt::ERBTemplate.new(template_path("htaccess.erb"))
 
         tail_content = nil
-        if File.exists?(src_htaccess_file)
+        if File.exist?(src_htaccess_file)
           tail_content = File.read(src_htaccess_file)
         end
         File.open(dst_htaccess_file, 'w', :encoding => 'UTF-8') do |f|

data/lib/amber/render/asset.rb

@@ -19,10 +19,10 @@ module Amber
       }
 
       def self.render(src_file, dst_file)
-        unless Dir.exists?(File.dirname(dst_file))
+        unless Dir.exist?(File.dirname(dst_file))
           FileUtils.mkdir_p(File.dirname(dst_file))
         end
-        File.unlink(dst_file) if File.exists?(dst_file)
+        File.unlink(dst_file) if File.exist?(dst_file)
         src_ext = File.extname(src_file)
         renderer = RENDER_MAP[src_ext]
         if renderer

data/lib/amber/render/filter/autolink.rb

@@ -0,0 +1,84 @@
+# encoding: utf-8
+# adapted from https://github.com/tenderlove/rails_autolink
+# MIT license
+
+module Amber
+  module Render
+    module Filter
+      module Autolink
+
+        def self.run(text)
+          auto_link_email_addresses(auto_link_urls(text))
+        end
+
+        private
+
+        AUTO_LINK_RE = %r{
+            (?: ((?:ed2k|ftp|http|https|irc|mailto|news|gopher|nntp|telnet|webcal|xmpp|callto|feed|svn|urn|aim|rsync|tag|ssh|sftp|rtsp|afs|file):)// | www\. )
+            [^\s<\u00A0]+
+          }ix
+
+        # regexps for determining context, used high-volume
+        AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, /<\/a>/i]
+
+        AUTO_EMAIL_LOCAL_RE = /[\w.!#\$%&'*\/=?^`{|}~+-]/
+        AUTO_EMAIL_RE = /[\w.!#\$%+-]\.?#{AUTO_EMAIL_LOCAL_RE}*@[\w-]+(?:\.[\w-]+)+/
+
+        BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
+
+        WORD_PATTERN = RUBY_VERSION < '1.9' ? '\w' : '\p{Word}'
+
+        # Turns all urls into clickable links.  If a block is given, each url
+        # is yielded and the result is used as the link text.
+        def self.auto_link_urls(text)
+          text.gsub(AUTO_LINK_RE) do
+            scheme, href = $1, $&
+            punctuation = []
+
+            if auto_linked?($`, $')
+              # do not change string; URL is already linked
+              href
+            else
+              # don't include trailing punctuation character as part of the URL
+              while href.sub!(/[^#{WORD_PATTERN}\/-]$/, '')
+                punctuation.push $&
+                if opening = BRACKETS[punctuation.last] and href.scan(opening).size > href.scan(punctuation.last).size
+                  href << punctuation.pop
+                  break
+                end
+              end
+
+              #link_text = block_given?? yield(href) : href
+              link_text = href.sub(/^#{scheme}\/\//,'')
+              href = 'http://' + href unless scheme
+              %(<a href="#{href}">#{link_text}</a>) + punctuation.reverse.join('')
+            end
+          end
+        end
+
+        # Turns all email addresses into clickable links.
+        def self.auto_link_email_addresses(text)
+          text.gsub(AUTO_EMAIL_RE) do
+            text = $&
+
+            if auto_linked?($`, $')
+              text
+            else
+              #display_text = (block_given?) ? yield(text) : text
+              #display_text = text
+              text.gsub!('@', '&#064').gsub!('.', '&#046;')
+              %(<a href="mailto:#{text}">#{text}</a>)
+            end
+          end
+        end
+
+        # Detects already linked context or position in the middle of a tag
+        def self.auto_linked?(left, right)
+          (left =~ AUTO_LINK_CRE[0] and right =~ AUTO_LINK_CRE[1]) or
+            (left.rindex(AUTO_LINK_CRE[2]) and $' !~ AUTO_LINK_CRE[3])
+        end
+
+      end
+    end
+  end
+end

data/lib/amber/render/filter/bracketlink.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+#
+# bracket links are links in the form [[label => target]] or [[page-name]]
+#
+
+module Amber
+  module Render
+    module Filter
+      module Bracketlink
+
+        # linking using double square brackets
+        BRACKET_LINK_RE = /
+          \[\[          # start [[
+          ([^\[\]]+)    # $text : one or more characters that are not [ or ] ($1)
+          \]\]          # end ]]
+        /x
+
+        def self.run(text, &block)
+          text.gsub(BRACKET_LINK_RE) do |m|
+            link_text = $~[1].strip
+            if link_text =~ /^.+\s*[-=]>\s*.+$/
+              # link_text == "from -> to"
+              from, to = link_text.split(/\s*[-=]>\s*/)[0..1]
+              from = "" unless from.instance_of? String # \ sanity check for
+              to   = "" unless from.instance_of? String # / badly formed links
+            else
+              # link_text == "to" (ie, no link label)
+              from = nil
+              to = link_text
+            end
+            yield(from, to)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/amber/render/filter/variables.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+#
+# bracket links are links in the form [[label => target]] or [[page-name]]
+#
+
+module Amber
+  module Render
+    module Filter
+      module Variables
+
+        # variable expansion uses {{ }}
+        VARIABLES_RE = /
+          \{\{          # start {{
+          ([^\{\}]+)    # $text : one or more characters that are not { or } ($1)
+          \}\}          # end }}
+        /x
+
+        def self.run(text, &block)
+          text.gsub(VARIABLES_RE) do |m|
+            variable_name = $~[1].strip
+            yield(variable_name)
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Amber
         limit = options[:limit] || @site.pagination_size
         order = options[:order] || :posted_at
         direction = options[:direction] || :desc
-        partial = options[:partial]
+        #partial = options[:partial]
         if options[:path]
           @site.find_page(options[:path])
         else

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

@@ -108,7 +108,7 @@ module Amber
         levels_max = options[:levels] || 1
         level      = options.delete(:level) || 1
         heading    = options.delete(:heading) || 2
-        locale     = @locals[:locale]
+        #locale     = @locals[:locale]
         menu       = submenu_for_page(page)
         if menu && menu.children.any?
           children = menu.children

data/lib/amber/render/table_of_contents.rb

@@ -27,6 +27,7 @@ module Amber::Render
       @heading_anchors = {}
       @options = options
       @options[:tag] ||= 'ol'
+      @parsed = nil
     end
 
     def to_html

data/lib/amber/render/template.rb

@@ -125,7 +125,10 @@ 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, view.locals))
+        html = template.render(view, view.locals)
+        html = add_variables(view, html)
+        html = add_bracket_links(view, html)
+        return html
       rescue Haml::Error => ex
         msg = "Line #{ex.line + 1} of file `#{file_path}`: #{ex.to_s}"
         Amber::logger.error(msg)
@@ -133,34 +136,46 @@ module Amber
       end
 
       def render_textile(view, content)
+        content = add_variables(view, content)
         content = add_bracket_links(view, content)
-        Autolink.auto_link(RedCloth.new(content).to_html)
+        return Filter::Autolink.run(RedCloth.new(content).to_html)
       end
 
       def render_markdown(view, content)
+        content = add_variables(view, content)
         content = add_bracket_links(view, content)
-        RDiscount.new(content, :smart, :autolink).to_html
+        return RDiscount.new(content, :smart, :autolink).to_html
       end
 
       def render_raw(view, content)
-        add_bracket_links(view, content)
+        content = add_variables(view, content)
+        content = add_bracket_links(view, content)
+        return content
       end
 
       def render_none(view, content)
-        content
+        return content
       end
 
       def add_bracket_links(view, content)
-        content = Bracketlink.bracket_link(content) do |from, to|
+        content = Filter::Bracketlink.run(content) do |from, to|
           view.link({from => to})
         end
-        content
+        return content
+      end
+
+      def add_variables(view, content)
+        locale = view.locals[:locale]
+        content = Filter::Variables.run(content) do |var_name|
+          view.page.var(var_name, locale) || var_name
+        end
+        return content
       end
 
       def type_from_file(file_path)
         suffix = File.extname(file_path)
         if suffix
-          suffix.sub! /^\./, ''
+          suffix.sub!(/^\./, '')
           suffix = suffix.to_sym
         end
         suffix

data/lib/amber/render/view.rb

@@ -57,6 +57,7 @@ module Amber
         @page      = options[:page] if options[:page]
         render_toc = should_render_toc?(locale, options, @page)
         template   = pick_template(locale, options)
+        return unless template
         if toc_only
           template.render(self, :mode => :toc, :href_base => options[:href_base])
         else
@@ -90,32 +91,33 @@ module Amber
       # 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}",
-          "#{page.file_path}/#{path}",
-          "#{File.dirname(page.file_path)}/#{path}",
-          "#{site.config_dir}/#{path}"
+      def find_file(search_path, site, page, locale)
+        return search_path if File.exist?(search_path)
+        searches = [
+          search_path,
+          "#{site.pages_dir}/#{search_path}",
+          "#{page.file_path}/#{search_path}",
+          "#{File.dirname(page.file_path)}/#{search_path}",
+          "#{site.config_dir}/#{search_path}"
         ]
         # attempt to find a file with preferred locale
-        search.each do |path|
-          return path if File.exists?(path)
+        searches.each do |path|
+          return path if File.exist?(path)
           Dir["#{path}.#{locale}.#{StaticPage::PAGE_SUFFIXES_GLOB}"].each do |path_with_locale|
-            return path_with_locale if File.exists?(path_with_locale)
+            return path_with_locale if File.exist?(path_with_locale)
           end
           Dir["#{path}.#{StaticPage::PAGE_SUFFIXES_GLOB}"].each do |path_with_suffix|
-            return path_with_suffix if File.exists?(path_with_suffix)
+            return path_with_suffix if File.exist?(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)
+        searches.each do |path2|
+          Dir["#{path2}.#{I18n.default_locale}.#{StaticPage::PAGE_SUFFIXES_GLOB}"].each do |path_with_locale|
+            return path_with_locale if File.exist?(path_with_locale)
           end
         end
-        raise MissingTemplate.new(path)
+        Amber.logger.error("No such path `#{path2}` from `#{page.content_file(locale)}`.")
+        return nil
       end
 
       def partialize(path)
@@ -181,6 +183,8 @@ module Amber
           Template.new(file: options[:partial], partial: true)
         elsif options[:text]
           Template.new(content: options[:text], type: (options[:type] || :text))
+        else
+          nil
         end
       end
 

data/lib/amber/server.rb

@@ -138,11 +138,11 @@ module Amber
         @server.site.render
         page.render_to_file(dst_dir, :force => true)
         file = page.destination_file(dst_dir, locale)
-        if File.exists?(file)
+        if File.exist?(file)
           content = File.read(file)
         else
           file = page.destination_file(dst_dir, I18n.default_locale)
-          if File.exists?(file)
+          if File.exist?(file)
             content = File.read(file)
           else
             view = Render::View.new(page, @server.site)
@@ -162,7 +162,7 @@ module Amber
       base_path = path.sub(RENDERABLE_ASSET_RE, '')
       Amber::Render::Asset::SOURCE_MAP[dest_suffix].each do |source_suffix|
         source_file_path = File.join(src_dir, base_path + source_suffix)
-        if File.exists?(source_file_path)
+        if File.exist?(source_file_path)
           return source_file_path
         end
       end

data/lib/amber/site.rb

@@ -81,8 +81,8 @@ module Amber
     # Which would match "/services/chat/security" but not "/services/security"
     #
     def find_pages(filter)
-     filter = filter.downcase
-     if filter =~ /\//
+      filter = filter.downcase
+      if filter =~ /\//
         path = filter.split('/').map{|segment| segment.gsub(/[^0-9a-z_-]/, '')}
         path_str = path.join('/')
         if (page = @pages_by_path[path_str])
@@ -152,9 +152,9 @@ module Amber
           @root
         else
           name = File.basename(config.path)
-          page = StaticPage.new(find_parent(config.path), name, config.pages_dir, config.path_prefix)
-          add_page(page)
-          page
+          sub_root = StaticPage.new(find_parent(config.path), name, config.pages_dir, config.path_prefix)
+          add_page(sub_root)
+          sub_root
         end
       end
       base_page.config = config

data/lib/amber/site_configuration.rb

@@ -56,6 +56,7 @@ module Amber
     #
     def initialize(site, root_dir, options={})
       @children = []
+      @path_prefix = nil
       @site = site
       @root_dir = File.expand_path(find_in_directory_tree('amber', 'config.rb', root_dir))
       if @root_dir == '/'
@@ -119,7 +120,7 @@ module Amber
 
     def config_path(file)
       path = File.join(@config_dir, file)
-      if File.exists?(path)
+      if File.exist?(path)
         path
       else
         nil
@@ -134,7 +135,7 @@ module Amber
       search_dir = directory_tree || Dir.pwd
       while search_dir != "/"
         Dir.foreach(search_dir) do |f|
-          if f == target_dir_name && File.exists?(File.join(search_dir, f,target_file_name))
+          if f == target_dir_name && File.exist?(File.join(search_dir, f,target_file_name))
             return search_dir
           end
         end

data/lib/amber/site_loader.rb

@@ -0,0 +1,95 @@
+#
+# responsible for loading all the pages of the site.
+#
+
+WORK IN PROGRESS, FACTOR OUT FROM SITE
+
+module Amber
+  class SiteLoader
+
+    #
+    # page_paths
+    # pages_by_name
+    # pages_by_path
+    # pages_by_locale_path
+    # root
+    # dir_list
+    #
+    def self.load(config)
+      config.reset_timestamp
+
+      # create base_page
+      base_page = begin
+        if config.path.nil?
+          @root = StaticPage.new(nil, 'root', config.pages_dir)
+          add_page(@root)
+          @root
+        else
+          name = File.basename(config.path)
+          page = StaticPage.new(find_parent(config.path), name, config.pages_dir, config.path_prefix)
+          add_page(page)
+          page
+        end
+      end
+      base_page.config = config
+
+      # load menu and locals
+      I18n.load_path += Dir[File.join(config.locales_dir, '/*.{rb,yml,yaml}')] if config.locales_dir
+
+      # add the full directory tree
+      base_page.scan_directory_tree do |page, asset_dir|
+        add_page(page) if page
+        @dir_list << asset_dir if asset_dir
+      end
+      @page_paths += @pages_by_path.keys
+
+      # recursively add sub-sites
+      config.children.each do |sub_config|
+        add_configuration(sub_config)
+      end
+    end
+
+    private
+
+    def self.find_parent(path)
+      so_far = []
+      path.split('/').compact.each do |path_segment|
+        so_far << path_segment
+        if page = @pages_by_path[so_far.join('/')]
+          return page
+        end
+      end
+      return @root
+    end
+
+    #
+    # registers a page with the site, indexing the page path in our various hashes
+    #
+    def add_page(page)
+      @pages_by_name[page.name] = page
+      @pages_by_path[page.path.join('/')] = page
+      add_aliases(I18n.default_locale, page, @pages_by_path)
+      page.locales.each do |locale|
+        next if locale == I18n.default_locale
+        add_aliases(locale, page, @pages_by_locale_path[locale])
+      end
+      @page_list << page
+    end
+
+    #
+    # registers a page's aliases with the site
+    #
+    def add_aliases(locale, page, path_hash)
+      page.aliases(locale).each do |alias_path|
+        alias_path_str = alias_path.join('/')
+        if path_hash[alias_path_str]
+          Amber.logger.warn "WARNING: page `#{page.path.join('/')}` has alias `#{alias_path_str}`, but this path is already taken by `#{path_hash[alias_path_str].path.join('/')}` (locale = #{locale})."
+        else
+          path_hash[alias_path_str] = page
+        end
+      end
+    end
+
+
+  end
+end

data/lib/amber/static_page.rb

@@ -112,6 +112,14 @@ module Amber
       @props.prop(*args)
     end
 
+    def vars
+      @vars ||= load_variables
+    end
+
+    def var(name, locale=I18n.locale)
+      (vars[locale] || vars[I18n.default_locale] || {})[name.to_s]
+    end
+
     #
     # Returns array of locale symbols for all locales with properties set
     # Note: there might be a content for a locale that does not show up in this array,
@@ -121,6 +129,10 @@ module Amber
       @props.locales
     end
 
+    def path_str
+      self.path.join('/')
+    end
+
     #
     # returns an array of normalized aliases based on the :alias property
     # defined for a page.
@@ -132,9 +144,9 @@ module Amber
     def aliases(locale=I18n.default_locale)
       @aliases ||= begin
         aliases_hash = Hash.new([])
-        @props.locales.each do |locale|
-          aliases = @props.prop_without_inheritance(locale, :alias)
-          aliases_hash[locale] = begin
+        @props.locales.each do |l|
+          aliases = @props.prop_without_inheritance(l, :alias)
+          aliases_hash[l] = begin
             if aliases.nil?
               []
             else

data/lib/amber/static_page/filesystem.rb

@@ -5,6 +5,8 @@
 require 'i18n'
 require 'pathname'
 require 'fileutils'
+require 'json'
+require 'yaml'
 
 module Amber
   class StaticPage
@@ -106,11 +108,19 @@ module Amber
     PAGE_SUFFIXES_RE = /(?<suffix>#{Amber::PAGE_SUFFIXES.join('|')})/
     PAGE_SUFFIXES_GLOB = "{#{Amber::PAGE_SUFFIXES.join(',')}}"
 
+    # e.g. json, yaml
+    VAR_SUFFIXES_RE = /(?<suffix>#{Amber::VAR_SUFFIXES.join('|')})/
+    VAR_SUFFIXES_GLOB = "{#{Amber::VAR_SUFFIXES.join(',')}}"
+
     # e.g. en.haml or es.md or index.pt.text
     LOCALE_FILE_MATCH_RE = /^(index\.)?#{LOCALES_RE}\.#{PAGE_SUFFIXES_RE}$/
     LOCALE_FILE_MATCH_GLOB = "{index.,}#{LOCALES_GLOB}.#{PAGE_SUFFIXES_GLOB}"
 
+    VAR_FILE_MATCH_RE = /^(index\.)?#{LOCALES_RE}\.#{VAR_SUFFIXES_RE}$/
+    VAR_FILE_MATCH_GLOB = "{index.,}#{LOCALES_GLOB}.#{VAR_SUFFIXES_GLOB}"
+
     SIMPLE_FILE_MATCH_RE = lambda {|name| /^(#{Regexp.escape(name)})(\.#{LOCALES_RE})?\.#{PAGE_SUFFIXES_RE}$/ }
+    SIMPLE_VAR_MATCH_RE = lambda {|name| /^(#{Regexp.escape(name)})(\.#{LOCALES_RE})?\.#{VAR_SUFFIXES_RE}$/ }
 
     private
 
@@ -198,11 +208,13 @@ module Amber
       if @simple_page
         []
       else
-        assets = {}
         Dir.foreach(@file_path).collect { |file|
-          if file && file !~ /\.#{PAGE_SUFFIXES_RE}$/
-            file unless File.directory?(File.join(@file_path, file))
-          end
+          is_asset = \
+            file &&
+            file !~ /\.#{PAGE_SUFFIXES_RE}$/ &&
+            file !~ /^#{VAR_FILE_MATCH_RE}$/ &&
+            !File.directory?(File.join(@file_path, file))
+          file if is_asset
         }.compact
       end
     end
@@ -223,24 +235,22 @@ module Amber
     #
     # (with or without leading hypen works)
     #
-    # this text is extracted and evaluated as ruby to set properties.
+    # This text is extracted and evaluated as ruby to set properties.
+    #
+    # The first paragraph is loaded into the property "excerpt".
     #
     def load_properties
       props = PageProperties.new(self)
       content_files.each do |locale, content_file|
-        if File.extname(content_file) == '.haml'
+        if type_from_path(content_file) == :haml
           props.eval(File.read(content_file, :encoding => 'UTF-8'), locale)
         else
-          headers = []
-          File.open(content_file, :encoding => 'UTF-8') do |f|
-            while (line = f.gets) =~ /^(- |)@\w/
-              if line !~ /^-/
-                line = '- ' + line
-              end
-              headers << line
-            end
+          headers, excerpt = parse_headers(content_file)
+          props.eval(headers, locale)
+          if !excerpt.empty?
+            props.set_prop(locale, "excerpt", excerpt)
           end
-          props.eval(headers.join("\n"), locale)
+          props.set_prop(locale, "content_type", type_from_path(content_file))
         end
         cleanup_properties(props, locale)
       end
@@ -256,10 +266,123 @@ module Amber
       end
     end
 
+    #
+    # parses a content_file's property headers and tries to extract the
+    # first paragraph.
+    #
+    def parse_headers(content_file)
+      headers = []
+      para1 = []
+      para2 = []
+      file_type = type_from_path(content_file)
+
+      File.open(content_file, :encoding => 'UTF-8') do |f|
+        while (line = f.gets) =~ /^(- |)@\w/
+          if line !~ /^-/
+            line = '- ' + line
+          end
+          headers << line
+        end
+        # eat empty lines
+        while line = f.gets
+          break unless line =~ /^\s*$/
+        end
+        # grab first two paragraphs
+        para1 << line
+        while line = f.gets
+          break if line =~ /^\s*$/
+          para1 << line
+        end
+        while line = f.gets
+          break if line =~ /^\s*$/
+          para2 << line
+        end
+      end
+
+      headers = headers.join
+      para1 = para1.join
+      para2 = para2.join
+      excerpt = ""
+
+      # pick the first non-heading paragraph.
+      # this is stupid, and chokes on nested headings.
+      # but is also cheap and fast :)
+      if file_type == :textile
+        if para1 =~ /^h[1-5]\. /
+          excerpt = para2
+        else
+          excerpt = para1
+        end
+      elsif file_type == :markdown
+        if para1 =~ /^#+ / || para1 =~ /^(===+|---+)\s*$/m
+          excerpt = para2
+        else
+          excerpt = para1
+        end
+      end
+      return [headers, excerpt]
+    end
+
+    ##
+    ## VARIABLES
+    ## Variables are associated with a page, but unlike properties they are not
+    ## inheritable. Variables are defined in a separate file.
+    ##
+    def variable_files
+      if @simple_page
+        directory = File.dirname(@file_path)
+        regexp = SIMPLE_VAR_MATCH_RE.call(@name)
+      else
+        directory = @file_path
+        regexp = VAR_FILE_MATCH_RE
+      end
+      hsh = {}
+      Dir.foreach(directory) do |file|
+        if file && match = regexp.match(file)
+          locale = match['locale'] || I18n.default_locale
+          hsh[locale.to_sym] = File.join(directory, file)
+        end
+      end
+      hsh
+    end
+
+    def load_variables
+      vars = {}
+      variable_files.each do |locale, var_file|
+        begin
+          if var_file =~ /\.ya?ml$/
+            vars[locale] = YAML.load_file(var_file)
+          elsif var_file =~ /\.json$/
+            vars[locale] = JSON.parse(File.read(var_file))
+          end
+        rescue StandardError => exc
+          Amber.logger.error('ERROR: could not load file #{var_file}: ' + exc.to_s)
+        end
+      end
+      return vars
+    end
+
+    def type_from_path(path)
+      case File.extname(path)
+      when ".text", ".textile"
+        :textile
+      when ".md", ".markdown"
+        :markdown
+      when ".haml"
+        :haml
+      when ".html"
+        :html
+      when ".erb"
+        :erb
+      else
+        :unknown
+      end
+    end
+
     # RAILS
     #def is_haml_template?(locale)
     #  content_file(locale) =~ /\.haml$/
-    #  #@suffix == '.haml' || File.exists?(self.absolute_template_path(locale) + '.haml')
+    #  #@suffix == '.haml' || File.exist?(self.absolute_template_path(locale) + '.haml')
     #end
 
   end

data/lib/amber/static_page/property_set.rb

@@ -39,11 +39,11 @@ module Amber
       #
       def get(property_name, inheritable_only=false)
         if inheritable_only || @this.nil?
-          instance_variable_get("@#{property_name}")
+          safe_instance_get("@#{property_name}")
         else
           value = @this.get(property_name)
           if value.nil?
-            value = instance_variable_get("@#{property_name}")
+            value = safe_instance_get("@#{property_name}")
           end
           value
         end
@@ -68,11 +68,22 @@ module Amber
       def to_s
         "<" + instance_variables.map{|v| "#{v}=#{instance_variable_get(v)}"}.join(', ') + ">"
       end
+
+      private
+
+      def safe_instance_get(prop_name)
+        if !instance_variable_defined?(prop_name)
+          instance_variable_set(prop_name, nil)
+        end
+        instance_variable_get(prop_name)
+      end
     end
 
     class ThisPropertySet < PropertySet
       def initialize
+        @this = nil
       end
     end
+
   end
 end

data/lib/amber/static_page/render.rb

@@ -122,7 +122,7 @@ module Amber
         content_file = content_file(file_locale)
         next unless content_file
         dest = destination_file(dest_dir, file_locale)
-        unless Dir.exists?(File.dirname(dest))
+        unless Dir.exist?(File.dirname(dest))
           FileUtils.mkdir_p(File.dirname(dest))
         end
         if options[:force] || !File.exist?(dest) || File.mtime(content_file) > File.mtime(dest)

data/lib/amber/templates/config.rb

@@ -0,0 +1,4 @@
+@title = "Your site's title"
+@default_locale = :en
+@locales = [:en, :fr]
+@short_paths = true

data/lib/amber/version.rb

@@ -1,5 +1,5 @@
 module Amber
   unless defined?(Amber::VERSION)
-    VERSION = '0.3.8'
+    VERSION = '0.3.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amber
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.11
 platform: ruby
 authors:
 - Elijah Sparrow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -142,8 +142,9 @@ files:
 - lib/amber/page_array.rb
 - lib/amber/render/apache.rb
 - lib/amber/render/asset.rb
-- lib/amber/render/autolink.rb
-- lib/amber/render/bracketlink.rb
+- lib/amber/render/filter/autolink.rb
+- lib/amber/render/filter/bracketlink.rb
+- lib/amber/render/filter/variables.rb
 - lib/amber/render/helpers/blog_helper.rb
 - lib/amber/render/helpers/date_helper.rb
 - lib/amber/render/helpers/haml_helper.rb
@@ -157,6 +158,7 @@ files:
 - lib/amber/server.rb
 - lib/amber/site.rb
 - lib/amber/site_configuration.rb
+- lib/amber/site_loader.rb
 - lib/amber/static_page.rb
 - lib/amber/static_page/filesystem.rb
 - lib/amber/static_page/page_properties.rb
@@ -164,6 +166,7 @@ files:
 - lib/amber/static_page/render.rb
 - lib/amber/templates/apache_config.erb
 - lib/amber/templates/apache_config_with_prefix.erb
+- lib/amber/templates/config.rb
 - lib/amber/templates/htaccess.erb
 - lib/amber/version.rb
 - locales/rails-i18n/af.yml
@@ -291,3 +294,4 @@ signing_key:
 specification_version: 4
 summary: Static website generator
 test_files: []
+has_rdoc: 

data/lib/amber/render/autolink.rb

@@ -1,78 +0,0 @@
-# encoding: utf-8
-# adapted from https://github.com/tenderlove/rails_autolink
-# MIT license
-
-module Amber::Render::Autolink
-
-  def self.auto_link(text)
-    auto_link_email_addresses(auto_link_urls(text))
-  end
-
-  private
-
-  AUTO_LINK_RE = %r{
-      (?: ((?:ed2k|ftp|http|https|irc|mailto|news|gopher|nntp|telnet|webcal|xmpp|callto|feed|svn|urn|aim|rsync|tag|ssh|sftp|rtsp|afs|file):)// | www\. )
-      [^\s<\u00A0]+
-    }ix
-
-  # regexps for determining context, used high-volume
-  AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, /<\/a>/i]
-
-  AUTO_EMAIL_LOCAL_RE = /[\w.!#\$%&'*\/=?^`{|}~+-]/
-  AUTO_EMAIL_RE = /[\w.!#\$%+-]\.?#{AUTO_EMAIL_LOCAL_RE}*@[\w-]+(?:\.[\w-]+)+/
-
-  BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
-
-  WORD_PATTERN = RUBY_VERSION < '1.9' ? '\w' : '\p{Word}'
-
-  # Turns all urls into clickable links.  If a block is given, each url
-  # is yielded and the result is used as the link text.
-  def self.auto_link_urls(text)
-    text.gsub(AUTO_LINK_RE) do
-      scheme, href = $1, $&
-      punctuation = []
-
-      if auto_linked?($`, $')
-        # do not change string; URL is already linked
-        href
-      else
-        # don't include trailing punctuation character as part of the URL
-        while href.sub!(/[^#{WORD_PATTERN}\/-]$/, '')
-          punctuation.push $&
-          if opening = BRACKETS[punctuation.last] and href.scan(opening).size > href.scan(punctuation.last).size
-            href << punctuation.pop
-            break
-          end
-        end
-
-        #link_text = block_given?? yield(href) : href
-        link_text = href.sub(/^#{scheme}\/\//,'')
-        href = 'http://' + href unless scheme
-        %(<a href="#{href}">#{link_text}</a>) + punctuation.reverse.join('')
-      end
-    end
-  end
-
-  # Turns all email addresses into clickable links.
-  def self.auto_link_email_addresses(text)
-    text.gsub(AUTO_EMAIL_RE) do
-      text = $&
-
-      if auto_linked?($`, $')
-        text
-      else
-        #display_text = (block_given?) ? yield(text) : text
-        #display_text = text
-        text.gsub!('@', '&#064').gsub!('.', '&#046;')
-        %(<a href="mailto:#{text}">#{text}</a>)
-      end
-    end
-  end
-
-  # Detects already linked context or position in the middle of a tag
-  def self.auto_linked?(left, right)
-    (left =~ AUTO_LINK_CRE[0] and right =~ AUTO_LINK_CRE[1]) or
-      (left.rindex(AUTO_LINK_CRE[2]) and $' !~ AUTO_LINK_CRE[3])
-  end
-
-end

data/lib/amber/render/bracketlink.rb

@@ -1,33 +0,0 @@
-# encoding: utf-8
-
-#
-# bracket links are links in the form [[label => target]] or [[page-name]]
-#
-
-module Amber::Render::Bracketlink
-
-  # linking using double square brackets
-  BRACKET_LINK_RE = /
-    \[\[          # start [[
-    ([^\[\]]+)    # $text : one or more characters that are not [ or ] ($1)
-    \]\]          # end ]]
-  /x
-
-  def self.bracket_link(text, &block)
-    text.gsub(BRACKET_LINK_RE) do |m|
-      link_text = $~[1].strip
-      if link_text =~ /^.+\s*[-=]>\s*.+$/
-        # link_text == "from -> to"
-        from, to = link_text.split(/\s*[-=]>\s*/)[0..1]
-        from = "" unless from.instance_of? String # \ sanity check for
-        to   = "" unless from.instance_of? String # / badly formed links
-      else
-        # link_text == "to" (ie, no link label)
-        from = nil
-        to = link_text
-      end
-      yield(from, to)
-    end
-  end
-
-end