middleman 3.0.0.alpha.5 → 3.0.0.alpha.6

data/lib/middleman/core_extensions/extensions.rb

@@ -31,9 +31,12 @@
 # Using for version parsing
 require "rubygems"
 
+# Namespace extensions module
 module Middleman::CoreExtensions::Extensions
   
+  # Register extension
   class << self
+    # @private
     def included(app)
       # app.set :default_extensions, []
       app.define_hook :after_configuration
@@ -43,18 +46,31 @@ module Middleman::CoreExtensions::Extensions
       
       app.extend ClassMethods
       app.send :include, InstanceMethods
+      app.delegate :configure, :to => :"self.class"
     end
   end
 
+  # Class methods
   module ClassMethods
+    # Add a callback to run in a specific environment
+    #
+    # @param [String, Symbol] env The environment to run in
+    # @return [void]
     def configure(env, &block)
       send("#{env}_config", &block)
     end
     
+    # Alias `extensions` to access registered extensions
+    #
+    # @return [Array<Module]
     def extensions
       @extensions ||= []
     end
     
+    # Register a new extension
+    # 
+    # @param [Array<Module>] new_extensions Extension modules to register
+    # @return [Array<Module]
     def register(*new_extensions)
       @extensions ||= []
       @extensions += new_extensions
@@ -65,12 +81,16 @@ module Middleman::CoreExtensions::Extensions
     end
   end
   
+  # Instance methods
   module InstanceMethods
     # This method is available in the project's `config.rb`.
     # It takes a underscore-separated symbol, finds the appropriate
     # feature module and includes it.
     #
     #     activate :lorem
+    #
+    # @param [Symbol, Module] feature Which extension to activate
+    # @return [void]
     def activate(feature)
       ext = ::Middleman::Extensions.load(feature.to_sym)
       
@@ -83,10 +103,6 @@ module Middleman::CoreExtensions::Extensions
         self.class.register(ext)
       end
     end
-
-    def configure(env, &block)
-      self.class.configure(env, &block)
-    end
     
     # Load features before starting server
     def initialize

data/lib/middleman/core_extensions/file_watcher.rb

@@ -1,11 +1,17 @@
 require "find"
 
+# API for watching file change events
 module Middleman::CoreExtensions::FileWatcher
+  # Setup extension
   class << self
+    # @private
     def registered(app)
       app.extend ClassMethods
       app.send :include, InstanceMethods
       
+      app.delegate :file_changed, :file_deleted, :to => :"self.class"
+      
+      # Before parsing config, load the data/ directory
       app.before_configuration do
         data_path = File.join(root, data_dir)
         Find.find(data_path) do |path|
@@ -14,6 +20,7 @@ module Middleman::CoreExtensions::FileWatcher
         end if File.exists?(data_path)
       end
       
+      # After config, load everything else
       app.ready do
         Find.find(root) do |path|
           next if File.directory?(path)
@@ -24,13 +31,22 @@ module Middleman::CoreExtensions::FileWatcher
     alias :included :registered
   end
   
+  # Class methods
   module ClassMethods
+    # Add callback to be run on file change
+    #
+    # @param [nil,Regexp] matcher A Regexp to match the change path against
+    # @return [Array<Proc>]
     def file_changed(matcher=nil, &block)
       @_file_changed ||= []
       @_file_changed << [block, matcher] if block_given?
       @_file_changed
     end
     
+    # Add callback to be run on file deletion
+    #
+    # @param [nil,Regexp] matcher A Regexp to match the deleted path against
+    # @return [Array<Proc>]
     def file_deleted(matcher=nil, &block)
       @_file_deleted ||= []
       @_file_deleted << [block, matcher] if block_given?
@@ -38,11 +54,12 @@ module Middleman::CoreExtensions::FileWatcher
     end
   end
   
+  # Instance methods
   module InstanceMethods
-    def file_changed(*args, &block)
-      self.class.file_changed(*args, &block)
-    end
-    
+    # Notify callbacks that a file changed
+    #
+    # @param [String] path The file that changed
+    # @return [void]
     def file_did_change(path)
       file_changed.each do |callback, matcher|
         next if path.match(%r{^#{build_dir}/})
@@ -50,11 +67,11 @@ module Middleman::CoreExtensions::FileWatcher
         instance_exec(path, &callback)
       end
     end
-    
-    def file_deleted(*args)
-      self.class.file_deleted(*args)
-    end
 
+    # Notify callbacks that a file was deleted
+    #
+    # @param [String] path The file that was deleted
+    # @return [void]
     def file_did_delete(path)
       file_deleted.each do |callback, matcher|
         next if path.match(%r{^#{build_dir}/})

data/lib/middleman/core_extensions/front_matter.rb

@@ -7,6 +7,7 @@ module Middleman::CoreExtensions::FrontMatter
       app.set :frontmatter_extensions, %w(.htm .html .php)
       app.extend ClassMethods
       app.send :include, InstanceMethods
+      app.delegate :frontmatter_changed, :to => :"self.class"
     end
     alias :included :registered
   end
@@ -37,28 +38,20 @@ module Middleman::CoreExtensions::FrontMatter
       provides_metadata matcher do |path|
         relative_path = path.sub(source_dir, "")
 
-        data = if frontmatter.has_data?(relative_path)
+        fmdata = if frontmatter.has_data?(relative_path)
           frontmatter.data(relative_path)[0]
         else
           {}
         end
 
-        # Forward remaining data to helpers
-        data_content("page", data)
-
+        data = {}
         %w(layout layout_engine).each do |opt|
-          if data.has_key?(opt)
-            data[opt.to_sym] = data.delete(opt)
-          end
+          data[opt.to_sym] = fmdata[opt] if fmdata.has_key?(opt)
         end
 
-        { :options => data }
+        { :options => data, :page => fmdata }
       end
     end
-    
-    def frontmatter_changed(*args, &block)
-      self.class.frontmatter_changed(*args, &block)
-    end
 
     def frontmatter_did_change(path)
       frontmatter_changed.each do |callback, matcher|

data/lib/middleman/core_extensions/rendering.rb

@@ -44,6 +44,8 @@ module Middleman::CoreExtensions::Rendering
       # the template don't persist for other templates.
       context = self.dup
 
+      @current_locs = locs, @current_opts = opts
+
       while ::Tilt[path]
         content = render_individual_file(path, locs, opts, context)
         path = File.basename(path, File.extname(path))
@@ -60,6 +62,8 @@ module Middleman::CoreExtensions::Rendering
     ensure
       @current_engine = engine_was
       @content_blocks = nil
+      @current_locs = nil
+      @current_opts = nil
     end
     
     # Sinatra/Padrino render method signature.
@@ -198,6 +202,12 @@ module Middleman::CoreExtensions::Rendering
     
       layout_path
     end
+    
+    def wrap_layout(layout_name, &block)
+      content = capture(&block) if block_given?
+      layout_path = locate_layout(layout_name, current_engine)
+      concat render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
+    end
   
     def current_engine
       @current_engine ||= nil

data/lib/middleman/core_extensions/sitemap.rb

@@ -26,6 +26,10 @@ module Middleman::CoreExtensions::Sitemap
       @sitemap ||= ::Middleman::Sitemap::Store.new(self)
     end
     
+    def current_page
+      sitemap.page(current_path)
+    end
+    
     # Keep a path from building
     def ignore(path)
       sitemap.ignore(path)

data/lib/middleman/guard.rb

@@ -41,12 +41,6 @@ module Guard
     def initialize(watchers = [], options = {})
       super
       @options = options
-
-      # Trap the interupt signal and shut down Guard (and thus the server) smoothly
-      trap(kill_command) do 
-        ::Guard.stop
-        exit!(0)
-      end
     end
     
     # Start Middleman in a fork
@@ -81,7 +75,7 @@ module Guard
       puts "== The Middleman is shutting down"
       if ::Middleman::JRUBY
       else
-        Process.kill(kill_command, @server_job)
+        Process.kill(::Middleman::WINDOWS ? :KILL : :TERM, @server_job)
         Process.wait @server_job
         @server_job = nil
       end
@@ -113,6 +107,10 @@ module Guard
       paths.each { |path| tell_server(:delete => path) }
     end
     
+    def self.kill_command
+      ::Middleman::WINDOWS ? 1 : :INT
+    end
+    
   private
     # Whether the passed files are config.rb or lib/*.rb
     # @param [Array<String>] paths Array of paths to check
@@ -129,9 +127,11 @@ module Guard
       uri = URI.parse("http://#{@options[:host]}:#{@options[:port]}/__middleman__")
       Net::HTTP.post_form(uri, {}.merge(params))
     end
-    
-    def kill_command
-      ::Middleman::WINDOWS ? 1 : :INT
-    end
   end
+end
+
+# Trap the interupt signal and shut down Guard (and thus the server) smoothly
+trap(::Guard::Middleman.kill_command) do 
+  ::Guard.stop
+  exit!(0)
 end

data/lib/middleman/sitemap/page.rb

@@ -99,6 +99,61 @@ module Middleman::Sitemap
       end
     end
     
+    def directory_index?
+      path.include?(app.index_file) || path =~ /\/$/
+    end
+    
+    def parent
+      parts = path.split("/")
+      if path.include?(app.index_file)
+        parts.pop
+      else
+      end
+      
+      return nil if parts.length < 1
+      
+      parts.pop
+      parts.push(app.index_file)
+      
+      parent_path = "/" + parts.join("/")
+      
+      if store.exists?(parent_path)
+        store.page(parent_path)
+      else
+        nil
+      end
+    end
+    
+    def children
+      return [] unless directory_index?
+      
+      base_path = path.sub("#{app.index_file}", "")
+      prefix    = /^#{base_path.sub("/", "\\/")}/
+
+      store.all_paths.select do |sub_path|
+        sub_path =~ prefix
+      end.select do |sub_path|
+        path != sub_path
+      end.select do |sub_path|
+       relative_path = sub_path.sub(prefix, "")
+       parts = relative_path.split("/")
+       if parts.length == 1
+         true
+       elsif parts.length == 2
+         parts.last == app.index_file
+       else
+         false
+       end
+      end.map do |p| 
+        store.page(p)
+      end.reject { |p| p.ignored? }
+    end
+    
+    def siblings
+      return [] unless parent
+      parent.children.reject { |p| p == self }
+    end
+    
   protected
     def app
       @store.app

data/lib/middleman/sitemap/template.rb

@@ -36,7 +36,7 @@ module Middleman::Sitemap
     
     def metadata
       metadata = app.cache.fetch(:metadata, source_file) do
-        data = { :options => {}, :locals => {} }
+        data = { :options => {}, :locals => {}, :page => {} }
         
         app.provides_metadata.each do |callback, matcher|
           next if !matcher.nil? && !source_file.match(matcher)
@@ -57,8 +57,14 @@ module Middleman::Sitemap
     end
 
     def render(opts={}, locs={}, &block)
-      opts = options.deep_merge(metadata[:options]).deep_merge(opts)
-      locs = locals.deep_merge(metadata[:locals]).deep_merge(locs)
+      md   = metadata.dup
+      opts = options.deep_merge(md[:options]).deep_merge(opts)
+      locs = locals.deep_merge(md[:locals]).deep_merge(locs)
+      
+      # Forward remaining data to helpers
+      if md.has_key?(:page)
+        app.data_content("page", md[:page])
+      end
       
       blocks.compact.each do |block|
         app.instance_eval(&block)

data/lib/middleman/step_definitions.rb

@@ -5,7 +5,6 @@ ENV['PATH'] = "#{MIDDLEMAN_BIN_PATH}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 require "aruba/cucumber"
 require "middleman/step_definitions/middleman_steps"
 require "middleman/step_definitions/builder_steps"
-require "middleman/step_definitions/generator_steps"
 require "middleman/step_definitions/server_steps"
 
 Before do

data/lib/middleman/templates/default.rb

@@ -12,11 +12,16 @@ class Middleman::Templates::Default < Middleman::Templates::Base
   def build_scaffold!
     template "shared/config.tt", File.join(location, "config.rb")
     copy_file "default/source/index.html.erb", File.join(location, "source/index.html.erb")
-    copy_file "default/source/layout.erb", File.join(location, "source/layout.erb")
+    copy_file "default/source/layouts/layout.erb", File.join(location, "source/layouts/layout.erb")
     empty_directory File.join(location, "source", options[:css_dir])
-    copy_file "default/source/stylesheets/site.css.scss", File.join(location, "source", options[:css_dir], "site.css.scss")
+    copy_file "default/source/stylesheets/all.css.scss", File.join(location, "source", options[:css_dir], "all.css.scss")
+    copy_file "default/source/stylesheets/_animate.scss", File.join(location, "source", options[:css_dir], "_animate.scss")
+    copy_file "default/source/stylesheets/_normalize.scss", File.join(location, "source", options[:css_dir], "_normalize.scss")
     empty_directory File.join(location, "source", options[:js_dir])
+    copy_file "default/source/javascripts/all.js", File.join(location, "source", options[:js_dir], "all.js")
     empty_directory File.join(location, "source", options[:images_dir])
+    copy_file "default/source/images/background.png", File.join(location, "source", options[:images_dir], "background.png")
+    copy_file "default/source/images/middleman.png", File.join(location, "source", options[:images_dir], "middleman.png")
   end  
 end
 

data/lib/middleman/templates/default/source/index.html.erb

@@ -1,5 +1,10 @@
-<% content_for :head do %>
-  <title>The Middleman!</title>
-<% end %>
+---
+title: Welcome to Middleman
+---
 
-<h1>The Middleman is watching.</h1>
+<div class="welcome">
+  <h1>Middleman is Watching</h1>
+  <p class="doc">
+    <%= link_to "Read Online Documentation", "http://middlemanapp.com/" %>
+  </p><!-- .doc -->
+</div><!-- .welcome -->

data/lib/middleman/templates/default/source/javascripts/all.js

@@ -0,0 +1 @@
+//= require_tree .

data/lib/middleman/templates/default/source/layouts/layout.erb

@@ -0,0 +1,19 @@
+<doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    
+    <!-- Always force latest IE rendering engine or request Chrome Frame -->
+    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    
+    <!-- Use title if it's in the page YAML frontmatter -->
+    <title><%= data.page.title || "The Middleman" %></title>
+    
+    <%= stylesheet_link_tag "all" %>
+    <%= javascript_include_tag  "all" %>
+  </head>
+  
+  <body class="<%= page_classes %>">
+    <%= yield %>
+  </body>
+</html>

data/lib/middleman/templates/default/source/stylesheets/_animate.scss

@@ -0,0 +1,23 @@
+.welcome {
+  -webkit-animation-name: welcome;
+  -webkit-animation-duration: .9s;
+}
+
+@-webkit-keyframes welcome {
+  from {
+    -webkit-transform: scale(0);
+    opacity: 0;
+  }
+  50% {
+   -webkit-transform: scale(0);
+   opacity: 0;
+  }
+  82.5% {
+    -webkit-transform: scale(1.03);
+    -webkit-animation-timing-function: ease-out;
+    opacity: 1;
+  }
+  to {
+    -webkit-transform: scale(1);
+  }
+}