middleman-core 3.3.7 → 3.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d1f92ae43159b3ae4a6096479f56e409ee540a
-  data.tar.gz: 6f6634ba7c4340dd2d5229f9222b8c1924a1b6a4
+  metadata.gz: c39177bcae9f7affa767b7fcf221be1558647868
+  data.tar.gz: 72e1622e55f6c7fec6e2fc98b3f345c039b8d298
 SHA512:
-  metadata.gz: a937e12df16c26ec28ef901feac136da3ed1534fff3d0a5bbad69f22e0e78721bc01f6ca158f2f4219a73b674581b3341496a5bed270d17473de7fc8692d0a47
-  data.tar.gz: 60aca4dc123e02ec8e906360e09cebad68bc0e98d53d6af7cddc995a60b986f2ff218c3696386dba6a59ee9f70941341dd38633b308c3a459b3e9be590e35963
+  metadata.gz: aaf08ab9935abdb556324add244473867837fe18b0194c189f6bf89348ce5c4ed22ccbf35e83685d4d2df03ad4e27d1c4eaa8ea3f669af530aed4bcfe11b4589
+  data.tar.gz: 39c5049097c9a69b269cdf07c60c9bac137e55d4cd21cdc39380b5392fe8308d0c07ae1d7ebd691076eb7db4ea6d0c6970b7426d9f69c83285eed7976b218713

data/features/asset_hash.feature

@@ -8,6 +8,8 @@ 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 |
@@ -29,6 +31,9 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And the file "index.html" should contain 'href="stylesheets/site-50eaa978.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 'src="../javascripts/application-1d8d5276.js"'
     And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
@@ -49,6 +54,7 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And I should see 'href="stylesheets/site-50eaa978.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"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'

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/directory_index.feature

@@ -25,8 +25,7 @@ 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"
@@ -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

