middleman-core 3.0.14 → 3.1.0.beta.1

data/fixtures/frontmatter-neighbor-app/source/front-matter-2.php.erb.frontmatter

@@ -0,0 +1,4 @@
+---
+layout: false
+title: This is the title
+---

data/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb

@@ -0,0 +1 @@
+<h1><%= data.page.title %></h1>

data/fixtures/frontmatter-neighbor-app/source/front-matter-auto.erb.frontmatter

@@ -0,0 +1,4 @@
+---
+layout: false
+title: This is the title
+---

data/fixtures/frontmatter-neighbor-app/source/front-matter-change.html.erb

@@ -0,0 +1 @@
+<%= data.page.title %>

data/fixtures/frontmatter-neighbor-app/source/front-matter-change.html.erb.frontmatter

@@ -0,0 +1,4 @@
+---
+title: Hola Mundo
+layout: false
+---

data/fixtures/frontmatter-neighbor-app/source/front-matter-encoding.html.erb

@@ -0,0 +1 @@
+<h1><%= data.page.title %></h1>

data/fixtures/frontmatter-neighbor-app/source/front-matter-encoding.html.erb.frontmatter

@@ -0,0 +1,5 @@
+# encoding: UTF-8
+---
+layout: false
+title: This is the title
+---

data/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb

@@ -0,0 +1,2 @@
+<h1><%= data.page.title %></h1>
+<?php echo "sup"; ?>

data/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb.frontmatter

@@ -0,0 +1,4 @@
+;;;
+  "layout": false,
+  "title":  "This is the title"
+;;;

data/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb

@@ -0,0 +1 @@
+<h1><%= data.page.title %></h1>

data/fixtures/frontmatter-neighbor-app/source/json-front-matter-auto.erb.frontmatter

@@ -0,0 +1,4 @@
+;;;
+  "layout": false,
+  "title":  "This is the title"
+;;;

data/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb

@@ -0,0 +1 @@
+<h1><%= data.page.title %></h1>

data/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb.frontmatter

@@ -0,0 +1,4 @@
+;;;
+  "layout": false,
+  "title":  "This is the title"
+;;;

data/fixtures/frontmatter-neighbor-app/source/raw-front-matter.html

@@ -0,0 +1 @@
+<h1><%= data.page.title %></h1>

data/fixtures/frontmatter-neighbor-app/source/raw-front-matter.html.frontmatter

@@ -0,0 +1,4 @@
+---
+layout: false
+title: This is the title
+---

data/fixtures/frontmatter-neighbor-app/source/raw-front-matter.php

@@ -0,0 +1 @@
+<?php echo "sup"; ?>

data/fixtures/frontmatter-neighbor-app/source/raw-front-matter.php.frontmatter

@@ -0,0 +1,4 @@
+---
+layout: false
+title: This is the title
+---

data/fixtures/frontmatter-settings-neighbor-app/config.rb

@@ -0,0 +1,4 @@
+# Proxy ignored.html, which should ignore itself through a frontmatter
+page 'proxied.html', :proxy => 'ignored.html'
+page 'override_layout.html', :layout => :alternate
+page 'page_mentioned.html'

data/fixtures/frontmatter-settings-neighbor-app/source/alternate_layout.html.erb

@@ -0,0 +1 @@
+This uses an alternate layout

data/fixtures/frontmatter-settings-neighbor-app/source/alternate_layout.html.erb.frontmatter

@@ -0,0 +1,3 @@
+---
+layout: alternate
+---

data/fixtures/frontmatter-settings-neighbor-app/source/ignored.html.erb

@@ -0,0 +1 @@
+This file ignores itself! But it can still be proxied.

data/fixtures/frontmatter-settings-neighbor-app/source/ignored.html.erb.frontmatter

@@ -0,0 +1,3 @@
+---
+ignored: true
+---

data/fixtures/frontmatter-settings-neighbor-app/source/layouts/alternate.erb

@@ -0,0 +1,3 @@
+Alternate layout!
+
+<%= yield %>

data/fixtures/frontmatter-settings-neighbor-app/source/layouts/override.erb

@@ -0,0 +1,2 @@
+<%= yield %>
+ Override.

data/fixtures/frontmatter-settings-neighbor-app/source/override_layout.html.erb

@@ -0,0 +1 @@
+Layout in use:

data/fixtures/frontmatter-settings-neighbor-app/source/override_layout.html.erb.frontmatter

@@ -0,0 +1,3 @@
+---
+layout: override
+---

data/fixtures/frontmatter-settings-neighbor-app/source/page_mentioned.html.erb

@@ -0,0 +1 @@
+Layout in use:

data/fixtures/frontmatter-settings-neighbor-app/source/page_mentioned.html.erb.frontmatter

@@ -0,0 +1,3 @@
+---
+layout: override
+---

data/fixtures/nested-data-app/config.rb

@@ -0,0 +1 @@
+set :layout, false

data/fixtures/nested-data-app/data/examples/test.yml

@@ -0,0 +1 @@
+title: "Hello"

data/fixtures/nested-data-app/source/test.html.erb

@@ -0,0 +1 @@
+<%= data.examples.map { |k, r| [k, r.title].join(":") }.join %>

data/fixtures/queryable-app/source/2010-08-08-test-document-file.html.markdown

@@ -0,0 +1,8 @@
+---
+id: 1
+title: Some fancy title
+tags: [ruby]
+status: :published
+---
+
+I like being the demo text.

data/fixtures/queryable-app/source/2010-08-09-another-test-document.html.markdown

@@ -0,0 +1,10 @@
+---
+id: 2
+title: Another title, that's for sure
+tags: [ruby, rails]
+special_attribute: Yes!
+friends: [Anton, Paul]
+status: :published
+---
+
+The body copy.

data/fixtures/queryable-app/source/2011-12-26-some-test-document.html.markdown

@@ -0,0 +1,6 @@
+---
+id: 5
+title: Some test document
+---
+
+This is just some test document.

data/fixtures/queryable-app/source/document_with_date_in_yaml.html.markdown

@@ -0,0 +1,7 @@
+---
+id: 3
+title: Document with date in YAML
+date: 2011-04-05
+---
+
+This document has no date in the filename, but in the YAML front matter.

data/fixtures/queryable-app/source/document_without_date.html.markdown

@@ -0,0 +1,7 @@
+---
+id: 4
+title: This document has no date
+seldom_attribute: is seldom
+---
+
+This document has no date at all.

data/lib/middleman-core/application.rb

@@ -12,10 +12,14 @@ require "middleman-core/vendor/hooks-0.2.0/lib/hooks"
 require "middleman-core/sitemap"
 
 require "middleman-core/core_extensions"
+require "middleman-core/configuration"
 
 # Core Middleman Class
 module Middleman
   class Application
+    # Global configuration
+    include Configuration::Global
+
     # Uses callbacks
     include Hooks
 
@@ -25,131 +29,96 @@ module Middleman
     # Ready (all loading and parsing of extensions complete) hook
     define_hook :ready
 
-    class << self
-
-      # Mix-in helper methods. Accepts either a list of Modules
-      # and/or a block to be evaluated
-      # @return [void]
-      def helpers(*extensions, &block)
-        class_eval(&block)   if block_given?
-        include(*extensions) if extensions.any?
-      end
-
-      # Access class-wide defaults
-      #
-      # @private
-      # @return [Hash] Hash of default values
-      def defaults
-        @defaults ||= {}
-      end
-
-      # Set class-wide defaults
-      #
-      # @param [Symbol] key Unique key name
-      # @param value Default value
-      # @return [void]
-      def set(key, value=nil, &block)
-        @defaults ||= {}
-        @defaults[key] = value
-
-        @inst.set(key, value, &block) if @inst
-      end
-    end
-
-    delegate :helpers, :to => :"self.class"
+    # Runs after the build is finished
+    define_hook :after_build
 
-    # Set attributes (global variables)
-    #
-    # @param [Symbol] key Name of the attribue
-    # @param value Attribute value
+    # Mix-in helper methods. Accepts either a list of Modules
+    # and/or a block to be evaluated
     # @return [void]
-    def set(key, value=nil, &block)
-      setter = "#{key}=".to_sym
-      self.class.send(:attr_accessor, key) if !respond_to?(setter)
-      value = block if block_given?
-      send(setter, value)
+    def self.helpers(*extensions, &block)
+      class_eval(&block)   if block_given?
+      include(*extensions) if extensions.any?
     end
+    delegate :helpers, :to => :"self.class"
 
     # Root project directory (overwritten in middleman build/server)
     # @return [String]
-    set :root,        ENV["MM_ROOT"] || Dir.pwd
+    def self.root
+      ENV["MM_ROOT"] || Dir.pwd
+    end
+    delegate :root, :to => :"self.class"
 
     # Pathname-addressed root
-    def root_path
-      @_root_path ||= Pathname.new(root)
+    def self.root_path
+      Pathname(root)
     end
+    delegate :root_path, :to => :"self.class"
 
     # Name of the source directory
     # @return [String]
-    set :source,      "source"
+    config.define_setting :source,      "source", 'Name of the source directory'
 
     # Middleman environment. Defaults to :development, set to :build by the build process
     # @return [String]
-    set :environment, (ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development
+    config.define_setting :environment, ((ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development), 'Middleman environment. Defaults to :development, set to :build by the build process'
 
     # Which file should be used for directory indexes
     # @return [String]
-    set :index_file,  "index.html"
+    config.define_setting :index_file,  "index.html", 'Which file should be used for directory indexes'
 
     # Whether to strip the index file name off links to directory indexes
     # @return [Boolean]
-    set :strip_index_file, true
+    config.define_setting :strip_index_file, true, 'Whether to strip the index file name off links to directory indexes'
 
     # Whether to include a trailing slash when stripping the index file
     # @return [Boolean]
-    set :trailing_slash, true
+    config.define_setting :trailing_slash, true, 'Whether to include a trailing slash when stripping the index file'
 
     # Location of javascripts within source.
     # @return [String]
-    set :js_dir,      "javascripts"
+    config.define_setting :js_dir,      "javascripts", 'Location of javascripts within source'
 
     # Location of stylesheets within source. Used by Compass.
     # @return [String]
-    set :css_dir,     "stylesheets"
+    config.define_setting :css_dir,     "stylesheets", 'Location of stylesheets within source'
 
     # Location of images within source. Used by HTML helpers and Compass.
     # @return [String]
-    set :images_dir,  "images"
+    config.define_setting :images_dir,  "images", 'Location of images within source'
 
     # Location of fonts within source. Used by Compass.
     # @return [String]
-    set :fonts_dir,   "fonts"
+    config.define_setting :fonts_dir,   "fonts", 'Location of fonts within source'
 
-    # Where to build output files
+    # Location of partials within source. Used by renderers.
     # @return [String]
-    set :build_dir,   "build"
+    config.define_setting :partials_dir,   "", 'Location of partials within source'
 
-    # Default prefix for building paths. Used by HTML helpers and Compass.
+    # Where to build output files
     # @return [String]
-    set :http_prefix, "/"
+    config.define_setting :build_dir,   "build", 'Where to build output files'
 
-    # Default string encoding for templates and output.
+    # Default prefix for building paths. Used by HTML helpers and Compass.
     # @return [String]
-    set :encoding,    "utf-8"
-
-    # Whether to catch and display exceptions
-    # @return [Boolean]
-    set :show_exceptions, true
+    config.define_setting :http_prefix, "/", 'Default prefix for building paths'
 
     # Default layout name
     # @return [String, Symbold]
-    set :layout, :_auto_layout
+    config.define_setting :layout, :_auto_layout, 'Default layout name'
+
+    # Default string encoding for templates and output.
+    # @return [String]
+    config.define_setting :encoding, "utf-8", 'Default string encoding for templates and output'
 
     # Activate custom features and extensions
     include Middleman::CoreExtensions::Extensions
 
-    # Manage Ruby string encodings
-    include Middleman::CoreExtensions::RubyEncoding
-
     # Basic Rack Request Handling
     register Middleman::CoreExtensions::Request
 
     # Handle exceptions
     register Middleman::CoreExtensions::ShowExceptions
 
-    # Add Builder Callbacks
-    register Middleman::CoreExtensions::Builder
-
     # Add Watcher Callbacks
     register Middleman::CoreExtensions::FileWatcher
 
@@ -170,7 +139,7 @@ module Middleman
     register Middleman::CoreExtensions::ExternalHelpers
 
     # with_layout and page routing
-    register Middleman::CoreExtensions::Routing
+    include Middleman::CoreExtensions::Routing
 
     # Initialize the Middleman project
     def initialize(&block)
@@ -178,12 +147,17 @@ module Middleman
       cache.clear
 
       # Setup the default values from calls to set before initialization
-      self.class.superclass.defaults.each { |k,v| set(k,v) }
+      self.class.config.load_settings(self.class.superclass.config.all_settings)
+
+      if Object.const_defined?(:Encoding)
+        Encoding.default_internal = config[:encoding]
+        Encoding.default_external = config[:encoding]
+      end
 
       # Evaluate a passed block if given
       instance_exec(&block) if block_given?
 
-      set :source, ENV["MM_SOURCE"] if ENV["MM_SOURCE"]
+      config[:source] = ENV["MM_SOURCE"] if ENV["MM_SOURCE"]
 
       super
     end
@@ -199,24 +173,17 @@ module Middleman
 
     # Whether we're in development mode
     # @return [Boolean] If we're in dev mode
-    def development?; environment == :development; end
+    def development?; config[:environment] == :development; end
 
     # Whether we're in build mode
     # @return [Boolean] If we're in build mode
-    def build?; environment == :build; end
-
-    # Backwards compatibilty with old Sinatra template interface
-    #
-    # @return [Middleman::Application]
-    def settings
-      self
-    end
+    def build?; config[:environment] == :build; end
 
     # The full path to the source directory
     #
     # @return [String]
     def source_dir
-      File.join(root, source)
+      File.join(root, config[:source])
     end
 
     delegate :logger, :instrument, :to => ::Middleman::Util
@@ -228,6 +195,7 @@ module Middleman
     def to_s
       "#<Middleman::Application:0x#{object_id}>"
     end
+    alias :inspect :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
 
     # Expand a path to include the index file if it's a directory
     #
@@ -239,7 +207,7 @@ module Middleman
 
       if !resource
         # Try it with /index.html at the end
-        indexed_path = File.join(path.sub(%r{/$}, ''), index_file)
+        indexed_path = File.join(path.sub(%r{/$}, ''), config[:index_file])
         resource = sitemap.find_resource_by_destination_path(indexed_path)
       end