RubyGems - middleman-core - Versions diffs - 3.4.1 → 4.0.0.alpha.2 - Mend

middleman-core 3.4.1 → 4.0.0.alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (507) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33038072c8408f70a3c27303e4a97b4bafd70bf9
-  data.tar.gz: b19a56c81c79763fb1521360c02f4f674a2bc16e
+  metadata.gz: e3cdf5b5b1dd7eb3048ca5c047e4f322d65f7d75
+  data.tar.gz: abc48d95a84f5ea6f0956720d14cd89a2f8afb6b
 SHA512:
-  metadata.gz: 7baf9acd082921715a38094c0ef1926348a21d69029648c7e4c96f258ddf68a43aa91f1af989df68486da16d8f9f4a262b8e9412bd809b80d9515dec74b236c0
-  data.tar.gz: 96d1292ce7c5eb0fabb1f53c48229b9be9dd2afaa7b871685ee6f2dd8543fcc6eba100b46632989f01ae57d9d5c980b73b05c05e0b3dd754ad4b552421cc9053
+  metadata.gz: aec26562a300ff23b4a95b99fa81d7b066813a716b0388ab268437844e0ddef14d96646e897d4705f6b70b011497937b7874b99eb37b910a691439b6840f82a6
+  data.tar.gz: 76178784355c104abe232162ae142c6269d496eed682b0d4485e55f6102d91798524b22570a9a26e4871858e3c05375f44b1a43f84122ab2e230d6e37a276cc7

data/{fixtures/asciidoc-app/config.rb → .gemtest} RENAMED Viewed

File without changes

data/.yardopts CHANGED Viewed

@@ -1,10 +1,6 @@
 lib/**/*.rb
 --exclude lib/vendored-middleman-deps/
 --exclude lib/middleman-core/step_definitions
---exclude lib/middleman-core/templates/default/
---exclude lib/middleman-core/templates/html5/
---exclude lib/middleman-core/templates/mobile/
---exclude lib/middleman-core/templates/shared/
---exclude lib/middleman-core/templates/extension/
 --no-private
---hide-void-return
+--hide-void-return
+--markup=markdown

data/Rakefile CHANGED Viewed

@@ -1 +1,5 @@
-require_relative '../gem_rake_helper'
+# coding:utf-8
+RAKE_ROOT = __FILE__
+GEM_NAME = ENV['NAME'] || 'middleman-core'
+require 'rubygems'
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/features/asset_hash.feature CHANGED Viewed

@@ -1,5 +1,5 @@
 Feature: Assets get a file hash appended to their 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
+  Scenario: Hashed-asset files are produced, and HTML, CSS, and JavaScript gets rewritten to reference the new files
     Given a successfully built app at "asset-hash-app"
     When I cd to "build"
     Then the following files should exist:
@@ -8,16 +8,12 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | favicon.ico |
       | images/100px-1242c368.png |
       | images/100px-5fd6fb90.jpg |
-      | images/200px-c11eb203.jpg |
-      | images/300px-59adce76.jpg |
       | images/100px-5fd6fb90.gif |
       | javascripts/application-1d8d5276.js |
-      | stylesheets/site-50eaa978.css |
+      | stylesheets/site-7474cadd.css |
       | index.html |
       | subdir/index.html |
       | other/index.html |
-      | api.json |
-      | subdir/api.json |
     And the following files should not exist:
       | images/100px.png |
       | images/100px.jpg |
@@ -26,82 +22,54 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | stylesheets/site.css |
     And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
-    And the file "stylesheets/site-50eaa978.css" should contain "background-image: url('../images/100px-5fd6fb90.jpg')"
+    And the file "stylesheets/site-7474cadd.css" should contain:
+      """
+      background-image: url("../images/100px-5fd6fb90.jpg")
+      """
     And the file "index.html" should contain 'href="apple-touch-icon.png"'
-    And the file "index.html" should contain 'href="stylesheets/site-50eaa978.css"'
+    And the file "index.html" should contain 'href="stylesheets/site-7474cadd.css"'
     And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
     And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
-    And the file "index.html" should contain 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
-    And the file "index.html" should contain 'src="images/100px-5fd6fb90.gif"'
-    And the file "index.html" should contain 'src="images/100px-1242c368.png"'
-    And the file "subdir/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
+    And the file "subdir/index.html" should contain 'href="../stylesheets/site-7474cadd.css"'
     And the file "subdir/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
     And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
-    And the file "other/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
+    And the file "other/index.html" should contain 'href="../stylesheets/site-7474cadd.css"'
     And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
     And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
-    And the file "api.json" should contain 'images/100px-5fd6fb90.gif'
-    And the file "api.json" should contain 'images/100px-5fd6fb90.jpg'
-    And the file "api.json" should contain 'images/100px-1242c368.png'
-    And the file "subdir/api.json" should contain 'images/100px-5fd6fb90.gif'
-    And the file "subdir/api.json" should contain 'images/100px-5fd6fb90.jpg'
-    And the file "subdir/api.json" should contain 'images/100px-1242c368.png'
-  Scenario: Hashed fonts assets work with woff and woff2 extension
-    Given a successfully built app at "asset-hash-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | fonts/fontawesome-webfont-56ce13e7.woff |
-      | fonts/fontawesome-webfont-10752316.woff2 |
-    And the file "stylesheets/uses_fonts-88aa3e2b.css" should contain "src: url('../fonts/fontawesome-webfont-10752316.woff2')"
-    And the file "stylesheets/uses_fonts-88aa3e2b.css" should contain "url('../fonts/fontawesome-webfont-56ce13e7.woff')"
   Scenario: Hashed assets work in preview server
     Given the Server is running at "asset-hash-app"
     When I go to "/"
     Then I should see 'href="apple-touch-icon.png"'
-    And I should see 'href="stylesheets/site-50eaa978.css"'
+    And I should see 'href="stylesheets/site-7474cadd.css"'
     And I should see 'src="javascripts/application-1d8d5276.js"'
     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"'
     When I go to "/subdir/"
-    Then I should see 'href="../stylesheets/site-50eaa978.css"'
+    Then I should see 'href="../stylesheets/site-7474cadd.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="../stylesheets/site-50eaa978.css"'
+    Then I should see 'href="../stylesheets/site-7474cadd.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/javascripts/application-1d8d5276.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-50eaa978.css"
-    Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
-    When I go to "/api.json"
-    Then I should see 'images/100px-5fd6fb90.gif'
-    And I should see 'images/100px-5fd6fb90.jpg'
-    And I should see 'images/100px-1242c368.png'
-    When I go to "/subdir/api.json"
-    Then I should see 'images/100px-5fd6fb90.gif'
-    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"'
+    When I go to "/stylesheets/site-7474cadd.css"
+    Then I should see:
+      """
+      background-image: url("../images/100px-5fd6fb90.jpg")
+      """
   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 "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-54baaf3a.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     # Asset helpers don't appear to work from Compass right now
     # When I go to "/stylesheets/site-e5a31a3e.css"
@@ -132,22 +100,27 @@ Feature: Assets get a file hash appended to their and references to them are upd
       activate :relative_assets
       activate :directory_indexes
       require 'lib/middleware.rb'
-      use Middleware
+      use ::Middleware
       """
     Given the Server is running at "asset-hash-app"
     When I go to "/"
-    Then I should see 'href="stylesheets/site-5770af52.css'
-    When I go to "stylesheets/site-5770af52.css"
+    Then I should see 'href="stylesheets/site-ac2166fd.css'
+    When I go to "stylesheets/site-ac2166fd.css"
     Then I should see 'background-image'
     Then I should see 'Added by Rack filter'
-    When I go to "stylesheets/site-50eaa978.css"
+    When I go to "stylesheets/site-7474cadd.css"
     Then I should see 'Not Found'
   Scenario: Hashed-asset files are not produced for ignored paths
     Given a fixture app "asset-hash-app"
     And a file named "config.rb" with:
       """
-      activate :asset_hash, :ignore => [%r(javascripts/*), 'images/*']
+      is_stylesheet = proc { |path| path.start_with? 'stylesheets' }
+      activate :asset_hash, ignore: [
+        %r(javascripts/*),
+        'images/*',
+        is_stylesheet
+      ]
       activate :relative_assets
       activate :directory_indexes
       """
@@ -161,18 +134,16 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | images/100px.jpg |
       | images/100px.gif |
       | javascripts/application.js |
-      | stylesheets/site-50eaa978.css |
+      | stylesheets/site.css |
       | index.html |
       | subdir/index.html |
       | other/index.html |
-      | api.json |
-      | subdir/api.json |
     And the following files should not exist:
       | images/100px-1242c368.png |
       | images/100px-5fd6fb90.jpg |
       | images/100px-5fd6fb90.gif |
       | javascripts/application-1d8d5276.js |
-      | stylesheets/site.css |
+      | stylesheets/site-7474cadd.css |
   # @wip Currently broken, we should move all asset-host functionality out of Compass and into something more similar to asset_hash with Rack-based rewrites
   # Scenario: Enabling an asset host and referencing assets in CSS with URL fragments are rewritten correctly

data/features/asset_host.feature CHANGED Viewed

@@ -5,8 +5,7 @@ Feature: Alternate between multiple asset hosts
     Given a fixture app "asset-host-app"
     And a file named "config.rb" with:
       """
-      activate :asset_host
-      set :asset_host, "http://assets1.example.com"
+      activate :asset_host, host: "http://assets1.example.com"
       """
     And the Server is running
     When I go to "/asset_host.html"
@@ -14,43 +13,32 @@ Feature: Alternate between multiple asset hosts
     When I go to "/stylesheets/asset_host.css"
     Then I should see "http://assets1"
-  Scenario: Set proc host globally
-    Given a fixture app "asset-host-app"
-    And a file named "config.rb" with:
-      """
-      activate :asset_host
-      set :asset_host do |asset|
-        "http://assets%d.example.com" % (asset.hash % 4)
-      end
-      """
-    And the Server is running
-    When I go to "/asset_host.html"
-    Then I should see "http://assets"
-    When I go to "/stylesheets/asset_host.css"
-    Then I should see "http://assets"
   Scenario: Set single host with inline-option
     Given a fixture app "asset-host-app"
     And a file named "config.rb" with:
       """
-      activate :asset_host, :host => "http://assets1.example.com"
+      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"
+    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"
-    Then I should see "http://assets1"
+    Then I should see content matching %r{http://assets1.example.com/}
+    Then I should not see content matching %r{http://assets1.example.com//}
   Scenario: Set proc host with inline-option
     Given a fixture app "asset-host-app"
     And a file named "config.rb" with:
       """
-      activate :asset_host, :host => Proc.new { |asset|
+      activate :asset_host, host: Proc.new { |asset|
         "http://assets%d.example.com" % (asset.hash % 4)
       }
       """
     And the Server is running
     When I go to "/asset_host.html"
-    Then I should see "http://assets"
+    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"
-    Then I should see "http://assets"
+    Then I should see content matching %r{http://assets1.example.com/}
+    Then I should not see content matching %r{http://assets1.example.com//}

data/features/builder.feature CHANGED Viewed

@@ -9,6 +9,7 @@ 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 |
@@ -26,6 +27,7 @@ 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/cache_buster.feature CHANGED Viewed

@@ -5,7 +5,7 @@ Feature: Generate mtime-based query string for busting browser caches
     Given "cache_buster" feature is "disabled"
     And the Server is running at "cache-buster-app"
     When I go to "/stylesheets/relative_assets.css"
-    Then I should see "blank.gif'"
+    Then I should see 'blank.gif"'
   Scenario: Rendering html with the feature disabled
     Given "cache_buster" feature is "disabled"

data/features/chained_templates.feature CHANGED Viewed

@@ -13,97 +13,7 @@ Feature: Templates should be chainable
     When I cd to "build"
     Then the following files should exist:
       | index.html                                    |
-      | test.erb.combobreaker                        |
     And the file "index.html" should contain "Title</h1>"
     And the file "index.html" should contain "Subtitle</h2>"
-    And the file "index.html" should contain "Sup</h3>"
-    And the file "test.erb.combobreaker" should contain "Title</h1>"
-    And the file "test.erb.combobreaker" should contain "Subtitle</h2>"
-    And the file "test.erb.combobreaker" should contain "Sup</h3>"
-  Scenario: Partials are parsed by multiple template engines: Outer template has .erb and inner .md.erb
-    Given a fixture app "partial-chained_templates-app"
-    And a template named "my_template.html.erb" with:
-    """
-    <h1>My Template</h1>
-    <%= partial 'my_partial' %>
-    """
-    And a template named "my_partial.html.md.erb" with:
-    """
-    ## My Partial
-    <%= 'hello world' %>
-    """
-    And the Server is running
-    When I go to "/my_template.html"
-    Then I should see:
-    """
-    <h1>My Template</h1>
-    """
-    Then I should see:
-    """
-    <h2 id="my-partial">My Partial</h2>
-    """
-    Then I should see:
-    """
-    <p>hello world</p>
-    """
-  Scenario: Partials are parsed by multiple template engines: Outer template has .md.erb and inner .md.erb
-    Given a fixture app "partial-chained_templates-app"
-    And a template named "my_template.html.md.erb" with:
-    """
-    # My Template
-    <%= partial 'my_partial' %>
-    """
-    And a template named "my_partial.html.md.erb" with:
-    """
-    ## My Partial
-    <%= 'hello world' %>
-    """
-    And the Server is running
-    When I go to "/my_template.html"
-    Then I should see:
-    """
-    <h1 id="my-template">My Template</h1>
-    """
-    Then I should see:
-    """
-    <h2 id="my-partial">My Partial</h2>
-    """
-    Then I should see:
-    """
-    <p>hello world</p>
-    """
-  Scenario: Partials are parsed by multiple template engines: Outer template has .md.erb, and inner .erb
-    Given a fixture app "partial-chained_templates-app"
-    And a template named "my_template.html.md.erb" with:
-    """
-    # My Template
-    <%= partial 'my_partial' %>
-    """
-    And a template named "my_partial.html.erb" with:
-    """
-    <h2>My Partial</h2>
-    <%= 'hello world' %>
-    """
-    And the Server is running
-    When I go to "/my_template.html"
-    Then I should see:
-    """
-    <h1 id="my-template">My Template</h1>
-    """
-    Then I should see:
-    """
-    <h2>My Partial</h2>
-    """
-    Then I should see:
-    """
-    <p>hello world</p>
-    """
+    And the file "index.html" should contain "Sup</h3>"

data/features/clean_build.feature CHANGED Viewed

@@ -42,21 +42,3 @@ Feature: Build Clean
     Then the following files should not exist:
       | sub/dir/about.html         |
       | sub/dir/nested/nested.html |
-  Scenario: Build and clean an app under a hidden directory
-    Given a fixture app "clean-app"
-    And app "clean-app" is using config "hidden-dir-before"
-    And a built app at "clean-app"
-    Then the following files should exist:
-      | .build/index.html              |
-      | .build/should_be_ignored.html  |
-      | .build/should_be_ignored2.html |
-      | .build/should_be_ignored3.html |
-    Given app "clean-app" is using config "hidden-dir-after"
-    And a built app at "clean-app"
-    Then the following files should exist:
-      | .build/index.html              |
-    And the following files should not exist:
-      | .build/should_be_ignored.html  |
-      | .build/should_be_ignored2.html |
-      | .build/should_be_ignored3.html |

data/features/cli_init.feature CHANGED Viewed

@@ -38,114 +38,20 @@ Feature: Middleman CLI
     When I run `middleman n MY_PROJECT`
     Then a directory named "MY_PROJECT" should exist
-  Scenario: Create a new project with Rack
-    When I run `middleman init MY_PROJECT --rack`
-    Then a directory named "MY_PROJECT" should exist
-    When I cd to "MY_PROJECT"
-    Then the following files should exist:
-      | config.rb                                     |
-      | config.ru                                     |
-      | Gemfile                                       |
-  Scenario: Create a new HTML5 project
-    When I run `middleman init MY_PROJECT --template=html5`
-    Then a directory named "MY_PROJECT" should exist
-    When I cd to "MY_PROJECT"
-    Then the following files should exist:
-      | config.rb                                     |
-      | Gemfile                                       |
-    Then the following files should not exist:
-      | config.ru                                     |
-    And the file "config.rb" should contain "set :js_dir, 'js'"
-    Then a directory named "source" should exist
-    When I cd to "source"
-    Then the following files should exist:
-      | index.html.erb                                |
-      | layouts/layout.erb                            |
-      | humans.txt                                    |
-      | js/main.js                                    |
-  Scenario: Create a new HTML5 project with Rack
-    When I run `middleman init MY_PROJECT --rack --template=html5`
-    Then a directory named "MY_PROJECT" should exist
-    When I cd to "MY_PROJECT"
-    Then the following files should exist:
-      | config.rb                                     |
-      | config.ru                                     |
-      | Gemfile                                       |
-  Scenario: Create a new Mobile HTML5 project
-    When I run `middleman init MY_PROJECT --template=mobile`
-    Then a directory named "MY_PROJECT" should exist
-    When I cd to "MY_PROJECT"
-    Then the following files should exist:
-      | config.rb                                     |
-      | Gemfile                                       |
-    Then the following files should not exist:
-      | config.ru                                     |
-    Then a directory named "source" should exist
-    When I cd to "source"
-    Then the following files should exist:
-      | index.html                                    |
-      | humans.txt                                    |
-      | js/libs/respond.min.js                        |
-  Scenario: Create a new Mobile HTML5 project with Rack
-    When I run `middleman init MY_PROJECT --rack --template=mobile`
-    Then a directory named "MY_PROJECT" should exist
-    When I cd to "MY_PROJECT"
-    Then the following files should exist:
-      | config.rb                                     |
-      | config.ru                                     |
-      | Gemfile                                       |
-  Scenario: Enforce creation of Mobile HTML5 project
-    When I run `middleman init MY_PROJECT --template=mobile`
-    When I run `middleman init MY_PROJECT --template=mobile --force`
-    Then a directory named "MY_PROJECT" should exist
-    And the output should contain:
-    """
-    identical
-    """
-    And the output should contain:
-    """
-    exist
-    """
-  Scenario: Enforce creation of HTML5 project
-    When I run `middleman init MY_PROJECT --template=html5`
-    When I run `middleman init MY_PROJECT --template=html5 --force`
-    Then a directory named "MY_PROJECT" should exist
-    And the output should contain:
-    """
-    identical
-    """
-    And the output should contain:
-    """
-    exist
-    """
-  Scenario: Enforce creation of default project
-    When I run `middleman init MY_PROJECT --template=default`
-    When I run `middleman init MY_PROJECT --template=default --force`
-    Then a directory named "MY_PROJECT" should exist
-    And the output should contain:
-    """
-    identical
-    """
-    And the output should contain:
-    """
-    exist
-    """
-  Scenario: Enforce creation of empty project
-    When I run `middleman init MY_PROJECT --template=empty`
-    When I run `middleman init MY_PROJECT --template=empty --force`
-    Then a directory named "MY_PROJECT" should exist
-    And the output should contain:
-    """
-    identical
-    """
-    And the output should contain:
-    """
-    exist
-    """
+  # Scenario: Create a new HTML5 project
+  #   When I run `middleman init MY_PROJECT --template=html5`
+  #   Then a directory named "MY_PROJECT" should exist
+  #   When I cd to "MY_PROJECT"
+  #   Then the following files should exist:
+  #     | config.rb                                     |
+  #     | Gemfile                                       |
+  #   Then the following files should not exist:
+  #     | config.ru                                     |
+  #   And the file "config.rb" should contain "set :js_dir, 'js'"
+  #   Then a directory named "source" should exist
+  #   When I cd to "source"
+  #   Then the following files should exist:
+  #     | index.html.erb                                |
+  #     | layouts/layout.erb                            |
+  #     | humans.txt                                    |
+  #     | js/main.js                                    |