middleman-core 4.0.0.alpha.6 → 4.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e34ff77656a24cfb0e1d05a9da94084ec6969e5
-  data.tar.gz: 8a3dfb3ed28cab63a63bdcde9394e7b3c4ab49c8
+  metadata.gz: 02dd866c5282faf778b2e57669ad86197c26cc90
+  data.tar.gz: 2402e62953aa0cb41f7cbe98078e7203b2bd98e4
 SHA512:
-  metadata.gz: 8ffb4c00d0e57ed303012affd7a06644641d6546251fd7f47ea788c98981b0f6d406c041aa03df5c38db6281c6599fc50618e76678095be8ce3b3f4d4d7c2c21
-  data.tar.gz: 8398c13098126daa8e9c01484c0ef4f9bb317f89f2abd5a42278d3939af5edace360c7732d7e92e90ccba932cffe9830c1c843c6616a5fdc7fc6bfd47b1f1296
+  metadata.gz: 5d66bfdb93ea7353d9c0f3750f13f5df0b31712e6f7527a256f53116ba422ed7b93cd14e9544e57ac531345ca09d2fb73c1c1c285d6a7848624cb4297a339cc8
+  data.tar.gz: 0653294a824cc10c51d0ecdb04fb0363d550e524ba04e58995d79dbd4d67fb7d751236e703a92c2f5a6860d970e2c879ce79bba92360c815242dc7e396cfbc55

data/features/asset_hash.feature

@@ -1,4 +1,4 @@
-Feature: Assets get a file hash appended to their and references to them are updated
+Feature: Assets get file hashes appended to them and references to them are updated
   Scenario: Hashed-asset files are produced, and HTML, CSS, JSON and JavaScript gets rewritten to reference the new files
     Given a successfully built app at "asset-hash-app"
     When I cd to "build"
@@ -79,6 +79,13 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And I should see 'images/100px-5fd6fb90.jpg'
     And I should see 'images/100px-1242c368.png'
 
+  Scenario: Hashed assets work with Slim
+    Given the Server is running at "asset-hash-app"
+    When I go to "/slim.html"
+    And I should see 'src="images/300px-59adce76.jpg"'
+    And I should see 'src="images/100px-5fd6fb90.jpg"'
+    And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
+
   Scenario: Enabling an asset host still produces hashed files and references
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"

data/features/asset_host.feature

@@ -1,17 +1,4 @@
 Feature: Alternate between multiple asset hosts
-  In order to speed up page loading
-  
-  Scenario: Set single host globally
-    Given a fixture app "asset-host-app"
-    And a file named "config.rb" with:
-      """
-      activate :asset_host, host: "http://assets1.example.com"
-      """
-    And the Server is running
-    When I go to "/asset_host.html"
-    Then I should see "http://assets1"
-    When I go to "/stylesheets/asset_host.css"
-    Then I should see "http://assets1"
 
   Scenario: Set single host with inline-option
     Given a fixture app "asset-host-app"
@@ -21,6 +8,7 @@ Feature: Alternate between multiple asset hosts
       """
     And the Server is running
     When I go to "/asset_host.html"
+    Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"'
     Then I should see content matching %r{http://assets1.example.com/}
     Then I should not see content matching %r{http://assets1.example.com//}
     When I go to "/stylesheets/asset_host.css"
@@ -37,6 +25,7 @@ Feature: Alternate between multiple asset hosts
       """
     And the Server is running
     When I go to "/asset_host.html"
+    Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"'
     Then I should see content matching %r{http://assets1.example.com/}
     Then I should not see content matching %r{http://assets1.example.com//}
     When I go to "/stylesheets/asset_host.css"

data/features/builder.feature

@@ -9,7 +9,6 @@ Feature: Builder
       | static.html                                   |
       | services/index.html                           |
       | stylesheets/static.css                        |
-      | spaces in file.html                           |
       | images/blank.gif                              |
       | images/Read me (example).txt                  |
       | images/Child folder/regular_file(example).txt |
@@ -27,7 +26,6 @@ Feature: Builder
     And the file "static.html" should contain "Static, no code!"
     And the file "services/index.html" should contain "Services"
     And the file "stylesheets/static.css" should contain "body"
-    And the file "spaces in file.html" should contain "spaces"
     
   Scenario: Build glob
     Given a successfully built app at "glob-app" with flags "--glob '*.css'"

data/features/cli_init.feature

@@ -55,3 +55,35 @@ Feature: Middleman CLI
     And I type "y"
     And I type "y"
     Then a directory named "MY_PROJECT" should exist
+
+  Scenario: Create a new project using Middleman directory
+    When I run `middleman init MY_PROJECT -T amicus`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    And the file "README.md" should contain "Amicus"
+    And the file ".gitignore" should not exist
+
+  Scenario: Create a new project using github(user/repository)
+    When I run `middleman init MY_PROJECT -T middleman/middleman-templates-default` interactively
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    Then a directory named "MY_PROJECT" should exist
+
+  Scenario: Create a new project using github(user/repository#branch)
+    When I run `middleman init MY_PROJECT -T middleman/middleman-templates-default#master` interactively
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    Then a directory named "MY_PROJECT" should exist
+    And the output should contain "-b master"
+
+  Scenario: Create a new project using full path(://)
+    When I run `middleman init MY_PROJECT -T https://github.com/middleman/middleman-templates-default.git` interactively
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    And I type "y"
+    Then a directory named "MY_PROJECT" should exist

data/features/collections.feature

@@ -143,3 +143,53 @@ Feature: Collections
     When I go to "index.html"
     And I should see 'Article: Blog3 Another Article'
     And I should see 'Article: Blog2 Yet Another Article'
+
+
+  Scenario: Collected data update with file changes
+    Given a fixture app "collections-app"
+    And a file named "config.rb" with:
+      """
+      data.articles.each_with_index do |a, i|
+        proxy "/#{i}.html", a
+      end
+      """
+    And a file named "data/articles.yaml" with:
+      """
+      ---
+      - "/blog1/2011-01-01-new-article.html"
+      - "/blog2/2011-01-02-another-article.html"
+      """
+    Given the Server is running at "collections-app"
+    When I go to "0.html"
+    Then I should see 'Newer Article Content'
+    When I go to "1.html"
+    Then I should see 'Another Article Content'
+    When I go to "2.html"
+    Then I should see 'Not Found'
+
+    When the file "data/articles.yaml" has the contents
+      """
+      ---
+      - "/blog1/2011-01-01-new-article.html"
+      """
+    When I go to "0.html"
+    Then I should see 'Newer Article Content'
+    When I go to "1.html"
+    Then I should see 'Not Found'
+    When I go to "2.html"
+    Then I should see 'Not Found'
+
+    When the file "data/articles.yaml" has the contents
+      """
+      ---
+      - "/blog2/2011-01-02-another-article.html"
+      - "/blog1/2011-01-01-new-article.html"
+      - "/blog2/2011-01-01-new-article.html"
+      """
+    When I go to "0.html"
+    Then I should see 'Another Article Content'
+    When I go to "1.html"
+    Then I should see 'Newer Article Content'
+    When I go to "2.html"
+    Then I should see 'Again'
+    

data/features/directory_index.feature

@@ -25,9 +25,8 @@ Feature: Directory Index
     And the file "a_folder/needs_index/index.html" should contain "Indexable"
     And the file "leave_me_alone.html" should contain "Stay away"
     And the file "regular/index.html" should contain "Regular"
-    And the file "evil spaces/index.html" should contain "Spaces"
-
-
+    And the file "evil spaces/index.html" should contain "Filled with Evil Spaces"
+    
   Scenario: Preview normal file
     Given the Server is running at "indexable-app"
     When I go to "/needs_index/"
@@ -35,8 +34,8 @@ Feature: Directory Index
 
   Scenario: Preview normal file with spaces in filename
     Given the Server is running at "indexable-app"
-    When I go to "/evil%20spaces/"
-    Then I should see "Spaces"
+    When I go to "/evil spaces/"
+    Then I should see "Filled with Evil Spaces"
 
   Scenario: Preview normal file subdirectory
     Given the Server is running at "indexable-app"

data/features/front-matter-neighbor.feature

@@ -136,3 +136,23 @@ Feature: Neighboring YAML Front Matter
     Then I should see "Layout in use: Override"
     When I go to "/page_mentioned.html.erb.frontmatter"
     Then I should see "File Not Found"
+
+  # Scenario: Neighbor frontmatter for destination of proxy resources
+  #   Given the Server is running at "frontmatter-settings-neighbor-app"
+  #   And the file "source/proxied_with_frontmatter.html.frontmatter" has the contents
+  #     """
+  #     ---
+  #     title: Proxied title
+  #     ---
+  #     """
+  #   And the file "source/ignored.html.erb" has the contents
+  #     """
+  #     ---
+  #     ignored: true
+  #     ---
+
+  #     <%= current_resource.data.inspect %>
+  #     <%= current_resource.data.title %>
+  #     """
+  #   When I go to "/proxied_with_frontmatter.html"
+  #   Then I should see "Proxied title"

data/features/helpers_link_to.feature

@@ -5,6 +5,24 @@ Feature: link_to helper
     When I go to "/link_to_erb.html"
     Then I should see "erb <s>with html tags</s>"
 
+  Scenario: link_to works with absolute URLs (where the relative part matches a local path)
+    Given a fixture app "link-to-app"
+    And a file named "config.rb" with:
+    """
+    set :relative_links, true
+    """
+    And a file named "source/test.html.erb" with:
+    """
+    Hello
+    """
+    And a file named "source/link_to_absolute.html.erb" with:
+    """
+    <%= link_to "test", "http://google.com/test.html" %>
+    """
+    And the Server is running at "link-to-app"
+    When I go to "/link_to_absolute.html"
+    Then I should see '<a href="http://google.com/test.html">test</a>'
+
   Scenario: link_to works with blocks (slim)
     Given the Server is running at "link-to-app"
     When I go to "/link_to_slim.html"

data/features/image_srcset_paths.feature

@@ -0,0 +1,7 @@
+Feature: Support srcset property as params for image_tag helper
+  This lets you specify responsive image sizes
+
+  Scenario: Rendering an image with the feature enabled
+    Given the Server is running at "image-srcset-paths-app"
+    When I go to "/image-srcset-paths.html"
+    Then I should see '//example.com/remote-image.jpg 2x, /images/blank_3x.jpg 3x'

data/features/markdown_kramdown_in_haml.feature

@@ -33,9 +33,10 @@ Feature: Markdown support in Haml (Kramdown)
       :markdown
         [A link](/link_target.html)
 
-        ![image](blank.gif)
+        ![image](blank.gif){: srcset="image_2x.jpg 2x"}
       """
     Given the Server is running at "markdown-in-haml-app"
     When I go to "/link_and_image/"
     Then I should see "/link_target/"
+    Then I should see "/images/image_2x.jpg 2x"
     Then I should see 'src="/images/blank.gif"'

data/features/minify_javascript.feature

@@ -145,7 +145,7 @@ Feature: Minify Javascript
       I'm a jQuery {{template}}.
     </script>
     """
-    
+
   Scenario: Rendering external js with the feature enabled
     Given a fixture app "minify-js-app"
     And a file named "config.rb" with:

data/features/multiple-sources.feature

@@ -25,3 +25,11 @@ Feature: Allow multiple sources to be setup.
     Then I should see "Data 2: Data 2"
     Then I should see "Override in Two: Overridden 2"
     Then I should see "Override in One: Opposite 2"
+
+  Scenario: Set source with destination_dir
+    Given the Server is running at "multiple-sources-with-duplicate-file-names-app"
+    When I go to "/index.html"
+    Then I should see "Default Source"
+
+    When I go to "/source2/index.html"
+    Then I should see "Second Source"

data/fixtures/asset-hash-app/source/slim.html.slim

@@ -0,0 +1,8 @@
+---
+directory_index: false
+layout: false
+---
+
+= image_tag '100px.jpg', srcset: "100px.jpg 1x, 200px.jpg 2x, 300px.jpg 3x"
+
+= image_tag "300px.jpg"

data/fixtures/asset-hash-app/source/subdir/index.html.erb

@@ -2,8 +2,17 @@
   <title>The Middleman!</title>
 <% end %>
 
+<h2>Abs</h2>
+<p>http://example.com/test.jpg</p>
+
 <h2>Image url:</h2>
-<p><%= image_path('100px.jpg') %></p>
+<p><img src="<%= image_path('100px.jpg') %>"></p>
+
+<h2>Image url2:</h2>
+<p><%= image_tag('200px.jpg') %></p>
+
+<h2>Image url3:</h2>
+<p><img src="/images/100px.jpg"></p>
 
 <h2>Autogenerated tests:</h2>
 <p>images/100px.jpg</p>

data/fixtures/asset-host-app/source/asset_host.html.erb

@@ -1,3 +1,5 @@
+<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
+
 <%= image_tag "blank0.gif" %>
 <%= image_tag "blank1.gif" %>
 <%= image_tag "blank2.gif" %>
@@ -17,4 +19,24 @@
 <%= image_tag "blank31.gif" %>
 <%= image_tag "blank32.gif" %>
 <%= image_tag "blank33.gif" %>
-<%= image_tag "blank34.gif" %>
+<%= image_tag "blank34.gif" %>
+<%= image_tag "blank100.gif" %>
+<%= image_tag "blank101.gif" %>
+<%= image_tag "blank102.gif" %>
+<%= image_tag "blank103.gif" %>
+<%= image_tag "blank104.gif" %>
+<%= image_tag "blank1010.gif" %>
+<%= image_tag "blank1021.gif" %>
+<%= image_tag "blank1032.gif" %>
+<%= image_tag "blank1043.gif" %>
+<%= image_tag "blank1054.gif" %>
+<%= image_tag "blank1020.gif" %>
+<%= image_tag "blank1021.gif" %>
+<%= image_tag "blank1022.gif" %>
+<%= image_tag "blank1023.gif" %>
+<%= image_tag "blank1024.gif" %>
+<%= image_tag "blank1030.gif" %>
+<%= image_tag "blank1031.gif" %>
+<%= image_tag "blank1032.gif" %>
+<%= image_tag "blank1033.gif" %>
+<%= image_tag "blank1034.gif" %>

data/fixtures/collections-app/source/blog2/2011-01-01-new-article.html.markdown

@@ -5,3 +5,5 @@ tags: foo, bar
 ---
 
 Newer Article Content
+
+Again

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

@@ -1,33 +1,38 @@
 # Proxy ignored.html, which should ignore itself through a frontmatter
 proxy 'proxied.html', 'ignored.html'
+proxy 'proxied_with_frontmatter.html', 'ignored.html'
 page 'override_layout.html', layout: :alternate
 page 'page_mentioned.html'
 
 ignore '*.frontmatter'
 
 # Reads neighbor for every file on every refresh.
-# TODO: Optimize
 class NeighborFrontmatter < ::Middleman::Extension
   self.resource_list_manipulator_priority = 81
 
   def manipulate_resource_list(resources)
     resources.each do |resource|
       next unless resource.source_file
-
-      neighbor = "#{resource.source_file[:relative_path]}.frontmatter"
-
-      file = app.files.find(:source, neighbor)
-
-      next unless file
-
-      fmdata = app.extensions[:front_matter].frontmatter_and_content(file[:full_path]).first
-      opts = fmdata.extract!(:layout, :layout_engine, :renderer_options, :directory_index, :content_type)
-      opts[:renderer_options].symbolize_keys! if opts.key?(:renderer_options)
-      ignored = fmdata.delete(:ignored)
-      resource.add_metadata options: opts, page: fmdata
-      resource.ignore! if ignored == true && !resource.is_a?(::Middleman::Sitemap::ProxyResource)
+      next if resource.source_file[:relative_path].extname == '.frontmatter'
+
+      [
+        "#{resource.url.sub(/^\//, '')}.frontmatter",
+        "#{resource.source_file[:relative_path]}.frontmatter"
+      ].each do |n|
+        file = app.files.find(:source, n)
+        apply_neighbor_data(resource, file) if file
+      end
     end
   end
+
+  def apply_neighbor_data(resource, file)
+    fmdata = app.extensions[:front_matter].frontmatter_and_content(file[:full_path]).first
+    opts = fmdata.extract!(:layout, :layout_engine, :renderer_options, :directory_index, :content_type)
+    opts[:renderer_options].symbolize_keys! if opts.key?(:renderer_options)
+    ignored = fmdata.delete(:ignored)
+    resource.add_metadata options: opts, page: fmdata
+    resource.ignore! if ignored == true && !resource.is_a?(::Middleman::Sitemap::ProxyResource)
+  end
 end
 
 Middleman::Extensions.register :neighbor_frontmatter, NeighborFrontmatter unless Middleman::Extensions.registered.include? :neighbor_frontmatter

data/fixtures/image-srcset-paths-app/image-srcset-paths.html.erb

@@ -0,0 +1 @@
+<%= image_tag 'blank.jpg', srcset: '//example.com/remote-image.jpg 2x, blank_3x.jpg 3x, http://example.com/remoteimage.jpg 4x' %>

data/fixtures/indexable-app/source/evil spaces.html

@@ -1 +1 @@
-Spaces
+Filled with Evil Spaces

data/fixtures/large-build-app/config.rb

@@ -1 +1,3 @@
 page "/spaces in file.html", layout: false
+
+config[:port] = 5555

data/fixtures/large-build-app/source/spaces in file.html.erb

@@ -1 +1 @@
-<%= "spaces" %>
+<%= "correctly found spaces in file data" %>

data/fixtures/more-traversal-app/source/layout.erb

@@ -16,6 +16,6 @@ Source: <%= current_page.source_file[:full_path].sub(root + "/", "") %>
 
 <% current_page.children.each do |p| %>
   <% if p.data %>
-    Data: <%= p.data %>
+    Data: <%= p.data.inspect %>
   <% end %>
 <% end %>

data/fixtures/multiple-sources-with-duplicate-file-names-app/config.rb

@@ -0,0 +1,2 @@
+files.watch :source, path: File.join(root, 'source2'),
+                     destination_dir: 'source2'

data/fixtures/multiple-sources-with-duplicate-file-names-app/source/index.html.erb

@@ -0,0 +1 @@
+Default Source

data/fixtures/multiple-sources-with-duplicate-file-names-app/source2/index.html.erb

@@ -0,0 +1 @@
+Second Source

data/fixtures/traversal-app/source/layout.erb

@@ -16,6 +16,6 @@ Source: <%= current_page.source_file[:full_path].sub(root + "/", "") %>
 
 <% current_page.children.each do |p| %>
   <% if p.data %>
-    Data: <%= p.data %>
+    Data: <%= p.data.inspect %>
   <% end %>
 <% end %>

data/lib/middleman/rack.rb

@@ -2,3 +2,4 @@ require 'middleman-core/load_paths'
 ::Middleman.setup_load_paths
 
 require 'middleman-core'
+require 'middleman-core/application'

data/lib/middleman-core/application.rb

@@ -30,6 +30,9 @@ require 'middleman-core/template_renderer'
 
 # Core Middleman Class
 module Middleman
+  MiddlewareDescriptor = Struct.new(:class, :options, :block)
+  MapDescriptor = Struct.new(:path, :block)
+
   class Application
     extend Forwardable
     include Contracts
@@ -78,6 +81,14 @@ module Middleman
     define_hook :before_render
     define_hook :after_render
 
+    # Which host preview should start on.
+    # @return [Fixnum]
+    config.define_setting :host, '0.0.0.0', 'The preview server host'
+
+    # Which port preview should start on.
+    # @return [Fixnum]
+    config.define_setting :port, 4567, 'The preview server port'
+
     # Name of the source directory
     # @return [String]
     config.define_setting :source, 'source', 'Name of the source directory'
@@ -180,10 +191,10 @@ module Middleman
     attr_reader :extensions
     attr_reader :sources
 
-    Contract None => SetOf['Middleman::Application::MiddlewareDescriptor']
+    Contract SetOf[MiddlewareDescriptor]
     attr_reader :middleware
 
-    Contract None => SetOf['Middleman::Application::MapDescriptor']
+    Contract SetOf[MapDescriptor]
     attr_reader :mappings
 
     # Reference to Logger singleton
@@ -191,6 +202,7 @@ module Middleman
     def_delegator :"::Middleman::Util", :instrument
     def_delegators :"self.class", :root, :root_path
     def_delegators :@generic_template_context, :link_to, :image_tag, :asset_path
+    def_delegators :@extensions, :activate
 
     # Initialize the Middleman project
     def initialize(&block)
@@ -293,14 +305,6 @@ module Middleman
       config_context.execute_configure_callbacks(config[:mode])
     end
 
-    def add_to_instance(name, &func)
-      define_singleton_method(name, &func)
-    end
-
-    def add_to_config_context(name, &func)
-      @config_context.define_singleton_method(name, &func)
-    end
-
     # Whether we're in server mode
     # @return [Boolean] If we're in dev mode
     def server?
@@ -342,19 +346,15 @@ module Middleman
       Pathname(File.join(root, config[:source]))
     end
 
-    MiddlewareDescriptor = Struct.new(:class, :options, :block)
-
     # Use Rack middleware
     #
     # @param [Class] middleware Middleware module
     # @return [void]
-    Contract Any, Args[Any], Proc => Any
+    # Contract Any, Args[Any], Maybe[Proc] => Any
     def use(middleware, *args, &block)
       @middleware << MiddlewareDescriptor.new(middleware, args, block)
     end
 
-    MapDescriptor = Struct.new(:path, :block)
-
     # Add Rack App mapped to specific path
     #
     # @param [String] map Path to map

data/lib/middleman-core/builder.rb

@@ -12,11 +12,14 @@ module Middleman
     # Make app & events available to `after_build` callbacks.
     attr_reader :app, :events
 
+    # Reference to the Thor class.
+    attr_accessor :thor
+
     # Logger comes from App.
     def_delegator :@app, :logger
 
     # Sort order, images, fonts, js/css and finally everything else.
-    SORT_ORDER = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .webp .ico .woff .otf .ttf .eot .js .css)
+    SORT_ORDER = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .webp .ico .woff .woff2 .otf .ttf .eot .js .css)
 
     # Create a new Builder instance.
     # @param [Middleman::Application] app The app to build.
@@ -41,7 +44,7 @@ module Middleman
 
     # Run the build phase.
     # @return [Boolean] Whether the build was successful.
-    Contract None => Bool
+    Contract Bool
     def run!
       @has_error = false
       @events = {}
@@ -74,7 +77,7 @@ module Middleman
 
     # Pre-request CSS to give Compass a chance to build sprites
     # @return [Array<Resource>] List of css resources that were output.
-    Contract None => ResourceList
+    Contract ResourceList
     def prerender_css
       logger.debug '== Prerendering CSS'
 
@@ -93,7 +96,7 @@ module Middleman
 
     # Find all the files we need to output and do so.
     # @return [Array<Resource>] List of resources that were output.
-    Contract None => ResourceList
+    Contract ResourceList
     def output_files
       logger.debug '== Building files'
 
@@ -130,7 +133,8 @@ module Middleman
     def write_tempfile(output_file, contents)
       file = Tempfile.new([
         File.basename(output_file),
-        File.extname(output_file)])
+        File.extname(output_file)
+      ])
       file.binmode
       file.write(contents)
       file.close
@@ -205,7 +209,7 @@ module Middleman
     # Get a list of all the paths in the destination folder and save them
     # for comparison against the files we build in this cycle
     # @return [void]
-    Contract None => Any
+    Contract Any
     def queue_current_paths
       @to_clean = []
 
@@ -230,7 +234,7 @@ module Middleman
     end
 
     # Remove files which were not built in this cycle
-    Contract None => ArrayOf[Pathname]
+    Contract ArrayOf[Pathname]
     def clean
       @to_clean.each do |f|
         FileUtils.rm(f)