bourbon 4.2.3 → 4.3.4

data/app/assets/stylesheets/helpers/_directional-values.scss

@@ -27,6 +27,11 @@
 /// @return {List}
 
 @function collapse-directionals($vals) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `collapse-directionals` is deprecated and " +
+    "will be removed in 5.0.0.";
+  }
+
   $output: null;
 
   $a: nth($vals, 1);
@@ -62,6 +67,11 @@
 /// @require {function} contains-falsy
 
 @mixin directional-property($pre, $suf, $vals) {
+  @include _bourbon-deprecate("directional-property");
+
+  $user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
+  $output-bourbon-deprecation-warnings: false !global;
+
   // Property Names
   $top:    $pre + "-top"    + if($suf, "-#{$suf}", "");
   $bottom: $pre + "-bottom" + if($suf, "-#{$suf}", "");
@@ -93,4 +103,6 @@
   } @else {
     #{$all}: $vals;
   }
+
+  $output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
 }

data/app/assets/stylesheets/helpers/_font-source-declaration.scss

@@ -2,6 +2,11 @@
 // Reference: http://goo.gl/Ru1bKP
 
 @function font-url-prefixer($asset-pipeline) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `font-url-prefixer` is deprecated and " +
+    "will be removed in 5.0.0.";
+  }
+
   @if $asset-pipeline == true {
     @return font-url;
   } @else {
@@ -16,6 +21,11 @@
   $file-formats,
   $font-url) {
 
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `font-source-declaration` is deprecated " +
+    "and will be removed in 5.0.0.";
+  }
+
   $src: ();
 
   $formats-map: (

data/app/assets/stylesheets/helpers/_gradient-positions-parser.scss

@@ -1,4 +1,12 @@
 @function _gradient-positions-parser($gradient-type, $gradient-positions) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_gradient-positions-parser` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
+  $user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
+  $output-bourbon-deprecation-warnings: false !global;
+
   @if $gradient-positions
   and ($gradient-type == linear)
   and (type-of($gradient-positions) != color) {
@@ -9,5 +17,8 @@
   and (type-of($gradient-positions) != color) {
     $gradient-positions: _radial-positions-parser($gradient-positions);
   }
+
+  $output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
+
   @return $gradient-positions;
 }

data/app/assets/stylesheets/helpers/_linear-angle-parser.scss

@@ -1,5 +1,10 @@
 // Private function for linear-gradient-parser
 @function _linear-angle-parser($image, $first-val, $prefix, $suffix) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_linear-angle-parser` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
   $offset: null;
   $unit-short:  str-slice($first-val, str-length($first-val) - 2, str-length($first-val));
   $unit-long:   str-slice($first-val, str-length($first-val) - 3, str-length($first-val));
@@ -15,8 +20,13 @@
   }
 
   @if $offset {
+    $user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
+    $output-bourbon-deprecation-warnings: false !global;
+
     $num: _str-to-num($first-val);
 
+    $output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
+
     @return (
       webkit-image: -webkit- + $prefix + ($offset - $num) + $suffix,
       spec-image: $image

data/app/assets/stylesheets/helpers/_linear-gradient-parser.scss

@@ -1,16 +1,24 @@
 @function _linear-gradient-parser($image) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_linear-gradient-parser` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
+  $user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
+  $output-bourbon-deprecation-warnings: false !global;
+
   $image: unquote($image);
   $gradients: ();
   $start: str-index($image, "(");
   $end: str-index($image, ",");
   $first-val: str-slice($image, $start + 1, $end - 1);
 
-  $prefix: str-slice($image, 0, $start);
+  $prefix: str-slice($image, 1, $start);
   $suffix: str-slice($image, $end, str-length($image));
 
   $has-multiple-vals: str-index($first-val, " ");
   $has-single-position: unquote(_position-flipper($first-val) + "");
-  $has-angle: is-number(str-slice($first-val, 0, 0));
+  $has-angle: is-number(str-slice($first-val, 1, 1));
 
   @if $has-multiple-vals {
     $gradients: _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals);
@@ -37,5 +45,7 @@
     );
   }
 
+  $output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
+
   @return $gradients;
 }

data/app/assets/stylesheets/helpers/_linear-positions-parser.scss

@@ -1,4 +1,12 @@
 @function _linear-positions-parser($pos) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_linear-positions-parser` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
+  $user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
+  $output-bourbon-deprecation-warnings: false !global;
+
   $type: type-of(nth($pos, 1));
   $spec: null;
   $degree: null;
@@ -11,7 +19,7 @@
       $side: nth($pos, 2);
 
       @if $length == 2 { // eg. to top
-        // Swap for backwards compatability
+        // Swap for backwards compatibility
         $degree: _position-flipper(nth($pos, 2));
       }
       @else if $length == 3 { // eg. to top left
@@ -38,7 +46,7 @@
     $spec: to $side $corner;
   }
   @else if $length == 1 {
-    // Swap for backwards compatability
+    // Swap for backwards compatibility
     @if $type == string {
       $degree: $pos;
       $spec: to _position-flipper($pos);
@@ -50,10 +58,18 @@
   }
   $degree: unquote($degree + ",");
   $spec:   unquote($spec + ",");
+
+  $output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
+
   @return $degree $spec;
 }
 
 @function _position-flipper($pos) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_position-flipper` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
   @return if($pos == left, right, null)
          if($pos == right, left, null)
          if($pos == top, bottom, null)

data/app/assets/stylesheets/helpers/_linear-side-corner-parser.scss

@@ -1,18 +1,28 @@
 // Private function for linear-gradient-parser
 @function _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals) {
-  $val-1: str-slice($first-val, 0, $has-multiple-vals - 1 );
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_linear-side-corner-parser` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
+  $user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
+  $output-bourbon-deprecation-warnings: false !global;
+
+  $val-1: str-slice($first-val, 1, $has-multiple-vals - 1);
   $val-2: str-slice($first-val, $has-multiple-vals + 1, str-length($first-val));
   $val-3: null;
   $has-val-3: str-index($val-2, " ");
 
   @if $has-val-3 {
     $val-3: str-slice($val-2, $has-val-3 + 1, str-length($val-2));
-    $val-2: str-slice($val-2, 0, $has-val-3 - 1);
+    $val-2: str-slice($val-2, 1, $has-val-3 - 1);
   }
 
   $pos: _position-flipper($val-1) _position-flipper($val-2) _position-flipper($val-3);
   $pos: unquote($pos + "");
 
+  $output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
+
   // Use old spec for webkit
   @if $val-1 == "to" {
     @return (

data/app/assets/stylesheets/helpers/_radial-arg-parser.scss

@@ -1,4 +1,9 @@
 @function _radial-arg-parser($g1, $g2, $pos, $shape-size) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_radial-arg-parser` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
   @each $value in $g1, $g2 {
     $first-val: nth($value, 1);
     $pos-type:  type-of($first-val);

data/app/assets/stylesheets/helpers/_radial-gradient-parser.scss

@@ -1,11 +1,16 @@
 @function _radial-gradient-parser($image) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_radial-gradient-parser` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
   $image: unquote($image);
   $gradients: ();
   $start: str-index($image, "(");
   $end: str-index($image, ",");
   $first-val: str-slice($image, $start + 1, $end - 1);
 
-  $prefix: str-slice($image, 0, $start);
+  $prefix: str-slice($image, 1, $start);
   $suffix: str-slice($image, $end, str-length($image));
 
   $is-spec-syntax: str-index($first-val, "at");

data/app/assets/stylesheets/helpers/_radial-positions-parser.scss

@@ -1,4 +1,12 @@
 @function _radial-positions-parser($gradient-pos) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_radial-positions-parser` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
+  $user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
+  $output-bourbon-deprecation-warnings: false !global;
+
   $shape-size: nth($gradient-pos, 1);
   $pos:        nth($gradient-pos, 2);
   $shape-size-spec: _shape-size-stripper($shape-size);
@@ -14,5 +22,7 @@
     $spec: "#{$spec},";
   }
 
+  $output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
+
   @return $pre-spec $spec;
 }

data/app/assets/stylesheets/helpers/_render-gradients.scss

@@ -1,6 +1,11 @@
 // User for linear and radial gradients within background-image or border-image properties
 
 @function _render-gradients($gradient-positions, $gradients, $gradient-type, $vendor: false) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_render-gradients` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
   $pre-spec: null;
   $spec: null;
   $vendor-gradients: null;

data/app/assets/stylesheets/helpers/_shape-size-stripper.scss

@@ -1,4 +1,9 @@
 @function _shape-size-stripper($shape-size) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_shape-size-stripper` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
   $shape-size-spec: null;
   @each $value in $shape-size {
     @if ($value == "cover") or ($value == "contain") {

data/app/assets/stylesheets/helpers/_str-to-num.scss

@@ -3,6 +3,11 @@
 // Source: http://sassmeister.com/gist/9647408
 //************************************************************************//
 @function _str-to-num($string) {
+  @if $output-bourbon-deprecation-warnings == true {
+    @warn "[Bourbon] [Deprecation] `_str-to-num` is " +
+    "deprecated and will be removed in 5.0.0.";
+  }
+
   // Matrices
   $strings: "0" "1" "2" "3" "4" "5" "6" "7" "8" "9";
   $numbers:  0   1   2   3   4   5   6   7   8   9;

data/app/assets/stylesheets/settings/_deprecation-warnings.scss

@@ -0,0 +1,8 @@
+@charset "UTF-8";
+
+/// Enable or disable output of Bourbon’s deprecation-related Sass warnings.
+/// This variable must be declared _before_ importing Bourbon.
+///
+/// @type Bool
+
+$output-bourbon-deprecation-warnings: true !default;

data/bourbon.gemspec

@@ -22,11 +22,11 @@ meaning they should be as close to the original CSS syntax as possible.
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency("sass", "~> 3.4")
-  s.add_runtime_dependency("thor")
+  s.add_runtime_dependency("thor", "~> 0.19")
 
-  s.add_development_dependency("aruba")
-  s.add_development_dependency("css_parser")
-  s.add_development_dependency("rake")
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("scss-lint", "~> 0.35")
+  s.add_development_dependency("aruba", "~> 0.6.2")
+  s.add_development_dependency("css_parser", "~> 1.3")
+  s.add_development_dependency("rake", "~> 10.4")
+  s.add_development_dependency("rspec", "~> 3.3")
+  s.add_development_dependency("scss_lint", "0.41")
 end

data/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "bourbon",
   "description": "A simple and lightweight mixin library for Sass.",
-  "version": "4.2.3",
+  "version": "4.3.4",
   "main": "app/assets/stylesheets/_bourbon.scss",
   "license": "MIT",
   "ignore": [

data/circle.yml

@@ -0,0 +1,10 @@
+general:
+  branches:
+    ignore:
+      - gh-pages
+machine:
+  ruby:
+    version: 2.3.0
+test:
+  override:
+    - bundle exec rake

data/eyeglass-exports.js

@@ -0,0 +1,7 @@
+var bourbon = require("./index");
+
+module.exports = function(eyeglass, sass) {
+  return {
+    sassDir: bourbon.includePaths[0]
+  };
+};

data/index.js

@@ -0,0 +1,7 @@
+var path = require('path');
+
+module.exports = {
+  includePaths: [
+    path.join(__dirname, 'app/assets/stylesheets')
+  ]
+};

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "4.2.3"
+  VERSION = "4.3.4"
 end

data/package.json

@@ -1,9 +1,10 @@
 {
   "name": "bourbon",
-  "version": "4.2.3",
+  "version": "4.3.4",
   "description": "A simple and lightweight mixin library for Sass.",
   "keywords": [
     "css",
+    "eyeglass-module",
     "mixins",
     "sass",
     "scss"
@@ -12,12 +13,16 @@
   "bugs": {
     "url": "https://github.com/thoughtbot/bourbon/issues"
   },
+  "eyeglass": {
+    "needs": "*",
+    "exports": "eyeglass-exports.js"
+  },
   "license": "MIT",
   "author": {
     "name": "thoughtbot",
     "url": "http://thoughtbot.com"
   },
-  "main": "app/assets/stylesheets/_bourbon.scss",
+  "main": "index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/thoughtbot/bourbon.git"

data/spec/bourbon/addons/text_inputs_spec.rb

@@ -19,6 +19,7 @@ describe "text-inputs" do
       input[type="time"]
       input[type="url"]
       input[type="week"]
+      input:not([type])
       textarea
     )
   end

data/spec/bourbon/functions/shade_spec.rb

@@ -7,7 +7,7 @@ describe "shade" do
 
   context "called on white" do
     it "shades white" do
-      expect(".shade-white").to have_rule("color: #3f3f3f")
+      expect(".shade-white").to have_rule("color: #404040")
     end
   end
 
@@ -25,7 +25,7 @@ describe "shade" do
 
   context "called on gray" do
     it "shades gray" do
-      expect(".shade-gray").to have_rule("color: #161616")
+      expect(".shade-gray").to have_rule("color: #171717")
     end
   end
 end

data/spec/bourbon/functions/tint_spec.rb

@@ -13,13 +13,13 @@ describe "tint" do
 
   context "called on black" do
     it "tints black" do
-      expect(".tint-black").to have_rule("color: #7f7f7f")
+      expect(".tint-black").to have_rule("color: gray")
     end
   end
 
   context "called on red" do
     it "tints red" do
-      expect(".tint-red").to have_rule("color: #ff3f3f")
+      expect(".tint-red").to have_rule("color: #ff4040")
     end
   end