@@ -149,3 +149,22 @@ 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.title %>
+      """
+    When I go to "/proxied_with_frontmatter.html"
+    Then I should see "Proxied title"

data/features/minify_javascript.feature

@@ -140,14 +140,14 @@ Feature: Minify Javascript
     </script>
     <script type='text/javascript'>
       //<!--
-    !function(){line(),here()}();
+    !function(){one,line(),here()}();
       //-->
     </script>
     <script type='text/html'>
       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/fixtures/asset-hash-app/source/index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <h2>Image url:</h2>
-<img src="<%= image_path('100px.jpg') %>">
+<img src="<%= image_path('100px.jpg') %>" srcset="<%= image_path('100px.jpg') %> 1x, <%= image_path('200px.jpg') %> 2x, <%= image_path('300px.jpg') %> 3x">
 
 <h2>Ignored path:</h2>
 <link rel="apple-touch-icon" href="apple-touch-icon.png">

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

@@ -1,4 +1,5 @@
 # Proxy ignored.html, which should ignore itself through a frontmatter
 page 'proxied.html', :proxy => 'ignored.html'
+page 'proxied_with_frontmatter.html', :proxy => 'ignored.html'
 page 'override_layout.html', :layout => :alternate
 page 'page_mentioned.html'

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

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

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

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

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

@@ -61,7 +61,14 @@ module Middleman::CoreExtensions
       # @private
       # @return [Hash]
       def raw_data
-        app.extensions[:frontmatter].data(source_file).first
+        data = app.extensions[:frontmatter].data(source_file).first
+
+        if proxy?
+          url_data = app.extensions[:frontmatter].data( File.join( app.source_dir, url ).chomp('/') ).first
+          data     = data.deep_merge(url_data)
+        end
+
+        data
       end
 
       # This page's frontmatter

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

@@ -21,6 +21,9 @@ module Middleman
           ::Rack::Mime::MIME_TYPES['.html'] = 'text/html; charset=utf-8'
           ::Rack::Mime::MIME_TYPES['.htm'] = 'text/html; charset=utf-8'
 
+          # Sourcemap format
+          ::Rack::Mime::MIME_TYPES['.map'] = 'application/json; charset=utf-8'
+
           app.extend ClassMethods
           app.extend ServerMethods
 

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

@@ -40,7 +40,7 @@ module Middleman
       def initialize(store, path, source_file=nil)
         @store       = store
         @app         = @store.app
-        @path        = path.gsub(' ', '%20') # handle spaces in filenames
+        @path        = path
         @source_file = source_file
         @destination_path = @path
 

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

@@ -69,7 +69,7 @@ end
 
 # Provide this Aruba overload in case we're matching something with quotes in it
 Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content|
-  check_file_content(file, partial_content, true)
+  check_file_content(file, Regexp.new(Regexp.escape(partial_content)), true)
 end
 
 And /the file "(.*)" should be gzipped/ do |file|

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

@@ -72,13 +72,13 @@ end
 
 When /^I go to "([^\"]*)"$/ do |url|
   in_current_dir do
-    @browser.get(URI.escape(url))
+    @browser.get(URI.encode(url))
   end
 end
 
 Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
   in_current_dir do
-    expect{ @browser.get(URI.escape(url)) }.to_not raise_exception
+    expect{ @browser.get(URI.encode(url)) }.to_not raise_exception
   end
 end
 

data/lib/middleman-core/templates/default/source/javascripts/all.js

@@ -1 +1 @@
-//= require_tree .
+//= require_tree .

data/lib/middleman-core/templates/local.rb

@@ -9,7 +9,7 @@ class Middleman::Templates::Local < Middleman::Templates::Base
   # Just copy from the template path
   # @return [void]
   def build_scaffold!
-    directory options[:template].to_s, location, force: options[:force]
+    directory options[:template].to_s, location, force: options[:force], exclude_pattern: /\.git\/.*/
   end
 end
 

data/lib/middleman-core/util.rb

@@ -68,7 +68,7 @@ module Middleman
       # @return [String]
       def normalize_path(path)
         # The tr call works around a bug in Ruby's Unicode handling
-        path.sub(%r{^/}, '').tr('', '')
+        URI.decode(path).sub(%r{^/}, '').tr('', '')
       end
 
       # This is a separate method from normalize_path in case we
@@ -144,7 +144,7 @@ module Middleman
           path_or_resource.url
         else
           path_or_resource.dup
-        end.gsub(' ', '%20')
+        end
 
         # Try to parse URL
         begin
@@ -182,7 +182,7 @@ module Middleman
         end
 
         if resource
-          uri.path = relative_path_from_resource(this_resource, resource_url, effective_relative)
+          uri.path = URI.encode(relative_path_from_resource(this_resource, resource_url, effective_relative))
         else
           # If they explicitly asked for relative links but we can't find a resource...
           raise "No resource exists at #{url}" if relative

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.3.7' unless const_defined?(:VERSION)
+  VERSION = '3.3.8' unless const_defined?(:VERSION)
 end

data/lib/middleman-more/extensions/asset_hash.rb

@@ -91,7 +91,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
       dirpath = Pathname.new(File.dirname(path))
 
       # TODO: This regex will change some paths in plan HTML (not in a tag) - is that OK?
-      body.gsub(/([=\'\"\(]\s*)([^\s\'\"\)]+(#{@exts_regex_text}))/) do |match|
+      body.gsub(/([=\'\"\(,]\s*)([^\s\'\"\)]+(#{@exts_regex_text}))/) do |match|
         opening_character = $1
         asset_path = $2
 

data/middleman-core.gemspec

@@ -39,5 +39,5 @@ Gem::Specification.new do |s|
   s.add_dependency("listen", [">= 2.7.9", "< 3.0"])
 
   # i18n
-  s.add_dependency("i18n", ["~> 0.6.9"])
+  s.add_dependency("i18n", ["~> 0.7.0"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.3.8
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,14 +182,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.7.0
 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.
@@ -327,6 +327,8 @@ files:
 - fixtures/asset-hash-app/source/images/100px.gif
 - fixtures/asset-hash-app/source/images/100px.jpg
 - fixtures/asset-hash-app/source/images/100px.png
+- fixtures/asset-hash-app/source/images/200px.jpg
+- fixtures/asset-hash-app/source/images/300px.jpg
 - fixtures/asset-hash-app/source/index.html.erb
 - fixtures/asset-hash-app/source/javascripts/application.js
 - fixtures/asset-hash-app/source/layout.erb
@@ -1271,7 +1273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development
@@ -1396,6 +1398,8 @@ test_files:
 - fixtures/asset-hash-app/source/images/100px.gif
 - fixtures/asset-hash-app/source/images/100px.jpg
 - fixtures/asset-hash-app/source/images/100px.png
+- fixtures/asset-hash-app/source/images/200px.jpg
+- fixtures/asset-hash-app/source/images/300px.jpg
 - fixtures/asset-hash-app/source/index.html.erb
 - fixtures/asset-hash-app/source/javascripts/application.js
 - fixtures/asset-hash-app/source/layout.erb