middleman-core 4.2.1 → 4.3.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27623f60c1192955ffca53ed17a11b631703a18c
-  data.tar.gz: 5e6f125ef24be52c4c1baff0047dbe188abec888
+  metadata.gz: 52f86ed81089423f830d056b3618e36218d4e478
+  data.tar.gz: a70572a4e9e68a10ce50860dee7b1bbf012e38d7
 SHA512:
-  metadata.gz: a72cb26efa7fb14c1e76c7c37ce7d82adc6f31e4d2467642611fc94a67a22e890ea9714c522e110c2ae7c32ade3192771cd9687981690380a75a98d630cc1096
-  data.tar.gz: fce5b0d259c3069ef44acc2a1dd1649ea277e37384a7b8bbab20da3a982803ff09b08b496abda03e5c927eae89b289bae772dda07fff24c30014e640cafe21ea
+  metadata.gz: f9e6f7ff55b3a7cfb86f966a1ba8c2bdfcbef8481ffcbcfce66d46febd5ad8edd297f813bf1e4e7ccc1b7fd6258a1271752f22180983d9a9ca9d0a2057d0518b
+  data.tar.gz: e27b12b8c5888a6b5eacd3bf9ae72c7d6b370b09ecc3c71182cf2a4f1f18b1a33347f60b81ee3a17556f7a7a6d8b7ae3ab89de3e14eda4f08ef40b8dac3da071

data/features/asset_hash.feature

@@ -63,8 +63,8 @@ Feature: Assets get file hashes appended to them and references to them are upda
     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-d1a750ca.css"'
-    And I should see 'href="stylesheets/fragment-99b76247.css"'
+    And I should see 'href="stylesheets/site-47c40978.css"'
+    And I should see 'href="stylesheets/fragment-313b648b.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"'
@@ -72,11 +72,11 @@ Feature: Assets get file hashes appended to them and references to them are upda
     And I should see 'src="images/100px-5fd6fb90.jpg?#test"'
     And I should see 'src="images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="../stylesheets/site-d1a750ca.css"'
+    Then I should see 'href="../stylesheets/site-47c40978.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-d1a750ca.css"'
+    Then I should see 'href="../stylesheets/site-47c40978.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     And I should see 'src="../images/100px-5fd6fb90.jpg?test"'
@@ -84,7 +84,7 @@ Feature: Assets get file hashes appended to them and references to them are upda
     And I should see 'src="../images/100px-5fd6fb90.jpg#test"'
     When I go to "/javascripts/application-1d8d5276.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-d1a750ca.css"
+    When I go to "/stylesheets/site-47c40978.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'
@@ -94,7 +94,7 @@ Feature: Assets get file hashes appended to them and references to them are upda
     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 "/stylesheets/fragment-99b76247.css"
+    When I go to "/stylesheets/fragment-313b648b.css"
     And I should see 'url("../images/100px-5fd6fb90.jpg");'
     And I should see 'url("../images/100px-5fd6fb90.jpg?test");'
     And I should see 'url("../images/100px-5fd6fb90.jpg?#test");'
@@ -179,14 +179,14 @@ Feature: Assets get file hashes appended to them and references to them are upda
         font-size: 14px
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-4d4e34e6.css'
+    Then I should see 'href="../stylesheets/uses_partials-58447acf.css'
     And the file "source/stylesheets/_partial.sass" has the contents
       """
       body
         font-size: 18px !important
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-ec347271.css'
+    Then I should see 'href="../stylesheets/uses_partials-72fbbb45.css'
 
   Scenario: The asset hash should change when a Rack-based filter changes
     Given a fixture app "asset-hash-app"
@@ -200,8 +200,8 @@ Feature: Assets get file hashes appended to them and references to them are upda
       """
     Given the Server is running at "asset-hash-app"
     When I go to "/"
-    Then I should see 'href="stylesheets/site-5ad7def0.css'
-    When I go to "stylesheets/site-5ad7def0.css"
+    Then I should see 'href="stylesheets/site-41d4c812.css'
+    When I go to "stylesheets/site-41d4c812.css"
     Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
     Then I should see 'Added by Rack filter'
 

data/features/builder.feature

@@ -41,7 +41,7 @@ Feature: Builder
 
   Scenario: Build empty errors
     Given a built app at "empty-app"
-    Then the exit status should be 1
+    Then was not successfully built
 
   Scenario: Build external_pipeline errors
     Given a built app at "external-pipeline-error"

data/features/chained_templates.feature

@@ -7,6 +7,13 @@ Feature: Templates should be chainable
     Then I should see "Title</h1>"
     And I should see "Subtitle</h2>"
     And I should see "Sup</h3>"
+    When I go to "/stylesheets/main.css"
+
+  Scenario: Scss file in Erb
+    Given the Server is running at "chained-app"
+    When I go to "/stylesheets/main.css"
+    Then I should see "color: from_main;"
+    And I should see "background: from_sub;"
 
   Scenario: Build chained template
     Given a successfully built app at "chained-app"

data/features/console.feature

@@ -2,7 +2,7 @@ Feature: Console
 
   Scenario: Enter and exit the console
     Given a fixture app "large-build-app"
-    When I run `middleman console` interactively
+    When I run the interactive middleman console
     And I type "puts 'Hello from the console.'"
     And I type "exit"
     Then it should pass with:

data/features/extension_api_deprecations.feature

@@ -1,9 +1,7 @@
 Feature: Extension author could use some hooks
 
   Scenario: When build
-    Given a fixture app "extension-api-deprecations-app"
-    When I run `middleman build`
-    Then the exit status should be 0
+    Given a successfully built app at "extension-api-deprecations-app"
     And the output should contain "`set :layout` is deprecated"
     And the file "build/index.html" should contain "In Index"
     And the file "build/index.html" should not contain "In Layout"

data/features/extension_hooks.feature

@@ -1,9 +1,7 @@
 Feature: Extension author could use some hooks
 
   Scenario: When build
-    Given a fixture app "extension-hooks-app"
-    When I run `middleman build`
-    Then the exit status should be 0
+    Given a successfully built app at "extension-hooks-app"
     And the output should contain "/// after_configuration ///"
     And the output should contain "/// ready ///"
     And the output should contain "/// before_build ///"

data/features/i18n_link_to.feature

@@ -34,6 +34,8 @@ Feature: i18n Paths
       <%= link_to "Other Home", "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en %>
       <% link_to "/index.html", class: 'current' do %><span>Home: Current Block</span><% end %>
       <% link_to "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en do %><span>Home: Other Block</span><% end %>
+      <%= link_to "Current Foobar", "/foobar.html", class: 'current' %>
+      <%= link_to "Other Foobar", "/foobar.html", title: "Other Foobar", locale: ::I18n.locale == :en ? :es : :en %>
 
       <% data.pages.each_with_index do |p, i| %>
         <%= link_to "Current #{p}", "/#{p}", class: 'current' %>
@@ -42,6 +44,14 @@ Feature: i18n Paths
         <% link_to "/#{p}", title: "Other #{p}", locale: ::I18n.locale == :en ? :es : :en do %><span>Other Block</span><% end %>
       <% end %>
       """
+    And a file named "source/localizable/foobar.en.html.erb" with:
+      """
+      English foobar
+      """
+    And a file named "source/localizable/foobar.es.html.erb" with:
+      """
+      Spanish foobar
+      """
     And a file named "config.rb" with:
       """
       set :strip_index_file, false
@@ -58,6 +68,8 @@ Feature: i18n Paths
     Then I should see '<a href="/es/hola.html" title="Other hello.html">Other hello.html</a>'
     Then I should see '<a href="/hello.html" class="current"><span>Current Block</span></a>'
     Then I should see '<a href="/es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
+    Then I should see '<a href="/foobar.html" class="current">Current Foobar</a>'
+    Then I should see '<a href="/es/foobar.html" title="Other Foobar">Other Foobar</a>'
     When I go to "/es/hola.html"
     Then I should see "Page: Hola"
     Then I should see '<a href="/es/index.html" class="current">Current Home</a>'
@@ -68,6 +80,8 @@ Feature: i18n Paths
     Then I should see '<a href="/hello.html" title="Other hello.html">Other hello.html</a>'
     Then I should see '<a href="/es/hola.html" class="current"><span>Current Block</span></a>'
     Then I should see '<a href="/hello.html" title="Other hello.html"><span>Other Block</span></a>'
+    Then I should see '<a href="/es/foobar.html" class="current">Current Foobar</a>'
+    Then I should see '<a href="/foobar.html" title="Other Foobar">Other Foobar</a>'
 
   Scenario: link_to is i18n aware and supports relative_links
     Given a fixture app "empty-app"
@@ -162,6 +176,7 @@ Feature: i18n Paths
       es:
         paths:
           hello: "hola"
+          form: "formulario"
         msg: Hola
       """
     And a file named "source/localizable/hello.html.erb" with:
@@ -172,6 +187,10 @@ Feature: i18n Paths
         Other: <%= url_for "/#{p}", locale: ::I18n.locale == :en ? :es : :en %>
       <% end %>
       """
+    And a file named "source/localizable/form.html.erb" with:
+      """
+      Other: <%= url_for "/form.html", query: { foo: 'bar' }, fragment: "deep", locale: ::I18n.locale == :en ? :es : :en %>
+      """
     And a file named "source/localizable/article.html.erb" with:
       """
       Page Lang: Default
@@ -199,6 +218,10 @@ Feature: i18n Paths
     Then I should see "Page: Hola"
     Then I should see 'Current: /es/hola.html'
     Then I should see 'Other: /hello.html'
+    When I go to "/form.html"
+    Then I should see 'Other: /es/formulario.html?foo=bar#deep'
+    When I go to "/es/formulario.html"
+    Then I should see 'Other: /form.html?foo=bar#deep'
     When I go to "/article.html"
     Then I should see "Page Lang: Default"
     Then I should see 'Current: /article.html'

data/features/i18n_preview.feature

@@ -32,6 +32,10 @@ Feature: i18n Preview
     Then I should see "Buenos días"
     When I go to "/es/una.html"
     Then I should see "Solamente una"
+    When I go to "/terms-and-conditions.html"
+    Then I should see "Terms & Conditions"
+    When I go to "/es/terms-and-conditions.html"
+    Then I should see "Condiciones Generales"
 
   Scenario: A template changes i18n during preview
     Given a fixture app "i18n-test-app"
@@ -249,4 +253,4 @@ Feature: i18n Preview
     Then I should see "More"
     When I go to "/es/"
     Then I should see "Como Esta?"
-    Then I should see "Mucho"
+    Then I should see "Mucho"

data/features/ignore.feature

@@ -7,11 +7,12 @@ Feature: Ignoring paths
       ignore 'plain.html'
       """
     And a successfully built app at "ignore-app"
+    When I cd to "build"
     Then the following files should exist:
-      | build/index.html |
+      | index.html |
     And the following files should not exist:
-      | build/plain.html |
-      | build/about.html |
+      | plain.html |
+      | about.html |
 
   Scenario: Ignore a single path (server)
     Given a fixture app "ignore-app"
@@ -66,16 +67,17 @@ Feature: Ignoring paths
       ignore 'images/**/*.png'
       """
     And a successfully built app at "ignore-app"
+    When I cd to "build"
     Then the following files should exist:
-      | build/plain.html |
-      | build/images/portrait.jpg |
-      | build/images/pic.png |
+      | plain.html |
+      | images/portrait.jpg |
+      | images/pic.png |
     And the following files should not exist:
-      | build/about.html |
-      | build/index.html |
-      | build/reports/index.html |
-      | build/reports/another.html |
-      | build/images/icons/messages.png |
+      | about.html |
+      | index.html |
+      | reports/index.html |
+      | reports/another.html |
+      | images/icons/messages.png |
 
   Scenario: Ignore a globbed path (server)
     Given a fixture app "ignore-app"
@@ -148,3 +150,57 @@ Feature: Ignoring paths
     Then I should see "File Not Found"
     When I go to "/images/icons/messages.png"
     Then I should see "File Not Found"
+
+  Scenario: Ignore localized templates (build)
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n
+      ignore 'localizable/hello.html.erb'
+      ignore /morning/
+      ignore 'localizable/*.md'
+      """
+    And a successfully built app at "i18n-test-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+      | es/index.html |
+    And the following files should not exist:
+      | hello.html |
+      | morning.html |
+      | one.html |
+      | es/hola.html |
+      | es/manana.html |
+      | es/una.html |
+      | es/hello.html |
+      | es/morning.html |
+      | es/one.html |
+    And the file "index.html" should contain "Howdy"
+    And the file "es/index.html" should contain "Como Esta?"
+
+  Scenario: Ignore localized templates (server)
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n
+      ignore 'localizable/hello.html.erb'
+      ignore /morning/
+      ignore 'localizable/*.md'
+      """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should not see "File Not Found"
+    When I go to "/es/index.html"
+    Then I should not see "File Not Found"
+    When I go to "/hello.html"
+    Then I should see "File Not Found"
+    When I go to "/morning.html"
+    Then I should see "File Not Found"
+    When I go to "/one.html"
+    Then I should see "File Not Found"
+    When I go to "/es/hola.html"
+    Then I should see "File Not Found"
+    When I go to "/es/manana.html"
+    Then I should see "File Not Found"
+    When I go to "/es/una.html"
+    Then I should see "File Not Found"

data/features/minify_javascript.feature

@@ -19,23 +19,23 @@ Feature: Minify Javascript
       })();
     </script>
     <script>
-      ;(function() {
-        this;
-        should();
-        too();
-      })();
+    ;(function() {
+      this;
+      should();
+      too();
+    })();
     </script>
     <script type='text/javascript'>
-      //<!--
-      ;(function() {
-        one;
-        line();
-        here();
-      })();
-      //-->
+    //<!--
+    ;(function() {
+      one;
+      line();
+      here();
+    })();
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -66,23 +66,23 @@ Feature: Minify Javascript
       })();
     </script>
     <script>
-      ;(function() {
-        this;
-        should();
-        too();
-      })();
+    ;(function() {
+      this;
+      should();
+      too();
+    })();
     </script>
     <script type='text/javascript'>
-      //<!--
-      ;(function() {
-        one;
-        line();
-        here();
-      })();
-      //-->
+    //<!--
+    ;(function() {
+      one;
+      line();
+      here();
+    })();
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -108,15 +108,15 @@ Feature: Minify Javascript
       Hello
     </script>
     <script>
-      Hello
+    Hello
     </script>
     <script type='text/javascript'>
-      //<!--
+    //<!--
     Hello
-      //-->
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 
@@ -134,15 +134,15 @@ Feature: Minify Javascript
       !function(){should(),all.be(),on={one:line}}();
     </script>
     <script>
-      !function(){should(),too()}();
+    !function(){should(),too()}();
     </script>
     <script type='text/javascript'>
-      //<!--
+    //<!--
     !function(){one,line(),here()}();
-      //-->
+    //-->
     </script>
     <script type='text/html'>
-      I'm a jQuery {{template}}.
+    I'm a jQuery {{template}}.
     </script>
     """
 

data/features/mount_rack.feature

@@ -1,3 +1,4 @@
+@wip
 Feature: Support Rack apps mounted using map
 
   Scenario: Mounted Rack App at /sinatra

data/features/relative_assets_helpers_only.feature

@@ -6,7 +6,7 @@ Feature: Relative Assets (Helpers Only)
       """
       activate :relative_assets, helpers_only: true
       """
-    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+    And a file named "source/stylesheets/relative_assets_helper.css.sass.erb" with:
       """
       h1
         background: url("<%= asset_url('images/blank.gif') %>")
@@ -38,7 +38,7 @@ Feature: Relative Assets (Helpers Only)
       }
       """
     And the Server is running at "relative-assets-app"
-    When I go to "/stylesheets/relative_assets.css"
+    When I go to "/stylesheets/relative_assets_helper.css"
     Then I should see 'url("../images/blank.gif'
     And I should see 'url("../images/blank2.gif'
     When I go to "/javascripts/application.js"
@@ -96,7 +96,7 @@ Feature: Relative Assets (Helpers Only)
         '/stylesheets/fonts3.css',
       ], helpers_only: true
       """
-    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
+    And a file named "source/stylesheets/relative_assets_helper.css.sass.erb" with:
       """
       h1
         background: url("<%= asset_url('images/blank.gif') %>")
@@ -117,7 +117,7 @@ Feature: Relative Assets (Helpers Only)
       }
       """
     And the Server is running at "relative-assets-app"
-    When I go to "/stylesheets/relative_assets.css"
+    When I go to "/stylesheets/relative_assets_helper.css"
     Then I should see 'url("../images/blank.gif'
     When I go to "/stylesheets/fonts3.css"
     Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'

data/features/support/env.rb

@@ -8,11 +8,8 @@ SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 require 'phantomjs/poltergeist'
 Capybara.javascript_driver = :poltergeist
 
-require 'coveralls'
-Coveralls.wear!
-
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core')

data/fixtures/chained-app/source/stylesheets/main.css.scss.erb

@@ -0,0 +1,3 @@
+@import 'sub';
+
+<%= 'body { color: from_main; }' %>

data/fixtures/chained-app/source/stylesheets/sub.scss

@@ -0,0 +1 @@
+body { background: from_sub; }

data/fixtures/generator-test/config.rb

@@ -1,16 +1,3 @@
-###
-# Compass
-###
-
-# Susy grids in Compass
-# First: gem install compass-susy-plugin
-# require 'susy'
-
-# Change Compass configuration
-# compass_config do |config|
-#   config.output_style = :compact
-# end
-
 ###
 # Page options, layouts, aliases and proxies
 ###
@@ -53,7 +40,6 @@
 
 # Production configuration
 configure :production do
-  # For example, change the Compass output style for deployment
   # activate :minify_css
 
   # Minify Javascript

data/fixtures/i18n-test-app/locales/en.yml

@@ -1,4 +1,10 @@
 ---
 en:
+  paths:
+    hello: "hello"
+    morning: "morning"
+    tac: "terms-and-conditions"
+
   greetings: "Howdy"
-  hi: "Hello"
+  hi: "Hello"
+  tac: "Terms & Conditions"

data/fixtures/i18n-test-app/locales/es.yml

@@ -4,6 +4,7 @@ es:
     hello: "hola"
     morning: "manana"
     one: "una"
-  
+
   greetings: "Como Esta?"
   hi: "Hola"
+  tac: "Condiciones Generales"

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

@@ -0,0 +1 @@
+<%= I18n.t('tac') %>

data/lib/middleman-core/application.rb

@@ -345,13 +345,14 @@ module Middleman
 
     # Clean up missing Tilt exts
     def prune_tilt_templates!
-      ::Tilt.default_mapping.lazy_map.each_key do |key|
+      mapping = ::Tilt.default_mapping
+      mapping.lazy_map.each_key do |key|
         begin
-          ::Tilt[".#{key}"]
+          mapping[key]
         rescue LoadError, NameError
-          ::Tilt.default_mapping.lazy_map.delete(key)
         end
       end
+      mapping.lazy_map.clear
     end
 
     # Whether we're in a specific mode

data/lib/middleman-core/builder.rb

@@ -184,8 +184,8 @@ module Middleman
                           ])
       file.binmode
       file.write(contents)
-      file.close
       File.chmod(0o644, file)
+      file.close
       file
     end
 

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

@@ -32,7 +32,7 @@ module Middleman
 
         # Tell the file watcher to observe the :data_dir
         @watcher = app.files.watch :data,
-                                   path: File.join(app.root, dir),
+                                   path: File.expand_path(dir, app.root),
                                    only: DATA_FILE_MATCHER
 
         # Setup data files before anything else so they are available when

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

@@ -155,6 +155,8 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     # If it's a "localizable template"
     localizable_folder_resources.each do |resource|
+      next if resource.ignored?
+
       page_id = File.basename(resource.path, File.extname(resource.path))
       locales.each do |locale|
         # Remove folder name
@@ -174,6 +176,8 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     # If it uses file extension localization
     file_extension_resources.each do |resource|
+      next if resource.ignored?
+
       result = parse_locale_extension(resource.path)
       ext_locale, path, page_id = result
       new_resources << build_resource(path, resource.path, page_id, ext_locale)
@@ -183,6 +187,12 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
     @lookup = new_resources.each_with_object({}) do |desc, sum|
       abs_path = desc.source_path.sub(options[:templates_dir], '')
+
+      # Process templates with locale suffix
+      locales.each do |locale|
+        abs_path = abs_path.sub(".#{locale}.", ".")
+      end
+
       sum[abs_path] ||= {}
       sum[abs_path][desc.locale] = '/' + desc.path
     end
@@ -194,10 +204,13 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
 
   Contract String, Symbol => Maybe[String]
   def localized_path(path, locale)
-    lookup_path = path.dup
-    lookup_path << app.config[:index_file] if lookup_path.end_with?('/')
-
-    @lookup[lookup_path] && @lookup[lookup_path][locale]
+    begin
+      lookup = ::Middleman::Util.parse_uri(path)
+      lookup.path << app.config[:index_file] if lookup.path && lookup.path.end_with?('/')
+      lookup.to_s if @lookup[lookup.path] && lookup.path = @lookup[lookup.path][locale]
+    rescue ::Addressable::URI::InvalidURIError
+      nil
+    end
   end
 
   Contract Symbol => String
@@ -272,7 +285,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
   def build_resource(path, source_path, page_id, locale)
     old_locale = ::I18n.locale
     ::I18n.locale = locale
-    localized_page_id = ::I18n.t("paths.#{page_id}", default: page_id, fallback: [])
+    localized_page_id = ::I18n.t("paths.#{page_id}", default: page_id)
 
     partially_localized_path = ''
 

data/lib/middleman-core/extension.rb

@@ -53,15 +53,16 @@ module Middleman
   #
   # Common lifecycle events can be handled by extensions simply by implementing an appropriately-named method:
   #
+  # * {#before_configuration}
   # * {#after_configuration}
-  # * {#after_build}
   # * {#before_build}
+  # * {#after_build}
+  # * {#ready}
   #
   # There are also some less common hooks that can be listened to from within an extension's `initialize` method:
   #
-  # * `app.before_render {|body, path, locs, template_class| ... }` - Manipulate template sources before they are rendered.
-  # * `app.after_render {|content, path, locs, template_class| ... }` - Manipulate output text after a template has been rendered. It is also common to install a Rack middleware to do this instead.
-  # * `app.ready { ... }` - Run code once Middleman is ready to serve or build files (after `after_configuration`).
+  # * `app.before_render { |body, path, locs, template_class| ... }` - Manipulate template sources before they are rendered.
+  # * `app.after_render { |content, path, locs, template_class| ... }` - Manipulate output text after a template has been rendered. It is also common to install a Rack middleware to do this instead.
 
   #
   # @see http://middlemanapp.com/advanced/custom/ Middleman Custom Extensions Documentation

data/lib/middleman-core/extension_manager.rb

@@ -24,6 +24,10 @@ module Middleman
       @app.after_configuration_eval(&method(:activate_all))
     end
 
+    def active?(key)
+      @activated.key?(key)
+    end
+
     def auto_activate(key)
       ::Middleman::Extensions.auto_activate(key, @app)
     end
@@ -60,7 +64,7 @@ module Middleman
         @activated[ext_name] ||= {}
         key = "instance_#{@activated[ext_name].keys.length}"
         @activated[ext_name][key] = extension.new(@app, options, &block)
-      elsif @activated.key?(ext_name)
+      elsif active?(ext_name)
         raise "#{ext_name} has already been activated and cannot be re-activated."
       else
         @activated[ext_name] = extension.new(@app, options, &block)

data/lib/middleman-core/extensions/minify_javascript.rb

@@ -10,7 +10,7 @@ class Middleman::Extensions::MinifyJavascript < ::Middleman::Extension
     require 'uglifier'
     ::Uglifier.new
   }, 'Set the JS compressor to use.'
-  option :content_types, %w(application/javascript), 'Content types of resources that contain JS'
+  option :content_types, %w(application/javascript application/ld+json), 'Content types of resources that contain JS'
   option :inline_content_types, %w(text/html text/php), 'Content types of resources that contain inline JS'
 
   def ready

data/lib/middleman-core/preview_server.rb

@@ -268,7 +268,8 @@ module Middleman
         begin
           ::WEBrick::HTTPServer.new(http_opts)
         rescue Errno::EADDRINUSE
-          $stderr.puts %(== Port "#{http_opts[:Port]}" is in use. This should not have happened. Please start "middleman server" again.)
+          port = http_opts[:Port]
+          $stderr.puts %(== Port #{port} is already in use. This could mean another instance of middleman is already running. Please make sure port #{port} is free and start `middleman server` again, or choose another port by running `middleman server —-port=#{port + 1}` instead.)
         end
       end
 

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

@@ -30,6 +30,10 @@ module Middleman
 
       def evaluate(scope, locals, &block)
         options = {}.merge!(@options).merge!(filename: eval_file, line: line, context: @context || scope)
+        if options.include?(:outvar)
+          options[:buffer] = options.delete(:outvar)
+          options[:save_buffer] = true
+        end
         @engine = ::Haml::Engine.new(data, options)
         output = @engine.render(scope, locals, &block)
 
@@ -44,6 +48,9 @@ module Middleman
 
         ::Haml::Options.defaults[:context] = nil
         ::Haml::Options.send :attr_accessor, :context
+        if defined?(::Haml::TempleEngine)
+          ::Haml::TempleEngine.define_options context: nil
+        end
 
         # rubocop:disable NestedMethodDefinition
         [::Haml::Filters::Sass, ::Haml::Filters::Scss, ::Haml::Filters::Markdown].each do |f|

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

@@ -11,7 +11,7 @@ module Middleman
       end
 
       # Called by Liquid to retrieve a template file
-      def read_template_file(template_path, _)
+      def read_template_file(template_path)
         file = app.files.find(:source, "_#{template_path}.liquid")
         raise ::Liquid::FileSystemError, "No such template '#{template_path}'" unless file
         file.read

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

@@ -238,11 +238,11 @@ module Middleman
 
                 # Rebuild cache
                 @resources.each do |resource|
-                  @_lookup_by_path[resource.path] = resource
+                  @_lookup_by_path[::Middleman::Util.normalize_path(resource.path)] = resource
                 end
 
                 @resources.each do |resource|
-                  @_lookup_by_destination_path[resource.destination_path] = resource
+                  @_lookup_by_destination_path[::Middleman::Util.normalize_path(resource.destination_path)] = resource
                 end
 
                 # NB: This needs to be done after the previous two steps,

data/lib/middleman-core/step_definitions/builder_steps.rb

@@ -6,6 +6,10 @@ end
 
 Given /^a built app at "([^\"]*)"$/ do |path|
   step %Q{a fixture app "#{path}"}
+
+  cwd = File.expand_path(aruba.current_directory)
+  step %Q{I set the environment variable "MM_ROOT" to "#{cwd}"}
+
   step %Q{I run `middleman build --verbose`}
 end
 
@@ -15,6 +19,12 @@ Given /^was successfully built$/ do
   step %Q{a directory named "build" should exist}
 end
 
+Given /^was not successfully built$/ do
+  step %Q{the output should not contain "Project built successfully."}
+  step %Q{the exit status should be 1}
+  step %Q{a directory named "build" should not exist}
+end
+
 Given /^a successfully built app at "([^\"]*)"$/ do |path|
   step %Q{a built app at "#{path}"}
   step %Q{was successfully built}
@@ -22,6 +32,10 @@ end
 
 Given /^a built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, flags|
   step %Q{a fixture app "#{path}"}
+  
+  cwd = File.expand_path(aruba.current_directory)
+  step %Q{I set the environment variable "MM_ROOT" to "#{cwd}"}
+
   step %Q{I run `middleman build #{flags}`}
 end
 
@@ -29,3 +43,15 @@ Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path,
   step %Q{a built app at "#{path}" with flags "#{flags}"}
   step %Q{was successfully built}
 end
+
+Given /^I run the interactive middleman console$/ do
+  cwd = File.expand_path(aruba.current_directory)
+  step %Q{I set the environment variable "MM_ROOT" to "#{cwd}"}
+  step %Q{I run `middleman console` interactively}
+end
+
+Given /^I run the interactive middleman server$/ do
+  cwd = File.expand_path(aruba.current_directory)
+  step %Q{I set the environment variable "MM_ROOT" to "#{cwd}"}
+  step %Q{I run `middleman server` interactively}
+end

data/lib/middleman-core/step_definitions/commandline_steps.rb

@@ -1,11 +1,11 @@
 When /^I stop (?:middleman|all commands) if the output( of the last command)? contains:$/ do |last_command, expected|
   begin
-    Timeout.timeout(exit_timeout) do
+    Timeout.timeout(aruba.config.exit_timeout) do
       loop do
         fail "You need to start middleman interactively first." unless @interactive
 
-        if unescape(@interactive.output) =~ Regexp.new(unescape(expected))
-          only_processes.each { |p| p.terminate }
+        if sanitize_text(@interactive.output) =~ Regexp.new(sanitize_text(expected))
+          all_commands.each { |p| p.terminate }
           break
         end
 
@@ -80,7 +80,7 @@ end
 
 # Make sure each and every process is really dead
 After do
-  only_processes.each { |p| p.terminate }
+  all_commands.each { |p| p.terminate }
 end
 
 Before '@ruby-2.1' do

data/lib/middleman-core/step_definitions/server_steps.rb

@@ -54,7 +54,7 @@ Given /^the Server is running$/ do
 
     app.after_configuration_eval do
       activation_commands.each do |p|
-        config_context.instance_exec(&p)
+        app.config_context.instance_exec(&p)
       end
     end
   end

data/lib/middleman-core/template_renderer.rb

@@ -132,7 +132,7 @@ module Middleman
       @app.extensions.add_exposed_to_context(context)
 
       locals.each do |k, _|
-        next unless context.respond_to?(k) && ![:current_path, :paginate, :page_articles, :blog_controller, :lang, :locale].include?(k.to_sym)
+        next unless context.respond_to?(k) && ![:current_path, :paginate, :page_articles, :blog_controller, :lang, :locale, :data].include?(k.to_sym)
 
         msg = "Template local `#{k}` tried to overwrite an existing context value. Please rename the key when passing to `locals`"
 
@@ -183,7 +183,7 @@ module Middleman
           content_renderer = ::Middleman::FileRenderer.new(@app, path)
           content = content_renderer.render(locs, opts, context, &block)
 
-          path = File.basename(path, File.extname(path))
+          path = path.sub(/\.[^.]*\z/, '')
         rescue LocalJumpError
           raise "Tried to render a layout (calls yield) at #{path} like it was a template. Non-default layouts need to be in #{@app.config[:source]}/#{@app.config[:layouts_dir]}."
         end

data/lib/middleman-core/util/data.rb

@@ -1,7 +1,6 @@
 require 'yaml'
 require 'json'
 require 'pathname'
-require 'backports/2.1.0/array/to_h'
 require 'hashie'
 require 'memoist'
 

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.2.1'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.3.0.rc.1'.freeze unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email       = ['me@tdreyno.com', 'ben@benhollis.net', 'karlfreeman@gmail.com']
   s.homepage    = 'http://middlemanapp.com'
   s.summary     = 'Hand-crafted frontend development'
-  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
+  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
 
   s.files        = `git ls-files -z`.split("\0")
   s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
@@ -23,25 +23,24 @@ Gem::Specification.new do |s|
   s.add_dependency('rack', ['>= 1.4.5', '< 3'])
   s.add_dependency('tilt', ['~> 2.0'])
   s.add_dependency('erubis')
-  s.add_dependency('fast_blank')
   s.add_dependency('parallel')
   s.add_dependency('servolux')
   s.add_dependency('dotenv')
 
   # Helpers
-  s.add_dependency('activesupport', ['>= 4.2', '< 5.1'])
+  s.add_dependency('activesupport', ['>= 4.2', '< 5.2'])
   s.add_dependency('padrino-helpers', ['~> 0.13.0'])
-  s.add_dependency("addressable", ["~> 2.3"])
+  s.add_dependency('addressable', ['~> 2.3'])
   s.add_dependency('memoist', ['~> 0.14'])
 
   # Watcher
-  s.add_dependency('listen', ['~> 3.0.0'])
+  s.add_dependency('listen', ['~> 3.0'])
 
   # Tests
-  s.add_development_dependency("capybara", ["~> 2.5.0"])
+  s.add_development_dependency('capybara', ['~> 2.5.0'])
 
   # i18n
-  s.add_dependency('i18n', ['~> 0.7.0'])
+  s.add_dependency('i18n', ['~> 0.7'])
 
   # Automatic Image Sizes
   s.add_dependency('fastimage', ['~> 2.0'])
@@ -54,10 +53,9 @@ Gem::Specification.new do |s|
   s.add_dependency('execjs', ['~> 2.0'])
 
   # Testing
-  s.add_dependency('contracts', ['~> 0.13.0'])
+  s.add_dependency('contracts', ['~> 0.13'])
 
   # Hash stuff
   s.add_dependency('hashie', ['~> 3.4'])
   s.add_dependency('hamster', ['~> 3.0'])
-  s.add_dependency('backports', ['~> 3.6'])
 end

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/..'))
-
-require 'coveralls'
-Coveralls.wear!
-
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+SimpleCov.start
 
 require 'aruba/api'
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0.rc.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,20 +74,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fast_blank
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +125,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +135,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -332,23 +318,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
 description: A static site generator. Provides dozens of templating languages (Haml,
-  Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
-  busting, Yaml data (and more) an easy part of your development cycle.
+  Sass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting,
+  Yaml data (and more) an easy part of your development cycle.
 email:
 - me@tdreyno.com
 - ben@benhollis.net
@@ -610,6 +582,8 @@ files:
 - fixtures/chained-app/config.rb
 - fixtures/chained-app/data/article.yml
 - fixtures/chained-app/source/index.html.str.erb
+- fixtures/chained-app/source/stylesheets/main.css.scss.erb
+- fixtures/chained-app/source/stylesheets/sub.scss
 - fixtures/chained-app/source/test.erb.combobreaker.str.erb
 - fixtures/clean-app/config-complications.rb
 - fixtures/clean-app/config-empty.rb
@@ -857,6 +831,7 @@ files:
 - fixtures/i18n-test-app/source/localizable/partials/_greeting.en.erb
 - fixtures/i18n-test-app/source/localizable/partials/_greeting.es.erb
 - fixtures/i18n-test-app/source/localizable/partials/index.html.erb
+- fixtures/i18n-test-app/source/localizable/tac.html.erb
 - fixtures/i18n-test-app/source/password.txt
 - fixtures/i18n-test-app/source/stylesheets/site.css
 - fixtures/ignore-app/source/about.html.erb
@@ -1558,12 +1533,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development
@@ -1815,6 +1790,8 @@ test_files:
 - fixtures/chained-app/config.rb
 - fixtures/chained-app/data/article.yml
 - fixtures/chained-app/source/index.html.str.erb
+- fixtures/chained-app/source/stylesheets/main.css.scss.erb
+- fixtures/chained-app/source/stylesheets/sub.scss
 - fixtures/chained-app/source/test.erb.combobreaker.str.erb
 - fixtures/clean-app/config-complications.rb
 - fixtures/clean-app/config-empty.rb
@@ -2062,6 +2039,7 @@ test_files:
 - fixtures/i18n-test-app/source/localizable/partials/_greeting.en.erb
 - fixtures/i18n-test-app/source/localizable/partials/_greeting.es.erb
 - fixtures/i18n-test-app/source/localizable/partials/index.html.erb
+- fixtures/i18n-test-app/source/localizable/tac.html.erb
 - fixtures/i18n-test-app/source/password.txt
 - fixtures/i18n-test-app/source/stylesheets/site.css
 - fixtures/ignore-app/source/about.html.erb