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

data/lib/middleman/templates/shared/config.tt

@@ -12,22 +12,7 @@
 # end
 
 ###
-# Haml
-###
-
-# CodeRay syntax highlighting in Haml
-# First: gem install haml-coderay
-# require 'haml-coderay'
-
-# CoffeeScript filters in Haml
-# First: gem install coffee-filter
-# require 'coffee-filter'
-
-# Automatic image dimensions on image_tag helper
-# activate :automatic_image_sizes
-
-###
-# Page command
+# Page options, layouts, aliases and proxies
 ###
 
 # Per-page layout changes:
@@ -52,6 +37,9 @@
 # Helpers
 ###
 
+# Automatic image dimensions on image_tag helper
+# activate :automatic_image_sizes
+
 # Methods defined in the helpers block are available in templates
 # helpers do
 #   def some_helper

data/lib/middleman/version.rb

@@ -4,7 +4,7 @@ require "rubygems"
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = "3.0.0.alpha.5"
+  VERSION = "3.0.0.alpha.6"
   
   # Parsed version for RubyGems
   # @private

data/middleman-x86-mingw32.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency("execjs", ["~> 1.2.7"])
   s.add_dependency("sprockets", ["~> 2.1.2"])
   s.add_dependency("sprockets-sass", ["~> 0.6.0"])
-  s.add_dependency("guard", ["~> 0.9.1"])
+  s.add_dependency("guard", ["~> 0.9.2"])
   s.add_dependency("redcarpet", ["~> 2.0.0"])
   
   s.add_dependency("eventmachine", ["1.0.0.beta.4.1"])

data/middleman.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency("execjs", ["~> 1.2.7"])
   s.add_dependency("sprockets", ["~> 2.1.2"])
   s.add_dependency("sprockets-sass", ["~> 0.6.0"])
-  s.add_dependency("guard", ["~> 0.9.1"])
+  s.add_dependency("guard", ["~> 0.9.2"])
   s.add_dependency("redcarpet", ["~> 2.0.0"])
   
   # Development and test

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: -3702664394
+  hash: -3702664400
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - alpha
-  - 5
-  version: 3.0.0.alpha.5
+  - 6
+  version: 3.0.0.alpha.6
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 -08:00
+date: 2011-12-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -268,12 +268,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 63
         segments: 
         - 0
         - 9
-        - 1
-        version: 0.9.1
+        - 2
+        version: 0.9.2
   name: guard
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
@@ -510,7 +510,6 @@ files:
 - features/fonts.feature
 - features/former_padrino_helpers.feature
 - features/front-matter.feature
-- features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_external.feature
@@ -522,11 +521,13 @@ files:
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/mount_rack.feature
+- features/nested_layouts.feature
 - features/page_alias_and_layouts.feature
 - features/partials.feature
 - features/preview_changes.feature
 - features/relative_assets.feature
 - features/scss-support.feature
+- features/sitemap_traversal.features
 - features/slim.feature
 - features/sprockets.feature
 - features/sprockets_gems.feature
@@ -569,6 +570,7 @@ files:
 - fixtures/different-engine-partial/source/layouts/layout.erb
 - fixtures/different-engine-partial/source/shared/_footer.slim
 - fixtures/different-engine-partial/source/shared/_header.erb
+- fixtures/empty-app/not-config.rb
 - fixtures/engine-matching-layout/config.rb
 - fixtures/engine-matching-layout/source/index.html.erb
 - fixtures/engine-matching-layout/source/layout.erb
@@ -618,6 +620,13 @@ files:
 - fixtures/multiple-layouts/source/index.html.erb
 - fixtures/multiple-layouts/source/layout.erb
 - fixtures/multiple-layouts/source/layout.haml
+- fixtures/nested-layout-app/config.rb
+- fixtures/nested-layout-app/source/data-one.html.erb
+- fixtures/nested-layout-app/source/data-two.html.erb
+- fixtures/nested-layout-app/source/index.html.erb
+- fixtures/nested-layout-app/source/layouts/inner.erb
+- fixtures/nested-layout-app/source/layouts/master.erb
+- fixtures/nested-layout-app/source/layouts/outer.erb
 - fixtures/no-layout/config.rb
 - fixtures/no-layout/source/index.html.erb
 - fixtures/partials-app/config.rb
@@ -743,6 +752,16 @@ files:
 - fixtures/test-app/source/sub1/page-classes.html.haml
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml
 - fixtures/test-app/source/tiny_src.html.haml
+- fixtures/traversal-app/config.rb
+- fixtures/traversal-app/source/index.html.erb
+- fixtures/traversal-app/source/layout.erb
+- fixtures/traversal-app/source/proxied.html.erb
+- fixtures/traversal-app/source/root.html.erb
+- fixtures/traversal-app/source/sub/index.html.erb
+- fixtures/traversal-app/source/sub/sibling.html.erb
+- fixtures/traversal-app/source/sub/sibling2.html.erb
+- fixtures/traversal-app/source/sub/sub2/index.html.erb
+- fixtures/traversal-app/source/sub/sub3/deep.html.erb
 - fixtures/wildcard-app/config.rb
 - fixtures/wildcard-app/source/admin/index.html.erb
 - fixtures/wildcard-app/source/admin/page.html.erb
@@ -785,7 +804,6 @@ files:
 - lib/middleman/extensions/minify_css/cssmin.rb
 - lib/middleman/extensions/minify_javascript.rb
 - lib/middleman/extensions/relative_assets.rb
-- lib/middleman/extensions/sitemap_tree.rb
 - lib/middleman/guard.rb
 - lib/middleman/renderers/erb.rb
 - lib/middleman/renderers/haml.rb
@@ -797,14 +815,18 @@ files:
 - lib/middleman/sitemap/template.rb
 - lib/middleman/step_definitions.rb
 - lib/middleman/step_definitions/builder_steps.rb
-- lib/middleman/step_definitions/generator_steps.rb
 - lib/middleman/step_definitions/middleman_steps.rb
 - lib/middleman/step_definitions/server_steps.rb
 - lib/middleman/templates.rb
 - lib/middleman/templates/default.rb
+- lib/middleman/templates/default/source/images/background.png
+- lib/middleman/templates/default/source/images/middleman.png
 - lib/middleman/templates/default/source/index.html.erb
-- lib/middleman/templates/default/source/layout.erb
-- lib/middleman/templates/default/source/stylesheets/site.css.scss
+- lib/middleman/templates/default/source/javascripts/all.js
+- lib/middleman/templates/default/source/layouts/layout.erb
+- lib/middleman/templates/default/source/stylesheets/_animate.scss
+- lib/middleman/templates/default/source/stylesheets/_normalize.scss
+- lib/middleman/templates/default/source/stylesheets/all.css.scss
 - lib/middleman/templates/html5.rb
 - lib/middleman/templates/html5/source/404.html
 - lib/middleman/templates/html5/source/README.md
@@ -1149,7 +1171,6 @@ test_files:
 - features/fonts.feature
 - features/former_padrino_helpers.feature
 - features/front-matter.feature
-- features/generator.feature
 - features/helpers_auto_javascript_include_tag.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_external.feature
@@ -1161,11 +1182,13 @@ test_files:
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/mount_rack.feature
+- features/nested_layouts.feature
 - features/page_alias_and_layouts.feature
 - features/partials.feature
 - features/preview_changes.feature
 - features/relative_assets.feature
 - features/scss-support.feature
+- features/sitemap_traversal.features
 - features/slim.feature
 - features/sprockets.feature
 - features/sprockets_gems.feature
@@ -1208,6 +1231,7 @@ test_files:
 - fixtures/different-engine-partial/source/layouts/layout.erb
 - fixtures/different-engine-partial/source/shared/_footer.slim
 - fixtures/different-engine-partial/source/shared/_header.erb
+- fixtures/empty-app/not-config.rb
 - fixtures/engine-matching-layout/config.rb
 - fixtures/engine-matching-layout/source/index.html.erb
 - fixtures/engine-matching-layout/source/layout.erb
@@ -1257,6 +1281,13 @@ test_files:
 - fixtures/multiple-layouts/source/index.html.erb
 - fixtures/multiple-layouts/source/layout.erb
 - fixtures/multiple-layouts/source/layout.haml
+- fixtures/nested-layout-app/config.rb
+- fixtures/nested-layout-app/source/data-one.html.erb
+- fixtures/nested-layout-app/source/data-two.html.erb
+- fixtures/nested-layout-app/source/index.html.erb
+- fixtures/nested-layout-app/source/layouts/inner.erb
+- fixtures/nested-layout-app/source/layouts/master.erb
+- fixtures/nested-layout-app/source/layouts/outer.erb
 - fixtures/no-layout/config.rb
 - fixtures/no-layout/source/index.html.erb
 - fixtures/partials-app/config.rb
@@ -1382,6 +1413,16 @@ test_files:
 - fixtures/test-app/source/sub1/page-classes.html.haml
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml
 - fixtures/test-app/source/tiny_src.html.haml
+- fixtures/traversal-app/config.rb
+- fixtures/traversal-app/source/index.html.erb
+- fixtures/traversal-app/source/layout.erb
+- fixtures/traversal-app/source/proxied.html.erb
+- fixtures/traversal-app/source/root.html.erb
+- fixtures/traversal-app/source/sub/index.html.erb
+- fixtures/traversal-app/source/sub/sibling.html.erb
+- fixtures/traversal-app/source/sub/sibling2.html.erb
+- fixtures/traversal-app/source/sub/sub2/index.html.erb
+- fixtures/traversal-app/source/sub/sub3/deep.html.erb
 - fixtures/wildcard-app/config.rb
 - fixtures/wildcard-app/source/admin/index.html.erb
 - fixtures/wildcard-app/source/admin/page.html.erb

data/features/generator.feature

@@ -1,8 +0,0 @@
-Feature: Generator
-  In order to generate static assets for client
-
-  Scenario: Copying template files
-    Given a project at "generator-test"
-    And the project has been initialized
-    Then template files should exist
-    And empty directories should exist

data/lib/middleman/extensions/sitemap_tree.rb

@@ -1,38 +0,0 @@
-module Middleman::Extensions
-  module SitemapTree
-    class << self
-      def registered(app)
-        app.helpers Helpers
-      end
-      alias :included :registered
-    end
-  
-    module Helpers
-      def sitemap_tree(regex=nil)
-        @sitemap_tree_cache = {}
-      
-        key = regex.nil? ? "all" : regex
-      
-        if !@sitemap_tree_cache.has_key?(key)
-          auto_hash = Hash.new{ |h,k| h[k] = Hash.new &h.default_proc }
-
-          app.sitemap.all_paths.each do |path|
-            next if !regex.nil? && !path.match(regex)
-            sub = auto_hash
-            path.split( "/" ).each{ |dir| sub[dir]; sub = sub[dir] }
-          end
-      
-          @sitemap_tree_cache[key] = auto_hash
-        end
-      
-        @sitemap_tree_cache[key]
-      end
-    
-      def html_sitemap
-        sitemap_tree(/\.html$/)
-      end
-    end
-  end
-
-  register :sitemap_tree, SitemapTree
-end

data/lib/middleman/step_definitions/generator_steps.rb

@@ -1,26 +0,0 @@
-require 'fileutils'
-
-Given /^the project has been initialized$/ do
-  step %Q{the project should be cleaned up}
-  init_cmd = File.join(MIDDLEMAN_BIN_PATH, "middleman init")
-  `cd #{File.dirname(@target)} && #{init_cmd} #{File.basename(@target)}`
-end
-
-Then /^template files should exist$/ do
-  template_glob = File.join(MIDDLEMAN_ROOT_PATH, "lib", "middleman", "templates", "default", "*/**/*")
-  
-  Dir[template_glob].each do |f|
-    next if File.directory?(f)
-    File.exists?("#{@target}/#{f.split('template/')[1]}").should be_true
-  end
-end
-
-Then /^empty directories should exist$/ do
-  %w(source/stylesheets source/javascripts source/images).each do |d|
-    File.exists?("#{@target}/#{d}").should be_true
-  end
-end
-
-Then /^the project should be cleaned up$/ do
-  FileUtils.rm_rf(@target)
-end

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

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame -->
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
-
-    <%= stylesheet_link_tag "site.css" %>
-    <%= yield_content :head %>
-  </head>
-  
-  <body class="<%= page_classes %>">
-
-    <div id="main" role="main">
-      <%= yield %>
-    </div>
-    
-  </body>
-</html>

data/lib/middleman/templates/default/source/stylesheets/site.css.scss

@@ -1,32 +0,0 @@
-@import "compass";
-
-$link-color:         #0388a6;
-$link-hover-color:   #009ce0;
-$link-focus-color:   false;
-$link-active-color:  false;
-$link-visited-color: false;
-
-$font-color:  #2a2a2a;
-$font-family: sans-serif;
-$base-font-size:   12px;
-$base-line-height: 18px;
-
-$total-cols: 12;
-$col-width: 4em;
-$gutter-width: 1em;
-$side-gutter-width: $gutter-width;
-
-@include global-reset;
-
-body {
-  font-family: $font-family;
-  color: $font-color; 
-}
-
-a {
-  @include link-colors($link-color, $link-hover-color, $link-focus-color, $link-active-color, $link-visited-color);
-}
-
-#main {
-  padding: 50px;
-}