flint-gs 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0d0539567fb162ecf38772974dbbc0cde72548
-  data.tar.gz: 5094eb179d16d8b40ce55666c9cf11cd7a3244e1
+  metadata.gz: 972dad8929bdf7d5e6d125c9da7c2d4b2dd86d1b
+  data.tar.gz: 1b2a584bfc2a192ddde61af066822ef74cc9cb80
 SHA512:
-  metadata.gz: f0286cbcee185f45947a5728bbe594e2841e738e4c613b18578118e41418d634bf415396ef7e6bd0abf2cc0e39225200e2b2f36f4de5c7ea657cd8982bd21296
-  data.tar.gz: c82aa3383be1c1b424d6ed822a4294d19848da8492492f87856b3453a39ebe19fe4957a488916815a2c251173c077c131a41c582bec60252fad4a14fcfa246f9
+  metadata.gz: 29914803abf6c0e4dec89d76d1550776564fc6ef6a8219122d53e1e1d78a3464ea765894219636b7baeee207c1ff4d8ddc46b6d9602395ac2b0ee15ab62ec5ab
+  data.tar.gz: 9cc8360a92e548e24522bd5d382d2680f6b6b362070c6e7d85e0a0eca69fc3e12fd45f76096f87e26cd44e978187125f2c1a5c8658bc167420127dc3b7d06b3d

data/README.md

@@ -53,36 +53,39 @@ function parses the selector string (for example, `.block__element__element`) li
 /**
  * Parser to support BEM syntax
  *
+ * @access private
+ *
  * @param {List} $selectors - string of selectors to parse
  *
  * @return {List} - parsed list of selectors according to syntax
+ *
+ * @group Internal Functions
  */
 @function flint-support-syntax-bem($selectors) {
-	// Clean up selector, remove double underscores for spaces
-	//  add pseudo character to differentiate selectors
-	$selectors: flint-replace-substring(inspect($selectors), "__", "/");
-	// Parse string back to list without pseudo character
-	$selectors: flint-string-to-list($selectors, "/");
-	// Define top-most parent of selector
-	$parent: nth($selectors, 1);
-	// Create new list of parsed selectors
-	$selector-list: ($parent);
-
-	// Loop over each selector and build list of selectors
-	@each $selector in $selectors {
-		// Make sure current selector is not the parent
-		@if $selector != $parent {
-			// Save to selector list
-			$selector-list: append($selector-list, ($parent + "__" + $selector), "comma");
-			// Define new parent
-			$parent: $parent + "__" + $selector;
-		}
-	}
-
-	// Return the list of parsed selectors
-	@return $selector-list;
+    // Clean up selector, remove double underscores for spaces
+    //  add pseudo character to differentiate selectors
+    $selectors: flint-replace-substring(inspect(unquote($selectors)), "__", "/");
+    // Parse string back to list without pseudo character
+    $selectors: flint-string-to-list($selectors, "/");
+    // Define top-most parent of selector
+    $parent: nth($selectors, 1);
+    // Create new list of parsed selectors
+    $selector-list: ("#{$parent}",);
+
+    // Loop over each selector and build list of selectors
+    @each $selector in $selectors {
+        // Make sure current selector is not the parent
+        @if $selector != $parent {
+            // Save to selector list
+            $selector-list: append($selector-list, "#{$parent}__#{$selector}", "comma");
+            // Define new parent
+            $parent: "#{$parent}__#{$selector}";
+        }
+    }
+
+    // Return the list of parsed selectors
+    @return $selector-list;
 }
