bourbon 5.0.0.beta.4 → 5.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 178580e1dd1d1567bcc3b6cdde059452f740cdf9
-  data.tar.gz: 55978441ae0c6251445b8720e524487a3e73dbbc
+  metadata.gz: bbcabb0de4099a8e82cae3ba0717c5067ef6d5bc
+  data.tar.gz: 23332a525fafb6e5b2febf8272829d6dbbc95a13
 SHA512:
-  metadata.gz: 7e910047d448437ce4b80bdf6af9cf9cba77dcb359617ade8ef3b0507a6145be30699b0d360e72cd36ad498b7286375010c0bd8afbfc8649210530e32c275094
-  data.tar.gz: 0535edd5b7f1329ceb49f66060b2c4ef418b1a961dc77e23fb53aad912be57d7656798094bab3913a6285d9bad5150ee52d329b34f368e3f65277c6da593a1e1
+  metadata.gz: f5ef886f1e4b3b503550a20ceeb3e2183c9c38c6351c32c304298e75d260de4dddfa3ec4b91ec02ec3f63cd984033982080bc063dbafcfaad29da5dfe4f0f751
+  data.tar.gz: cf1b84c963502b0c8f5909890a3cd72facc7f82f3100666fa80fd23d9901e26932a6793d3127e203b0ac7f21a34e68adfc51ebf1b85ee7c3412da88eecec5787

data/CHANGELOG.md

@@ -5,7 +5,22 @@ project adheres to [Semantic Versioning](http://semver.org).
 
 ## [Unreleased]
 
-[Unreleased]: https://github.com/thoughtbot/bourbon/compare/v5.0.0.beta.4...HEAD
+[Unreleased]: https://github.com/thoughtbot/bourbon/compare/v5.0.0.beta.5...HEAD
+
+## [5.0.0-beta.5] - 2016-03-23
+
+### Fixed
+
+- Fixed a Sass load path issue that would intermittently break the importing of
+  Bourbon in Rails apps.
+
+### Changed
+
+- Swapped the order of the `$file-formats` and `$asset-pipeline` arguments in
+  the `font-face` mixin, so that `$asset-pipeline` is last (because it has a
+  default and is likely used the least).
+
+[5.0.0-beta.5]: https://github.com/thoughtbot/bourbon/compare/v5.0.0.beta.4...v5.0.0.beta.5
 
 ## [5.0.0-beta.4] - 2016-03-11
 

data/bower.json

@@ -34,5 +34,5 @@
     "type": "git",
     "url": "https://github.com/thoughtbot/bourbon.git"
   },
-  "version": "5.0.0-beta.4"
+  "version": "5.0.0-beta.5"
 }

data/core/_bourbon.scss

@@ -1,4 +1,4 @@
-// Bourbon 5.0.0-beta.4
+// Bourbon 5.0.0-beta.5
 // http://bourbon.io
 // Copyright 2011 thoughtbot, inc.
 // MIT License

data/core/bourbon/library/_font-face.scss

@@ -43,8 +43,8 @@
 @mixin font-face(
     $font-family,
     $file-path,
-    $asset-pipeline: _bourbon-get-setting("rails-asset-pipeline"),
-    $file-formats: _bourbon-get-setting("global-font-file-formats")
+    $file-formats: _bourbon-get-setting("global-font-file-formats"),
+    $asset-pipeline: _bourbon-get-setting("rails-asset-pipeline")
   ) {
 
   @font-face {

data/lib/bourbon.rb

@@ -1,4 +1,7 @@
 require "bourbon/generator"
 
 bourbon_path = File.expand_path("../../core", __FILE__)
-ENV["SASS_PATH"] = File.join([ENV["SASS_PATH"], bourbon_path].compact)
+ENV["SASS_PATH"] = [
+  ENV["SASS_PATH"],
+  bourbon_path,
+].compact.join(File::PATH_SEPARATOR)

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "5.0.0.beta.4"
+  VERSION = "5.0.0.beta.5"
 end

data/package.json

@@ -29,5 +29,5 @@
   "scripts": {
     "test": "bundle exec rake"
   },
-  "version": "5.0.0-beta.4"
+  "version": "5.0.0-beta.5"
 }

data/spec/fixtures/library/font-face-3.scss

@@ -3,6 +3,6 @@
 @include font-face(
   "pitch",
   "/fonts/pitch",
-  true,
-  "woff2"
+  "woff2",
+  $asset-pipeline: true
 );

data/spec/fixtures/library/font-face-4.scss

@@ -3,5 +3,5 @@
 @include font-face(
   "circular",
   "/circular",
-  $file-formats: ("woff2", "svg")
+  ("woff2", "svg")
 );

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bourbon
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta.4
+  version: 5.0.0.beta.5
 platform: ruby
 authors:
 - Christian Reuter
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba