middleman-core 4.0.0.rc.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9063a648e09ffaf652d7d00d7213e654f8dc5025
-  data.tar.gz: c8838c695ad6796bb5192fd9d4c3e86cabab45af
+  metadata.gz: 943984d8ce5d131f06921104850e97defd44613d
+  data.tar.gz: d33b774d8f9df3ba11fc3f5218a97533f97aa781
 SHA512:
-  metadata.gz: a28c9df0f7e4e8b5f38fdb5363a5a8943d87c842fa82acfcbf339cc73bc4664c3e69c6f639674fc58662c256d1db316370c4dcad3b1e3614b99ba87c6d087543
-  data.tar.gz: 41955c5cc6713531928e0b26751d011481c0db1a7c71ff3c5abf6c043ed8215ccc4a82efd10ece7e2cbeb0a297bff6b0d0ee4fdb37358612f928cedd447bbcf1
+  metadata.gz: 933d5babdb56a3bf292c5e2c6503fc2932f9cf6c38592ce7456ed8e2f574b2f59f495cbe050701d5c8e9d71c607d61d41c53fa81b5c371a55f94578cfa56f159
+  data.tar.gz: 867ddaef10a672e7b027fc033217975caccc1b713a0a37c67f5cba9709d8ef5350ae2dadf07b5df6622a7ac609847c4e0abf42222d08f541016246817ccc3d0a

data/features/relative_assets.feature

@@ -41,6 +41,11 @@ Feature: Relative Assets
     And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff'
     And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf'
     And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg'
+    When I go to "/stylesheets/fonts2.css"
+    Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot'
+    And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff'
+    And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf'
+    And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg'
 
   Scenario: Building css with the feature enabled
     Given a fixture app "relative-assets-app"

data/fixtures/relative-assets-app/source/stylesheets/fonts2.css.scss

@@ -0,0 +1,10 @@
+@font-face {
+    font-family: 'Roboto';
+    src: url(/fonts/roboto/roboto-regular-webfont.eot);
+    src: url(/fonts/roboto/roboto-regular-webfont.eot?#iefix) format('embedded-opentype'),
+         url(/fonts/roboto/roboto-regular-webfont.woff) format('woff'),
+         url(/fonts/roboto/roboto-regular-webfont.ttf) format('truetype'),
+         url(/fonts/roboto/roboto-regular-webfont.svg#robotoregular) format('svg');
+    font-weight: normal;
+    font-style: normal;
+}

data/lib/middleman-core/util.rb

@@ -332,12 +332,19 @@ module Middleman
 
     Contract String, String, ArrayOf[String], Proc => String
     def rewrite_paths(body, _path, exts, &_block)
-      matcher = /([=\'\"\(,] *)([^\s\'\"\)>]+(#{Regexp.union(exts)}))/
+      matcher = /([=\'\"\(,]\s*)([^\s\'\"\)>]+(#{Regexp.union(exts)}))/
+
+      url_fn_prefix = 'url('
 
       body.dup.gsub(matcher) do |match|
         opening_character = $1
         asset_path = $2
 
+        if asset_path.start_with?(url_fn_prefix)
+          opening_character << url_fn_prefix
+          asset_path = asset_path[url_fn_prefix.length..-1]
+        end
+
         begin
           uri = ::Addressable::URI.parse(asset_path)
 

data/lib/middleman-core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1217,6 +1217,7 @@ files:
 - fixtures/relative-assets-app/source/relative_image.html.erb
 - fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb
 - fixtures/relative-assets-app/source/stylesheets/fonts.css
+- fixtures/relative-assets-app/source/stylesheets/fonts2.css.scss
 - fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass
 - fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass
 - fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss
@@ -1410,9 +1411,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -2350,6 +2351,7 @@ test_files:
 - fixtures/relative-assets-app/source/relative_image.html.erb
 - fixtures/relative-assets-app/source/relative_image_absolute_css.html.erb
 - fixtures/relative-assets-app/source/stylesheets/fonts.css
+- fixtures/relative-assets-app/source/stylesheets/fonts2.css.scss
 - fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass
 - fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass
 - fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss