SassyCast 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f42a0fe044be49a40d427fe6af9cdc0fa60639a
-  data.tar.gz: 8a4c35110c665195d42761ae5a9aa389ea86bb5f
+  metadata.gz: 1a2f1dc189fde28c3eab8bdc0d8437f41f2bde33
+  data.tar.gz: 48f936048f7a036c01ede59ed44347f2f5410dfb
 SHA512:
-  metadata.gz: bf461c41c1d0a48c9496a755996edff6ced8011b14541e7708968a46027cbcaf2dab57d15fe1d9971948bcd3d4818bc1f65184f46267b09c2b5bc88cec3cb6ea
-  data.tar.gz: e16b8b9828b79152b02b54f697e51a39b9ccaed02fd0526023c8de3646a84aff6528e78cf876e38337f44524c4f9aa0cf4fbe4eefc798aca5af19df0cc7e57b6
+  metadata.gz: f6f42c4059bd809b9ac44695b689695cf2ad22e1e61825f84990b56d6dd329d0752159fdb3de8df685942a586eb4ae7ac005a3bba079222f3c0a53074a37be85
+  data.tar.gz: 51d15bcb539e4796ebca7d86237471acc2f0085fb78f66db35f89d7fb2f9d51e82de138a02f14ddb7495bc03e0c93a5de55cb3057069fea26725434a9ff3e7dd

data/CHANGELOG.md

@@ -1,4 +1,5 @@
-# Changelog
-
-* `1.0.0`: `to-list` improvements, stable API
-* `0.0.1`: initial commit
+# Changelog
+
+* `1.1.0`: dissociated error checking from function logic, and fixed some minor things
+* `1.0.0`: `to-list` improvements, stable API
+* `0.0.1`: initial commit

data/README.md

@@ -1,119 +1,123 @@
-SassyCast
-=========
-
-SassyCast is a simple API for type conversion in Sass.
-
-## `to-bool`
-
-``` scss
-to-bool(false);                 // false
-to-bool(0);                     // false
-to-bool(null);                  // false
-to-bool("");                    // false
-to-bool(true);                  // true
-to-bool(1);                     // true
-to-bool(());                    // true
-to-bool(string);                // true
-to-bool("quoted string");       // true
-to-bool(this is a list);        // true
-to-bool((this: is a map));      // true
-to-bool(1337);                  // true
-to-bool(#000);                  // true
-```
-
-## `to-number`
-
-``` scss
-to-number(1337);                // 1337
-to-number("0");                 // 0
-to-number("42");                // 42
-to-number("4.2");               // 4.2
-to-number("-10");               // -10
-to-number("-10px");             // -10px
-to-number(true);                // 1
-to-number(false);               // 0
-to-number(string);              // 0
-to-number(this is a list);      // 0
-to-number((this: is a map));    // 0
-to-number(null);                // 0
-to-number(#000);                // 0
-```
-
-## `to-list`
-
-``` scss
-to-list(0);                     // 0
-to-list(1);                     // 1
-to-list(string);                // string
-to-list(this is a list);        // this is a list
-to-list(this: is a map);        // this, is a map
-to-list(true);                  // true
-to-list(false);                 // false
-to-list(null);                  // null
-to-list(#000);                  // #333
-```
-
-## `to-string`
-
-``` scss
-to-string(0);                   // "0"
-to-string(1);                   // "1"
-to-string(true);                // "true"
-to-string(false);               // "false"
-to-string(null);                // "null"
-to-string(this is a list);      // "this is a list"
-to-string(this, is, a, list);   // "this, is, a, list"
-to-string((this: is a map));    // "(this: is a map)"
-to-string((this: is, a, map));  // "(this: is, a, map)"
-to-string(#000);                // "#333"
-```
-
-## `to-null`
-
-``` scss
-to-null(null);                  // null
-to-null(0);                     // null
-to-null(1);                     // null
-to-null(string);                // null
-to-null(this is a list);        // null
-to-null(this: is a map);        // null
-to-null(true);                  // null
-to-null(false);                 // null
-to-null(#333);                  // null
-```
-
-## `to-map`
-
-``` scss
-to-map(0);                      // (1: 0)
-to-map(1);                      // (1: 1)
-to-map(true);                   // (1: true)
-to-map(false);                  // (1: false)
-to-map(null);                   // (1: null)
-to-map(string);                 // (1: string)
-to-map(this is a list);         // (1: this, 2: is, 3: a, 4: map)
-to-map(this: is a map);         // (this: is a map)
-```
-
-## `to-color`
-
-``` scss
-to-color(0);                    // null
-to-color(1);                    // null
-to-color(black);                // black
-to-color(#000);                 // black
-to-color("#000");               // black
-to-color(true);                 // null
-to-color(false);                // null
-to-color(null);                 // null
-to-color(string);               // null
-to-color(this is a list);       // null
-to-color((this: is a map));     // null
-```
-
-## A few things to note:
-
-* When trying to cast something to a number that cannot be converted, it returns `0`
-* When trying to cast something to a color that cannot be converted, it returns `null`
-* Casting to a map use `1` as key (and index in case of a list)
-* Color formats are converted automatically by Sass; when casting a color to string, the resulting string can be different from the color input
+SassyCast
+=========
+
+SassyCast is a simple API for type conversion in Sass.
+
+## `to-bool`
+
+``` scss
+to-bool(false);                 // false
+to-bool(0);                     // false
+to-bool(null);                  // false
+to-bool("");                    // false
+to-bool(true);                  // true
+to-bool(1);                     // true
+to-bool(());                    // true
+to-bool(string);                // true
+to-bool("quoted string");       // true
+to-bool(this is a list);        // true
+to-bool((this: is a map));      // true
+to-bool(1337);                  // true
+to-bool(#000);                  // true
+```
+
+## `to-number`
+
+``` scss
+to-number(1337);                // 1337
+to-number("0");                 // 0
+to-number("42");                // 42
+to-number("4.2");               // 4.2
+to-number("-10");               // -10
+to-number("-10px");             // -10px
+to-number(true);                // 1
+to-number(false);               // 0
+to-number(string);              // 0
+to-number(this is a list);      // 0
+to-number((this: is a map));    // 0
+to-number(null);                // 0
+to-number(#000);                // 0
+```
+
+## `to-list`
+
+``` scss
+to-list(0);                     // 0
+to-list(1);                     // 1
+to-list(string);                // string
+to-list(this is a list);        // this is a list
+to-list(this: is a map);        // this, is a map
+to-list(true);                  // true
+to-list(false);                 // false
+to-list(null);                  // null
+to-list(#000);                  // #333
+```
+
+## `to-string`
+
+``` scss
+to-string(0);                   // "0"
+to-string(1);                   // "1"
+to-string(true);                // "true"
+to-string(false);               // "false"
+to-string(null);                // "null"
+to-string(this is a list);      // "this is a list"
+to-string(this, is, a, list);   // "this, is, a, list"
+to-string((this: is a map));    // "(this: is a map)"
+to-string((this: is, a, map));  // "(this: is, a, map)"
+to-string(#000);                // "#333"
+```
+
+## `to-null`
+
+``` scss
+to-null(null);                  // null
+to-null(0);                     // null
+to-null(1);                     // null
+to-null(string);                // null
+to-null(this is a list);        // null
+to-null(this: is a map);        // null
+to-null(true);                  // null
+to-null(false);                 // null
+to-null(#333);                  // null
+```
+
+## `to-map`
+
+``` scss
+to-map(0);                      // (1: 0)
+to-map(1);                      // (1: 1)
+to-map(true);                   // (1: true)
+to-map(false);                  // (1: false)
+to-map(null);                   // (1: null)
+to-map(string);                 // (1: string)
+to-map(this is a list);         // (1: this, 2: is, 3: a, 4: map)
+to-map(this: is a map);         // (this: is a map)
+```
+
+## `to-color`
+
+``` scss
+to-color(0);                    // null
+to-color(1);                    // null
+to-color(black);                // black
+to-color(#000);                 // black
+to-color("#000");               // black
+to-color(true);                 // null
+to-color(false);                // null
+to-color(null);                 // null
+to-color(string);               // null
+to-color(this is a list);       // null
+to-color((this: is a map));     // null
+```
+
+## A few things to note:
+
+* When trying to cast something to a number that cannot be converted, it returns `0`
+* When trying to cast something to a color that cannot be converted, it returns `null`
+* Casting to a map use `1` as key (and index in case of a list)
+* Color formats are sometimes converted automatically by Sass; when casting a color to string, the resulting string can be different from the color input
+
+## Credits
+
+Huge thanks to [Marc Mintel](http://twitter.com/marcmintel) for his help.

data/lib/SassyCast.rb

@@ -1,14 +1,14 @@
-require 'compass'
-extension_path = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-Compass::Frameworks.register('SassyCast', :path => extension_path)
-
-#  Version is a number. If a version contains alphas, it will be created as a prerelease version
-#  Date is in the form of YYYY-MM-DD
-module SassyCast
-  VERSION = "1.0.0"
-  DATE = "2014-01-31"
-end
-
-module Sass::Script::Functions
-
-end
+require 'compass'
+extension_path = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+Compass::Frameworks.register('SassyCast', :path => extension_path)
+
+#  Version is a number. If a version contains alphas, it will be created as a prerelease version
+#  Date is in the form of YYYY-MM-DD
+module SassyCast
+  VERSION = "1.1.0"
+  DATE = "2014-10-03"
+end
+
+module Sass::Script::Functions
+
+end

data/stylesheets/SassyCast.scss

@@ -1,7 +1,2 @@
-@import "types/bool/bool";
-@import "types/number/number";
-@import "types/string/string";
-@import "types/list/list";
-@import "types/map/map";
-@import "types/null/null";
-@import "types/color/color";
+@import "private/all";
+@import "public/all";

data/stylesheets/private/_all.scss

@@ -0,0 +1,16 @@
+@import "bool/bool";
+@import "number/helpers/find-integer";
+@import "number/helpers/find-digits";
+@import "number/helpers/pow";
+@import "number/helpers/length";
+@import "number/number";
+@import "string/string";
+@import "list/list";
+@import "map/map";
+@import "null/null";
+@import "color/helpers/from-rgb";
+@import "color/helpers/from-hsl";
+@import "color/helpers/from-hex";
+@import "color/helpers/get-color-value";
+@import "color/helpers/hex-to-dec";
+@import "color/color";

data/stylesheets/private/bool/_bool.scss

@@ -0,0 +1,16 @@
+/**
+ * Convert to bool
+ * ---
+ * @access private
+ * ---
+ * @param {*} $value - value to cast
+ * ---
+ * @return {bool}
+ */
+
+@function _sc-to-bool($value) {
+  @if not $value or $value == "" or $value == 0 {
+    @return false;
+  }
+  @return true;
+}

data/stylesheets/{types → private}/color/_color.scss

@@ -1,64 +1,60 @@
-// Helpers
-
-@import "helpers/from-rgb";
-@import "helpers/from-hsl";
-@import "helpers/from-hex";
-@import "helpers/get-color-value";
-@import "helpers/hex-to-dec";
-
-// Convert to color
-// --------------------------------------------------------------------------------
-// @param $value: value to cast
-// --------------------------------------------------------------------------------
-// @return [color] | null
-
-@function to-color($value) {
-  @if type-of($value) == color {
-    @return $value;
-  }
-
-  @if type-of($value) != string {
-    //@warn "Could not cast `#{inspect($value)}` to color.";
-    @return null;
-  }
-  
-  $value-lower: to-lower-case($value);
-  $colors: transparent black silver gray white maroon red purple fuchsia green lime olive yellow navy blue teal aqua aliceblue antiquewhite aqua aquamarine azure beige bisque black blanchedalmond blue blueviolet brown burlywood cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan darkblue darkcyan darkgoldenrod darkgray darkgreen darkgrey darkkhaki darkmagenta darkolivegreen darkorange darkorchid darkred darksalmon darkseagreen darkslateblue darkslategray darkslategrey darkturquoise darkviolet deeppink deepskyblue dimgray dimgrey dodgerblue firebrick floralwhite forestgreen fuchsia gainsboro ghostwhite gold goldenrod gray green greenyellow grey honeydew hotpink indianred indigo ivory khaki lavender lavenderblush lawngreen lemonchiffon lightblue lightcoral lightcyan lightgoldenrodyellow lightgray lightgreen lightgrey lightpink lightsalmon lightseagreen lightskyblue lightslategray lightslategrey lightsteelblue lightyellow lime limegreen linen magenta maroon mediumaquamarine mediumblue mediumorchid mediumpurple mediumseagreen mediumslateblue mediumspringgreen mediumturquoise mediumvioletred midnightblue mintcream mistyrose moccasin navajowhite navy oldlace olive olivedrab orange orangered orchid palegoldenrod palegreen paleturquoise palevioletred papayawhip peachpuff peru pink plum powderblue purple red rosybrown royalblue saddlebrown salmon sandybrown seagreen seashell sienna silver skyblue slateblue slategray slategrey snow springgreen steelblue tan teal thistle tomato turquoise violet wheat white whitesmoke yellow yellowgreen;
-  $keywords: ();
-
-  // Filling $keywords with stringified color keywords
-  @each $color in $colors {
-    $keywords: append($keywords, $color + "");
-  }
-  
-  // Deal with inherit keyword
-  @if $value-lower == "inherit" {
-    @return unquote($value);
-  }
- 
-  // Deal with color keywords
-  @if index($keywords, $value-lower) {
-    @return nth($colors, index($keywords, $value-lower));
-  }
-  
-  // Deal with hexadecimal triplets
-  @else if str-slice($value-lower, 1, 1) == '#' {
-    @return _from-hex($value);
-  }
-  
-  // Deal with rgb(a) colors
-  @else if str-slice($value-lower, 1, 3) == 'rgb' {
-    @return _from-rgb($value);
-  }
-  
-  // Deal with hsl(a) colors
-  @else if str-slice($value-lower, 1, 3) == 'hsl' {
-    @return _from-hsl($value);
-  }
-  
-  // Return value
-  @else {
-    //@warn "Could not cast `#{inspect($value)}` to color.";
-    @return null;
-  }
+/** 
+ * Convert to color
+ * ---
+ * @access private
+ * ---
+ * @param {*} $value - value to cast
+ * ---
+ * @return {color | null}
+ */
+
+@function _sc-to-color($value) {
+  @if type-of($value) == color {
+    @return $value;
+  }
+
+  @if type-of($value) != string {
+    //@warn "Could not cast `#{inspect($value)}` to color.";
+    @return null;
+  }
+  
+  $value-lower: to-lower-case($value);
+  $colors: transparent black silver gray white maroon red purple fuchsia green lime olive yellow navy blue teal aqua aliceblue antiquewhite aqua aquamarine azure beige bisque black blanchedalmond blue blueviolet brown burlywood cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan darkblue darkcyan darkgoldenrod darkgray darkgreen darkgrey darkkhaki darkmagenta darkolivegreen darkorange darkorchid darkred darksalmon darkseagreen darkslateblue darkslategray darkslategrey darkturquoise darkviolet deeppink deepskyblue dimgray dimgrey dodgerblue firebrick floralwhite forestgreen fuchsia gainsboro ghostwhite gold goldenrod gray green greenyellow grey honeydew hotpink indianred indigo ivory khaki lavender lavenderblush lawngreen lemonchiffon lightblue lightcoral lightcyan lightgoldenrodyellow lightgray lightgreen lightgrey lightpink lightsalmon lightseagreen lightskyblue lightslategray lightslategrey lightsteelblue lightyellow lime limegreen linen magenta maroon mediumaquamarine mediumblue mediumorchid mediumpurple mediumseagreen mediumslateblue mediumspringgreen mediumturquoise mediumvioletred midnightblue mintcream mistyrose moccasin navajowhite navy oldlace olive olivedrab orange orangered orchid palegoldenrod palegreen paleturquoise palevioletred papayawhip peachpuff peru pink plum powderblue purple red rosybrown royalblue saddlebrown salmon sandybrown seagreen seashell sienna silver skyblue slateblue slategray slategrey snow springgreen steelblue tan teal thistle tomato turquoise violet wheat white whitesmoke yellow yellowgreen;
+  $keywords: ();
+
+  // Filling $keywords with stringified color keywords
+  @each $color in $colors {
+    $keywords: append($keywords, $color + "");
+  }
+  
+  // Deal with inherit keyword
+  @if $value-lower == "inherit" {
+    @return unquote($value);
+  }
+ 
+  // Deal with color keywords
+  @if index($keywords, $value-lower) {
+    @return nth($colors, index($keywords, $value-lower));
+  }
+  
+  // Deal with hexadecimal triplets
+  @else if str-slice($value-lower, 1, 1) == '#' {
+    @return _sc-from-hex($value);
+  }
+  
+  // Deal with rgb(a) colors
+  @else if str-slice($value-lower, 1, 3) == 'rgb' {
+    @return _sc-from-rgb($value);
+  }
+  
+  // Deal with hsl(a) colors
+  @else if str-slice($value-lower, 1, 3) == 'hsl' {
+    @return _sc-from-hsl($value);
+  }
+  
+  // Return value
+  @else {
+    //@warn "Could not cast `#{inspect($value)}` to color.";
+    @return null;
+  }
 }