bourbon 5.0.0.beta.1 → 5.0.0.beta.2

data/core/bourbon/{functions → validators}/_is-light.scss

@@ -10,8 +10,10 @@
 ///   is-light($color)
 ///
 /// @return {boolean}
+///
+/// @access private
 
-@function is-light($hex-color) {
+@function _is-light($hex-color) {
   $-local-red: red(rgba($hex-color, 1));
   $-local-green: green(rgba($hex-color, 1));
   $-local-blue: blue(rgba($hex-color, 1));

data/features/step_definitions/bourbon_steps.rb

@@ -7,10 +7,11 @@ end
 
 Then /^the sass directories(?: with "([^"]+)" prefix)? should have been generated$/ do |prefix|
   sass_directories = [
-    "bourbon/addons",
     "bourbon/helpers",
-    "bourbon/functions",
+    "bourbon/library",
     "bourbon/settings",
+    "bourbon/utilities",
+    "bourbon/validators",
   ]
   sass_directories.map!{ |directory| bourbon_path(prefix, directory) }
   check_directory_presence(sass_directories, true)

data/lib/bourbon.rb

@@ -1,20 +1,3 @@
 require "bourbon/generator"
-
-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("../../core", __FILE__)
-    ENV["SASS_PATH"] = [ENV["SASS_PATH"], bourbon_path].compact.join(File::PATH_SEPARATOR)
-  end
-end
+bourbon_path = File.expand_path("../../core", __FILE__)
+ENV["SASS_PATH"] = File.join([ENV["SASS_PATH"], bourbon_path].compact)

data/lib/bourbon/version.rb

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

data/package.json

@@ -1,7 +1,17 @@
 {
-  "name": "bourbon",
-  "version": "5.0.0-beta.1",
+  "author": {
+    "name": "thoughtbot",
+    "url": "http://thoughtbot.com"
+  },
+  "bugs": {
+    "url": "https://github.com/thoughtbot/bourbon/issues"
+  },
   "description": "A simple and lightweight mixin library for Sass.",
+  "eyeglass": {
+    "needs": "*",
+    "exports": "eyeglass-exports.js"
+  },
+  "homepage": "http://bourbon.io",
   "keywords": [
     "css",
     "eyeglass-module",
@@ -9,25 +19,15 @@
     "sass",
     "scss"
   ],
-  "homepage": "http://bourbon.io",
-  "bugs": {
-    "url": "https://github.com/thoughtbot/bourbon/issues"
-  },
-  "eyeglass": {
-    "needs": "*",
-    "exports": "eyeglass-exports.js"
-  },
   "license": "MIT",
-  "author": {
-    "name": "thoughtbot",
-    "url": "http://thoughtbot.com"
-  },
   "main": "index.js",
+  "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-beta.2"
 }

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

@@ -2,7 +2,7 @@ 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

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,7 +2,7 @@ require "spec_helper"
 
 describe "buttons" do
   before(:all) do
-    ParserSupport.parse_file("addons/buttons")
+    ParserSupport.parse_file("library/buttons")
 
     @buttons_list = %w(
       button

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

@@ -2,7 +2,7 @@ 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

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "contrast-switch" do
   before(:all) do
-    ParserSupport.parse_file("addons/contrast-switch")
+    ParserSupport.parse_file("library/contrast-switch")
   end
 
   context "called with a light base color" do

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/{addons → library}/font_stacks_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "font-stacks" do
   before(:all) do
-    ParserSupport.parse_file("addons/font-stacks")
+    ParserSupport.parse_file("library/font-stacks")
   end
 
   context "stacks used in variable" do

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "modular-scale" do
   before(:all) do
-    ParserSupport.parse_file("addons/modular-scale")
+    ParserSupport.parse_file("library/modular-scale")
   end
 
   context "called with arguments (1, $value: 2em)" do

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

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

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

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

data/spec/bourbon/{functions → library}/shade_spec.rb

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

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

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

data/spec/bourbon/{functions → library}/strip_unit_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "strip-unit" do
   before(:all) do
-    ParserSupport.parse_file("functions/strip-unit")
+    ParserSupport.parse_file("library/strip-unit")
   end
 
   context "called with px" do

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "text-inputs" do
   before(:all) do
-    ParserSupport.parse_file("addons/text-inputs")
+    ParserSupport.parse_file("library/text-inputs")
 
     @inputs_list = %w(
       [type='color']

data/spec/bourbon/{functions → library}/tint_spec.rb

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

data/spec/bourbon/library/triangle_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe "triangle" do
+  before(:all) do
+    ParserSupport.parse_file("library/triangle")
+  end
+
+  context "called with defaults" do
+    it "outputs the properties" do
+      ruleset = "border-style: solid; " +
+                "height: 0; " +
+                "width: 0; " +
+                "border-color: transparent transparent currentColor; " +
+                "border-width: 0 0.5rem 0.5rem;"
+
+      expect(".triangle").to have_ruleset(ruleset)
+    end
+  end
+
+  context "called with arguments" do
+    it "outputs the properties" do
+      ruleset = "border-style: solid; " +
+                "height: 0; " +
+                "width: 0; " +
+                "border-color: #b25c9c transparent transparent; " +
+                "border-width: 20px 15px 0;"
+
+      expect(".triangle--with-arguments").to have_ruleset(ruleset)
+    end
+  end
+end

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

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

data/spec/bourbon/{functions → utilities}/assign_inputs_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "assign-inputs" do
   before(:all) do
-    ParserSupport.parse_file("functions/assign-inputs")
+    ParserSupport.parse_file("utilities/assign-inputs")
     @text_inputs_list = [
       "[type='password']",
       "[type='text']",

data/spec/bourbon/{settings → utilities}/bourbon_get_setting_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "_bourbon-get-setting" do
   before(:all) do
-    ParserSupport.parse_file("settings/bourbon-get-setting")
+    ParserSupport.parse_file("utilities/bourbon-get-setting")
   end
 
   context "gets the modular-scale-base setting" do

data/spec/bourbon/{functions → utilities}/collapse_directionals.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "collapse-directionals" do
   before(:all) do
-    ParserSupport.parse_file("functions/collapse-directionals")
+    ParserSupport.parse_file("utilities/collapse-directionals")
   end
 
   context "collapse-directionals" do

data/spec/bourbon/{helpers → utilities}/directional_values_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "directional-values" do
   before(:all) do
-    ParserSupport.parse_file("helpers/directional-values")
+    ParserSupport.parse_file("utilities/directional-values")
   end
 
   context "directional-property" do

data/spec/bourbon/{functions → utilities}/font_source_declaration_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "font-source-declaration" do
   before(:all) do
-    ParserSupport.parse_file("functions/font-source-declaration")
+    ParserSupport.parse_file("utilities/font-source-declaration")
   end
 
   context "called with pipeline" do

data/spec/bourbon/{functions → utilities}/unpack_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "unpack" do
   before(:all) do
-    ParserSupport.parse_file("functions/unpack")
+    ParserSupport.parse_file("utilities/unpack")
   end
 
   context "single" do

data/spec/bourbon/{functions → validators}/contains_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "contains" do
   before(:all) do
-    ParserSupport.parse_file("functions/contains")
+    ParserSupport.parse_file("validators/contains")
   end
 
   context "called on array with single item" do