middleman-core 4.0.0.rc.1 → 4.0.0.rc.2

data/features/minify_javascript.feature

@@ -38,7 +38,7 @@ Feature: Minify Javascript
       I'm a jQuery {{template}}.
     </script>
     """
-    
+
   Scenario: Rendering inline js with a passthrough minifier
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
@@ -86,7 +86,7 @@ Feature: Minify Javascript
     </script>
     """
 
-  Scenario: Rendering inline css with a passthrough minifier using activate-style compressor
+  Scenario: Rendering inline JS with a passthrough minifier using activate-style compressor
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
@@ -119,7 +119,7 @@ Feature: Minify Javascript
       I'm a jQuery {{template}}.
     </script>
     """
-    
+
   Scenario: Rendering inline js with the feature enabled
     Given a fixture app "minify-js-app"
     And a file named "config.rb" with:
@@ -146,6 +146,42 @@ Feature: Minify Javascript
     </script>
     """
 
+  Scenario: Rendering inline js in a PHP document
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript, inline: true
+      """
+    And the Server is running at "minify-js-app"
+    When I go to "/inline-js.php"
+    Then I should see:
+    """
+    <?='Hello'?>
+
+    <script>
+      !function(){should(),all.be(),on={one:line}}();
+    </script>
+    <script type='text/javascript'>
+      //<!--
+    !function(){one,line(),here()}();
+      //-->
+    </script>
+    <script type='text/html'>
+      I'm a jQuery {{template}}.
+    </script>
+    """
+
+  Scenario: Rendering inline js in a proxied resource
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript, inline: true
+      proxy '/inline-js-proxy', '/inline-js.html', ignore: true
+      """
+    And the Server is running at "minify-js-app"
+    When I go to "/inline-js-proxy"
+    Then I should see "14" lines
+
   Scenario: Rendering external js with the feature enabled
     Given a fixture app "minify-js-app"
     And a file named "config.rb" with:
@@ -157,7 +193,18 @@ Feature: Minify Javascript
     Then I should see "1" lines
     When I go to "/more-js/other.js"
     Then I should see "1" lines
-    
+
+  Scenario: Rendering external js in a proxied resource
+    Given a fixture app "minify-js-app"
+    And a file named "config.rb" with:
+      """
+      activate :minify_javascript
+      proxy '/js-proxy', '/javascripts/js_test.js', ignore: true
+      """
+    And the Server is running at "minify-js-app"
+    When I go to "/js-proxy"
+    Then I should see "1" lines
+
   Scenario: Rendering external js with a passthrough minifier
     And the Server is running at "passthrough-app"
     When I go to "/javascripts/js_test.js"
@@ -172,7 +219,7 @@ Feature: Minify Javascript
     And the Server is running at "minify-js-app"
     When I go to "/inline-coffeescript.html"
     Then I should see "3" lines
-  
+
   Scenario: Rendering external js (coffeescript) with the feature enabled
     Given a fixture app "minify-js-app"
     And a file named "config.rb" with:
@@ -182,7 +229,7 @@ Feature: Minify Javascript
     And the Server is running at "minify-js-app"
     When I go to "/javascripts/coffee_test.js"
     Then I should see "1" lines
-    
+
   Scenario: Rendering inline js (coffeescript) with a passthrough minifier
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
@@ -200,7 +247,7 @@ Feature: Minify Javascript
     And the Server is running at "passthrough-app"
     When I go to "/inline-coffeescript.html"
     Then I should see "13" lines
-    
+
   Scenario: Rendering external js (coffeescript) with a passthrough minifier
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
@@ -216,4 +263,4 @@ Feature: Minify Javascript
     And the Server is running at "passthrough-app"
     When I go to "/javascripts/coffee_test.js"
     Then I should see "11" lines
-    
+

data/features/move_files.feature

@@ -0,0 +1,44 @@
+Feature: Move files
+
+  Scenario: Move one path to another
+    Given a fixture app "large-build-app"
+    And a file named "config.rb" with:
+    """
+    move_file "/static.html", "/static2.html"
+    """
+    And the Server is running at "large-build-app"
+    When I go to "/static.html"
+    Then I should see 'Not Found'
+    When I go to "/static2.html"
+    Then I should see 'Static, no code!'
+
+  Scenario: Move one path to another with directory indexes
+    Given a fixture app "large-build-app"
+    And a file named "config.rb" with:
+    """
+    activate :directory_indexes
+    move_file "/static.html", "/static2.html"
+    """
+    And the Server is running at "large-build-app"
+    When I go to "/static.html"
+    Then I should see 'Not Found'
+    When I go to "/static/index.html"
+    Then I should see 'Not Found'
+    When I go to "/static2.html"
+    Then I should see 'Static, no code!'
+
+  Scenario: Move one path to another with directory indexes (using dest path)
+    Given a fixture app "large-build-app"
+    And a file named "config.rb" with:
+    """
+    activate :directory_indexes
+    move_file "/static/index.html", "/static2.html"
+    """
+    And the Server is running at "large-build-app"
+    When I go to "/static.html"
+    Then I should see 'Not Found'
+    When I go to "/static/index.html"
+    Then I should see 'Not Found'
+    When I go to "/static2.html"
+    Then I should see 'Static, no code!'
+

