flint-gs 1.8.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d3d740711745817f4afa2cb46a3b39c2e62aa2a
-  data.tar.gz: 8dedb3aa43b439b8c1026023ae6720b44a801c9c
+  metadata.gz: a150c2e0da9a945396df9ad56fe361761678278c
+  data.tar.gz: 06f27376ed86dfe4b14c6ed8e0ba000a8312dfa2
 SHA512:
-  metadata.gz: d477bed5e3b8e642550cb652fc7e96c0e779ca9f3b9721f6b7dd5a0898c3cafdbe390d9f145af2e495ccf5bd9faec24ac75f90795c739ce1403f915831b9f603
-  data.tar.gz: 87b693caa081a1e2ca7b0763d6848ccb1f8b42c0731d55db9fa1768bde3a9ec7a6a8b9a68670cda8e2bd42084d5d6dead5ff89cddc3be4c54f65e9692386b3bc
+  metadata.gz: b28f695620f39fae5cdbcff2e5021d33861bc391f299a6b8e7fd51fd5e1c7b96b3da20839ee826d6dfbdd14552fef6a2decb6f953633d9e11c7795c210ac091f
+  data.tar.gz: 718c30f212093b9d7753335f519e7b72a75c33124437bcbe5efa4b7868cbece05f204b9cbc7bc5fe0538d9afe056f18cfcc58d6c0a9bee4afe30a42ff666cac4

data/README.md

@@ -31,15 +31,15 @@ Enjoy.
 ## Requirements
 
 * Sass ~> `3.3.0`
-* Compass ~> `1.0.0.alpha.19`
+* Ruby ~> `1.8.7`
 
 ## Installation
 
 1. Install via Ruby `gem install flint-gs`, or Bower `bower install flint --save-dev`
-2. Add `require "flint"` to your `config.rb`
-3. Import it in your stylesheets with `@import "flint"`
+2. If you're using Compass, add `require "flint"` to your `config.rb`
+3. Import it into your stylesheet with `@import "flint"`
 
-If you don't want to install it, then simply download or clone the current build files. Use the starter `config.rb` to require any custom functions Flint uses; currently this is required, as we're making use of custom SassScript functions until the 'script `&`' [returns to Sass](https://gist.github.com/nex3/8050187). Adjust the paths according to your project.
+If you don't want to install it, then simply download or clone the current build files. Use the starter `config.rb` to require any custom functions Flint uses; currently this is required, as we're making use of custom SassScript functions until the SassScript `&` [returns to Sass](https://gist.github.com/nex3/8050187). Adjust the paths according to your project.
 
 ## Documentation
 

data/lib/flint.rb

@@ -1,12 +1,23 @@
-require 'compass'
+require 'sass'
 
-extension_path = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-Compass::Frameworks.register('flint', :path => extension_path)
+base_directory = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+flint_stylesheets_path = File.join(base_directory, 'sass')
 
-#  Date is in the form of YYYY-MM-DD
+if (defined? Compass)
+    Compass::Frameworks.register('flint', :path => base_directory)
+else
+    # Compass not found, register on the Sass path via the environment
+    if ENV.has_key?("SASS_PATH")
+        ENV["SASS_PATH"] = ENV["SASS_PATH"] + File::PATH_SEPARATOR + flint_stylesheets_path
+    else
+        ENV["SASS_PATH"] = flint_stylesheets_path
+    end
+end
+
+# Date is in the form of YYYY-MM-DD
 module Flint
-    VERSION = "1.8.0"
-    DATE = "2014-08-01"
+    VERSION = "1.9.1"
+    DATE = "2014-08-04"
 end
 
 # Custom functions

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

@@ -18,9 +18,9 @@
 // @param $calc-key [string] : breakpoint key
 // @param $calc-span [number] : span value
 // @param $calc-context [number] : context value
-// @param $calc-gutter [number] : gutter value
-// @param $calc-shift [number] : shift value
-// @param $i [number] : index if variable length is > 1
+// @param $calc-gutter [string] : gutter modifier
+// @param $calc-shift [number] : shift modifier
+// @param $i [number | null] : index if variable length is > 1
 // -------------------------------------------------------------------------------
 // @output calculated styles
 
@@ -44,9 +44,19 @@
 	// Default value for cache search result
 	$cached: false;
 
+	// Check lengths, if invalid throw error
+	// ----
+	@if flint-types-in-list($calc-gutter, "string") and length($calc-gutter) != length($flint__all__keys) {
+		@warn "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}";
+		$errors: true;
+	} @else if flint-types-in-list($calc-shift, "number") and length($calc-shift) != length($flint__all__keys) {
+		@warn "Invalid argument length of #{length($calc-shift)} for shift. If you're using a shorthand, please provide an argument for each breakpoint in your config (#{length($flint__all__keys)}). Your argument was: #{$calc-shift}";
+		$errors: true;
+	}
+
 	// Check if any arguments are lists if called from loop
 	// ----
-	@if $i != null {
+	@if $i and not $errors {
 
 		@if flint-types-in-list($calc-key, "number") {
 			$calc-key: nth($calc-key, $i);
@@ -68,7 +78,7 @@
 
 	// Check for cached results
 	// ----
-	@if $calc-context != "auto" and $calc-span != 0 {
+	@if $calc-context != "auto" and $calc-span != 0 and not $errors {
 		@if map-has-key($flint__cache-results, "#{$calc-key, $calc-span, $calc-context, $calc-gutter, $calc-shift, $i}") {
 
 			// Get results
@@ -83,7 +93,7 @@
 
 	// Hide if span is zero
 	// ----
-	@if $calc-span == 0 {
+	@if $calc-span == 0 and not $errors {
 
 		// First check if it's the default, so we don't hide the element on all breakpoints
 		@if $calc-key == flint-get-value("settings", "default") {
@@ -110,7 +120,7 @@
 		}
 
 		// Only run through if cache search was unsuccessful
-		@if $cached == false {
+		@if not $cached and not $errors {
 
 			// Shift, no context
 			// ----
@@ -203,7 +213,7 @@
 								}
 							} @else {
 								// Else warn that context should not be set to `auto`
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								// Throw error
 								$errors: true;
 							}
@@ -245,7 +255,7 @@
 								}
 							} @else {
 								// Else warn that context should not be set to `auto`
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								$errors: true;
 							}
 							// Output styles normally if not set to auto
@@ -284,7 +294,7 @@
 
 								}
 							} @else {
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								$errors: true;
 							}
 						} @else {
@@ -322,7 +332,7 @@
 
 								}
 							} @else {
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								$errors: true;
 							}
 						} @else {
@@ -360,7 +370,7 @@
 
 								}
 							} @else {
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								$errors: true;
 							}
 						} @else {
@@ -395,7 +405,7 @@
 
 								}
 							} @else {
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								$errors: true;
 							}
 						} @else {
@@ -425,7 +435,7 @@
 								}
 
 							} @else {
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								$errors: true;
 							}
 						} @else {
@@ -454,7 +464,7 @@
 
 								}
 							} @else {
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								$errors: true;
 							}
 						} @else {
@@ -483,7 +493,7 @@
 
 								}
 							} @else {
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								$errors: true;
 							}
 						} @else {
@@ -512,7 +522,7 @@
 
 								}
 							} @else {
-								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string()}`";
+								@warn "You set context to `#{$calc-context}`, but a parent instance could not be found for `#{selector_string() + '::' + $calc-key}`";
 								$errors: true;
 							}
 						} @else {
@@ -565,10 +575,10 @@
 
 		// Make sure there are no errors
 		// ----
-		@if $errors == false {
+		@if not $errors {
 
 			// Cache result
-			@if $calc-context != "auto" and $calc-span != 0 and $cached == false {
+			@if $calc-context != "auto" and $calc-span != 0 and not $cached {
 				$flint__cache-results: map-merge($flint__cache-results, (
 					"#{$calc-key, $calc-span, $calc-context, $calc-gutter, $calc-shift, $i}": ($output-width, $output-margin-right, $output-margin-left)
 				)) !global;

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

@@ -200,14 +200,10 @@
         or flint-types-in-list($key, "number") and $span == "auto" {
 
             // Emit warning for invalid argument lengths
-            @if flint-is-string($key) and length($key) == 1 {
-                @if not flint-exists($flint, $key) {
-                    @warn "Invalid argument: #{$key}. Breakpoint does not exist. Please provide a valid argument.";
-                }
-            } @else if flint-types-in-list($key, "number") and length($key) != length($flint__all__keys) {
-                @warn "Invalid argument length for column: #{length($key)}. 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) {
+                @warn "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) {
-                @warn "Invalid argument length for context: #{length($span)}. Please provide an argument for each breakpoint in your config (#{length($flint__all__keys)}). Your argument was: #{$span}";
+                @warn "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) {
@@ -280,7 +276,7 @@
         // @param $context [null] : context value of span
         // -------------------------------------------------------------------------------
         // @output calculated styles
-        } @else if flint-exists($flint, $key) and flint-is-number($span) and $context == null
+        } @else if flint-is-string($key) and flint-is-number($span) and $context == null
 
         // Call by alias with context
         // -------------------------------------------------------------------------------
@@ -289,14 +285,12 @@
         // @param $context [number | string] : context value of span
         // -------------------------------------------------------------------------------
         // @output calculated styles
-        or flint-exists($flint, $key) and flint-is-number($span) and flint-is-number($context)
-        or flint-exists($flint, $key) and flint-is-number($span) and $context == "auto" {
+        or flint-is-string($key) and flint-is-number($span) and flint-is-number($context)
+        or flint-is-string($key) and flint-is-number($span) and $context == "auto" {
 
             // Emit warning for invalid argument lengths
-            @if not length($span) == 1 {
-                @warn "Invalid argument length for column: #{length($span)}. Please provide a single argument for your breakpoint. Your argument was: #{$span}";
-            } @else if not length($context) == 1 {
-                @warn "Invalid argument length for context: #{length($context)}. Please provide a single argument for your breakpoint. Your argument was: #{$context}";
+            @if not flint-exists($flint, $key) {
+                @warn "Invalid argument: #{$key}. Breakpoint does not exist. Please provide a valid argument.";
             } @else {
 
                 $calc-key: $key;
@@ -361,7 +355,7 @@
 
         // Wrap @content in media queries
         // -------------------------------------------------------------------------------
-        // @param $key [list] : defines how to make up media query
+        // @param $key [string | list] : defines how to make up media query
         // -------------------------------------------------------------------------------
         // @output styles wrapped in media query
         } @else if flint-exists($flint, $key) and $span == null and $context == null
@@ -399,7 +393,7 @@
 
             // From $key breakpoint to infinity
             // -------------------------------------------------------------------------------
-            // @param $key [from key to infinity] : min-width from $key breakpoint
+            // @param $key [list : from key to infinity] : min-width from $key breakpoint
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "string", 4) and nth($key, 1) == "from" and nth($key, 3) == "to" and nth($key, 4) == "infinity" {
 
@@ -417,7 +411,7 @@
 
             // From $key-x breakpoint to $key-y breakpoint
             // -------------------------------------------------------------------------------
-            // @param $key [from key-x to key-y] : from $key-x breakpoint to $key-y
+            // @param $key [list : from key-x to key-y] : from $key-x breakpoint to $key-y
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "string", 4) and nth($key, 1) == "from" and nth($key, 3) == "to" {
 
@@ -435,7 +429,7 @@
 
             // From $num-x to $num-y
             // -------------------------------------------------------------------------------
-            // @param $key [from number to number] : arbitrary media query
+            // @param $key [list : from number to number] : arbitrary media query
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "string" "number" "string" "number", 4) and nth($key, 1) == "from" and nth($key, 3) == "to" {
                 // Make sure passed units match units used in config
@@ -450,7 +444,7 @@
 
             // Greater than $key breakpoint
             // -------------------------------------------------------------------------------
-            // @param $key [greater than key] : anything above $key breakpoint
+            // @param $key [list : greater than key] : anything above $key breakpoint
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "string", 3) and nth($key, 1) == "greater" and nth($key, 2) == "than" {
 
@@ -468,7 +462,7 @@
 
             // Greater than number
             // -------------------------------------------------------------------------------
-            // @param $key [greater than number] : anything above number
+            // @param $key [list : greater than number] : anything above number
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "string" "string" "number", 3) and nth($key, 1) == "greater" and nth($key, 2) == "than" {
 
@@ -482,7 +476,7 @@
 
             // Number greater than $key breakpoint
             // -------------------------------------------------------------------------------
-            // @param $key [number greater than key] : unit value greater than $key breakpoint
+            // @param $key [list : number greater than key] : unit value greater than $key breakpoint
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "number" "string" "string" "string", 4) and nth($key, 2) == "greater" and nth($key, 3) == "than" {
 
@@ -496,7 +490,7 @@
 
             // Less than $key breakpoint
             // -------------------------------------------------------------------------------
-            // @param $key [less than key] : anything below $key breakpoint
+            // @param $key [list : less than key] : anything below $key breakpoint
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "string", 3) and nth($key, 1) == "less" and nth($key, 2) == "than" {
 
@@ -514,7 +508,7 @@
 
             // Less than number
             // -------------------------------------------------------------------------------
-            // @param $key [less than number] : anything below number
+            // @param $key [list : less than number] : anything below number
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "string" "string" "number", 3) and nth($key, 1) == "less" and nth($key, 2) == "than" {
 
@@ -528,7 +522,7 @@
 
             // Number less than $key breakpoint
             // -------------------------------------------------------------------------------
-            // @param $key [number less than key] : unit value less than $key breakpoint
+            // @param $key [list : number less than key] : unit value less than $key breakpoint
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "number" "string" "string" "string", 4) and nth($key, 2) == "less" and nth($key, 3) == "than" {
 
@@ -542,7 +536,7 @@
 
             // For $key-x $key-y $key-z
             // -------------------------------------------------------------------------------
-            // @param $key [for list of strings] : will duplicate styles for each passed $key breakpoint
+            // @param $key [list : for list of keys] : comma delimited list of queries
             // -------------------------------------------------------------------------------
             } @else if flint-types-in-list($key, "string") and nth($key, 1) == "for" {
                 // Define empty query list
@@ -580,6 +574,13 @@
                   @content;
                 }
             }
+
+        // Invalid argument
+        // -------------------------------------------------------------------------------
+        // @throw : invalid argument warning
+        // -------------------------------------------------------------------------------
+        } @else {
+            @warn "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.";
         }
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flint-gs
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.1
 description: Flint is designed to be a flexible layout toolkit that developers can
   use for any responsive grid-based project.
 email: