flint-gs 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62fdbbd2f7bcd9e44852bb8a9e980792ee50d529
-  data.tar.gz: e0866a6bdf45667960b289a7df5dc6199091c9cb
+  metadata.gz: f9f756a8f74ec0109b5b0e6bab31bc7721a65f99
+  data.tar.gz: 2e9e4b2af16cf3e4344c875802c16b2ddab45362
 SHA512:
-  metadata.gz: 8ef4fff7fe04af89319a0a4f22b41caecbd37fb37c836a2550e104720bdae96728fed3dbbac7850d09f8fa31f79e3b4d6b48e60a848b794b5944f4ef6caec232
-  data.tar.gz: cea6e7bf22b451b3dd7d7ec81a23c09461d7551d7a6c7c0cca5557939899b2e7294a4b9ad1bc4d9813ef03133638573b37413b431e25a267904b19b4738a9fe0
+  metadata.gz: 6986295e0c48b1b0b7ea33d7ec4adbedf32209d0a573175daa7d0a42fe3825ebe30478991c250329682c491a28ea84c6799a2c56d44fe834640fae6f1b5408df
+  data.tar.gz: 8e2023f8c225d5f80214f1b89dfd474c01747cd696a5b79c0e94c23fd53010f824dad684fa7da0f79292e337f38ffb1ac3d36c6de87a50e3fe8b7a5d6fd233d8

data/README.md

@@ -63,32 +63,9 @@ function parses the selector string (for example, `.block__element__element`) li
 ///
 /// @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(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;
-}
+@function flint-support-syntax-bem($selectors) { ... }
 ```
+[View Source](https://github.com/ezekg/flint/blob/master/stylesheets/flint/functions/lib/_support-syntax-bem.scss)
 
 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
 instance system to look up a selectors parent, etc. To support your own preferred syntax: create a `flint-support-syntax-<syntax-name>` function

data/lib/flint/functions.rb

@@ -1,92 +1,127 @@
 module Flint
 
-    def self.declare(*args)
-      Sass::Script::Functions.declare(*args)
-    end
+  def self.declare(*args)
+    Sass::Script::Functions.declare(*args)
+  end
 
-    ###
-    # Use ruby functions
-    #
-    # @return {Bool}
-    ###
-    def flint_use_ruby()
-        Sass::Script::Bool.new(true)
-    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
+  #
+  # 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
-    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_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
-    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
+  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]
+
+  #
+  # Check if key exists in map
+  #
+  # @param {Map}    map - map to search
+  # @param {String} key - key to search for
+  #
+  # @return {Bool}
+  #
+  def flint_ruby_exists(map, key)
+    assert_type map, :Map, :map
+    assert_type key, :String, :key
+
+    hash = map.to_h
+
+    if hash.fetch(key, false)
+      return Sass::Script::Bool.new(true)
+    else
+      hash.each do |_, value|
+        if value.is_a?(Sass::Script::Value::Map)
+          return Sass::Script::Bool.new(true) if flint_ruby_exists(value, key).value
         end
+      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::Bool.new(false)
+  end
+  declare :flint_ruby_exists, :args => [:map, :key]
 
 end

data/lib/flint/version.rb

@@ -1,3 +1,3 @@
 module Flint
-    VERSION = "2.1.4"
+    VERSION = "2.2.0"
 end

data/stylesheets/flint/functions/helpers/_helpers.scss

@@ -198,7 +198,7 @@
 ///
 /// @return {Number} em value of target relative to context
 ///
-@function flint-to-em($target, $context: $flint__base-font-size) {
+@function flint-to-em($target, $context: $flint-base-font-size) {
 	@return ($target / $context) * 1em;
 }
 
@@ -212,7 +212,7 @@
 ///
 /// @return {Number} rem value of target relative to context
 ///
-@function flint-to-rem($target, $context: $flint__base-font-size) {
+@function flint-to-rem($target, $context: $flint-base-font-size) {
 	@return ($target / $context) * 1rem;
 }
 

data/stylesheets/flint/functions/lib/_calc-width.scss

@@ -16,8 +16,8 @@
 	$result: ();
 
 	// Check to see if value has been cached
-	@if map-has-key($flint__cached-values, "#{$key, $span, $context, $deduct}::width") and $context != "auto" {
-		@return map-get($flint__cached-values, "#{$key, $span, $context, $deduct}::width");
+	@if map-has-key($flint-cached-values, "#{$key, $span, $context, $deduct}::width") and $context != "auto" {
+		@return map-get($flint-cached-values, "#{$key, $span, $context, $deduct}::width");
 	}
 
 	@if $span == "container" {
@@ -30,7 +30,7 @@
 		// Check if instance maps are enabled
 		//
 		@if not flint-get-value("settings", "instance-maps") {
-			@if not $flint__development-mode {
+			@if not $flint-development-mode {
 				@error "Instance maps are disabled. Automatic context is not available. Enable `instance-maps` in the config to continue.";
 			} @else {
 				@warn "Instance maps are disabled. Automatic context is not available. Enable `instance-maps` in the config to continue.";
@@ -41,7 +41,7 @@
 			$result: map-merge($result, ("target": ((flint-get-instance-value($key, "internal", "width") / flint-get-instance-value($key, "span") * $span) - if($deduct, $deduct, 0))));
 			$result: map-merge($result, ("context": flint-get-instance-value($key, "internal", "width")));
 		} @else {
-			@if not $flint__development-mode {
+			@if not $flint-development-mode {
 				@error "You set context to `#{$context}`, but a parent instance could not be found for `#{nth(&, 1) + '::' + $key}`";
 			} @else {
 				@return false;
@@ -62,7 +62,7 @@
 
 	// Save result to cache
 	@if $context != "auto" {
-		$flint__cached-values: map-merge($flint__cached-values, ("#{$key, $span, $context, $deduct}::width": $result));
+		$flint-cached-values: map-merge($flint-cached-values, ("#{$key, $span, $context, $deduct}::width": $result));
 	}
 
 	// Return result

data/stylesheets/flint/functions/lib/_exists.scss

@@ -3,26 +3,34 @@
 ///
 /// @access private
 ///
-/// @param {Map}    $map   - map to search
-/// @param {String} $value - key to search for
+/// @param {Map}    $map - map to search
+/// @param {String} $key - key to search for
 ///
 /// @return {Bool}
 ///
 /// @group Internal Functions
 ///
-@function flint-exists($map, $value){
-	$is-map: flint-is-map($map);
-	$top-has-key: $is-map and map-has-key($map, $value) or false;
+@function flint-exists($map, $key) {
 
-	@if $top-has-key {
-		@return true;
-	} @else if $is-map {
-		@each $m, $k in $map {
-			@if flint-exists($k, $value) {
-				@return true;
+	@if not flint-is-string($key) {
+		@return false;
+	}
+
+	// Use Ruby function if available
+	@if $flint-use-ruby-functions {
+		@return flint_ruby_exists($map, $key);
+	} @else {
+		$is-map: flint-is-map($map);
+		$top-has-key: $is-map and map-has-key($map, $key) or false;
+
+		@if $top-has-key {
+			@return true;
+		} @else if $is-map {
+			@each $m, $k in $map {
+				@return flint-exists($k, $key)
 			}
 		}
-	}
 
-	@return false;
+		@return false;
+	}
 }

data/stylesheets/flint/functions/lib/_get-instance-value.scss

@@ -11,5 +11,5 @@
 /// @group Internal Functions
 ///
 @function flint-get-instance-value($key, $values...) {
-	@return flint-map-fetch($flint__instances, flint-has-family-instance($key), $values...);
+	@return flint-map-fetch($flint-instances, flint-has-family-instance($key), $values...);
 }

data/stylesheets/flint/functions/lib/_has-family-instance.scss

@@ -10,13 +10,13 @@
 ///
 /// @group Internal Functions
 ///
-@function flint-has-family-instance($key: flint-get-value("settings", "default"), $syntax: $flint__support-syntax) {
+@function flint-has-family-instance($key: flint-get-value("settings", "default"), $syntax: $flint-support-syntax) {
 	$selector: nth(&, 1);
 
 	// Check if instance result had been cached
-	@if map-has-key($flint__cached-instances, "#{$selector}") {
+	@if map-has-key($flint-cached-instances, "#{$selector}") {
 		// Get cached instance
-		$cached-instance: map-get($flint__cached-instances, "#{$selector}");
+		$cached-instance: map-get($flint-cached-instances, "#{$selector}");
 		// Return with current key
 		@return "#{$cached-instance}::#{$key}";
 	}
@@ -30,18 +30,18 @@
 		// Loop through transformed selectors
 		@for $i from 1 through $length {
 
-			// Check flint-last selector in list
-			@if flint-exists($flint__instances, "#{flint-last($parsed-selector)}::#{$key}") {
+			// Check last selector in list
+			@if flint-exists($flint-instances, "#{flint-last($parsed-selector)}::#{$key}") {
 
 				// Cache result
-				$flint__cached-instances: map-merge($flint__cached-instances, ("#{$selector}": "#{flint-last($parsed-selector)}"));
+				$flint-cached-instances: map-merge($flint-cached-instances, ("#{$selector}": "#{flint-last($parsed-selector)}"));
 
 				// Return the matching instance key
 				@return "#{flint-last($parsed-selector)}::#{$key}";
 
 			} @else {
 
-				// Else, flint-remove the flint-last selector and loop again
+				// Else, remove the last selector and loop again
 				$parsed-selector: flint-remove($parsed-selector, flint-last($parsed-selector));
 
 			}
@@ -56,15 +56,16 @@
 
 		// Loop through length of list of selectors
 		@for $i from 1 through $length {
+			$selector-string: flint-list-to-string($selector-list, " ");
 
 			// Make sure that we're not counting the current selector set
-			@if flint-exists($flint__instances, "#{flint-list-to-string($selector-list, ' ')}::#{$key}") and $selector != $selector-list {
+			@if flint-exists($flint-instances, "#{$selector-string}::#{$key}") and $selector != $selector-list {
 
 				// Cache result
-				$flint__cached-instances: map-merge($flint__cached-instances, ("#{$selector}": "#{flint-list-to-string($selector-list, ' ')}"));
+				$flint-cached-instances: map-merge($flint-cached-instances, ("#{$selector}": "#{$selector-string}"));
 
 				// Return the matching instance key
-				@return "#{flint-list-to-string($selector-list, ' ')}::#{$key}";
+				@return "#{$selector-string}::#{$key}";
 
 			} @else {
 

data/stylesheets/flint/functions/lib/_instance.scss

@@ -18,14 +18,14 @@
 @function flint-instance($key, $span, $context, $gutter, $output-width, $output-margin-right, $output-margin-left) {
 
     // Increase the instance count
-    $flint__instance-count: $flint__instance-count + 1 !global;
+    $flint-instance-count: $flint-instance-count + 1 !global;
 
     // Lets clean up the selector a bit...
     $selector: nth(&, 1);
 
-    $flint__instance: (
+    $flint-instance: (
 		"#{$selector}::#{$key}": (
-			"instance-count": $flint__instance-count,
+			"instance-count": $flint-instance-count,
 			"parent-selector": if(flint-has-family-instance($key) != false, flint-has-family-instance($key), none),
 			"key": $key,
 			"breakpoint": flint-get-value("breakpoints", $key, "breakpoint"),
@@ -41,5 +41,5 @@
 		)
     );
 
-    @return map-merge($flint__instance, $flint__instances);
+    @return map-merge($flint-instance, $flint-instances);
 }

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

@@ -16,7 +16,7 @@
 @function flint-list-to-string($list, $glue: "", $is-nested: false) {
 
 	// Use Ruby function if available
-	@if $flint__use-ruby-functions {
+	@if $flint-use-ruby-functions {
 		@return flint_ruby_list_to_string($list, $glue);
 	} @else {
 		$result: null;

data/stylesheets/flint/functions/lib/_map-fetch.scss

@@ -13,7 +13,7 @@
 @function flint-map-fetch($map, $keys...) {
 
 	// Use Ruby function if available
-	@if $flint__use-ruby-functions {
+	@if $flint-use-ruby-functions {
 		@return flint_ruby_map_fetch($map, $keys...);
 	} @else {
 		$result: $map;

data/stylesheets/flint/functions/lib/_replace-substring.scss

@@ -14,7 +14,7 @@
 @function flint-replace-substring($string, $substring, $new-substring: " ") {
 
 	// Use Ruby function if available
-	@if $flint__use-ruby-functions {
+	@if $flint-use-ruby-functions {
 		@return flint_ruby_replace_substring($string, $substring, $new-substring);
 	} @else {
 		// Loop through length of string

data/stylesheets/flint/functions/lib/_steal-key.scss

@@ -13,7 +13,7 @@
 	$length: length(map-keys(flint-get-value("breakpoints")));
 
 	@if not flint-is-number($index) {
-		@if not $flint__development-mode {
+		@if not $flint-development-mode {
 			@error "Passed $index (#{$index}) is not a number. Function takes index number of breakpoint key.";
 		} @else {
 			@return false;
@@ -21,7 +21,7 @@
 	}
 
 	@if $index > $length {
-		@if not $flint__development-mode {
+		@if not $flint-development-mode {
 			@error "Passed $index (#{$index}) is greater than the length of the config map.";
 		} @else {
 			@return false;

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

@@ -15,7 +15,7 @@
 	@if flint-is-string($string) {
 
 		// Use Ruby function if available
-		@if $flint__use-ruby-functions {
+		@if $flint-use-ruby-functions {
 			@return flint_ruby_string_to_list($string, $find, $ignore);
 		} @else {
 			$string-list: ();

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

@@ -22,7 +22,7 @@
         @return call("flint-support-syntax-#{$syntax}", $selectors);
 
     } @else {
-        @if not $flint__development-mode {
+        @if not $flint-development-mode {
             // Throw error if the syntax does not exist and a function to call cannot be found
             @error "You did not pass a valid syntax to `flint-support-syntax`: #{$syntax}. Either specify a custom `flint-support-syntax-<syntax>` function to call, or use one of the offically supported syntaxes. For more info, please visit the docs.";
         } @else {

data/stylesheets/flint/functions/lib/_use-syntax.scss

@@ -10,11 +10,11 @@
 /// @group Internal Functions
 ///
 @function flint-use-syntax($selectors) {
-    @if $flint__support-syntax {
-        @return flint-support-syntax($flint__support-syntax, $selectors);
+    @if $flint-support-syntax {
+        @return flint-support-syntax($flint-support-syntax, $selectors);
     } @else {
-        @if not $flint__development-mode {
-            @error "Support syntax is set to #{$flint__support-syntax}. Aborting mission.";
+        @if not $flint-development-mode {
+            @error "Support syntax is set to #{$flint-support-syntax}. Aborting mission.";
         } @else {
             @return false;
         }

data/stylesheets/flint/globals/_globals.scss

@@ -9,7 +9,7 @@
 ///
 /// @type Bool
 ///
-$flint__development-mode: false !global;
+$flint-development-mode: false !global;
 
 ///
 /// Set global variable to check if foundation has been set
@@ -18,7 +18,7 @@ $flint__development-mode: false !global;
 ///
 /// @type String
 ///
-$flint__foundation: "non-existent" !global;
+$flint-foundation: "non-existent" !global;
 
 ///
 /// Keep count of all instances
@@ -27,7 +27,7 @@ $flint__foundation: "non-existent" !global;
 ///
 /// @type Number
 ///
-$flint__instance-count: 0 !global;
+$flint-instance-count: 0 !global;
 
 ///
 /// Keep map of all instances
@@ -36,7 +36,7 @@ $flint__instance-count: 0 !global;
 ///
 /// @type Map
 ///
-$flint__instances: () !global;
+$flint-instances: () !global;
 
 ///
 /// Font size for em calculation
@@ -45,7 +45,7 @@ $flint__instances: () !global;
 ///
 /// @type Number
 ///
-$flint__base-font-size: 16px !global;
+$flint-base-font-size: 16px !global;
 
 ///
 /// Detect if Ruby functions are available
@@ -54,7 +54,7 @@ $flint__base-font-size: 16px !global;
 ///
 /// @type Bool
 ///
-$flint__use-ruby-functions: if(flint-use-ruby-functions() == true, true, false) !global;
+$flint-use-ruby-functions: if(flint-use-ruby-functions() == true, true, false) !global;
 
 ///
 /// Global syntax support
@@ -63,7 +63,7 @@ $flint__use-ruby-functions: if(flint-use-ruby-functions() == true, true, false)
 ///
 /// @type String
 ///
-$flint__support-syntax: flint-get-value("settings", "support-syntax") !global;
+$flint-support-syntax: flint-get-value("settings", "support-syntax") !global;
 
 ///
 /// Gather all keys, breakpoints and column counts
@@ -72,9 +72,9 @@ $flint__support-syntax: flint-get-value("settings", "support-syntax") !global;
 ///
 /// @type List
 ///
-$flint__all-keys: flint-get-all-keys() !global;
-$flint__all-breakpoints: flint-get-all-breakpoints() !global;
-$flint__all-columns: flint-get-all-columns() !global;
+$flint-all-keys: flint-get-all-keys() !global;
+$flint-all-breakpoints: flint-get-all-breakpoints() !global;
+$flint-all-columns: flint-get-all-columns() !global;
 
 ///
 /// Cache selector instance lists
@@ -83,7 +83,7 @@ $flint__all-columns: flint-get-all-columns() !global;
 ///
 /// @type Map
 ///
-$flint__cached-instances: () !global;
+$flint-cached-instances: () !global;
 
 ///
 /// Cache calculated values
@@ -92,7 +92,7 @@ $flint__cached-instances: () !global;
 ///
 /// @type Map
 ///
-$flint__cached-values: () !global;
+$flint-cached-values: () !global;
 
 ///
 /// Cache calculation results
@@ -101,4 +101,4 @@ $flint__cached-values: () !global;
 ///
 /// @type Map
 ///
-$flint__cached-results: () !global;
+$flint-cached-results: () !global;

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

@@ -14,7 +14,7 @@
 @mixin flint-output($width, $margin-right, $margin-left) {
 
 	@if not flint-is-map($width) {
-		@if not $flint__development-mode {
+		@if not $flint-development-mode {
 			@error "Passed $width (#{$width}) was not a map; a map containing a target / context combination is required."
 		}
 	}
@@ -65,9 +65,9 @@
 	//
 	// Check lengths, if invalid throw error
 	//
-	@if flint-types-in-list($calc-gutter, "string") and length($calc-gutter) != length($flint__all-keys) {
-		@if not $flint__development-mode {
-			@error "Invalid argument length of #{length($calc-gutter)} for gutter. If you're using a shorthand, please provide an argument for each breakpoint in your config (#{length($flint__all-keys)}). Your argument was: #{$calc-gutter}";
+	@if flint-types-in-list($calc-gutter, "string") and length($calc-gutter) != length($flint-all-keys) {
+		@if not $flint-development-mode {
+			@error "Invalid argument length of #{length($calc-gutter)} for gutter. If you're using a shorthand, please provide an argument for each breakpoint in your config (#{length($flint-all-keys)}). Your argument was: #{$calc-gutter}";
 		}
 	}
 
@@ -95,8 +95,8 @@
 	// Check for cached results
 	//
 	@if $calc-context != "auto" and $calc-span != 0 {
-		@if map-has-key($flint__cached-results, "#{$calc-key, $calc-span, $calc-context, $calc-gutter, $i}") {
-			$result: map-get($flint__cached-results, "#{$calc-key, $calc-span, $calc-context, $calc-gutter, $i}");
+		@if map-has-key($flint-cached-results, "#{$calc-key, $calc-span, $calc-context, $calc-gutter, $i}") {
+			$result: map-get($flint-cached-results, "#{$calc-key, $calc-span, $calc-context, $calc-gutter, $i}");
 
 			// Get results
 			$output-width-map: nth($result, 1);
@@ -206,7 +206,7 @@
 				$output-margin-left: 0;
 
 			} @else {
-				@if not $flint__development-mode {
+				@if not $flint-development-mode {
 					@error "Invalid gutter argument: #{$calc-gutter}. Please provide a valid argument.";
 				} @else {
 					$errors: true;
@@ -218,7 +218,7 @@
 
 			// Cache result
 			@if $calc-context != "auto" and $calc-span != 0 and not $cached {
-				$flint__cached-results: map-merge($flint__cached-results, (
+				$flint-cached-results: map-merge($flint-cached-results, (
 					"#{$calc-key, $calc-span, $calc-context, $calc-gutter, $i}": ($output-width-map, $output-margin-right, $output-margin-left)
 				)) !global;
 			}

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

@@ -499,11 +499,11 @@
 
         // Apply global border-box-sizing if set to true
         @if flint-get-value("settings", "border-box-sizing") {
-            $flint__foundation: "existent" !global;
+            $flint-foundation: "existent" !global;
         }
 
         // Foundation is now globally existant
-        @if $flint__foundation == "existent" {
+        @if $flint-foundation == "existent" {
             @at-root *, *:before, *:after {
                 @include flint-box-sizing;
                 @content;
@@ -516,14 +516,14 @@
     } @else if $key == "container" or $span == "container" or $context == "container" {
 
         // Apply individually if foundation is not set globally, but is set to true in config
-        @if flint-get-value("settings", "border-box-sizing") and $flint__foundation == "non-existent" {
+        @if flint-get-value("settings", "border-box-sizing") and $flint-foundation == "non-existent" {
             @include _("foundation");
         }
 
         // Output container for each breakpoint if fixed grid
         @if $key == "container" and flint-get-value("settings", "grid") == "fixed" {
 
-            @for $i from 1 through length($flint__all-keys) {
+            @for $i from 1 through length($flint-all-keys) {
 
                 // Set up variables
                 $calc-key: flint-steal-key($i);
@@ -609,7 +609,7 @@
     } @else {
 
         // Apply individually if foundation is not set globally, but is set to true in config
-        @if flint-get-value("settings", "border-box-sizing") and $flint__foundation == "non-existent" {
+        @if flint-get-value("settings", "border-box-sizing") and $flint-foundation == "non-existent" {
             @include _("foundation");
         }
 
@@ -648,17 +648,17 @@
         or flint-types-in-list($key, "number") and $span == "auto" {
 
             // Emit erroring for invalid argument lengths
-            @if flint-types-in-list($key, "number") and length($key) != length($flint__all-keys) {
-                @if not $flint__development-mode {
-                    @error "Invalid argument length of #{length($key)} for span. Please provide an argument for each breakpoint in your config (#{length($flint__all-keys)}). Your argument was: #{$key}";
+            @if flint-types-in-list($key, "number") and length($key) != length($flint-all-keys) {
+                @if not $flint-development-mode {
+                    @error "Invalid argument length of #{length($key)} for span. Please provide an argument for each breakpoint in your config (#{length($flint-all-keys)}). Your argument was: #{$key}";
                 }
-            } @else if flint-types-in-list($span, "number") and length($span) != length($flint__all-keys) {
-                @if not $flint__development-mode {
-                    @error "Invalid argument length of #{length($span)} for context. Please provide an argument for each breakpoint in your config (#{length($flint__all-keys)}). Your argument was: #{$span}";
+            } @else if flint-types-in-list($span, "number") and length($span) != length($flint-all-keys) {
+                @if not $flint-development-mode {
+                    @error "Invalid argument length of #{length($span)} for context. Please provide an argument for each breakpoint in your config (#{length($flint-all-keys)}). Your argument was: #{$span}";
                 }
             } @else {
 
-                @for $i from 1 through length($flint__all-keys) {
+                @for $i from 1 through length($flint-all-keys) {
 
                     $calc-key: flint-steal-key($i);
                     $calc-span: $key;
@@ -714,7 +714,7 @@
                             }
 
                         } @else {
-                            @if not $flint__development-mode {
+                            @if not $flint-development-mode {
                                 @error "Invalid gutter settings in config map: #{flint-get-value('settings', 'grid')}. Valid arguments: fluid, fixed";
                             }
                         }
@@ -735,7 +735,7 @@
 
             // Throw error for invalid argument lengths
             @if not flint-exists($flint, $key) {
-                @if not $flint__development-mode {
+                @if not $flint-development-mode {
                     @error "Invalid argument: #{$key}. Breakpoint does not exist. Please provide a valid argument.";
                 }
             } @else {
@@ -794,7 +794,7 @@
                         }
 
                     } @else {
-                        @if not $flint__development-mode {
+                        @if not $flint-development-mode {
                             @error "Invalid gutter settings in config map: #{flint-get-value('settings', 'grid')}. Valid arguments: fluid, fixed";
                         }
                     }
@@ -833,7 +833,7 @@
                         }
                     }
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Invalid gutter settings in config map: #{flint-get-value('settings', 'grid')}. Valid arguments: fluid, fixed";
                     }
                 }
@@ -852,7 +852,7 @@
                         @content;
                     }
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Invalid gutter settings in config map: #{flint-get-value('settings', 'grid')}. Valid arguments: fluid, fixed";
                     }
                 }
@@ -871,7 +871,7 @@
                         @content;
                     }
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Invalid gutter settings in config map: #{flint-get-value('settings', 'grid')}. Valid arguments: fluid, fixed";
                     }
                 }
@@ -887,7 +887,7 @@
                     }
                 // Throw error
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Passed units [#{unit(nth($key, 2))}, #{unit(nth($key, 4))}] do not match the unit used in your config map: #{flint-get-config-unit()}";
                     }
                 }
@@ -906,7 +906,7 @@
                         @content;
                     }
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Invalid gutter settings in config map: #{flint-get-value('settings', 'grid')}. Valid arguments: fluid, fixed";
                     }
                 }
@@ -921,7 +921,7 @@
                         @content;
                     }
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Passed units [#{unit(nth($key, 3))}] do not match the unit used in your config map: #{flint-get-config-unit()}";
                     }
                 }
@@ -936,7 +936,7 @@
                         @content;
                     }
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Passed units [#{unit(nth($key, 1))}] do not match the unit used in your config map: #{flint-get-config-unit()}";
                     }
                 }
@@ -955,7 +955,7 @@
                         @content;
                     }
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Invalid gutter settings in config map: #{flint-get-value('settings', 'grid')}. Valid arguments: fluid, fixed";
                     }
                 }
@@ -970,7 +970,7 @@
                         @content;
                     }
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Passed units [#{unit(nth($key, 3))}] do not match the unit used in your config map: #{flint-get-config-unit()}";
                     }
                 }
@@ -985,7 +985,7 @@
                         @content;
                     }
                 } @else {
-                    @if not $flint__development-mode {
+                    @if not $flint-development-mode {
                         @error "Passed units [#{unit(nth($key, 1))}] do not match the unit used in your config map: #{flint-get-config-unit()}";
                     }
                 }
@@ -1017,13 +1017,13 @@
                                 $query: append($query, unquote('( min-width: #{flint-calc-breakpoint("alias", $calc-key, flint-get-index($calc-key))} ) and ( max-width: #{(flint-calc-breakpoint("prev", $calc-key, flint-get-index($calc-key)) - $unit)} )'), "comma");
                             }
                         } @else {
-                            @if not $flint__development-mode {
+                            @if not $flint-development-mode {
                                 @error "Invalid gutter settings in config map: #{flint-get-value('settings', 'grid')}. Valid arguments: fluid, fixed";
                             }
                         }
                     } @else {
                         @if not $calc-key == "for" {
-                            @if not $flint__development-mode {
+                            @if not $flint-development-mode {
                                 @error "Invalid argument: #{$calc-key}. Breakpoint does not exist. Please provide a valid argument.";
                             }
                         }
@@ -1040,7 +1040,7 @@
         //
         } @else {
             @if $key != "clear" {
-                @if not $flint__development-mode {
+                @if not $flint-development-mode {
                     @error "Invalid argument(s). Please double check and provide a valid argument. If you're calling by alias, please provide a single span argument for your breakpoint. See documentation for additional details.";
                 }
             }

data/stylesheets/flint/mixins/lib/_new-instance.scss

@@ -14,7 +14,7 @@
 /// @group Internal Mixins
 ///
 @mixin flint-new-instance($calc-key, $calc-span, $calc-context, $calc-gutter, $output-width, $output-margin-right, $output-margin-left) {
-	$flint__instances:
+	$flint-instances:
 		flint-instance(
 			$calc-key,
 			$calc-span,

data/stylesheets/flint/mixins/lib/_print-instance.scss

@@ -15,7 +15,7 @@
         $selector: nth(&, 1);
         // Append key to selector
 		$print-selector: "#{$selector}" + "::" + "#{$calc-key}";
-		@include flint-print-instance(map-get($flint__instances, unquote($print-selector)));
+		@include flint-print-instance(map-get($flint-instances, unquote($print-selector)));
 	}
 }
 

data/tests/config.rb

@@ -1,6 +1,6 @@
-require '../lib/flint.rb'
-require 'rubygems'
-require 'bundler'
+require "../lib/flint.rb"
+require "rubygems"
+require "bundler"
 
 # Require dependencies through bundler
 Bundler.require(:default, :test) if defined?(Bundler)
@@ -24,29 +24,100 @@ sass_options = {
 	:unix_newlines => true
 }
 
-module Sass::Script::Functions
-    @@timeStart = Time.now
-    @@timeLast  = Time.now
+module Flint
+  class Profiler
 
-    def profileRender(timeLast)
-        diff = Time.now - timeLast
-        return Sass::Script::String.new(diff * 1)
+    @@t_then = Time.now
+    @@t_now = Time.now
+
+    def initialize(function, action, args = nil, env = nil)
+      @function = function
+      @action = action
+      @args = args
+      @env = env
+      profile
+    end
+
+    def get_time
+      @@t_now = Time.now
+      t = (@@t_now.to_f - @@t_then.to_f) * 1000.0
+      @@t_then = @@t_now
+      @@t_total = t
+      "\e[0;31m#{t.to_s}\e[0m".ljust(40)
+    end
+
+    def get_name
+      case
+      when @function.respond_to?(:name)
+        @function.name
+      else
+        nil
+      end
+    end
+
+    def get_args
+      if @args.nil?
+        nil
+      else
+        @args.to_s[1...@args.length-2]
+      end
+    end
+
+    def get_env
+      if @env
+        original_filename = @env.options.fetch(:original_filename, "unknown file")
+        filename = @env.options.fetch(:filename, "unknown file")
+        "\e[0;33m#{File.basename(original_filename)}:#{File.basename(filename)}\e[0m".ljust(80)
+      else
+        "\e[0;33munknown file\e[0m".ljust(80)
+      end
     end
 
-    def timing_total()
-        return self.profileRender(@@timeStart)
+    def get_action
+      "\e[0;32m#{@action.to_s}\e[0m".ljust(40)
     end
 
-    def timing_interval()
-        str = profileRender(@@timeLast)
-        @@timeLast = Time.now
-        return str
+    def get_caller
+      "\e[0;34m#{get_name}\e[0m(\e[0;30m#{get_args}\e[0m)"
     end
+
+    # Black:  \e[0;30m
+    # Red:    \e[0;31m
+    # Green:  \e[0;32m
+    # Yellow: \e[0;33m
+    # Blue:   \e[0;34m
+    # Purple: \e[0;35m
+    # Cyan:   \e[0;36m
+    # White:  \e[0;37m
+    def profile
+      puts "#{get_env} | #{get_time} | #{get_action} | #{get_caller}"
+      # exit if @@t_total > 100 && @action == :execute
+    end
+  end
+end
+
+class Sass::Tree::Visitors::Perform
+  alias_method :visit_function_old, :visit_function
+
+  def visit_function(node)
+    Flint::Profiler.new node.dup, :create
+    visit_function_old node
+  end
+end
+
+class Sass::Script::Tree::Funcall
+  alias_method :perform_sass_fn_old, :perform_sass_fn
+
+  def perform_sass_fn(function, args, splat, environment)
+    Flint::Profiler.new function.dup, :execute, args.dup, environment.dup
+    perform_sass_fn_old function, args, splat, environment
+  end
 end
 
 class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
-	# Removes all comments completely
-	def visit_comment(node)
-		return []
-	end
+
+  # Removes all comments completely
+  def visit_comment(node)
+    return []
+  end
 end

data/tests/input/functions/lib/_get-instance-value.scss

@@ -3,7 +3,7 @@
 //
 @include describe("[function] get-instance-value") {
 
-	// $flint__instances: (
+	// $flint-instances: (
 	// 	".instance::desktop": (
 	// 		"instance-count": 1,
 	// 		"parent-selector": none,
@@ -67,6 +67,6 @@
 		}
 	}
 
-	$flint__instances: () !global;
-	$flint__instance-count: 0 !global;
+	$flint-instances: () !global;
+	$flint-instance-count: 0 !global;
 }

data/tests/input/functions/lib/_has-family-instance.scss

@@ -30,6 +30,6 @@
 		}
 	}
 
-	$flint__instances: () !global;
-	$flint__instance-count: 0 !global;
+	$flint-instances: () !global;
+	$flint-instance-count: 0 !global;
 }

data/tests/input/functions/lib/_instance.scss

@@ -26,24 +26,24 @@
 
         @at-root {
             @include it("should expect instance map to match pseudo instance") {
-                @include should(expect(inspect($flint__instances)), to(be(inspect($pseudo-instance))));
+                @include should(expect(inspect($flint-instances)), to(be(inspect($pseudo-instance))));
             }
         }
 
-        $flint__instances: () !global;
-        $flint__instance-count: 0 !global;
+        $flint-instances: () !global;
+        $flint-instance-count: 0 !global;
 
-        $flint__instances: flint-instance("desktop", 4, null, null, 18.75em, 0.625em, 0.625em) !global;
+        $flint-instances: flint-instance("desktop", 4, null, null, 18.75em, 0.625em, 0.625em) !global;
 
         @at-root {
             @include it("should expect instance map to match pseudo instance") {
-                @include should(expect(inspect($flint__instances)), to(be(inspect($pseudo-instance))));
+                @include should(expect(inspect($flint-instances)), to(be(inspect($pseudo-instance))));
             }
         }
     }
 
-    $flint__instances: () !global;
-    $flint__instance-count: 0 !global;
+    $flint-instances: () !global;
+    $flint-instance-count: 0 !global;
 
     $pseudo-instance: (
         ".parent-instance .child-instance::mobile": (
@@ -176,12 +176,12 @@
 
             @at-root {
                 @include it("should expect instance map to match pseudo instance map") {
-                    @include should(expect(inspect($flint__instances)), to(be(inspect($pseudo-instance))));
+                    @include should(expect(inspect($flint-instances)), to(be(inspect($pseudo-instance))));
                 }
             }
         }
     }
 
-    $flint__instances: () !global;
-    $flint__instance-count: 0 !global;
+    $flint-instances: () !global;
+    $flint-instance-count: 0 !global;
 }

data/tests/input/output.scss

@@ -42,10 +42,10 @@ $flint: (
 ) !global;
 
 // Enable development mode
-$flint__development-mode: true !global;
+$flint-development-mode: true !global;
 
 // Test speed improvements
-// $flint__use-ruby-functions: false !global;
+// $flint-use-ruby-functions: false !global;
 
 ///
 /// BEGIN TESTS
@@ -58,7 +58,7 @@ $flint__development-mode: true !global;
 ///
 
 @include it("should expect foundation to not be set") {
-    @include should(expect($flint__foundation),
+    @include should(expect($flint-foundation),
         to(be("non-existent"))
     );
 }
@@ -66,7 +66,7 @@ $flint__development-mode: true !global;
 @include _("foundation");
 
 @include it("should expect foundation to be set") {
-    @include should(expect($flint__foundation),
+    @include should(expect($flint-foundation),
         to(be("existent"))
     );
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flint-gs
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler