flint-gs 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47a2fff466126e39135bf8dc116f0746ac0f414c
-  data.tar.gz: 2b0a596ceef2f535b7ed0eafe652be69329d8907
+  metadata.gz: be77583a95bea1ccb8a4f21b589f7ed82051e386
+  data.tar.gz: bd283a60a819136c9176c1a3b80f5dc6e5a218d0
 SHA512:
-  metadata.gz: a9074b8596af49551438d531d2eee5e1f4c05da14ab92adbc1e7f91d7d6d2bee4ccb59e75334c0ea1bc8e605a41674dbc39ddfaba877164de9bc07df89f445fc
-  data.tar.gz: 9caf8f80086d8fd5c963bd182baa4439626db7c92993c1118beb4b381af13c92942fedbe2051007495aefaaf8281563b96af293a0cd6ca1ca8e288ee2aa4ee06
+  metadata.gz: 4d2b91287da93847a55d70649cb3302870c10ff46d28552390b8a2e9ed700f129b9de438724dc9b4deb593c9dfc6ab9bc54293aac5b9bdcc22785dc1c71eb824
+  data.tar.gz: 4faa32948799fcd8364a31ee5177bc9c3ed0414afc947ea94bbb948027964a1f7a72c5af7cebb897c2e4cffba6bf806b0b92394e01cca6280359837e5e0eb825

data/lib/flint/version.rb

@@ -1,3 +1,3 @@
 module Flint
-    VERSION = "2.3.3"
+    VERSION = "2.3.4"
 end

data/stylesheets/flint/functions/lib/_html-encode.scss

@@ -1,6 +1,8 @@
 ///
 /// HTML encode string
 ///
+/// @group Internal Functions
+///
 @function flint-html-encode($string) {
   $encode-map: ("%": "%25", " ": "%20", "!": "%21", '"': "%22", "#": "%23", "$": "%24", "&": "%26", "'": "%27", "(": "%28", ")": "%29", "*": "%2A", "+": "%2B", ",": "%2C", "-": "%2D", ".": "%2E", "/": "%2F", ":": "%3A", ";": "%3B", "<": "%3C", "=": "%3D", ">": "%3E", "?": "%3F", "@": "%40", "[": "%5B", "\\": "%5C", "]": "%5D", "^": "%5E", "_": "%5F", "`": "%60", "{": "%7B", "|": "%7C", "}": "%7D", "~": "%7E", "¢": "%A2", "£": "%A3", "¥": "%A5", "§": "%A7", "«": "%AB", "¬": "%AC", "¯": "%AD", "º": "%B0", "±": "%B1", "ª": "%B2", "µ": "%B5", "»": "%BB", "¼": "%BC", "½": "%BD", "¿": "%BF", "À": "%C0", "Á": "%C1", "Â": "%C2", "Ã": "%C3", "Ä": "%C4", "Å": "%C5", "Æ": "%C6", "Ç": "%C7", "È": "%C8", "É": "%C9", "Ê": "%CA", "Ë": "%CB", "Ì": "%CC", "Í": "%CD", "Î": "%CE", "Ï": "%CF", "Ð": "%D0", "Ñ": "%D1", "Ò": "%D2", "Ó": "%D3", "Ô": "%D4", "Õ": "%D5", "Ö": "%D6", "Ø": "%D8", "Ù": "%D9", "Ú": "%DA", "Û": "%DB", "Ü": "%DC", "Ý": "%DD", "Þ": "%DE", "ß": "%DF", "à": "%E0", "á": "%E1", "â": "%E2", "ã": "%E3", "ä": "%E4", "å": "%E5", "æ": "%E6", "ç": "%E7", "è": "%E8", "é": "%E9", "ê": "%EA", "ë": "%EB", "ì": "%EC", "í": "%ED", "î": "%EE", "ï": "%EF", "ð": "%F0", "ñ": "%F1", "ò": "%F2", "ó": "%F3", "ô": "%F4", "õ": "%F5", "ö": "%F6", "÷": "%F7", "ø": "%F8", "ù": "%F9", "ú": "%FA", "û": "%FB", "ü": "%FC", "ý": "%FD", "þ": "%FE", "ÿ": "%FF");
 

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

@@ -23,10 +23,13 @@
     // Lets clean up the selector a bit...
     $selector: nth(&, 1);
 
+		// Get the selector family instance
+    $family-instance: flint-has-family-instance($key);
+
     $flint-instance: (
 		"#{$selector}::#{$key}": (
 			"instance-count": $flint-instance-count,
-			"parent-selector": if(flint-has-family-instance($key) != false, flint-has-family-instance($key), none),
+			"parent-selector": if($family-instance != false, $family-instance, none),
 			"key": $key,
 			"breakpoint": flint-get-value("breakpoints", $key, "breakpoint"),
 			"columns": flint-get-value("breakpoints", $key, "columns"),

data/stylesheets/flint/mixins/lib/_grid-overlay.scss

@@ -42,8 +42,6 @@
 ///
 /// @access private
 ///
-/// @requires {Mixin} background-grid
-///
 /// @group Internal Mixins
 ///
 @mixin flint-overlay-grid {

data/tests/config.rb

@@ -1,123 +1,34 @@
-require "../lib/flint.rb"
-require "rubygems"
-require "bundler"
-
-# Require dependencies through bundler
-Bundler.require(:default, :test) if defined?(Bundler)
-
-# Define paths
-css_dir = "output"
-sass_dir = "input"
-
-# Output style will change based on environment
-output_style = :expanded
-
-# Disable line comments
-line_comments = false
-
-# Disable Sass warnings
-# disable_warnings = true
-
-# Options
-sass_options = {
-	# For when working on Windows machines
-	:unix_newlines => true
-}
-
-module Flint
-  class Profiler
-
-    @@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 get_action
-      "\e[0;32m#{@action.to_s}\e[0m".ljust(40)
-    end
-
-    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
-end
+require "../lib/flint.rb"
+require "rubygems"
+require "bundler"
+
+# Require dependencies through bundler
+Bundler.require(:default, :test) if defined?(Bundler)
+
+require "sass-prof"
+prof             = SassProf::Config
+# prof.output_file = "sass-prof.log"
+# prof.quiet       = false
+prof.max_width   = 40
+prof.color       = true
+prof.t_max       = 9000
+prof.ignore      = [:var]
+
+# Define paths
+css_dir = "output"
+sass_dir = "input"
+
+# Output style will change based on environment
+output_style = :expanded
+
+# Disable line comments
+line_comments = false
+
+# Disable Sass warnings
+# disable_warnings = true
+
+# Options
+sass_options = {
+  # For when working on Windows machines
+  :unix_newlines => true
+}

data/tests/output/output.css

@@ -1,9 +1,11 @@
 @charset "UTF-8";
+/*! sassyjson - v1.1.8 - 2014-06-01 */
 body {
   margin: 0;
   padding: 0;
 }
 
+/* >> Bootcamp >> */
 html {
   position: relative;
 }
@@ -302,6 +304,7 @@ Test Results {
   Skipped: 0;
 }
 
+/* << Bootcamp << */
 .col-1 {
   float: left;
   width: 18.75%;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flint-gs
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -225,6 +225,7 @@ files:
 - tests/input/functions/lib/_use-syntax.scss
 - tests/input/output.scss
 - tests/output/output.css
+- tests/sass-prof.log
 - tests/tests.html
 homepage: http://flint.gs
 licenses:
@@ -358,5 +359,6 @@ test_files:
 - tests/input/functions/lib/_use-syntax.scss
 - tests/input/output.scss
 - tests/output/output.css
+- tests/sass-prof.log
 - tests/tests.html
 has_rdoc: