bourbon 4.3.4 → 5.0.0

data/features/step_definitions/bourbon_steps.rb

@@ -6,7 +6,13 @@ Given /^I install bourbon to "([^"]*)"$/ do |path|
 end
 
 Then /^the sass directories(?: with "([^"]+)" prefix)? should have been generated$/ do |prefix|
-  sass_directories = ["addons", "css3", "functions"]
+  sass_directories = [
+    "bourbon/helpers",
+    "bourbon/library",
+    "bourbon/settings",
+    "bourbon/utilities",
+    "bourbon/validators",
+  ]
   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, 'app/assets/stylesheets')
+    path.join(__dirname, "core")
   ]
 };

data/lib/bourbon.rb

@@ -1,28 +1,4 @@
-# CodeKit needs relative paths
-dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
-
+require "sass"
 require "bourbon/generator"
 
-unless defined?(Sass)
-  require 'sass'
-end
-
-module Bourbon
-  if defined?(Rails) && defined?(Rails::Engine)
-    class Engine < ::Rails::Engine
-      require 'bourbon/engine'
-    end
-
-    module Rails
-      class Railtie < ::Rails::Railtie
-        rake_tasks do
-          load "tasks/install.rake"
-        end
-      end
-    end
-  else
-    bourbon_path = File.expand_path("../../app/assets/stylesheets", __FILE__)
-    ENV["SASS_PATH"] = [ENV["SASS_PATH"], bourbon_path].compact.join(File::PATH_SEPARATOR)
-  end
-end
+Sass.load_paths << File.expand_path("../../core", __FILE__)

data/lib/bourbon/generator.rb

@@ -1,12 +1,13 @@
-require 'bourbon/version'
+require "bourbon/version"
 require "fileutils"
-require 'thor'
+require "thor"
+require "pathname"
 
 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 +18,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 +30,7 @@ module Bourbon
       end
     end
 
-    desc 'version', 'Show Bourbon version'
+    desc "version", "Show Bourbon version"
     def version
       say "Bourbon #{Bourbon::VERSION}"
     end
@@ -42,9 +43,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
 
@@ -54,7 +55,7 @@ module Bourbon
     end
 
     def remove_bourbon_directory
-      FileUtils.rm_rf("bourbon")
+      FileUtils.rm_rf(install_path)
     end
 
     def make_install_directory
@@ -70,7 +71,7 @@ module Bourbon
     end
 
     def stylesheets_directory
-      File.join(top_level_directory, "app", "assets", "stylesheets")
+      File.join(top_level_directory, "core")
     end
 
     def top_level_directory

data/lib/bourbon/version.rb

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

data/package.json

@@ -1,33 +1,34 @@
 {
-  "name": "bourbon",
-  "version": "4.3.4",
-  "description": "A simple and lightweight mixin library for Sass.",
-  "keywords": [
-    "css",
-    "eyeglass-module",
-    "mixins",
-    "sass",
-    "scss"
-  ],
-  "homepage": "http://bourbon.io",
+  "author": {
+    "name": "thoughtbot",
+    "url": "http://thoughtbot.com"
+  },
   "bugs": {
     "url": "https://github.com/thoughtbot/bourbon/issues"
   },
+  "description": "A lightweight Sass tool set.",
   "eyeglass": {
     "needs": "*",
     "exports": "eyeglass-exports.js"
   },
+  "homepage": "http://bourbon.io",
+  "keywords": [
+    "css",
+    "eyeglass-module",
+    "mixins",
+    "sass",
+    "scss"
+  ],
   "license": "MIT",
-  "author": {
-    "name": "thoughtbot",
-    "url": "http://thoughtbot.com"
-  },
   "main": "index.js",
+  "style": "core/_bourbon.scss",
+  "name": "bourbon",
   "repository": {
     "type": "git",
     "url": "https://github.com/thoughtbot/bourbon.git"
   },
   "scripts": {
-    "test": "echo \"No test specified\""
-  }
+    "test": "bundle exec rake"
+  },
+  "version": "5.0.0"
 }

data/spec/bourbon/{addons → library}/border_color_spec.rb

@@ -2,12 +2,12 @@ require "spec_helper"
 
 describe "border-color" do
   before(:all) do
-    ParserSupport.parse_file("addons/border-color")
+    ParserSupport.parse_file("library/border-color")
   end
 
   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 → library}/border_radius_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "border-radius" do
   before(:all) do
-    ParserSupport.parse_file("addons/border-radius")
+    ParserSupport.parse_file("library/border-radius")
   end
 
   context "called with one argument" do

data/spec/bourbon/{addons → library}/border_style_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "border-style" do
   before(:all) do
-    ParserSupport.parse_file("addons/border-style")
+    ParserSupport.parse_file("library/border-style")
   end
 
   context "called with one style" do

data/spec/bourbon/{addons → library}/border_width_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "border-width" do
   before(:all) do
-    ParserSupport.parse_file("addons/border-width")
+    ParserSupport.parse_file("library/border-width")
   end
 
   context "called with one color" do

data/spec/bourbon/{addons → library}/buttons_spec.rb

@@ -2,13 +2,13 @@ require "spec_helper"
 
 describe "buttons" do
   before(:all) do
-    ParserSupport.parse_file("addons/buttons")
+    ParserSupport.parse_file("library/buttons")
 
     @buttons_list = %w(
       button
-      input[type="button"]
-      input[type="reset"]
-      input[type="submit"]
+      [type='button']
+      [type='reset']
+      [type='submit']
     )
   end
 

data/spec/bourbon/{addons → library}/clearfix_spec.rb

@@ -2,15 +2,15 @@ require "spec_helper"
 
 describe "clearfix" do
   before(:all) do
-    ParserSupport.parse_file("addons/clearfix")
+    ParserSupport.parse_file("library/clearfix")
   end
 
   context "called on element" 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/library/contrast_switch_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe "contrast-switch" do
+  before(:all) do
+    ParserSupport.parse_file("library/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/{addons → library}/ellipsis_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "ellipsis" do
   before(:all) do
-    ParserSupport.parse_file("addons/ellipsis")
+    ParserSupport.parse_file("library/ellipsis")
   end
 
   context "called on element" do

data/spec/bourbon/library/font_face_spec_1.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe "font-face" do
+  before(:all) do
+    ParserSupport.parse_file("css3/font-face-1")
+  end
+
+  context "called with defaults" do
+    it "outputs defaults" do
+      ruleset = 'font-family: "source-sans-pro"; ' +
+                '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)
+    end
+  end
+end

data/spec/bourbon/library/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/library/font_face_spec_3.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe "font-face" do
+  before(:all) do
+    ParserSupport.parse_file("css3/font-face-3")
+  end
+
+  context "called with defaults" do
+    it "outputs defaults" do
+      ruleset = 'font-family: "pitch";' +
+                'src: font-url("/fonts/pitch.woff2") format("woff2");'
+
+      expect("@font-face").to have_ruleset(ruleset)
+    end
+  end
+end

data/spec/bourbon/library/font_face_spec_4.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+describe "font-face" do
+  before(:all) do
+    ParserSupport.parse_file("css3/font-face-4")
+  end
+
+  context "called with defaults" do
+    it "outputs defaults" do
+      ruleset = 'font-family: "circular"; ' +
+                'src: url("/circular.woff2") format("woff2"), ' +
+                'url("/circular.svg#circular") format("svg");'
+
+      expect("@font-face").to have_ruleset(ruleset)
+    end
+  end
+end

data/spec/bourbon/library/font_stacks_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe "font-stacks" do
+  before(:all) do
+    ParserSupport.parse_file("library/font-stacks")
+  end
+
+  context "stacks used in variable" do
+    it "output stacks" do
+      helvetica = '"Helvetica Neue", "Helvetica", "Arial", sans-serif'
+      lucida_grande = '"Lucida Grande", "Lucida Sans Unicode", ' +
+                      '"Geneva", "Verdana", sans-serif'
+      verdana = '"Verdana", "Geneva", sans-serif'
+      garamond = '"Garamond", "Baskerville", "Baskerville Old Face", ' +
+                 '"Hoefler Text", "Times New Roman", serif'
+      georgia = '"Georgia", "Times", "Times New Roman", serif'
+      hoefler_text = '"Hoefler Text", "Baskerville Old Face", ' +
+                     '"Garamond", "Times New Roman", serif'
+      consolas = '"Consolas", "monaco", monospace'
+      courier_new = '"Courier New", "Courier", "Lucida Sans Typewriter", ' +
+                    '"Lucida Typewriter", monospace'
+      monaco = '"Monaco", "Consolas", "Lucida Console", monospace'
+
+      system = '-apple-system, BlinkMacSystemFont, "Avenir Next", "Avenir", ' +
+               '"Segoe UI", "Lucida Grande", "Helvetica Neue", "Helvetica", ' +
+               '"Fira Sans", "Roboto", "Noto", "Droid Sans", "Cantarell", ' +
+               '"Oxygen", "Ubuntu", "Franklin Gothic Medium", ' +
+               '"Century Gothic", "Liberation Sans", sans-serif'
+
+      expect(".helvetica").to have_value(helvetica)
+      expect(".lucida-grande").to have_value(lucida_grande)
+      expect(".verdana").to have_value(verdana)
+      expect(".garamond").to have_value(garamond)
+      expect(".georgia").to have_value(georgia)
+      expect(".hoefler-text").to have_value(hoefler_text)
+      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