bourbon 5.0.0.alpha.0 → 5.0.0.beta.1

data/core/bourbon/settings/_bourbon-get-setting.scss

@@ -0,0 +1,14 @@
+@charset "UTF-8";
+
+/// Return a Bourbon setting.
+///
+/// @argument {string} $setting
+///
+/// @example scss
+///   _bourbon-get-setting(rails-asset-pipeline)
+///
+/// @access private
+
+@function _bourbon-get-setting($setting) {
+  @return map-get(map-merge($_bourbon-defaults, $bourbon), $setting);
+}

data/core/bourbon/settings/_scales.scss

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 ////
-/// Pre-defined scales for use with the `modular-scale` function
+/// Pre-defined scales for use with the `modular-scale` function.
 ///
 /// @see {function} modular-scale
 ///

data/core/bourbon/settings/_settings.scss

@@ -0,0 +1,33 @@
+@charset "UTF-8";
+
+/// Default Bourbon configuration settings.
+///
+/// @type map
+///
+/// @property {list} global-font-file-formats [("ttf", "woff2", "woff")]
+///   Global font file formats for the `font-face` mixin.
+///
+/// @property {number (with unit)} modular-scale-base [1em]
+///   Global base value for the `modular-scale` function.
+///
+/// @property {number (unitless)} modular-scale-ratio [$major-third (1.25)]
+///   Global base ratio for the `modular-scale` function.
+///
+/// @property {boolean} rails-asset-pipeline [false]
+///   Enable or disable the `$asset-pipeline` variable for all functions that
+///   accept it.
+///
+/// @access private
+
+$_bourbon-defaults: (
+  "global-font-file-formats": ("ttf", "woff2", "woff"),
+  "modular-scale-base": 1em,
+  "modular-scale-ratio": $major-third,
+  "rails-asset-pipeline": false,
+);
+
+/// User overrides of Bourbon configuration settings
+///
+/// @type map
+
+$bourbon: () !default;

data/eyeglass-exports.js

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

data/features/step_definitions/bourbon_steps.rb

@@ -6,7 +6,12 @@ Given /^I install bourbon to "([^"]*)"$/ do |path|
 end
 
 Then /^the sass directories(?: with "([^"]+)" prefix)? should have been generated$/ do |prefix|
-  sass_directories = ["bourbon/addons", "bourbon/css3", "bourbon/functions"]
+  sass_directories = [
+    "bourbon/addons",
+    "bourbon/helpers",
+    "bourbon/functions",
+    "bourbon/settings",
+  ]
   sass_directories.map!{ |directory| bourbon_path(prefix, directory) }
   check_directory_presence(sass_directories, true)
 end

data/index.js

@@ -1,7 +1,7 @@
-var path = require('path');
+var path = require("path");
 
 module.exports = {
   includePaths: [
-    path.join(__dirname, 'core')
+    path.join(__dirname, "core")
   ]
 };

data/lib/bourbon.rb

@@ -1,17 +1,9 @@
-# CodeKit needs relative paths
-dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
-
 require "bourbon/generator"
 
-unless defined?(Sass)
-  require 'sass'
-end
-
 module Bourbon
   if defined?(Rails) && defined?(Rails::Engine)
     class Engine < ::Rails::Engine
-      require 'bourbon/engine'
+      require "bourbon/engine"
     end
 
     module Rails
@@ -22,7 +14,7 @@ module Bourbon
       end
     end
   else
-    bourbon_path = File.expand_path("../../app/assets/stylesheets", __FILE__)
+    bourbon_path = File.expand_path("../../core", __FILE__)
     ENV["SASS_PATH"] = [ENV["SASS_PATH"], bourbon_path].compact.join(File::PATH_SEPARATOR)
   end
 end

data/lib/bourbon/generator.rb

@@ -1,12 +1,12 @@
-require 'bourbon/version'
+require "bourbon/version"
 require "fileutils"
-require 'thor'
+require "thor"
 
 module Bourbon
   class Generator < Thor
