breakpoint 2.2.0.alpha.1 → 2.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8d365e3212d4b79464cbc2f5eadbcabe69e64869
+  data.tar.gz: 305565d16c733060da89d576b613c270c9805064
+SHA512:
+  metadata.gz: 66f36f855f898bc363dafc9f6de5a29592084d979b2363cd3690196ca4a31981c957eb5e27e37fe48bb0ac018f806f308b12d01cc5d18347637d451f78e58151
+  data.tar.gz: 55fb6032e1bbaa5c90fff0057c2a6dd02cc586868e9ceb2792d82956dcbcff2ece4802edc7cdca0e41cc44da3dea9cbf398cf5f277cbe7c257517931c77bcf61

data/CHANGELOG.markdown

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.2.0 - Nov 23, 2013
+* fix simple or queries
+* convert respond-to to use sass maps
+* convert context to use sass maps
+
 ## 2.0.7 - Sept 17th, 2013
 * fix fallback support for 1.x
 

data/README.markdown

@@ -1,6 +1,4 @@
-# Breakpoint #
-
-[![Build Status](https://travis-ci.org/Team-Sass/breakpoint.png)](https://travis-ci.org/Team-Sass/   breakpoint)
+# Breakpoint [![Gem Version](https://badge.fury.io/rb/breakpoint.png)](http://badge.fury.io/rb/breakpoint) [![Build Status](https://travis-ci.org/Team-Sass/breakpoint.png)](https://travis-ci.org/Team-Sass/breakpoint)
 
 **Really Simple Media Queries with Sass**
 

data/lib/breakpoint.rb

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

data/stylesheets/_breakpoint.scss

@@ -127,3 +127,10 @@ $breakpoint-legacy-syntax:      false !default;
 
   @include private-breakpoint-reset-contexts();
 }
+
+
+@mixin mq($query, $no-query: false) {
+  @include breakpoint($query, $no-query) {
+    @content;
+  }
+}

data/stylesheets/breakpoint/_context.scss

@@ -2,14 +2,14 @@
 // Private Breakpoint Variables
 //////////////////////////////
 $private-breakpoint-context-holder: ();
-$private-breakpoint-context-placeholder: 0;
+$private-breakpoint-query-count: 0 !default;
 
 //////////////////////////////
 // Breakpoint Has Context
 // Returns whether or not you are inside a Breakpoint query
 //////////////////////////////
 @function breakpoint-has-context() {
-  @if length($private-breakpoint-context-placeholder) {
+  @if length($private-breakpoint-query-count) {
     @return true;
   }
   @else {
@@ -17,36 +17,22 @@ $private-breakpoint-context-placeholder: 0;
   }
 }
 
-
 //////////////////////////////
 // Breakpoint Get Context
 // $feature: Input feature to get it's current MQ context. Returns false if no context
 //////////////////////////////
 @function breakpoint-get-context($feature) {
-  @each $context in $private-breakpoint-context-holder {
-    @if $feature == nth($context, 1) {
-      // strip feature name
-      $values: ();
-      @for $i from 2 through length($context) {
-        $values: append($values, nth($context, $i), comma);
-      }
-
-      $length: length($values) + 1;
-      @for $i from $length through $private-breakpoint-context-placeholder {
-        // Apply the Default Media type if feature is media
-        @if $feature == 'media' {
-          $values: append($values, $breakpoint-default-media, comma);
-        }
-        @else {
-          $values: append($values, false, comma);
-        }
-      }
-
-      @return $values;
+  @if map-has-key($private-breakpoint-context-holder, $feature) {
+    @return map-get($private-breakpoint-context-holder, $feature);
+  }
+  @else {
+    @if breakpoint-has-context() and $feature == 'media' {
+      @return $breakpoint-default-media;
+    }
+    @else {
+      @return false;
     }
   }
-
-  @return false;
 }
 
 //////////////////////////////
@@ -57,68 +43,37 @@ $private-breakpoint-context-placeholder: 0;
     $feature: 'monochrome';
   }
 
-  $placeholder-plus-one: ($private-breakpoint-context-placeholder + 1);
-
-  $holder: ();
-
-  @if $private-breakpoint-context-placeholder == 1 {
-    $holder: ($feature $value);
-    $private-breakpoint-context-holder: append($private-breakpoint-context-holder, $holder, comma) !global;
-    @return true;
+  $current: map-get($private-breakpoint-context-holder, $feature);
+  @if $current and length($current) == $private-breakpoint-query-count {
+    @warn "You have already queried against `#{$feature}`. Unexpected things may happen if you query against the same feature more than once in the same `and` query. Breakpoint is overwriting the current context with `#{$value}`";
+  }
 
-  } @else {
-    $feature-used: false;
-    @each $context in $private-breakpoint-context-holder {
-      @if nth($context, 1) == $feature {
-        $feature-used: $context;
+  @if not map-has-key($private-breakpoint-context-holder, $feature) {
+    $v-holder: ();
+    @for $i from 1 to $private-breakpoint-query-count {
+      @if $feature == 'media' {
+        $v-holder: append($v-holder, $breakpoint-default-media);
       }
-    }
-
-    @if $feature-used != false {
-      $holder: $feature;
-      @for $i from 2 through $placeholder-plus-one {
-        @if $i <= length($feature-used)  {
-          $holder: append($holder, nth($feature-used, $i), space);
-        } @elseif $i < $placeholder-plus-one {
-          $holder: append($holder, false, space);
-        } @else {
-          $holder: append($holder, $value, space);
-        }
+      @else {
+        $v-holder: append($v-holder, false);
       }
     }
-    @elseif $feature-used == false {
-      $holder: $feature;
-      @for $i from 2 through $placeholder-plus-one {
-        @if $i < $placeholder-plus-one {
-          // Apply the Default Media type if feature is media
-          @if $feature == 'media' {
-            $holder: append($holder, $breakpoint-default-media, space);
-          }
-          @else {
-            $holder: append($holder, false, space);
-          }
-
-        } @else {
-          $holder: append($holder, $value, space);
-        }
+    $v-holder: append($v-holder, $value);
+    $private-breakpoint-context-holder: map-merge($private-breakpoint-context-holder, ($feature: $v-holder)) !global;
+  }
+  @else {
+    $v-holder: map-get($private-breakpoint-context-holder, $feature);
+    $length: length($v-holder);
+    @for $i from $length to $private-breakpoint-query-count - 1 {
+      @if $feature == 'media' {
+        $v-holder: append($v-holder, $breakpoint-default-media);
       }
-    }
-
-    // Rebuild context
-    $rebuild: ();
-    @if $feature-used != false {
-      @each $context in $private-breakpoint-context-holder {
-        @if nth($context, 1) == nth($holder, 1) {
-          $rebuild: append($rebuild, $holder, comma);
-        } @else {
-          $rebuild: append($rebuild, $context, comma);
-        }
+      @else {
+        $v-holder: append($v-holder, false);
       }
-
-    } @else {
-      $rebuild: append($private-breakpoint-context-holder, $holder, comma);
     }
-    $private-breakpoint-context-holder: $rebuild !global;
+    $v-holder: append($v-holder, $value);
+    $private-breakpoint-context-holder: map-merge($private-breakpoint-context-holder, ($feature: $v-holder)) !global;
   }
 
   @return true;
@@ -129,5 +84,5 @@ $private-breakpoint-context-placeholder: 0;
 //////////////////////////////
 @mixin private-breakpoint-reset-contexts {
   $private-breakpoint-context-holder: () !global;
-  $private-breakpoint-context-placeholder: 0 !global;
-}
+  $private-breakpoint-query-count: 0 !global;
+}

data/stylesheets/breakpoint/_parsers.scss

@@ -11,7 +11,8 @@
 // General Breakpoint Parser
 //////////////////////////////
 @function breakpoint-parse($query) {
-  $private-breakpoint-context-placeholder: $private-breakpoint-context-placeholder + 1 !global;
+  // Increase number of 'and' queries
+  $private-breakpoint-query-count: $private-breakpoint-query-count + 1 !global;
 
   // Set up Media Type
   $query-print: '';
@@ -98,7 +99,22 @@
     $query-print: breakpoint-build-resolution($query-print, $query-resolution, $empty-media, $first);
   }
 
-  // @return 'all';
+  // Loop through each feature that's been detected so far and append 'false' to the the value list to increment their counters
+  @each $f, $v in $private-breakpoint-context-holder {
+    $v-holder: $v;
+    $length: length($v-holder);
+    @if length($v-holder) < $private-breakpoint-query-count {
+      @for $i from $length to $private-breakpoint-query-count {
+        @if $f == 'media' {
+          $v-holder: append($v-holder, $breakpoint-default-media);
+        }
+        @else {
+          $v-holder: append($v-holder, false);
+        }
+      }
+    }
+    $private-breakpoint-context-holder: map-merge($private-breakpoint-context-holder, ($f: $v-holder)) !global;
+  }
 
   @return $query-print;
 }

data/stylesheets/breakpoint/_respond-to.scss

@@ -6,39 +6,21 @@ $breakpoints: () !default;
 ////////////////////////
 // Respond-to API Mixin
 ////////////////////////
-
 @mixin respond-to($context, $no-query: false) {
-  @if type-of($breakpoints) != 'list' {
+  @if type-of($breakpoints) != 'map' {
     // Just in case someone writes gibberish to the $breakpoints variable.
-    @warn "Your breakpoints aren't a list! See https://github.com/snugug/respond-to#api if you'd like a reminder on how to use Respond-to";
+    @warn "Your breakpoints aren't a map! See https://github.com/snugug/respond-to#api if you'd like a reminder on how to use Respond-to";
+    @content;
   }
-  @if length($breakpoints)  != 0 {
-    // If there's only one breakpoint, SASS will think it's a space separated list :P
-    @if length($breakpoints) == 2 and type-of(nth($breakpoints, 1)) != 'list' {
-      $breakpoints: append((), (nth($breakpoints, 1), nth($breakpoints, 2)));
-    }
-    @each $bkpt in $breakpoints {
-      @if $context == nth($bkpt, 1) {
-        $length: length($bkpt);
-        $mq: false !default;
-
-        @for $i from 2 through $length {
-          // If it's the first item, override $mq
-          @if $i == 2 {
-            $mq: nth($bkpt, $i);
-          }
-          // Else, join $mq
-          @else {
-            $mq: join($mq, nth($bkpt, $i));
-          }
-        }
-
-        @include breakpoint($mq, $no-query) {
-          @content;
-        }
-      }
+  @else if map-has-key($breakpoints, $context) {
+    @include breakpoint(map-get($breakpoints, $context), $no-query) {
+      @content;
     }
   }
+  @else if not map-has-key($breakpoints, $context) {
+    @warn "`#{$context}` isn't a defined breakpoint! Please add it using `$breakpoints: add-breakpoint(`#{$context}`, $value);`";
+    @content;
+  }
   @else {
     @warn "You haven't created any breakpoints yet! Make some already! See https://github.com/snugug/respond-to#api if you'd like a reminder on how to use Respond-to";
     @content;
@@ -48,8 +30,18 @@ $breakpoints: () !default;
 //////////////////////////////
 // Add Breakpoint to Breakpoints
 //////////////////////////////
-@function add-breakpoint($name, $bkpt) {
-  $bkpt: $name $bkpt;
-  $output: append($breakpoints, $bkpt, 'comma');
-  @return $output;
+@function add-breakpoint($name, $bkpt, $overwrite: false) {
+  $output: ($name: $bkpt);
+  @if length($breakpoints) == 0 {
+    @return $output;
+  }
+  @else {
+    @if map-has-key($breakpoints, $name) and $overwrite != true {
+      @warn "You already have a breakpoint named `#{$name}`, please choose another breakpoint name, or pass in `$overwrite: true` to overwrite the previous breakpoint.";
+      @return $breakpoints;
+    }
+    @else if not map-has-key($breakpoints, $name) or $overwrite == true {
+      @return map-merge($breakpoints, $output);
+    }
+  }
 }

data/stylesheets/breakpoint/parsers/_query.scss

@@ -67,9 +67,16 @@
         $query-holder: append($query-holder, $feature-holder, comma);
         @return $query-holder;
       }
+      // let's check to see if the first item is a media type
+      @else if breakpoint-is-media(nth($query, 1)) {
+        $query-holder: append($query-holder, nth($query, 1));
+        $feature-holder: append(nth($query, 2), nth($query, 3), space);
+        $query-holder: append($query-holder, $feature-holder);
+        @return $query-holder;
+      }
     }
   }
 
-  // If it's a single item, or if it's not a special case double or tripple, we can simply return the query.
+  // If it's a single item, or if it's not a special case double or triple, we can simply return the query.
   @return $query;
 }

metadata

@@ -1,67 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: breakpoint
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 2
-  - 2
-  - 0
-  - alpha
-  - 1
-  version: 2.2.0.alpha.1
+version: !ruby/object:Gem::Version
+  version: 2.2.0
 platform: ruby
-authors: 
+authors:
 - Mason Wendell
 - Sam Richard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-20 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-11-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sass
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 3
-        - 0
-        - rc
-        - 1
+      - !ruby/object:Gem::Version
         version: 3.3.0.rc.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: compass
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.3.0.rc.1
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 13
-        - alpha
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.13.alpha.7
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.alpha.7
 description: Really simple media queries in Sass
-email: 
+email:
 - mason@zivtech.com
 - sam@snug.ug
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.markdown
 - CHANGELOG.markdown
 - lib/breakpoint.rb
@@ -82,37 +67,27 @@ files:
 - stylesheets/breakpoint/parsers/resolution/_resolution.scss
 - stylesheets/breakpoint/parsers/single/_default.scss
 - stylesheets/breakpoint/parsers/triple/_default.scss
-has_rdoc: true
 homepage: https://github.com/Team-Sass/breakpoint
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: breakpoint
-rubygems_version: 1.3.6
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An easy to use system for writing and managing media queries.
 test_files: []
-