-
 ```
 
 This will be parsed into a list of selectors: `.block, .block__element, .block__element__element`. The list of selectors can then be used by the

data/lib/flint.rb

@@ -1,4 +1,6 @@
-require 'sass'
+require "sass"
+require_relative "flint/version"
+require_relative "flint/functions"
 
 base_directory = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 flint_stylesheets_path = File.join(base_directory, 'stylesheets')
@@ -10,75 +12,5 @@ else
 end
 
 module Flint
-    VERSION = "2.0.3"
-    DATE = "2014-10-02"
-end
-
-module Sass::Script::Functions
-
-    ###
-    # Use ruby functions
-    #
-    # @return {Bool}
-    ###
-    def flint_use_ruby()
-        Sass::Script::Bool.new(true)
-    end
-
-    ###
-    # Fetch value from map
-    #
-    # @param {Map}     map  - map to fetch value from
-    # @param {ArgList} keys - list of keys to traverse
-    #
-    # @return {*}
-    ###
-    def flint_ruby_map_fetch(map, *keys)
-        assert_type map, :Map, :map
-        result = map
-        keys.each {|key| result != nil ? result = result.to_h.fetch(key, nil) : break}
-        return result != nil ? result : Sass::Script::Bool.new(false)
-    end
-    declare :flint_ruby_map_fetch, :args => [:map, :keys], :var_args => true
-
-    ###
-    # Turn string into a flat list
-    #
-    # @param {String} string    - string to operate on
-    # @param {String} separator - item to find which separates substrings
-    # @param {String} ignore    - removes remaining string beyond item
-    #
-    # @return {List}
-    ###
-    def flint_ruby_string_to_list(string, separator, ignore)
-        assert_type string, :String, :string
-        assert_type separator, :String, :separator
-        assert_type ignore, :String, :ignore
-        # Remove everything after ignore, split with separator
-        items = string.value[/[^#{ignore}]+/].split(separator.value)
-        if items.count == 1
-            Sass::Script::String.new(items[0], :comma)
-        else
-            Sass::Script::List.new(items.map { |i| Sass::Script::String.new(i) }, :comma)
-        end
-    end
-    declare :flint_ruby_string_to_list, :args => [:string, :separator, :ignore]
-
-    ###
-    # Replace substring with string
-    #
-    # @param {String} string  - string that contains substring
-    # @param {String} find    - substring to replace
-    # @param {String} replace - new string to replace sub with
-    #
-    # @return {String}
-    ###
-    def flint_ruby_replace_substring(string, find, replace)
-        assert_type string, :String, :string
-        assert_type find, :String, :find
-        assert_type replace, :String, :replace
-        Sass::Script::String.new(string.value.gsub(find.value, replace.value))
-    end
-    declare :flint_ruby_replace_substring, :args => [:string, :find, :replace]
-
+    Sass::Script::Functions.send(:include, Flint)
 end

data/lib/flint/functions.rb

@@ -0,0 +1,97 @@
+module Flint
+
+    def self.declare(*args)
+      Sass::Script::Functions.declare(*args)
+    end
+
+    def self.map(hash)
+      Sass::Script::Value::Map.new(hash)
+    end
+
+    ###
+    # Use ruby functions
+    #
+    # @return {Bool}
+    ###
+    def flint_use_ruby()
+        Sass::Script::Bool.new(true)
+    end
+
+    ###
+    # Fetch value from map
+    #
+    # @param {Map}     map  - map to fetch value from
+    # @param {ArgList} keys - list of keys to traverse
+    #
+    # @return {*}
+    ###
+    def flint_ruby_map_fetch(map, *keys)
+        assert_type map, :Map, :map
+        result = map
+        keys.each { |key| result.nil? ? break : result = result.to_h.fetch(key, nil) }
+        unless result.nil?
+            result
+        else
+            Sass::Script::Bool.new(false)
+        end
+    end
+    declare :flint_ruby_map_fetch, :args => [:map, :keys], :var_args => true
+
+    ###
+    # Joins all elements of list with passed glue
+    #
+    # @param {List}   list
+    # @param {String} glue
+    #
+    # @return {String}
+    ###
+    def flint_ruby_list_to_string(list, glue)
+        assert_type list, :List, :list
+        assert_type glue, :String, :glue
+        arr = list.to_a.flatten.map { |item| item.value }
+        Sass::Script::String.new(arr.join(glue.value))
+    end
+    declare :flint_ruby_list_to_string, :args => [:list, :glue]
+
+    ###
+    # Turn string into a flat list
+    #
+    # @param {String} string    - string to operate on
+    # @param {String} separator - item to find which separates substrings
+    # @param {String} ignore    - removes remaining string beyond item
+    #
+    # @return {List}
+    ###
+    def flint_ruby_string_to_list(string, separator, ignore)
+        assert_type string, :String, :string
+        assert_type separator, :String, :separator
+        assert_type ignore, :String, :ignore
+        # Remove everything after ignore, split with separator
+        items = string.value[/[^#{ignore}]+/].split(separator.value)
+        if items.count == 1
+            Sass::Script::String.new(items[0], :comma)
+        else
+            Sass::Script::List.new(items.map { |i| Sass::Script::String.new(i) }, :comma)
+        end
+    end
+    declare :flint_ruby_string_to_list, :args => [:string, :separator, :ignore]
+
+    ###
+    # Replace substring with string
+    #
+    # @param {String} string  - string that contains substring
+    # @param {String} find    - substring to replace
+    # @param {String} replace - new string to replace sub with
+    #
+    # @return {String}
+    ###
+    def flint_ruby_replace_substring(string, find, replace)
+        assert_type string, :String, :string
+        assert_type find, :String, :find
+        assert_type replace, :String, :replace
+        Sass::Script::String.new(string.value.gsub(find.value, replace.value))
+    end
+    declare :flint_ruby_replace_substring, :args => [:string, :find, :replace]
+
+    Sass::Script::Functions.send(:include, Flint)
+end

data/lib/flint/version.rb

@@ -0,0 +1,4 @@
+module Flint
+    VERSION = "2.0.4"
+    DATE = "2014-10-03"
+end

data/stylesheets/flint/functions/lib/_list-to-string.scss

@@ -14,18 +14,24 @@
  * @group Internal Functions
  */
 @function flint-list-to-string($list, $glue: "", $is-nested: false) {
-	$result: null;
-	$length: length($list);
 
-	@for $i from 1 through $length {
-		$n: nth($list, $i);
+	// Use Ruby function if available
+	@if $flint__use-ruby-functions {
+		@return flint_ruby_list_to_string($list, $glue);
+	} @else {
+		$result: null;
+		$length: length($list);
 
-		@if flint-is-list($n) {
-			$result: $result#{flint-list-to-string($n, $glue, true)};
-		} @else {
-			$result: if($i != length($list) or $is-nested, $result#{$n}#{$glue}, $result#{$n});
+		@for $i from 1 through $length {
+			$n: nth($list, $i);
+
+			@if flint-is-list($n) {
+				$result: $result#{flint-list-to-string($n, $glue, true)};
+			} @else {
+				$result: if($i != length($list) or $is-nested, $result#{$n}#{$glue}, $result#{$n});
+			}
 		}
-	}
 
-	@return $result;
+		@return unquote($result);
+	}
 }

data/stylesheets/flint/functions/lib/_string-to-list.scss

@@ -80,13 +80,13 @@
 				$string-list: append($string-list, $matched-string, "comma");
 
 				// Finally, return comma separated list of selectors
-				@return $string-list;
+				@return flint-purge($string-list);
 			} @else {
 
 				// Else, just return the string as a single item list
 				$string-list: append($string-list, $string);
 
-				@return $string-list;
+				@return flint-purge($string-list);
 			}
 		}
 	} @else {

data/stylesheets/flint/functions/lib/_support-syntax-bem.scss

@@ -12,22 +12,22 @@
 @function flint-support-syntax-bem($selectors) {
     // Clean up selector, remove double underscores for spaces
     //  add pseudo character to differentiate selectors
-    $selectors: flint-replace-substring(inspect($selectors), "__", "/");
+    $selectors: flint-replace-substring(inspect(unquote($selectors)), "__", "/");
     // Parse string back to list without pseudo character
     $selectors: flint-string-to-list($selectors, "/");
     // Define top-most parent of selector
     $parent: nth($selectors, 1);
     // Create new list of parsed selectors
-    $selector-list: ($parent);
+    $selector-list: ("#{$parent}",);
 
     // Loop over each selector and build list of selectors
     @each $selector in $selectors {
         // Make sure current selector is not the parent
         @if $selector != $parent {
             // Save to selector list
-            $selector-list: append($selector-list, ($parent + "__" + $selector), "comma");
+            $selector-list: append($selector-list, "#{$parent}__#{$selector}", "comma");
             // Define new parent
-            $parent: $parent + "__" + $selector;
+            $parent: "#{$parent}__#{$selector}";
         }
     }
 

data/stylesheets/flint/mixins/lib/_main.scss

@@ -274,8 +274,6 @@
  * @param {String|Number}      $context (null) - context value of span, or null for shorthand
  * @param {String|List}        $gutter  (null) - alias for gutter modifier
  *
- * @content all content passed will be placed _underneath_ output so that it takes precedence.
- *
  * @throws error if list lengths do not match number of breakpoints (when using variable shorthands).
  *
  * ----

data/tests/bootcamp/_bootcamp.scss

@@ -0,0 +1,46 @@
+@import "lib/sassyjson";
+
+@import "core/variables/settings";
+
+@import "core/variables/helpers";
+@import "core/variables/should";
+@import "core/variables/trackers";
+
+@import "core/mixins/describe";
+@import "core/mixins/it";
+@import "core/mixins/runner";
+@import "core/mixins/should";
+@import "core/mixins/xdescribe";
+@import "core/mixins/xit";
+
+@import "core/functions/actual";
+@import "core/functions/error";
+@import "core/functions/expect";
+@import "core/functions/not-to";
+@import "core/functions/should";
+@import "core/functions/to";
+
+@import "utils/contain";
+@import "utils/equal";
+@import "utils/list-join";
+@import "utils/power";
+
+@import "matchers/be";
+@import "matchers/equal";
+
+@import "matchers/lists/be-empty";
+@import "matchers/lists/be-longer-than";
+@import "matchers/lists/be-shorter-than";
+@import "matchers/lists/contain";
+@import "matchers/lists/deep-contain";
+@import "matchers/lists/deep-equal";
+@import "matchers/lists/have-length-of";
+
+@import "matchers/numbers/be-close-to";
+@import "matchers/numbers/be-greater-than";
+@import "matchers/numbers/be-less-than";
+
+@import "matchers/types/be-falsy";
+@import "matchers/types/be-null";
+@import "matchers/types/be-truthy";
+@import "matchers/types/have-type-of";

data/tests/bootcamp/core/functions/_actual.scss

@@ -0,0 +1,3 @@
+@function actual() {
+  @return $bc-actual;
+}

data/tests/bootcamp/core/functions/_error.scss

@@ -0,0 +1,29 @@
+@function error($type, $message) {
+  $title: null;
+
+  @if $type == "type" {
+    $title: "TYPE ERROR";
+  }
+
+  @else if $type == "warn" {
+    $title: "WARNING"
+  }
+
+  @else if $type == "dep" {
+    $title: "DEPRECATED"
+  }
+
+  @else if $type == "fatal" {
+    $bc-error: true !global;
+    $title: "FATAL ERROR";
+  }
+
+  @else {
+    $bc-error: true !global;
+    $title: "ERROR";
+  }
+
+  $bc-error-text: "!#{$title}! #{$message}." !global;
+
+  @return false;
+}

data/tests/bootcamp/core/functions/_expect.scss

@@ -0,0 +1,6 @@
+@function expect($this) {
+  $bc-actual: $this !global;
+  $bc-actual-text: "Expected" !global;
+
+  @return null;
+}

data/tests/bootcamp/core/functions/_not-to.scss

@@ -0,0 +1,5 @@
+@function not-to($this) {
+  $bc-expect-text: "not to " + $bc-expect-text !global;
+
+  @return not $this;
+}