breakup 1.0.0 → 1.0.1

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem "sass", "~>3.4.0"
+

data/Gemfile.lock

@@ -0,0 +1,10 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    sass (3.4.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sass (~> 3.4.0)

data/Makefile

@@ -22,7 +22,7 @@ build/libsass/test/%.css: test/%.scss
 
 build/rubysass/test/%.css: test/%.scss
 	mkdir -p build/rubysass/test
-	sass $< $@
+	bundle exec sass --sourcemap=none $< $@
 
 
 test: $(source_files) $(libsass_output_files) $(rubysass_output_files)

data/PACKAGING.md

@@ -0,0 +1,17 @@
+Packaging
+=========
+
+Because I do this so rarely I need a thing to remind me
+
+Version bump lib/breakup/version.rb and in package.json
+
+Git tag the commit
+    git tag 1.0.0 && git push origin 1.0.0
+
+Build gem and release
+    gem build breakup.gemspec
+    gem push breakup-1.0.0.gem
+
+Build npm package and release
+
+    npm publish . --tag 1.0.0

data/README.md

@@ -31,17 +31,28 @@ basic styles and the unwrapped wide styles so oldIE is given the wide view).
 
 ## Installation
 
-Breakup is distributed as a Compass plugin (though it is written in pure SCSS,
-so works as a stand-alone file without a dependancy on Compass).
+Breakup is compatible with both the origial ruby version of Sass and libsass.
+It is available as a rubygem and an npm package. If you don't wish to use either
+of these package managers you can also copy
+[stylesheets/_breakup.scss](stylesheets/_breakup.scss) into your project and
+`@import` it from there, as Breakup is written in pure SCSS and has no external
+dependencies.
+
+### Ruby
+
+Breakup is distributed as a Compass plugin.
 
 * Run `gem install breakup` or add breakup to your Gemfile.
 * Add `require "breakup"` to the top of your compass.rb
 * Add `@import 'breakup';` to your base stylesheets
 
-Alternatively, if you don't want to be dependant upon Compass, you can copy
-[stylesheets/_breakup.scss](stylesheets/_breakup.scss) into your project and
-`@import` it from there.
+### Node
+
+Breakup is distributed as an npm package.
 
+* Run `npm install breakup-sass --save-dev`
+* Add `@import 'node_modules/breakup-sass/stylesheets/breakup';` to your base
+  stylesheets
 
 ## Usage
 

data/lib/breakup/version.rb

@@ -1,3 +1,3 @@
 module Breakup
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "breakup-sass",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": {
     "name": "Ben Scott",
     "email": "ben@reload.me.uk"

data/stylesheets/_breakup.scss

@@ -59,6 +59,60 @@ $breakup-breakpoints-allow-naked: () !default;
 
 
 
+// Merge a list of breakpoints into an already defined $breakup-breakpoints
+// list. Returns null, as it manipulates the $breakup-breakpoints list directly.
+//
+// $breakpoints: A list of lists in the same style as $breakup-breakpoints, that
+// shall be merged into the $breakup-breakpoints list.
+@function breakup-add-breakpoints($breakpoints) {
+    @each $breakpoint in $breakpoints {
+        // Assign to a junk variable as sass doesn't let you run a function just
+        // for its side effects
+        $breakup-tmp: breakup-add-breakpoint($breakpoint...);
+    }
+    @return null;
+}
+
+
+
+// Wrapper around index as its return value differs from Sass 3.4 upwards.
+// Sass 3.2, 3.3 and libsass return false if the item is not found
+// Sass 3.4 returns null if the item is not found
+// This function follows the Sass 3.4 convention of returning null
+//
+// $list: The list to search through
+// $value: The value to search for
+@function breakup-index($list, $value) {
+    $index-result: index($list, $value);
+    @if $index-result {
+        @return $index-result;
+    }
+    @else {
+        @return null;
+    }
+}
+
+
+
+// Merge a single breakpoint into an already defined $breakup-breakpoints list.
+// Returns null, as it manipulates the $breakup-breakpoints list directly.
+//
+// $breakpoint-name:    The name of the breakpoint to add
+// $value:              The media query value to add
+@function breakup-add-breakpoint($breakpoint-name, $value) {
+    // Check the breakpoint-name doesn't already exist.
+    // If if already exists, throw a warning saying the shall be overwritten
+    @if breakup-list-key-search($breakup-breakpoints, $breakpoint-name) != false {
+        @warn 'Attempting to add "#{$breakpoint-name}" to $breakup-breakpoints but it already exists. Refusing to write the new value.';
+        @return null;
+    }
+
+    $breakup-breakpoints: append($breakup-breakpoints, ($breakpoint-name $value));
+    @return null;
+}
+
+
+
 // Wrapper around a @media block. if $breakup-naked is true then the
 // content is output directly if the declaration has been marked as a fallback
 // breakpoint.
@@ -89,7 +143,7 @@ $breakup-breakpoints-allow-naked: () !default;
 //
 // $block-name:     The block name to render
 @mixin breakup-block($block-name) {
-    @if index($breakup-included-blocks, $block-name) != false {
+    @if breakup-index($breakup-included-blocks, $block-name) != null {
         @content;
     }
 }
@@ -113,7 +167,7 @@ $breakup-breakpoints-allow-naked: () !default;
             $allow-naked-list: $breakup-breakpoints-allow-naked, null;
         }
 
-        $allow-naked: index($allow-naked-list, $breakpoint-name) != false;
+        $allow-naked: breakup-index($allow-naked-list, $breakpoint-name) != null;
 
 
         // For breakpoints, the block name is the same as the breakpoint name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: breakup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -51,8 +51,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - Makefile
+- PACKAGING.md
 - README.md
 - breakup.gemspec
 - examples/example_allblocks.css
@@ -107,4 +110,3 @@ summary: Breakup is a Sass component that allows you to create multiple CSS file
   mobile, tablet and desktop) and fallback files where no styles are wrapped (e.g.
   for oldIE which does not support media queries).
 test_files: []
-has_rdoc: