middleman-core 3.0.6 → 3.0.7

data/features/cli_init.feature

@@ -50,9 +50,10 @@ Feature: Middleman CLI
     Then a directory named "source" should exist
     When I cd to "source"
     Then the following files should exist:
-      | index.html                                    |
+      | index.html.erb                                |
+      | layouts/layout.erb                            |
       | humans.txt                                    |
-      | js/main.js                                  |
+      | js/main.js                                    |
       
   Scenario: Create a new HTML5 project with Rack
     When I run `middleman init MY_PROJECT --rack --template=html5`

data/features/front-matter.feature

@@ -69,4 +69,15 @@ Feature: YAML Front Matter
       <%= data.page.title %>
       """
     When I go to "/front-matter-change.html"
-    Then I should see "Hola Mundo"
+    Then I should see "Hola Mundo"
+
+  Scenario: A template should handle an empty YAML feed
+    Given the Server is running at "frontmatter-app"
+    And the file "source/front-matter-change.html.erb" has the contents
+    """
+    ---
+    ---
+    Hello World
+    """
+    When I go to "/front-matter-change.html"
+    Then I should see "Hello World"

data/lib/middleman-core/core_extensions/front_matter.rb

@@ -31,7 +31,7 @@ module Middleman::CoreExtensions
           )
 
           sitemap.provides_metadata do |path|
-            fmdata = frontmatter_manager.data(path).first
+            fmdata = frontmatter_manager.data(path).first || {}
 
             data = {}
             %w(layout layout_engine).each do |opt|
@@ -158,7 +158,7 @@ module Middleman::CoreExtensions
       # @return [void]
       def manipulate_resource_list(resources)
         resources.each do |r|
-          if !r.proxy? && r.data["ignored"] == true
+          if !r.proxy? && !r.data.nil? && r.data["ignored"] == true
             r.frontmatter_ignored = true
           end
         end

data/lib/middleman-core/core_extensions/rendering.rb

@@ -68,6 +68,13 @@ module Middleman
             app.register Middleman::Renderers::Less
           rescue LoadError
           end
+
+          # Stylus Support
+          begin
+            require "middleman-core/renderers/stylus"
+            app.register Middleman::Renderers::Stylus
+          rescue LoadError
+          end
         end
 
         alias :included :registered

data/lib/middleman-core/preview_server.rb

@@ -6,17 +6,18 @@ module Middleman
     DEFAULT_PORT = 4567
 
     class << self
-      attr_reader :app, :port
+      attr_reader :app, :host, :port
       delegate :logger, :to => :app
 
       # Start an instance of Middleman::Application
       # @return [void]
       def start(opts={})
         @options = opts
+        @host = @options[:host] || Socket.gethostname
         @port = @options[:port] || DEFAULT_PORT
 
         mount_instance
-        logger.info "== The Middleman is standing watch on port #{port}"
+        logger.info "== The Middleman is standing watch at http://#{host}:#{port}"
 
         @initialized ||= false
         unless @initialized
@@ -52,11 +53,11 @@ module Middleman
       # @return [void]
       def reload
         logger.info "== The Middleman is reloading"
-        
+
         unmount_instance
         mount_instance
-        
-        logger.info "== The Middleman is standing watch on port #{port}"
+
+        logger.info "== The Middleman is standing watch at http://#{host}:#{port}"
       end
 
       # Stop the current instance, exit Webrick
@@ -73,22 +74,22 @@ module Middleman
           if opts[:environment]
             set :environment, opts[:environment].to_sym
           end
-          
+
           logger(opts[:debug] ? 0 : 1, opts[:instrumenting] || false)
         end
       end
 
       def start_file_watcher
         return if @options[:"disable-watcher"]
-        
+
         first_run = !@listener
-        
+
         if first_run
           # Watcher Library
           require "listen"
           @listener = Listen.to(Dir.pwd, :relative_paths => true)
         end
-        
+
         @listener.change do |modified, added, removed|
           added_and_modified = (modified + added)
 
@@ -125,11 +126,9 @@ module Middleman
 
       # Initialize webrick
       # @return [void]
-      def setup_webrick(host, is_logging)
-        @host = host
-
+      def setup_webrick(is_logging)
         http_opts = {
-          :BindAddress => @host,
+          :BindAddress => host,
           :Port        => port,
           :AccessLog   => []
         }
@@ -154,13 +153,10 @@ module Middleman
       def mount_instance
         @app = new_app
 
-        @webrick ||= setup_webrick(
-          @options[:host]  || "0.0.0.0",
-          @options[:debug] || false
-        )
-        
+        @webrick ||= setup_webrick(@options[:debug] || false)
+
         start_file_watcher
-          
+
         @webrick.mount "/", ::Rack::Handler::WEBrick, app.class.to_rack_app
       end
 
@@ -180,13 +176,13 @@ module Middleman
           %r{^lib/^[^\.](.*)\.rb$},
           %r{^helpers/^[^\.](.*)_helper\.rb$}
         ]
-        
+
         if @options[:reload_paths]
           @options[:reload_paths].split(',').each do |part|
             match_against << %r{^#{part}}
           end
         end
-        
+
         paths.any? do |path|
           match_against.any? do |matcher|
             path.match(matcher)

data/lib/middleman-core/renderers/redcarpet.rb

@@ -5,6 +5,14 @@ module Middleman
 
     class RedcarpetTemplate < ::Tilt::RedcarpetTemplate::Redcarpet2
 
+      def initialize(*args, &block)
+        super
+        
+        if @options.has_key?(:context)
+          @context = @options[:context]
+        end
+      end
+
       # Overwrite built-in Tilt version.
       # Don't overload :renderer option with smartypants
       # Support renderer-level options
@@ -32,9 +40,11 @@ module Middleman
         renderer.new(render_options)
       end
 
-      def evaluate(scope, locals, &block)
+      def evaluate(context, locals, &block)
+        @context ||= context
+
         if @engine.renderer.respond_to? :middleman_app=
-          @engine.renderer.middleman_app = scope
+          @engine.renderer.middleman_app = @context
         end
         super
       end

data/lib/middleman-core/renderers/slim.rb

@@ -23,11 +23,12 @@ module Middleman
           )
           
           app.after_configuration do
-            sass_context_hack = {
+            context_hack = {
               :context => self
             }
-            ::Slim::EmbeddedEngine.default_options[:sass] = sass_context_hack
-            ::Slim::EmbeddedEngine.default_options[:scss] = sass_context_hack
+            %w(sass scss markdown).each do |engine|
+              ::Slim::EmbeddedEngine.default_options[engine.to_sym] = context_hack
+            end
           end
         end
 

data/lib/middleman-core/renderers/stylus.rb

@@ -0,0 +1,28 @@
+require "stylus"
+require "stylus/tilt"
+
+module Middleman
+  module Renderers
+
+    # Sass renderer
+    module Stylus
+
+      # Setup extension
+      class << self
+
+        # Once registered
+        def registered(app)
+          # Default less options
+          app.set :styl, {}
+
+          app.before_configuration do
+            template_extensions :styl => :css
+          end
+        end
+
+        alias :included :registered
+      end
+
+    end
+  end
+end

data/lib/middleman-core/templates/html5/source/index.html.erb

@@ -0,0 +1,6 @@
+---
+title: HTML5 Boilerplate Middleman
+---
+
+<!-- Add your site or application content here -->
+<p>Hello world! This is HTML5 Boilerplate.</p>

data/lib/middleman-core/templates/html5/source/{index.html → layouts/layout.erb}

@@ -6,7 +6,8 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title></title>
+        <!-- Use title if it's in the page YAML frontmatter -->
+        <title><%= data.page.title || "HTML5 Boilerplate" %></title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width">
 
@@ -21,8 +22,7 @@
             <p class="chromeframe">You are using an outdated browser. <a href="http://browsehappy.com/">Upgrade your browser today</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to better experience this site.</p>
         <![endif]-->
 
-        <!-- Add your site or application content here -->
-        <p>Hello world! This is HTML5 Boilerplate.</p>
+        <%= yield %>
 
         <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
         <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.8.0.min.js"><\/script>')</script>

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.6' unless const_defined?(:VERSION)
+  VERSION = '3.0.7' unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -439,6 +439,7 @@ files:
 - lib/middleman-core/renderers/redcarpet.rb
 - lib/middleman-core/renderers/sass.rb
 - lib/middleman-core/renderers/slim.rb
+- lib/middleman-core/renderers/stylus.rb
 - lib/middleman-core/sitemap.rb
 - lib/middleman-core/sitemap/extensions/ignores.rb
 - lib/middleman-core/sitemap/extensions/on_disk.rb
@@ -483,11 +484,12 @@ files:
 - lib/middleman-core/templates/html5/source/favicon.ico
 - lib/middleman-core/templates/html5/source/humans.txt
 - lib/middleman-core/templates/html5/source/img/.gitignore
-- lib/middleman-core/templates/html5/source/index.html
+- lib/middleman-core/templates/html5/source/index.html.erb
 - lib/middleman-core/templates/html5/source/js/main.js
 - lib/middleman-core/templates/html5/source/js/plugins.js
 - lib/middleman-core/templates/html5/source/js/vendor/jquery-1.8.0.min.js
 - lib/middleman-core/templates/html5/source/js/vendor/modernizr-2.6.1.min.js
+- lib/middleman-core/templates/html5/source/layouts/layout.erb
 - lib/middleman-core/templates/html5/source/robots.txt
 - lib/middleman-core/templates/local.rb
 - lib/middleman-core/templates/mobile.rb
@@ -595,7 +597,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3834291849307720462
+      hash: 1408914751343926382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -604,10 +606,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3834291849307720462
+      hash: 1408914751343926382
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development