-    map ['-v', '--version'] => :version
+    map ["-v", "--version"] => :version
 
-    desc 'install', 'Install Bourbon into your project'
+    desc "install", "Install Bourbon into your project"
     method_options :path => :string, :force => :boolean
     def install
       if bourbon_files_already_exist? && !options[:force]
@@ -17,7 +17,7 @@ module Bourbon
       end
     end
 
-    desc 'update', 'Update Bourbon'
+    desc "update", "Update Bourbon"
     method_options :path => :string
     def update
       if bourbon_files_already_exist?
@@ -29,7 +29,7 @@ module Bourbon
       end
     end
 
-    desc 'version', 'Show Bourbon version'
+    desc "version", "Show Bourbon version"
     def version
       say "Bourbon #{Bourbon::VERSION}"
     end
@@ -42,9 +42,9 @@ module Bourbon
 
     def install_path
       @install_path ||= if options[:path]
-          Pathname.new(File.join(options[:path], 'bourbon'))
+          Pathname.new(File.join(options[:path], "bourbon"))
         else
-          Pathname.new('bourbon')
+          Pathname.new("bourbon")
         end
     end
 

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "5.0.0.alpha.0"
+  VERSION = "5.0.0.beta.1"
 end

data/package.json

@@ -1,9 +1,10 @@
 {
   "name": "bourbon",
-  "version": "5.0.0.alpha.0",
+  "version": "5.0.0-beta.1",
   "description": "A simple and lightweight mixin library for Sass.",
   "keywords": [
     "css",
+    "eyeglass-module",
     "mixins",
     "sass",
     "scss"
@@ -12,6 +13,10 @@
   "bugs": {
     "url": "https://github.com/thoughtbot/bourbon/issues"
   },
+  "eyeglass": {
+    "needs": "*",
+    "exports": "eyeglass-exports.js"
+  },
   "license": "MIT",
   "author": {
     "name": "thoughtbot",

data/spec/bourbon/addons/border_color_spec.rb

@@ -7,7 +7,7 @@ describe "border-color" do
 
   context "called with one color" do
     it "applies same color to all sides" do
-      rule = "border-color: #ff0000"
+      rule = "border-color: #f00"
 
       expect(".border-color-all").to have_rule(rule)
     end
@@ -15,7 +15,7 @@ describe "border-color" do
 
   context "called with two colors" do
     it "applies to alternating sides" do
-      rule = "border-color: #00ff00 #0000ff"
+      rule = "border-color: #0f0 #00f"
 
       expect(".border-color-alternate").to have_rule(rule)
     end
@@ -23,7 +23,7 @@ describe "border-color" do
 
   context "called with three colors" do
     it "applies second color to left and right" do
-      rule = "border-color: #ff0000 #00ff00 #0000ff"
+      rule = "border-color: #f00 #0f0 #00f"
 
       expect(".border-color-implied-left").to have_rule(rule)
     end
@@ -31,7 +31,7 @@ describe "border-color" do
 
   context "called with four colors" do
     it "applies different colors to all sides" do
-      rule = "border-color: #0000ff #00ff00 #ff0000 #ffff00"
+      rule = "border-color: #00f #0f0 #f00 #ff0"
 
       expect(".border-color-explicit").to have_rule(rule)
     end
@@ -39,9 +39,9 @@ describe "border-color" do
 
   context "called with null values" do
     it "writes rules for other three" do
-      ruleset = "border-top-color: #00ff00; " +
-                "border-right-color: #ffff00; " +
-                "border-left-color: #0000ff;"
+      ruleset = "border-top-color: #0f0; " +
+                "border-right-color: #ff0; " +
+                "border-left-color: #00f;"
       bad_rule = "border-bottom-color: null;"
 
       expect(".border-color-false-third").to have_ruleset(ruleset)

data/spec/bourbon/addons/buttons_spec.rb

@@ -6,9 +6,9 @@ describe "buttons" do
 
     @buttons_list = %w(
       button
-      [type="button"]
-      [type="reset"]
-      [type="submit"]
+      [type='button']
+      [type='reset']
+      [type='submit']
     )
   end
 

data/spec/bourbon/addons/clearfix_spec.rb

@@ -9,8 +9,8 @@ describe "clearfix" do
     it "adds clearfix" do
       input = ".clearfix::after"
       ruleset = "clear: both; " +
-                "content: \"\"; " +
-                "display: table;"
+                'content: ""; ' +
+                "display: block;"
 
       expect(input).to have_ruleset(ruleset)
     end

data/spec/bourbon/addons/contrast_switch_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe "contrast-switch" do
+  before(:all) do
+    ParserSupport.parse_file("addons/contrast-switch")
+  end
+
+  context "called with a light base color" do
+    it "outputs the dark color" do
+      rule = "color: #000;"
+
+      expect(".contrast-switch-light-base").to have_ruleset(rule)
+    end
+  end
+
+  context "called with a dark base color" do
+    it "outputs the light color" do
+      rule = "color: #eee;"
+
+      expect(".contrast-switch-dark-base").to have_ruleset(rule)
+    end
+  end
+end

data/spec/bourbon/{css3 → addons}/font_face_spec_1.rb

@@ -8,8 +8,6 @@ describe "font-face" do
   context "called with defaults" do
     it "outputs defaults" do
       ruleset = 'font-family: "source-sans-pro"; ' +
-                'font-style: normal; ' +
-                'font-weight: normal; ' +
                 'src: url("/fonts/source-sans-pro/source-sans-pro-regular.woff2") format("woff2"), url("/fonts/source-sans-pro/source-sans-pro-regular.woff") format("woff"), url("/fonts/source-sans-pro/source-sans-pro-regular.ttf") format("truetype");'
 
       expect("@font-face").to have_ruleset(ruleset)

data/spec/bourbon/addons/font_face_spec_2.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe "font-face" do
+  before(:all) do
+    ParserSupport.parse_file("css3/font-face-5")
+  end
+
+  context "called with additional CSS rules" do
+    it "outputs defaults with additional content" do
+      ruleset = 'font-family: "calibre"; ' +
+                'src: url("fonts/calibre.woff2") format("woff2"), ' +
+                'url("fonts/calibre.woff") format("woff"), ' +
+                'url("fonts/calibre.ttf") format("truetype"); ' +
+                "font-style: normal;" +
+                "font-weight: 600;" +
+                "unicode-range: U+26;"
+
+      expect("@font-face").to have_ruleset(ruleset)
+    end
+  end
+end

data/spec/bourbon/{css3 → addons}/font_face_spec_3.rb

@@ -7,10 +7,8 @@ describe "font-face" do
 
   context "called with defaults" do
     it "outputs defaults" do
-      ruleset = 'font-family: "pitch"; ' +
-                'font-style: "normal"; ' +
-                'font-weight: "normal"; ' +
-                'src: url("/fonts/pitch.woff") format("woff");'
+      ruleset = 'font-family: "pitch";' +
+                'src: font-url("/fonts/pitch.woff2") format("woff2");'
 
       expect("@font-face").to have_ruleset(ruleset)
     end

data/spec/bourbon/{css3 → addons}/font_face_spec_4.rb

@@ -8,8 +8,6 @@ describe "font-face" do
   context "called with defaults" do
     it "outputs defaults" do
       ruleset = 'font-family: "circular"; ' +
-                'font-style: "normal"; ' +
-                'font-weight: "normal"; ' +
                 'src: url("/circular.woff2") format("woff2"), ' +
                 'url("/circular.svg#circular") format("svg");'
 

data/spec/bourbon/addons/font_stacks_spec.rb

@@ -9,7 +9,7 @@ describe "font-stacks" do
     it "output stacks" do
       helvetica = '"Helvetica Neue", "Helvetica", "Arial", sans-serif'
       lucida_grande = '"Lucida Grande", "Lucida Sans Unicode", ' +
-                      '"Lucida Sans", "Geneva", "Verdana", sans-serif'
+                      '"Geneva", "Verdana", sans-serif'
       verdana = '"Verdana", "Geneva", sans-serif'
       garamond = '"Garamond", "Baskerville", "Baskerville Old Face", ' +
                  '"Hoefler Text", "Times New Roman", serif'
@@ -21,6 +21,10 @@ describe "font-stacks" do
                     '"Lucida Typewriter", monospace'
       monaco = '"monaco", "Consolas", "Lucida Console", monospace'
 
+      system = '-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", ' +
+               '"Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", ' +
+               '"Helvetica Neue", sans-serif'
+
       expect(".helvetica").to have_value(helvetica)
       expect(".lucida-grande").to have_value(lucida_grande)
       expect(".verdana").to have_value(verdana)
@@ -30,6 +34,7 @@ describe "font-stacks" do
       expect(".consolas").to have_value(consolas)
       expect(".courier-new").to have_value(courier_new)
       expect(".monaco").to have_value(monaco)
+      expect(".system").to have_value(system)
     end
   end
 end

data/spec/bourbon/addons/hide_visually_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe "hide-visually" do
+  before(:all) do
+    ParserSupport.parse_file("addons/hide-visually")
+  end
+
+  context "called on element" do
+    it "adds properties to hide the element" do
+      ruleset = "border: 0; " +
+                "clip: rect(1px, 1px, 1px, 1px); " +
+                "clip-path: circle(1% at 1% 1%); " +
+                "height: 1px; " +
+                "overflow: hidden; " +
+                "padding: 0; " +
+                "position: absolute; " +
+                "width: 1px;"
+
+      expect(".hide-visually").to have_ruleset(ruleset)
+    end
+  end
+
+  context "called with unhide argument" do
+    it "adds properties to reverse the hiding of the element" do
+      ruleset = "clip: auto; " +
+                "clip-path: none; " +
+                "height: auto; " +
+                "overflow: visible; " +
+                "position: static; " +
+                "width: auto;"
+
+      expect(".hide-visually--unhide").to have_ruleset(ruleset)
+    end
+  end
+end

data/spec/bourbon/{functions → addons}/modular_scale_spec.rb

@@ -2,24 +2,24 @@ require "spec_helper"
 
 describe "modular-scale" do
   before(:all) do
-    ParserSupport.parse_file("functions/modular-scale")
+    ParserSupport.parse_file("addons/modular-scale")
   end
 
   context "called with arguments (1, $value: 2em)" do
     it "outputs double the first value from the default scale" do
-      expect(".one-base-two").to have_rule("font-size: 2.666em")
+      expect(".one-base-two").to have_rule("font-size: 2.5em")
     end
   end
 
   context "called with arguments (1, $value: 3em)" do
     it "outputs triple the first value from the default scale" do
-      expect(".one-base-three").to have_rule("font-size: 3.999em")
+      expect(".one-base-three").to have_rule("font-size: 3.75em")
     end
   end
 
   context "called with arguments (1, $value: 4em 6em)" do
     it "outputs quadruple the first value from the default scale" do
-      expect(".one-double-value").to have_rule("font-size: 1.12556em")
+      expect(".one-double-value").to have_rule("font-size: 1.024em")
     end
   end
 
@@ -31,13 +31,13 @@ describe "modular-scale" do
 
   context "called with argument (2)" do
     it "outputs the second value from the default scale" do
-      expect(".two-base-one").to have_rule("font-size: 1.77689em")
+      expect(".two-base-one").to have_rule("font-size: 1.5625em")
     end
   end
 
   context "called with arguments (2, $value: 4em 6em)" do
     it "outputs sextuple the second value from the default scale" do
-      expect(".two-double-value").to have_rule("font-size: 3.55378em")
+      expect(".two-double-value").to have_rule("font-size: 3.125em")
     end
   end
 end