middleman-core 3.0.5 → 3.0.6

data/features/proxy_pages.feature

@@ -0,0 +1,94 @@
+Feature: Proxy Pages (using proxy rather than page)
+  In order to use a single view to generate multiple output files
+
+  Scenario: Checking built folder for content
+    Given a successfully built app at "proxy-pages-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | fake.html                                     |
+      | fake2.html                                    |
+      | fake3.html                                    |
+      | fake4.html                                    |
+      | fake/one.html                                 |
+      | fake/two.html                                 |
+      | fake2/one.html                                |
+      | fake2/two.html                                |
+      | fake3/one.html                                |
+      | fake3/two.html                                |
+      | fake4/one.html                                |
+      | fake4/two.html                                |
+      | target_ignore.html                            |
+      | target_ignore2.html                           |
+      | target_ignore3.html                           |
+      | target_ignore4.html                           |
+      | 明日がある.html                               |
+    Then the following files should not exist:
+      | should_be_ignored6.html                       |
+      | should_be_ignored7.html                       |
+      | should_be_ignored8.html                       |
+    
+  Scenario: Preview basic proxy
+    Given the Server is running at "proxy-pages-app"
+    When I go to "/fake.html"
+    Then I should see "I am real"
+    When I go to "/fake2.html"
+    Then I should see "I am real"
+    When I go to "/fake3.html"
+    Then I should see "I am real"
+    When I go to "/fake4.html"
+    Then I should see "I am real"
+    
+  Scenario: Preview proxy with variable one
+    Given the Server is running at "proxy-pages-app"
+    When I go to "/fake/one.html"
+    Then I should see "I am real: one"
+    
+    When I go to "/fake2/one.html"
+    Then I should see "I am real: one"
+    
+    When I go to "/fake3/one.html"
+    Then I should see "I am real: one"
+    
+    When I go to "/fake4/one.html"
+    Then I should see "I am real: one"
+    
+  Scenario: Preview proxy with variable two
+    Given the Server is running at "proxy-pages-app"
+    When I go to "/fake/two.html"
+    Then I should see "I am real: two"
+    
+    When I go to "/fake2/two.html"
+    Then I should see "I am real: two"
+    
+    When I go to "/fake3/two.html"
+    Then I should see "I am real: two"
+    
+    When I go to "/fake4/two.html"
+    Then I should see "I am real: two"
+
+  Scenario: Build proxy with variable one
+    Given a successfully built app at "proxy-pages-app"
+    When I cd to "build"
+    Then the file "fake/one.html" should contain "I am real: one"
+    Then the file "fake2/one.html" should contain "I am real: one"
+    Then the file "fake3/one.html" should contain "I am real: one"
+    
+  Scenario: Target ignore
+    Given the Server is running at "proxy-pages-app"
+    When I go to "/target_ignore.html"
+    Then I should see "Ignore me! 3"
+    When I go to "/target_ignore2.html"
+    Then I should see "Ignore me! 6"
+    When I go to "/target_ignore3.html"
+    Then I should see "Ignore me! 7"
+    When I go to "/target_ignore4.html"
+    Then I should see "Ignore me! 8"
+    
+  Scenario: Preview ignored paths
+    Given the Server is running at "proxy-pages-app"
+    When I go to "/should_be_ignored6.html"
+    Then I should see "File Not Found"
+    When I go to "/should_be_ignored7.html"
+    Then I should see "File Not Found"
+    When I go to "/should_be_ignored8.html"
+    Then I should see "File Not Found"

data/features/tilde_directories.feature

@@ -0,0 +1,14 @@
+@encoding
+
+Feature: Tilde directories
+  In order to support ~ characters in directories
+
+  Scenario: Build directories with containing ~ characters in their name
+    Given a fixture app "empty-app"
+    And a file named "source/~notexistinguser/index.html" with:
+    """
+    It works!
+    """
+    And the Server is running
+    When I go to "/~notexistinguser/index.html"
+    Then I should see "It works!"

data/fixtures/proxy-pages-app/config.rb

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+proxy "/fake.html", "/real.html", :layout => false
+proxy "fake2.html", "/real.html", :layout => false
+proxy "fake3.html", "real.html", :layout => false
+proxy "/fake4.html", "real.html", :layout => false
+
+proxy "/target_ignore.html", "/should_be_ignored3.html", :ignore => true
+proxy "target_ignore2.html", "/should_be_ignored6.html", :ignore => true
+proxy "target_ignore3.html", "should_be_ignored7.html", :ignore => true
+proxy "/target_ignore4.html", "should_be_ignored8.html", :ignore => true
+
+%w(one two).each do |num|
+  proxy "/fake/#{num}.html", "/real/index.html", :ignore => true, :locals => { :num => num }
+  proxy "fake2/#{num}.html", "/real/index.html", :ignore => true, :locals => { :num => num }
+  proxy "fake3/#{num}.html", "real/index.html", :ignore => true, :locals => { :num => num }
+  proxy "/fake4/#{num}.html", "real/index-ivars.html", :ignore => true do
+    @num = num
+  end
+end
+
+proxy "明日がある.html", "/real.html", :layout => false

data/fixtures/proxy-pages-app/source/real.html

@@ -0,0 +1 @@
+I am real

data/fixtures/proxy-pages-app/source/real/index-ivars.html.erb

@@ -0,0 +1,6 @@
+---
+layout: false
+---
+
+I am real: <%= @num %>
+

data/fixtures/proxy-pages-app/source/real/index.html.erb

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+I am real: <%= num %>

data/fixtures/proxy-pages-app/source/should_be_ignored3.html

@@ -0,0 +1 @@
+<h1>Ignore me! 3</h1>

data/fixtures/proxy-pages-app/source/should_be_ignored6.html

@@ -0,0 +1 @@
+<h1>Ignore me! 6</h1>

data/fixtures/proxy-pages-app/source/should_be_ignored7.html

@@ -0,0 +1 @@
+<h1>Ignore me! 7</h1>

data/fixtures/proxy-pages-app/source/should_be_ignored8.html

@@ -0,0 +1 @@
+<h1>Ignore me! 8</h1>

data/lib/middleman-core/application.rb

@@ -142,7 +142,7 @@ module Middleman
     include Middleman::CoreExtensions::RubyEncoding
 
     # Basic Rack Request Handling
-    include Middleman::CoreExtensions::Request
+    register Middleman::CoreExtensions::Request
 
     # Handle exceptions
     register Middleman::CoreExtensions::ShowExceptions

data/lib/middleman-core/cli.rb

@@ -71,7 +71,7 @@ module Middleman
         end
 
         if klass.nil?
-          super
+          raise Thor::Error.new "There's no '#{meth}' command for Middleman. Try 'middleman help' for a list of commands."
         else
           args.unshift(task) if task
           klass.start(args, :shell => self.shell)

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

@@ -127,8 +127,7 @@ module Middleman::CoreExtensions
       # @param [String] path
       # @return [Array<Thor::CoreExt::HashWithIndifferentAccess, String>]
       def frontmatter_and_content(path)
-        full_path = File.expand_path(path, @app.source_dir)
-
+        full_path = File.expand_path(File.join(@app.source_dir, path))
         content = File.read(full_path)
         data = {}
 

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

@@ -45,9 +45,7 @@ module Middleman
         # @param [Hash] opts
         # @return [void]
         def page(url, opts={}, &block)
-
-          blocks = []
-          blocks << block if block_given?
+          blocks = Array(block)
 
           # Default layout
           opts[:layout] = layout if opts[:layout].nil?
@@ -70,20 +68,12 @@ module Middleman
           end
 
           # Setup proxy
-          if opts.has_key?(:proxy)
-            proxy(url, opts[:proxy])
-
-            if opts.has_key?(:ignore) && opts[:ignore]
-              ignore(opts[:proxy])
-              opts.delete(:ignore)
-            end
-
-            opts.delete(:proxy)
-          else
-            if opts.has_key?(:ignore) && opts[:ignore]
-              ignore(url)
-              opts.delete(:ignore)
-            end
+          if target = opts.delete(:proxy)
+            # TODO: deprecate proxy through page?
+            proxy(url, target, opts, &block) and return
+          elsif opts.delete(:ignore)
+            # TODO: deprecate ignore through page?
+            ignore(url)
           end
 
           # Setup a metadata matcher for rendering those options

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

@@ -9,6 +9,7 @@ module Middleman::CoreExtensions::RubyEncoding
       app.send :include, InstanceMethods
     end
 
+    alias :included :registered
   end
 
   module InstanceMethods

data/lib/middleman-core/preview_server.rb

@@ -1,9 +1,6 @@
 require "webrick"
 
 module Middleman
-
-  WINDOWS = !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i) unless const_defined?(:WINDOWS)
-
   module PreviewServer
 
     DEFAULT_PORT = 4567
@@ -25,7 +22,7 @@ module Middleman
         unless @initialized
           @initialized = true
 
-          register_signal_handlers unless ::Middleman::WINDOWS
+          register_signal_handlers
 
           # Save the last-used @options so it may be re-used when
           # reloading later on.
@@ -38,7 +35,12 @@ module Middleman
       # Detach the current Middleman::Application instance
       # @return [void]
       def stop
-        logger.info "== The Middleman is shutting down"
+        begin
+          logger.info "== The Middleman is shutting down"
+        rescue
+          # if the user closed their terminal STDOUT/STDERR won't exist
+        end
+
         if @listener
           @listener.stop
           @listener = nil
@@ -108,12 +110,17 @@ module Middleman
         @listener.start(false) if first_run
       end
 
-      # Trap the interupt signal and shut down smoothly
+      # Trap some interupt signals and shut down smoothly
       # @return [void]
       def register_signal_handlers
-        trap("INT")  { shutdown }
-        trap("TERM") { shutdown }
-        trap("QUIT") { shutdown }
+        %w(INT HUP TERM QUIT).each do |sig|
+          if Signal.list[sig]
+            Signal.trap(sig) do
+              shutdown
+              exit
+            end
+          end
+        end
       end
 
       # Initialize webrick
@@ -145,12 +152,13 @@ module Middleman
       # @param [Middleman::Application] app
       # @return [void]
       def mount_instance
+        @app = new_app
+
         @webrick ||= setup_webrick(
           @options[:host]  || "0.0.0.0",
           @options[:debug] || false
         )
         
-        @app = new_app
         start_file_watcher
           
         @webrick.mount "/", ::Rack::Handler::WEBrick, app.class.to_rack_app

data/lib/middleman-core/sitemap/extensions/ignores.rb

@@ -60,8 +60,6 @@ module Middleman
           # @param [String, Regexp] path Path glob expression, or path regex
           # @return [void]
           def ignore(path=nil, &block)
-            original_callback_size = @ignored_callbacks.size
-
             if path.is_a? Regexp
               @ignored_callbacks << Proc.new {|p| p =~ path }
             elsif path.is_a? String

data/lib/middleman-core/sitemap/extensions/proxies.rb

@@ -74,40 +74,87 @@ module Middleman
             @_proxy_manager ||= ProxyManager.new(self)
           end
 
-          def proxy(*args)
-            proxy_manager.proxy(*args)
+          def proxy(*args, &block)
+            proxy_manager.proxy(*args, &block)
           end
         end
 
+        # Manages the list of proxy configurations and manipulates the sitemap
+        # to include new resources based on those configurations
         class ProxyManager
           def initialize(app)
             @app = app
-
-            @proxy_paths = {}
+            @proxy_configs = Set.new
           end
 
           # Setup a proxy from a path to a target
           # @param [String] path
           # @param [String] target
+          # @param [Hash] opts options to apply to the proxy, including things like
+          #               :locals, :ignore to hide the proxy target, :layout, and :directory_indexes.
           # @return [void]
-          def proxy(path, target)
-            @proxy_paths[::Middleman::Util.normalize_path(path)] = ::Middleman::Util.normalize_path(target)
+          def proxy(path, target, opts={}, &block)
+            metadata = { :options => {}, :locals => {}, :blocks => [] }
+            metadata[:blocks] << block if block_given?
+            metadata[:locals] = opts.delete(:locals) || {}
+
+            @app.ignore(target) if opts.delete(:ignore)
+            metadata[:options] = opts
+
+            @proxy_configs << ProxyConfiguration.new(:path => path, :target => target, :metadata => metadata)
+
             @app.sitemap.rebuild_resource_list!(:added_proxy)
           end
 
           # Update the main sitemap resource list
           # @return [void]
           def manipulate_resource_list(resources)
-            resources + @proxy_paths.map do |key, value|
+            resources + @proxy_configs.map do |config|
               p = ::Middleman::Sitemap::Resource.new(
                 @app.sitemap,
-                key
+                config.path
               )
-              p.proxy_to(value)
+              p.proxy_to(config.target)
+              p.add_metadata(config.metadata)
               p
             end
           end
         end
+
+        # Configuration for a proxy instance
+        class ProxyConfiguration
+          # The path that this proxy will appear at in the sitemap
+          attr_reader :path
+          def path=(p)
+            @path = ::Middleman::Util.normalize_path(p)
+          end
+
+          # The existing sitemap path that this will proxy to
+          attr_reader :target
+          def target=(t)
+            @target = ::Middleman::Util.normalize_path(t)
+          end
+
+          # Additional metadata like blocks and locals to apply to the proxy
+          attr_accessor :metadata
+
+          # Create a new proxy configuration from hash options
+          def initialize(options={})
+            options.each do |key, value|
+              send "#{key}=", value
+            end
+          end
+
+          # Two configurations are equal if they reference the same path
+          def eql?(other)
+            other.path == path
+          end
+
+          # Two configurations are equal if they reference the same path
+          def hash
+            path.hash
+          end
+        end
       end
     end
   end

data/lib/middleman-core/sitemap/store.rb

@@ -1,5 +1,6 @@
 # Used for merging results of metadata callbacks
 require "active_support/core_ext/hash/deep_merge"
+require 'monitor'
 
 module Middleman
 
@@ -25,6 +26,8 @@ module Middleman
         @_cached_metadata = {}
         @resource_list_manipulators = []
         @needs_sitemap_rebuild = true
+        @lock = Monitor.new
+
         reset_lookup_cache!
 
         # Register classes which can manipulate the main site map list
@@ -48,36 +51,44 @@ module Middleman
       # Rebuild the list of resources from scratch, using registed manipulators
       # @return [void]
       def rebuild_resource_list!(reason=nil)
-        @needs_sitemap_rebuild = true
+        @lock.synchronize do
+          @needs_sitemap_rebuild = true
+        end
       end
 
       # Find a resource given its original path
       # @param [String] request_path The original path of a resource.
       # @return [Middleman::Sitemap::Resource]
       def find_resource_by_path(request_path)
-        request_path = ::Middleman::Util.normalize_path(request_path)
-        ensure_resource_list_updated!
-        @_lookup_by_path[request_path]
+        @lock.synchronize do
+          request_path = ::Middleman::Util.normalize_path(request_path)
+          ensure_resource_list_updated!
+          @_lookup_by_path[request_path]
+        end
       end
 
       # Find a resource given its destination path
       # @param [String] request_path The destination (output) path of a resource.
       # @return [Middleman::Sitemap::Resource]
       def find_resource_by_destination_path(request_path)
-        request_path = ::Middleman::Util.normalize_path(request_path)
-        ensure_resource_list_updated!
-        @_lookup_by_destination_path[request_path]
+        @lock.synchronize do
+          request_path = ::Middleman::Util.normalize_path(request_path)
+          ensure_resource_list_updated!
+          @_lookup_by_destination_path[request_path]
+        end
       end
 
       # Get the array of all resources
       # @param [Boolean] include_ignored Whether to include ignored resources
       # @return [Array<Middleman::Sitemap::Resource>]
       def resources(include_ignored=false)
-        ensure_resource_list_updated!
-        if include_ignored
-          @resources
-        else
-          @resources.reject(&:ignored?)
+        @lock.synchronize do
+          ensure_resource_list_updated!
+          if include_ignored
+            @resources
+          else
+            @resources.reject(&:ignored?)
+          end
         end
       end
 
@@ -115,19 +126,10 @@ module Middleman
       # @param [Symbol] origin an indicator of where this metadata came from - only one
       #                        block per [matcher, origin] pair may exist.
       # @return [Array<Array<Proc, Regexp>>]
-      def provides_metadata_for_path(matcher=nil, origin=nil, &block)
+      def provides_metadata_for_path(matcher=nil, &block)
         @_provides_metadata_for_path ||= []
         if block_given?
-          if origin
-            existing_provider = @_provides_metadata_for_path.find {|b,m,o| o == origin && m == matcher}
-          end
-
-          if existing_provider
-            existing_provider[0] = block
-          else
-            @_provides_metadata_for_path << [block, matcher, origin]
-          end
-
+          @_provides_metadata_for_path << [block, matcher]
           @_cached_metadata = {}
         end
         @_provides_metadata_for_path
@@ -151,10 +153,7 @@ module Middleman
 
           metadata = callback.call(request_path)
 
-          if metadata.has_key?(:blocks)
-            result[:blocks] << metadata[:blocks]
-            metadata.delete(:blocks)
-          end
+          result[:blocks] += Array(metadata.delete(:blocks))
 
           result.deep_merge(metadata)
         end
@@ -213,30 +212,34 @@ module Middleman
       # rebuild_resource_list! since the last time it was run. This is
       # very expensive!
       def ensure_resource_list_updated!
-        return unless @needs_sitemap_rebuild
-        @needs_sitemap_rebuild = false
+        @lock.synchronize do
+          return unless @needs_sitemap_rebuild
+          @needs_sitemap_rebuild = false
 
-        @app.logger.debug "== Rebuilding resource list"
+          @app.logger.debug "== Rebuilding resource list"
 
-        @resources = @resource_list_manipulators.inject([]) do |result, (_, inst)|
-          newres = inst.manipulate_resource_list(result)
+          @resources = @resource_list_manipulators.inject([]) do |result, (_, inst)|
+            newres = inst.manipulate_resource_list(result)
 
-          # Reset lookup cache
-          reset_lookup_cache!
-          newres.each do |resource|
-            @_lookup_by_path[resource.path] = resource
-            @_lookup_by_destination_path[resource.destination_path] = resource
-          end
+            # Reset lookup cache
+            reset_lookup_cache!
+            newres.each do |resource|
+              @_lookup_by_path[resource.path] = resource
+              @_lookup_by_destination_path[resource.destination_path] = resource
+            end
 
-          newres
+            newres
+          end
         end
       end
 
       private
 
       def reset_lookup_cache!
-        @_lookup_by_path = {}
-        @_lookup_by_destination_path = {}
+        @lock.synchronize {
+          @_lookup_by_path = {}
+          @_lookup_by_destination_path = {}
+        }
       end
     end
   end

data/lib/middleman-core/templates/default/source/stylesheets/normalize.css

@@ -1,11 +1,11 @@
-/*! normalize.css 2011-11-04T15:38 UTC - http://github.com/necolas/normalize.css */
+/*! normalize.css v2.0.1 | MIT License | git.io/normalize */
 
-/* =============================================================================
+/* ==========================================================================
    HTML5 display definitions
    ========================================================================== */
 
 /*
- * Corrects block display not defined in IE6/7/8/9 & FF3
+ * Corrects `block` display not defined in IE 8/9.
  */
 
 article,
@@ -17,86 +17,69 @@ footer,
 header,
 hgroup,
 nav,
-section {
+section,
+summary {
     display: block;
 }
 
 /*
- * Corrects inline-block display not defined in IE6/7/8/9 & FF3
+ * Corrects `inline-block` display not defined in IE 8/9.
  */
 
 audio,
 canvas,
 video {
     display: inline-block;
-    *display: inline;
-    *zoom: 1;
 }
 
 /*
- * Prevents modern browsers from displaying 'audio' without controls
+ * Prevents modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
  */
 
 audio:not([controls]) {
     display: none;
+    height: 0;
 }
 
 /*
- * Addresses styling for 'hidden' attribute not present in IE7/8/9, FF3, S4
- * Known issue: no IE6 support
+ * Addresses styling for `hidden` attribute not present in IE 8/9.
  */
 
 [hidden] {
     display: none;
 }
 
-
-/* =============================================================================
+/* ==========================================================================
    Base
    ========================================================================== */
 
 /*
- * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
- *    http://clagnut.com/blog/348/#c790
- * 2. Keeps page centred in all browsers regardless of content height
- * 3. Prevents iOS text size adjust after orientation change, without disabling user zoom
- *    www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
+ * 1. Sets default font family to sans-serif.
+ * 2. Prevents iOS text size adjust after orientation change, without disabling
+ *    user zoom.
  */
 
 html {
-    font-size: 100%; /* 1 */
-    overflow-y: scroll; /* 2 */
-    -webkit-text-size-adjust: 100%; /* 3 */
-    -ms-text-size-adjust: 100%; /* 3 */
+    font-family: sans-serif; /* 1 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+    -ms-text-size-adjust: 100%; /* 2 */
 }
 
 /*
- * Addresses margins handled incorrectly in IE6/7
+ * Removes default margin.
  */
 
 body {
     margin: 0;
 }
 
-/* 
- * Addresses font-family inconsistency between 'textarea' and other form elements.
- */
-
-body,
-button,
-input,
-select,
-textarea {
-    font-family: sans-serif;
-}
-
-
-/* =============================================================================
+/* ==========================================================================
    Links
    ========================================================================== */
 
 /*
- * Addresses outline displayed oddly in Chrome
+ * Addresses `outline` inconsistency between Chrome and other browsers.
  */
 
 a:focus {
@@ -104,22 +87,21 @@ a:focus {
 }
 
 /*
- * Improves readability when focused and also mouse hovered in all browsers
- * people.opera.com/patrickl/experiments/keyboard/test
+ * Improves readability when focused and also mouse hovered in all browsers.
  */
 
-a:hover,
-a:active {
+a:active,
+a:hover {
     outline: 0;
 }
 
-
-/* =============================================================================
+/* ==========================================================================
    Typography
    ========================================================================== */
 
 /*
- * Neutralise smaller font-size in 'section' and 'article' in FF4+, Chrome, S5
+ * Addresses `h1` font sizes within `section` and `article` in Firefox 4+,
+ * Safari 5, and Chrome.
  */
 
 h1 {
@@ -127,7 +109,7 @@ h1 {
 }
 
 /*
- * Addresses styling not present in IE7/8/9, S5, Chrome
+ * Addresses styling not present in IE 8/9, Safari 5, and Chrome.
  */
 
 abbr[title] {
@@ -135,20 +117,16 @@ abbr[title] {
 }
 
 /*
- * Addresses style set to 'bolder' in FF3+, S4/5, Chrome
-*/
-
-b, 
-strong { 
-    font-weight: bold; 
-}
+ * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ */
 
-blockquote {
-    margin: 1em 40px;
+b,
+strong {
+    font-weight: bold;
 }
 
 /*
- * Addresses styling not present in S5, Chrome
+ * Addresses styling not present in Safari 5 and Chrome.
  */
 
 dfn {
@@ -156,7 +134,7 @@ dfn {
 }
 
 /*
- * Addresses styling not present in IE6/7/8/9
+ * Addresses styling not present in IE 8/9.
  */
 
 mark {
@@ -164,22 +142,21 @@ mark {
     color: #000;
 }
 
+
 /*
- * Corrects font family set oddly in IE6, S4/5, Chrome
- * en.wikipedia.org/wiki/User:Davidgothberg/Test59
+ * Corrects font family set oddly in Safari 5 and Chrome.
  */
 
-pre,
 code,
 kbd,
+pre,
 samp {
     font-family: monospace, serif;
-    _font-family: 'courier new', monospace;
     font-size: 1em;
 }
 
 /*
- * Improves readability of pre-formatted text in all browsers
+ * Improves readability of pre-formatted text in all browsers.
  */
 
 pre {
@@ -189,31 +166,23 @@ pre {
 }
 
 /*
- * 1. Addresses CSS quotes not supported in IE6/7
- * 2. Addresses quote property not supported in S4
+ * Sets consistent quote types.
  */
 
-/* 1 */
-
 q {
-    quotes: none;
+    quotes: "\201C" "\201D" "\2018" "\2019";
 }
 
-/* 2 */
-
-q:before,
-q:after {
-    content: '';
-    content: none;
-}
+/*
+ * Addresses inconsistent and variable font size in all browsers.
+ */
 
 small {
-    font-size: 75%;
+    font-size: 80%;
 }
 
 /*
- * Prevents sub and sup affecting line-height in all browsers
- * gist.github.com/413930
+ * Prevents `sub` and `sup` affecting `line-height` in all browsers.
  */
 
 sub,
@@ -232,79 +201,44 @@ sub {
     bottom: -0.25em;
 }
 
-
-/* =============================================================================
-   Lists
-   ========================================================================== */
-
-ul,
-ol {
-    margin-left: 0;
-    padding: 0 0 0 40px;
-}
-
-dd {
-    margin: 0 0 0 40px;
-}
-
-nav ul,
-nav ol {
-    list-style: none;
-    list-style-image: none;
-}
-
-
-/* =============================================================================
+/* ==========================================================================
    Embedded content
    ========================================================================== */
 
 /*
- * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3
- * 2. Improves image quality when scaled in IE7
- *    code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/
+ * Removes border when inside `a` element in IE 8/9.
  */
 
 img {
-    border: 0; /* 1 */
-    -ms-interpolation-mode: bicubic; /* 2 */
+    border: 0;
 }
 
 /*
- * Corrects overflow displayed oddly in IE9 
+ * Corrects overflow displayed oddly in IE 9.
  */
 
 svg:not(:root) {
     overflow: hidden;
 }
 
-
-/* =============================================================================
+/* ==========================================================================
    Figures
    ========================================================================== */
 
 /*
- * Addresses margin not present in IE6/7/8/9, S5, O11
+ * Addresses margin not present in IE 8/9 and Safari 5.
  */
 
 figure {
     margin: 0;
 }
 
-
-/* =============================================================================
+/* ==========================================================================
    Forms
    ========================================================================== */
 
 /*
- * Corrects margin displayed oddly in IE6/7
- */
-
-form {
-    margin: 0;
-}
-
-/*
- * Define consistent border, margin, and padding
+ * Define consistent border, margin, and padding.
  */
 
 fieldset {
@@ -314,59 +248,68 @@ fieldset {
 }
 
 /*
- * 1. Corrects color not being inherited in IE6/7/8/9
- * 2. Corrects alignment displayed oddly in IE6/7
+ * 1. Corrects color not being inherited in IE 8/9.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
  */
 
 legend {
     border: 0; /* 1 */
-    *margin-left: -7px; /* 2 */
+    padding: 0; /* 2 */
 }
 
 /*
- * 1. Corrects font size not being inherited in all browsers
- * 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome
- * 3. Improves appearance and consistency in all browsers
+ * 1. Corrects font family not being inherited in all browsers.
+ * 2. Corrects font size not being inherited in all browsers.
+ * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome
  */
 
 button,
 input,
 select,
 textarea {
-    font-size: 100%; /* 1 */
-    margin: 0; /* 2 */
-    vertical-align: baseline; /* 3 */
-    *vertical-align: middle; /* 3 */
+    font-family: inherit; /* 1 */
+    font-size: 100%; /* 2 */
+    margin: 0; /* 3 */
 }
 
 /*
- * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
+ * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
  */
 
 button,
 input {
-    line-height: normal; /* 1 */
+    line-height: normal;
 }
 
 /*
- * 1. Improves usability and consistency of cursor style between image-type 'input' and others
- * 2. Corrects inability to style clickable 'input' types in iOS
- * 3. Removes inner spacing in IE7 without affecting normal text inputs
- *    Known issue: inner spacing remains in IE6
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Corrects inability to style clickable `input` types in iOS.
+ * 3. Improves usability and consistency of cursor style between image-type
+ *    `input` and others.
  */
 
 button,
-input[type="button"], 
-input[type="reset"], 
+html input[type="button"], /* 1 */
+input[type="reset"],
 input[type="submit"] {
-    cursor: pointer; /* 1 */
     -webkit-appearance: button; /* 2 */
-    *overflow: visible;  /* 3 */
+    cursor: pointer; /* 3 */
 }
 
 /*
- * 1. Addresses box sizing set to content-box in IE8/9
- * 2. Removes excess padding in IE8/9
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+input[disabled] {
+    cursor: default;
+}
+
+/*
+ * 1. Addresses box sizing set to `content-box` in IE 8/9.
+ * 2. Removes excess padding in IE 8/9.
  */
 
 input[type="checkbox"],
@@ -376,8 +319,9 @@ input[type="radio"] {
 }
 
 /*
- * 1. Addresses appearance set to searchfield in S5, Chrome
- * 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof)
+ * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome.
+ * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
+ *    (include `-moz` to future-proof).
  */
 
 input[type="search"] {
@@ -388,16 +332,17 @@ input[type="search"] {
 }
 
 /*
- * Removes inner padding that is displayed in S5, Chrome on OS X
+ * Removes inner padding and search cancel button in Safari 5 and Chrome
+ * on OS X.
  */
 
+input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
     -webkit-appearance: none;
 }
 
 /*
- * Removes inner padding and border in FF3+
- * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
+ * Removes inner padding and border in Firefox 4+.
  */
 
 button::-moz-focus-inner,
@@ -407,8 +352,8 @@ input::-moz-focus-inner {
 }
 
 /*
- * 1. Removes default vertical scrollbar in IE6/7/8/9
- * 2. Improves readability and alignment in all browsers
+ * 1. Removes default vertical scrollbar in IE 8/9.
+ * 2. Improves readability and alignment in all browsers.
  */
 
 textarea {
@@ -416,16 +361,15 @@ textarea {
     vertical-align: top; /* 2 */
 }
 
-
-/* =============================================================================
+/* ==========================================================================
    Tables
    ========================================================================== */
 
-/* 
- * Remove most spacing between table cells
+/*
+ * Remove most spacing between table cells.
  */
 
 table {
     border-collapse: collapse;
     border-spacing: 0;
-}
+}

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.5' unless const_defined?(:VERSION)
+  VERSION = '3.0.6' 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.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -195,12 +195,14 @@ files:
 - features/instance_vars.feature
 - features/mount_rack.feature
 - features/preview_changes.feature
+- features/proxy_pages.feature
 - features/request_params.feature
 - features/sitemap_traversal.feature
 - features/static_server.feature
 - features/step_definitions/page_layout_steps.rb
 - features/strip_url.feature
 - features/support/env.rb
+- features/tilde_directories.feature
 - features/unicode_filenames.feature
 - features/wildcard_page_helper.feature
 - fixtures/automatic-directory-matcher-app/config.rb
@@ -366,6 +368,14 @@ files:
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
 - fixtures/preview-app/source/layout.erb
+- fixtures/proxy-pages-app/config.rb
+- fixtures/proxy-pages-app/source/real.html
+- fixtures/proxy-pages-app/source/real/index-ivars.html.erb
+- fixtures/proxy-pages-app/source/real/index.html.erb
+- fixtures/proxy-pages-app/source/should_be_ignored3.html
+- fixtures/proxy-pages-app/source/should_be_ignored6.html
+- fixtures/proxy-pages-app/source/should_be_ignored7.html
+- fixtures/proxy-pages-app/source/should_be_ignored8.html
 - fixtures/request-app/config.rb
 - fixtures/request-app/source/index.html.erb
 - fixtures/sinatra-app/config.rb
@@ -585,7 +595,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2720475402935195824
+      hash: -3834291849307720462
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -594,10 +604,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2720475402935195824
+      hash: -3834291849307720462
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development
@@ -625,12 +635,14 @@ test_files:
 - features/instance_vars.feature
 - features/mount_rack.feature
 - features/preview_changes.feature
+- features/proxy_pages.feature
 - features/request_params.feature
 - features/sitemap_traversal.feature
 - features/static_server.feature
 - features/step_definitions/page_layout_steps.rb
 - features/strip_url.feature
 - features/support/env.rb
+- features/tilde_directories.feature
 - features/unicode_filenames.feature
 - features/wildcard_page_helper.feature
 - fixtures/automatic-directory-matcher-app/config.rb
@@ -796,6 +808,14 @@ test_files:
 - fixtures/preview-app/config.rb
 - fixtures/preview-app/source/content.html.erb
 - fixtures/preview-app/source/layout.erb
+- fixtures/proxy-pages-app/config.rb
+- fixtures/proxy-pages-app/source/real.html
+- fixtures/proxy-pages-app/source/real/index-ivars.html.erb
+- fixtures/proxy-pages-app/source/real/index.html.erb
+- fixtures/proxy-pages-app/source/should_be_ignored3.html
+- fixtures/proxy-pages-app/source/should_be_ignored6.html
+- fixtures/proxy-pages-app/source/should_be_ignored7.html
+- fixtures/proxy-pages-app/source/should_be_ignored8.html
 - fixtures/request-app/config.rb
 - fixtures/request-app/source/index.html.erb
 - fixtures/sinatra-app/config.rb