breakpoint 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d365e3212d4b79464cbc2f5eadbcabe69e64869
-  data.tar.gz: 305565d16c733060da89d576b613c270c9805064
+  metadata.gz: 187581b23b36b6c3c281fc34fcbe3c4132cf6bc7
+  data.tar.gz: 1281f213b32e0bfa780dd060a569170b568d8f62
 SHA512:
-  metadata.gz: 66f36f855f898bc363dafc9f6de5a29592084d979b2363cd3690196ca4a31981c957eb5e27e37fe48bb0ac018f806f308b12d01cc5d18347637d451f78e58151
-  data.tar.gz: 55fb6032e1bbaa5c90fff0057c2a6dd02cc586868e9ceb2792d82956dcbcff2ece4802edc7cdca0e41cc44da3dea9cbf398cf5f277cbe7c257517931c77bcf61
+  metadata.gz: 371973f6a05ee72454db2f96c90c96e444e84e3d6992e2f0df8ca1c06707cc84ed1976713489ec91a2a4ec23c7df2cefd1614cc8dcdd58ac3c8926f7a4699774
+  data.tar.gz: e7e13771c4fff147c92ee0303122081426906f399766217dbf8aa8d68a90786675e7d08b52a5285a77249c073505f83c991cbb03da598f268c41f6c5011f86b3

data/lib/breakpoint.rb

@@ -3,6 +3,6 @@ require 'compass'
 Compass::Frameworks.register("breakpoint", :path => "#{File.dirname(__FILE__)}/..")
 
 module Breakpoint
-  VERSION = "2.2.0"
-  DATE = "2013-11-23"
+  VERSION = "2.3.0"
+  DATE = "2013-12-02"
 end

data/stylesheets/_breakpoint.scss

@@ -36,52 +36,26 @@ $breakpoint-legacy-syntax:      false !default;
 //////////////////////////////
 
 @mixin breakpoint($query, $no-query: false) {
-  // Internal Variables
-  $query-string: '';
-
   // Reset contexts
   @include private-breakpoint-reset-contexts();
 
-  // Test to see if it's a comma-separated list
-  $or-list: if(list-separator($query) == 'comma', true, false);
-  $query-fallback: false;
-
-
-  @if ($or-list == false and $breakpoint-legacy-syntax == false) {
-    $query-string: breakpoint-parse($query);
-  }
-  @else {
-    $length: length($query);
-
-    $last: nth($query, $length);
-    $query-fallback: breakpoint-no-query($last);
-
-    @if ($query-fallback != false) {
-      $length: $length - 1;
-    }
+  $breakpoint: breakpoint($query, false);
 
-    @if ($breakpoint-legacy-syntax == true) {
-      $mq: ();
+  $query-string: map-get($breakpoint, 'query');
+  $query-fallback: map-get($breakpoint, 'fallback');
 
-      @for $i from 1 through $length {
-        $mq: append($mq, nth($query, $i), comma);
-      }
-
-      $query-string: breakpoint-parse($mq);
-    }
-    @else {
-      $query-string: '';
-      @for $i from 1 through $length {
-        $query-string: $query-string + if($i == 1, '', ', ') + breakpoint-parse(nth($query, $i));
-      }
-    }
-  }
+  $private-breakpoint-context-holder: map-get($breakpoint, 'context holder') !global;
+  $private-breakpoint-query-count: map-get($breakpoint, 'query count') !global;
 
   // Allow for an as-needed override or usage of no query fallback.
   @if $no-query != false {
     $query-fallback: $no-query;
   }
 
+  @if $query-fallback != false {
+    $context-setter: private-breakpoint-set-context('no-query', $query-fallback);
+  }
+
   // Print Out Query String
   @if not $breakpoint-no-queries {
     @media #{$query-string} {

data/stylesheets/breakpoint/_context.scss

@@ -23,7 +23,14 @@ $private-breakpoint-query-count: 0 !default;
 //////////////////////////////
 @function breakpoint-get-context($feature) {
   @if map-has-key($private-breakpoint-context-holder, $feature) {
-    @return map-get($private-breakpoint-context-holder, $feature);
+    $get: map-get($private-breakpoint-context-holder, $feature);
+    // Special handling of no-query from get side so /false/ prepends aren't returned
+    @if $feature == 'no-query' {
+      @if type-of($get) == 'list' and length($get) > 1 and nth($get, 1) == false {
+        $get: nth($get, length($get));
+      }
+    }
+    @return $get;
   }
   @else {
     @if breakpoint-has-context() and $feature == 'media' {

data/stylesheets/breakpoint/_parsers.scss

@@ -7,6 +7,81 @@
 @import "parsers/triple";
 @import "parsers/resolution";
 
+//////////////////////////////
+// Breakpoint Function
+//////////////////////////////
+@function breakpoint($query, $contexts...) {
+  // Internal Variables
+  $query-string: '';
+  $query-fallback: false;
+  $return: ();
+
+  // Reserve Global Private Breakpoint Context
+  $holder-context: $private-breakpoint-context-holder;
+  $holder-query-count: $private-breakpoint-query-count;
+
+  // Reset Global Private Breakpoint Context
+  $private-breakpoint-context-holder: () !global;
+  $private-breakpoint-query-count: 0 !global;
+
+
+  // Test to see if it's a comma-separated list
+  $or-list: if(list-separator($query) == 'comma', true, false);
+
+
+  @if ($or-list == false and $breakpoint-legacy-syntax == false) {
+    $query-string: breakpoint-parse($query);
+  }
+  @else {
+    $length: length($query);
+
+    $last: nth($query, $length);
+    $query-fallback: breakpoint-no-query($last);
+
+    @if ($query-fallback != false) {
+      $length: $length - 1;
+    }
+
+    @if ($breakpoint-legacy-syntax == true) {
+      $mq: ();
+
+      @for $i from 1 through $length {
+        $mq: append($mq, nth($query, $i), comma);
+      }
+
+      $query-string: breakpoint-parse($mq);
+    }
+    @else {
+      $query-string: '';
+      @for $i from 1 through $length {
+        $query-string: $query-string + if($i == 1, '', ', ') + breakpoint-parse(nth($query, $i));
+      }
+    }
+  }
+
+  @if length($contexts) == 0 or nth($contexts, 1) == false {
+    $return: ('query': $query-string,
+              'fallback': $query-fallback,
+              'context holder': $private-breakpoint-context-holder,
+              'query count': $private-breakpoint-query-count
+    );
+  }
+  @else {
+    @if $query-fallback != false {
+      $context-setter: private-breakpoint-set-context('no-query', $query-fallback);
+    }
+
+    @each $context in $contexts {
+      $return: map-merge($return, ($context: breakpoint-get-context($context)));
+    }
+  }
+
+  // Reset Global Private Breakpoint Context
+  $private-breakpoint-context-holder: () !global;
+  $private-breakpoint-query-count: 0 !global;
+  @return $return;
+}
+
 //////////////////////////////
 // General Breakpoint Parser
 //////////////////////////////
@@ -40,7 +115,7 @@
 
     // Parse a single feature
     @if ($length == 1) {
-      // Feature is currenty a list, grab the actual value
+      // Feature is currently a list, grab the actual value
       $feature: nth($feature, 1);
 
       // Media Type must by convention be the first item, so it's safe to flat override $query-print, which right now should only be the default media type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: breakpoint
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Mason Wendell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -17,31 +17,31 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc.1
+        version: 3.3.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc.1
+        version: 3.3.0.rc.2
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.alpha.7
+        version: 1.0.0.alpha.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.alpha.7
+        version: 1.0.0.alpha.13
 description: Really simple media queries in Sass
 email:
-- mason@zivtech.com
+- mason@thecodingdesigner.com
 - sam@snug.ug
 executables: []
 extensions: []