data/features/redirects.feature

@@ -8,6 +8,7 @@ Feature: Meta redirects
     """
     And the Server is running at "large-build-app"
     When I go to "/hello.html"
+    Then I should see '<link rel="canonical" href="world.html"'
     Then I should see '<meta http-equiv=refresh content="0; url=world.html"'
 
   Scenario: Redirect to external site

data/features/relative_assets.feature

@@ -21,6 +21,12 @@ Feature: Relative Assets
     Given "relative_assets" feature is "disabled"
     And the Server is running at "relative-assets-app"
     When I go to "/relative_image.html"
+    Then I should see '"/stylesheets/relative_assets.css"'
+    Then I should see '"/javascripts/app.js"'
+    Then I should see "/images/blank.gif"
+    When I go to "/absolute_image_relative_css.html"
+    Then I should see '"stylesheets/relative_assets.css"'
+    Then I should see '"javascripts/app.js"'
     Then I should see "/images/blank.gif"
 
   Scenario: Rendering css with the feature enabled
@@ -53,10 +59,15 @@ Feature: Relative Assets
     When I cd to "build"
     Then the file "relative_image/index.html" should contain "../stylesheets/relative_assets.css"
 
-  Scenario: Rendering html with the feature enabled
+  Scenario: Rendering html with the feature enabled (overrides relative option on helpers)
     Given "relative_assets" feature is "enabled"
     And the Server is running at "relative-assets-app"
     When I go to "/relative_image.html"
+    Then I should see '"stylesheets/relative_assets.css"'
+    Then I should see '"javascripts/app.js"'
+    When I go to "/relative_image_absolute_css.html"
+    Then I should see '"stylesheets/relative_assets.css"'
+    Then I should see '"javascripts/app.js"'
     Then I should not see "/images/blank.gif"
     And I should see "images/blank.gif"
 
@@ -110,4 +121,4 @@ Feature: Relative Assets
       """
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
-    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
+    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'

data/features/slim.feature

@@ -78,4 +78,4 @@ Feature: Support slim templating language
     When I go to "/sass.html"
     Then I should see "html,body,div"
     When I go to "/error.html"
-    Then I should see "Error: Invalid"
+    Then I should see "Error:"

data/features/stylus.feature

@@ -1,4 +1,3 @@
-@nojava
 Feature: Stylus Updates and Partials
   Scenario: The preview server should update stylesheets when Stylus changes
     Given the Server is running at "stylus-preview-app"

data/features/support/env.rb

@@ -1,9 +1,13 @@
 ENV["TEST"] = "true"
-ENV["AUTOLOAD_SPROCKETS"] ||= "false"
+
+require 'sassc'
 
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
+
 require 'coveralls'
 Coveralls.wear!
 

data/features/support/preserve_mime_types.rb

@@ -0,0 +1,7 @@
+Around('@preserve_mime_types') do |_scenario, block|
+  mime_types = ::Rack::Mime::MIME_TYPES.clone
+
+  block.call
+
+  ::Rack::Mime::MIME_TYPES.replace mime_types
+end

data/fixtures/asset-hash-app/source/stylesheets/site.css.scss

@@ -1,4 +1,4 @@
 #main {
   padding: 50px;
-  background-image: image-url('100px.jpg');
-}
+  background-image: url('/images/100px.jpg');
+}

data/fixtures/asset-hash-app/source/stylesheets/uses_fonts.css

@@ -0,0 +1,4 @@
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('../fonts/fontawesome-webfont.woff2') format('woff2'), url('../fonts/fontawesome-webfont.woff') format('woff');
+}

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

@@ -39,4 +39,8 @@
 <%= image_tag "blank1031.gif" %>
 <%= image_tag "blank1032.gif" %>
 <%= image_tag "blank1033.gif" %>
-<%= image_tag "blank1034.gif" %>
+<%= image_tag "blank1034.gif" %>
+
+<a href="https://github.com/angular/angular.js">Angular.js</a>
+
+<script>(function(a,b,c,d){})(window,document,'script','//www.example.com/script.js');</script>

data/fixtures/chained-app/source/test.erb.combobreaker.str.erb

@@ -0,0 +1,8 @@
+---
+layout: false
+sup: "Sup"
+---
+
+<h1>#{"<%= data.article.title %>"}</h1>
+<h2>#{"<%= data.article.subtitle %>"}</h2>
+<h3>#{"<%= current_page.data.sup %>"}</h3>

data/fixtures/clean-app/config-hidden-dir-after.rb

@@ -0,0 +1,5 @@
+set :build_dir, ".build"
+
+ignore "/should_be_ignored.html"
+ignore "/should_be_ignored2.html"
+proxy "/target_ignore.html", "/should_be_ignored3.html", ignore: true

data/fixtures/clean-app/config-hidden-dir-before.rb

@@ -0,0 +1 @@
+set :build_dir, ".build"

data/fixtures/content-type-app/source/index.php

@@ -0,0 +1 @@
+<?="I'm a PHP file!"?>

data/fixtures/extension-api-deprecations-app/config.rb

@@ -0,0 +1,11 @@
+class LayoutDisabler < Middleman::Extension
+  def initialize(app, options_hash = {}, &block)
+    super
+
+    app.set :layout, false
+  end
+end
+
+::Middleman::Extensions.register(:layout_disabler, LayoutDisabler)
+
+activate :layout_disabler

data/fixtures/extension-api-deprecations-app/source/index.html.erb

@@ -0,0 +1 @@
+In Index

data/fixtures/extension-api-deprecations-app/source/layouts/layout.erb

@@ -0,0 +1,3 @@
+In Layout
+
+<%= yield %>

data/fixtures/frontmatter-app/config.rb

@@ -0,0 +1 @@
+config[:frontmatter_delims][:yaml] << %w(\\--- \\---)

data/fixtures/frontmatter-app/source/front-matter-haml.html.haml

@@ -0,0 +1,6 @@
+\---
+layout: false
+title: This is the title
+\---
+
+%h1= current_page.data.title

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

@@ -15,7 +15,7 @@ class NeighborFrontmatter < ::Middleman::Extension
 
       next unless file
 
-      fmdata = ::Middleman::Util::Data.parse(file[:full_path], :yaml).first
+      fmdata = ::Middleman::Util::Data.parse(file[:full_path], app.config[:frontmatter_delims], :yaml).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)

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

@@ -26,7 +26,7 @@ class NeighborFrontmatter < ::Middleman::Extension
   end
 
   def apply_neighbor_data(resource, file)
-    fmdata = ::Middleman::Util::Data.parse(file[:full_path], :yaml).first
+    fmdata = ::Middleman::Util::Data.parse(file[:full_path], app.config[:frontmatter_delims], :yaml).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)

data/fixtures/i18n-test-app/source/localizable/partials/index.html.erb

@@ -1,6 +1,8 @@
+<%= ::I18n.locale %>
+
 Site: <%= partial :site %>
 Country: <%= partial :country %>
 Greeting: <%= partial :greeting %>
 State: <%= partial :state %>
 Flag: <%= partial "images/flag.svg" %>
-President: <%= partial "images/president.svg" %>
+President: <%= partial "images/president.svg" %>

data/fixtures/import-app/bower.json

@@ -0,0 +1,21 @@
+{
+  "name": "import-app",
+  "homepage": "https://github.com/middleman/middleman",
+  "authors": [
+    "Thomas Reynolds <me@tdreyno.com>"
+  ],
+  "description": "",
+  "main": "",
+  "moduleType": [],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": "~2.1.4"
+  }
+}

data/fixtures/import-app/bower_components/jquery/.bower.json

@@ -0,0 +1,39 @@
+{
+  "name": "jquery",
+  "version": "2.1.4",
+  "main": "dist/jquery.js",
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "build",
+    "dist/cdn",
+    "speed",
+    "test",
+    "*.md",
+    "AUTHORS.txt",
+    "Gruntfile.js",
+    "package.json"
+  ],
+  "devDependencies": {
+    "sizzle": "2.1.1-jquery.2.1.2",
+    "requirejs": "2.1.10",
+    "qunit": "1.14.0",
+    "sinon": "1.8.1"
+  },
+  "keywords": [
+    "jquery",
+    "javascript",
+    "library"
+  ],
+  "homepage": "https://github.com/jquery/jquery",
+  "_release": "2.1.4",
+  "_resolution": {
+    "type": "version",
+    "tag": "2.1.4",
+    "commit": "7751e69b615c6eca6f783a81e292a55725af6b85"
+  },
+  "_source": "git://github.com/jquery/jquery.git",
+  "_target": "~2.1.4",
+  "_originalSource": "jquery",
+  "_direct": true
+}

data/fixtures/import-app/bower_components/jquery/MIT-LICENSE.txt

@@ -0,0 +1,21 @@
+Copyright 2014 jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/fixtures/import-app/bower_components/jquery/bower.json

@@ -0,0 +1,28 @@
+{
+  "name": "jquery",
+  "version": "2.1.4",
+  "main": "dist/jquery.js",
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "build",
+    "dist/cdn",
+    "speed",
+    "test",
+    "*.md",
+    "AUTHORS.txt",
+    "Gruntfile.js",
+    "package.json"
+  ],
+  "devDependencies": {
+    "sizzle": "2.1.1-jquery.2.1.2",
+    "requirejs": "2.1.10",
+    "qunit": "1.14.0",
+    "sinon": "1.8.1"
+  },
+  "keywords": [
+    "jquery",
+    "javascript",
+    "library"
+  ]
+}