shelves 0.2.1 → 0.5.0

data/Rakefile

@@ -1,22 +1,9 @@
 #!/usr/bin/env rake
 require 'bundler/gem_tasks'
 
+task :default => :generate
+
 desc 'Generate shelves.css'
 task :generate do
-  require 'sprockets'
-  require 'sprockets-sass'
-  require 'sass'
-  require 'compass'
-  
-  Compass.configuration do |compass|
-    compass.output_style  = :compact
-    compass.line_comments = false
-  end
-  
-  env = Sprockets::Environment.new
-  env.append_path 'scss'
-  
-  File.open 'css/shelves.css', 'w' do |f|
-    f.write env['shelves-grid.css'].to_s
-  end
+  system './bin/shelves > ./css/shelves.css'
 end

data/bin/shelves

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+ENV['BUNDLE_GEMFILE'] ||= File.join(Dir.pwd, 'Gemfile')
+require 'bundler/setup' if File.exist? ENV['BUNDLE_GEMFILE']
+
+require 'shelves'
+Shelves::CLI.run

data/lib/shelves.rb

@@ -1,11 +1,13 @@
 require 'shelves/version'
 
 module Shelves
+  autoload :CLI, 'shelves/cli'
+
   # Returns the path to the root of the project.
   def self.root
     @root_path ||= File.expand_path '../..', __FILE__
   end
-  
+
   # Returns the path to the main stylesheets directory.
   def self.stylesheets_path
     @stylesheets_path ||= File.join root, 'scss'
@@ -16,6 +18,6 @@ if defined?(::Rails)
   require 'shelves/extensions/rails'
 elsif defined?(::Sprockets) && Sprockets.respond_to?(:append_path)
   require 'shelves/extensions/sprockets'
-else
+elsif defined?(::Compass)
   require 'shelves/extensions/compass'
 end

data/lib/shelves/cli.rb

@@ -0,0 +1,265 @@
+require 'choice'
+require 'erb'
+require 'sass'
+
+Choice.options do
+  banner <<-BANNER
+Shelves - The only responsive, fluid CSS grid with infinitely nestable columns.
+
+Example Usage:
+    shelves --width 1140px --columns 16 > grid.css
+BANNER
+
+  separator 'Base Options:'
+
+  option 'width' do
+    short '-w'
+    long '--width WIDTH'
+    desc 'The max width.'
+    desc '(default: 1040px)'
+  end
+
+  option 'columns' do
+    short '-c'
+    long '--columns COLUMNS'
+    desc 'The number of columns.'
+    desc '(default: 12)'
+    cast Integer
+  end
+
+  option 'margin' do
+    short '-m'
+    long '--margin MARGIN'
+    desc 'The outer margin.'
+    desc '(default: 20px)'
+  end
+
+  option 'gutter' do
+    short '-g'
+    long '--gutter GUTTER'
+    desc 'The column gutter.'
+    desc 'Will be converted to a percentage value.'
+    desc '(default: 20px)'
+  end
+
+  option 'skip-nested' do
+    short '-N'
+    long '--skip-nested'
+    desc 'Do not include nested columns.'
+  end
+
+  option 'skip-tablet' do
+    short '-T'
+    long '--skip-tablet'
+    desc 'Do not include tablet columns.'
+  end
+
+  option 'skip-mobile' do
+    short '-M'
+    long '--skip-mobile'
+    desc 'Do not include mobile columns.'
+  end
+
+  option 'version' do
+    short '-v'
+    long '--version'
+    desc 'Show version.'
+    action do
+      puts Shelves::VERSION
+      exit
+    end
+  end
+
+  option 'help' do
+    short '-h'
+    long '--help'
+    desc 'Show this message.'
+  end
+
+  separator ''
+  separator 'Tablet Options:'
+
+  option 'tablet-breakpoint' do
+    long '--tablet-breakpoint BREAKPOINT'
+    desc 'The breakpoint for tablets.'
+    desc '(default: 800px)'
+  end
+
+  option 'tablet-columns' do
+    long '--tablet-columns COLUMNS'
+    desc 'The number of columns for tablets.'
+    desc '(default: 6)'
+    cast Integer
+  end
+
+  option 'tablet-margin' do
+    long '--tablet-margin MARGIN'
+    desc 'The outer margin for tablets.'
+    desc '(default: 75% of margin)'
+  end
+
+  option 'tablet-gutter' do
+    long '--tablet-gutter GUTTER'
+    desc 'The column gutter for tablets.'
+    desc '(default: 150% of gutter)'
+  end
+
+  separator ''
+  separator 'Mobile Options:'
+
+  option 'mobile-breakpoint' do
+    long '--mobile-breakpoint BREAKPOINT'
+    desc 'The breakpoint for mobile.'
+    desc '(default: 480px)'
+  end
+
+  option 'mobile-columns' do
+    long '--mobile-columns COLUMNS'
+    desc 'The number of columns for mobile.'
+    desc '(default: 4)'
+    cast Integer
+  end
+
+  option 'mobile-margin' do
+    long '--mobile-margin MARGIN'
+    desc 'The outer margin for mobile.'
+    desc '(default: 50% of margin)'
+  end
+
+  option 'mobile-gutter' do
+    long '--mobile-gutter GUTTER'
+    desc 'The column gutter for mobile.'
+    desc '(default: 238% of gutter)'
+  end
+
+  separator ''
+  separator 'Advanced Options:'
+
+  option 'skip-ie7-support' do
+    long '--skip-ie7-support'
+    desc 'Skip legacy support for IE7.'
+  end
+
+  option 'skip-prefixes' do
+    long '--skip-prefixes'
+    desc 'Do not include prefix classes.'
+  end
+
+  option 'skip-suffixes' do
+    long '--skip-suffix'
+    desc 'Do not include suffix classes.'
+  end
+
+  option 'skip-pushes' do
+    long '--skip-push'
+    desc 'Do not include push classes.'
+  end
+
+  option 'skip-pulls' do
+    long '--skip-pull'
+    desc 'Do not include pull classes.'
+  end
+
+  option 'nested-prefixes' do
+    long '--nested-prefixes'
+    desc 'Include prefix classes for nested columns.'
+  end
+
+  option 'nested-suffixes' do
+    long '--nested-suffixes'
+    desc 'Include suffix classes for nested columns.'
+  end
+
+  option 'nested-pushes' do
+    long '--nested-pushes'
+    desc 'Include push classes for nested columns.'
+  end
+
+  option 'nested-pulls' do
+    long '--nested-pulls'
+    desc 'Include pull classes for nested columns.'
+  end
+
+  option 'tablet-prefixes' do
+    long '--tablet-prefixes'
+    desc 'Include prefix classes for tablet columns.'
+  end
+
+  option 'tablet-suffixes' do
+    long '--tablet-suffixes'
+    desc 'Include suffix classes for tablet columns.'
+  end
+
+  option 'tablet-pushes' do
+    long '--tablet-pushes'
+    desc 'Include push classes for tablet columns.'
+  end
+
+  option 'tablet-pulls' do
+    long '--tablet-pulls'
+    desc 'Include pull classes for tablet columns.'
+  end
+
+  option 'mobile-prefixes' do
+    long '--mobile-prefixes'
+    desc 'Include prefix classes for mobile columns.'
+  end
+
+  option 'mobile-suffixes' do
+    long '--mobile-suffixes'
+    desc 'Include suffix classes for mobile columns.'
+  end
+
+  option 'mobile-pushes' do
+    long '--mobile-pushes'
+    desc 'Include push classes for mobile columns.'
+  end
+
+  option 'mobile-pulls' do
+    long '--mobile-pulls'
+    desc 'Include pull classes for mobile columns.'
+  end
+end
+
+module Shelves
+  module CLI extend self
+    def run
+      settings = normalize_settings(Choice.choices)
+      sass_template = render_sass_template(settings)
+      sass_engine = Sass::Engine.new(sass_template,
+        :syntax => :scss,
+        :load_paths => [Shelves.stylesheets_path],
+        :style => :compact,
+        :line_comments => false
+      )
+
+      puts sass_engine.render
+    end
+
+    private
+
+      def render_sass_template(settings)
+        template = ERB.new <<-TEMPLATE
+<% settings.each do |setting, value| %>
+$shelves-<%= setting %>: <%= value %>;
+<% end %>
+@import "shelves";
+@include shelves;
+TEMPLATE
+        template.result(binding)
+      end
+
+      def normalize_settings(settings)
+        normalized_settings = {}
+        settings.each do |setting, value|
+          if setting =~ /^skip-(\w*)$/
+            setting = $1
+            value = false
+          end
+          normalized_settings[setting] = value
+        end
+
+        normalized_settings
+      end
+  end
+end

data/lib/shelves/version.rb

@@ -1,3 +1,3 @@
 module Shelves
-  VERSION = '0.2.1'
+  VERSION = '0.5.0'
 end

data/scss/shelves-grid.scss

@@ -1,3 +1,2 @@
 @import "shelves";
-
 @include shelves;

data/scss/shelves.scss

@@ -7,7 +7,6 @@ The only responsive, fluid CSS grid with infinitely nestable columns.
 Copyright (c) 2012, Pete Browne
 */
 
-@import "compass/utilities/general/clearfix";
 @import "shelves/settings";
 @import "shelves/functions";
 @import "shelves/mixins";

data/scss/shelves/_functions.scss

@@ -5,19 +5,17 @@
 //   $context - The number of columns encapsulating the column.
 //              Defaults to the the value of $total.
 //   $total   - The total number of columns in the grid.
-//              Defaults to the value of $shelves-columns. 
+//              Defaults to the value of $shelves-columns.
 //   $gutter  - The width of the gutter in the root context (in %).
 //              Defaults to the value of $shelves-gutter.
 //
 @function column-width(
-  $context: false,
-  $total:   $shelves-columns,
-  $gutter:  $shelves-gutter
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter
 ) {
-  @if $context == false {
-    $context: $total;
-  }
-  
+  $context: $total !default;
+
   @if $context <= 1 {
     @return 100%;
   }
@@ -38,19 +36,17 @@
 //   $context - The number of columns encapsulating the gutter.
 //              Defaults to the the value of $total.
 //   $total   - The total number of columns in the grid.
-//              Defaults to the value of $shelves-columns. 
+//              Defaults to the value of $shelves-columns.
 //   $gutter  - The width of the gutter in the root context (in %).
 //              Defaults to the value of $shelves-gutter.
 //
 @function column-gutter(
-  $context: false,
-  $total:   $shelves-columns,
-  $gutter:  $shelves-gutter
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter
 ) {
-  @if $context == false {
-    $context: $total;
-  }
-  
+  $context: $total !default;
+
   @if $context <= 1 {
     @return 0%;
   }
@@ -71,20 +67,18 @@
 //   $context - The number of columns encapsulating the columns.
 //              Defaults to the the value of $total.
 //   $total   - The total number of columns in the grid.
-//              Defaults to the value of $shelves-columns. 
+//              Defaults to the value of $shelves-columns.
 //   $gutter  - The width of the gutter in the root context (in %).
 //              Defaults to the value of $shelves-gutter.
 //
 @function columns-width(
   $n,
-  $context: false,
-  $total:   $shelves-columns,
-  $gutter:  $shelves-gutter
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter
 ) {
-  @if $context == false or $context > $total {
-    $context: $total;
-  }
-  
+  $context: $total !default;
+
   @if $n <= 1 {
     @return column-width($context, $total, $gutter);
   }
@@ -94,7 +88,7 @@
   @else {
     $column-width: column-width($context, $total, $gutter);
     $column-gutter: column-gutter($context, $total, $gutter);
-    
+
     @return $column-width * $n + $column-gutter * ($n - 1);
   }
 }
@@ -107,15 +101,15 @@
 //   $context - The number of columns encapsulating the columns.
 //              Defaults to the the value of $total.
 //   $total   - The total number of columns in the grid.
-//              Defaults to the value of $shelves-columns. 
+//              Defaults to the value of $shelves-columns.
 //   $gutter  - The width of the gutter in the root context (in %).
 //              Defaults to the value of $shelves-gutter.
 //
 @function columns-distance(
   $n,
-  $context: false,
-  $total:   $shelves-columns,
-  $gutter:  $shelves-gutter
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter
 ) {
   @return columns-width($n, $context, $total, $gutter) + column-gutter($context, $total, $gutter);
 }

data/scss/shelves/_settings.scss

@@ -1,10 +1,12 @@
 // Default Grid Settings
-$shelves-width:          1040px !default;
-$shelves-max-width:      $shelves-width !default;
-$shelves-min-width:      767px !default;
-$shelves-columns:        12 !default;
-$shelves-margin:         32px !default;
-$shelves-gutter:         24px !default;
+$shelves-width: 1060px !default;
+$shelves-max-width: $shelves-width !default;
+$shelves-min-width: 767px !default;
+$shelves-columns: 12 !default;
+$shelves-margin: 20px !default;
+$shelves-gutter: 20px !default;
+$shelves-tablet-breakpoint: 800px !default;
+$shelves-mobile-breakpoint: 480px !default;
 
 // Convert the gutter to a percentage if necessary.
 @if unit($shelves-gutter) != "%" {
@@ -13,23 +15,48 @@ $shelves-gutter:         24px !default;
 
 // Default Tablet Settings
 $shelves-tablet-columns: 6 !default;
-$shelves-tablet-margin:  $shelves-margin * 0.75 !default;
-$shelves-tablet-gutter:  $shelves-gutter * 1.5 !default;
+$shelves-tablet-margin: $shelves-margin * 0.75 !default;
+$shelves-tablet-gutter: $shelves-gutter * 1.5 !default;
 
 // Default Mobile Settings
 $shelves-mobile-columns: 4 !default;
-$shelves-mobile-margin:  $shelves-margin * 0.5 !default;
-$shelves-mobile-gutter:  $shelves-gutter * 2.375 !default;
+$shelves-mobile-margin: $shelves-margin * 0.5 !default;
+$shelves-mobile-gutter: $shelves-gutter * 2.375 !default;
 
 // Default Class Names
 // (Note the lack of the preceding ".")
-$shelves-container-name:     "container" !default;
-$shelves-row-name:           "row" !default;
-$shelves-column-name:        "column" !default;
-$shelves-prefix-name:        "prefix" !default;
-$shelves-suffix-name:        "suffix" !default;
-$shelves-push-name:          "push" !default;
-$shelves-pull-name:          "pull" !default;
-$shelves-separator:          "-" !default;
+$shelves-container-name: "container" !default;
+$shelves-row-name: "row" !default;
+$shelves-column-name: "column" !default;
+$shelves-prefix-name: "prefix" !default;
+$shelves-suffix-name: "suffix" !default;
+$shelves-push-name: "push" !default;
+$shelves-pull-name: "pull" !default;
+$shelves-separator: "-" !default;
 $shelves-tablet-column-name: "tablet-column" !default;
 $shelves-mobile-column-name: "mobile-column" !default;
+
+// Default options for the grid generator
+$shelves-prefixes: true !default;
+$shelves-suffixes: true !default;
+$shelves-pushes: true !default;
+$shelves-pulls: true !default;
+$shelves-nested: true !default;
+$shelves-nested-prefixes: false !default;
+$shelves-nested-suffixes: false !default;
+$shelves-nested-pushes: false !default;
+$shelves-nested-pulls: false !default;
+$shelves-tablet: true !default;
+$shelves-tablet-prefixes: false !default;
+$shelves-tablet-suffixes: false !default;
+$shelves-tablet-pushes: false !default;
+$shelves-tablet-pulls: false !default;
+$shelves-mobile: true !default;
+$shelves-mobile-prefixes: false !default;
+$shelves-mobile-suffixes: false !default;
+$shelves-mobile-pushes: false !default;
+$shelves-mobile-pulls: false !default;
+
+// Support IE7
+$legacy-support-for-ie7: true !default;
+$shelves-ie7-support: $legacy-support-for-ie7 !default;

data/scss/shelves/mixins/_base.scss

@@ -22,14 +22,14 @@
 //                      mobile sizes. Defaults to false.
 //
 @mixin row(
-  $max-width:       $shelves-max-width,
-  $min-width:       $shelves-min-width,
+  $max-width: $shelves-max-width,
+  $min-width: $shelves-min-width,
   $reset-if-tablet: true,
   $reset-if-mobile: false
 ) {
-  @include pie-clearfix;
+  @include shelves-clearfix;
   width: 100%;
-  
+
   @if type-of($max-width) == 'number' {
     max-width: $max-width;
     margin-left: auto;
@@ -37,18 +37,18 @@
   }
   @if type-of($min-width) == 'number' {
     min-width: $min-width;
-    
+
     .#{$shelves-row-name} {
       min-width: 0;
     }
   }
   @if $reset-if-tablet {
-    @media screen and (max-width: 800px) {
+    @media screen and (max-width: $shelves-tablet-breakpoint) {
       @include reset-row;
     }
   }
   @if $reset-if-mobile {
-    @media screen and (max-width: 480px) {
+    @media screen and (max-width: $shelves-mobile-breakpoint) {
       @include reset-row;
     }
   }
@@ -61,7 +61,7 @@
 //   $context         - The number of columns encapsulating the element.
 //                      Defaults to the the value of $total.
 //   $total           - The total number of columns in the grid.
-//                      Defaults to the value of $shelves-columns. 
+//                      Defaults to the value of $shelves-columns.
 //   $gutter          - The width of the gutter in the root context (in %).
 //                      Defaults to the value of $shelves-gutter.
 //   $reset-if-tablet - Include styles for resetting the column at
@@ -71,9 +71,9 @@
 //
 @mixin column(
   $n,
-  $context:         false,
-  $total:           $shelves-columns,
-  $gutter:          $shelves-gutter,
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter,
   $reset-if-tablet: true,
   $reset-if-mobile: false
 ) {
@@ -96,19 +96,19 @@
   float: left;
   min-height: 1px;
   position: relative;
-  
-  @if $legacy-support-for-ie7 {
+
+  @if $shelves-ie7-support {
     // IE6-7 incorrectly rounds up percentage widths (breaking layouts)
     // http://ejohn.org/blog/sub-pixel-problems-in-css/
     *margin-right: -1px;
   }
   @if $reset-if-tablet {
-    @media screen and (max-width: 800px) {
+    @media screen and (max-width: $shelves-tablet-breakpoint) {
       @include reset-column;
     }
   }
   @if $reset-if-mobile {
-    @media screen and (max-width: 480px) {
+    @media screen and (max-width: $shelves-mobile-breakpoint) {
       @include reset-column;
     }
   }
@@ -120,15 +120,15 @@
 //   $context - The number of columns encapsulating the element.
 //              Defaults to the the value of $total.
 //   $total   - The total number of columns in the grid.
-//              Defaults to the value of $shelves-columns. 
+//              Defaults to the value of $shelves-columns.
 //   $gutter  - The width of the gutter in the root context (in %).
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin columns-width(
   $n,
-  $context: false,
-  $total:   $shelves-columns,
-  $gutter:  $shelves-gutter
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter
 ) {
   width: columns-width($n, $context, $total, $gutter);
 }
@@ -138,23 +138,41 @@
 //   $context     - The number of columns encapsulating the element.
 //                  Defaults to the the value of $total.
 //   $total       - The total number of columns in the grid.
-//                  Defaults to the value of $shelves-columns. 
+//                  Defaults to the value of $shelves-columns.
 //   $gutter      - The width of the gutter in the root context (in %).
 //                  Defaults to the value of $shelves-gutter.
 //   $reset-first - Removes the gutter for the first column in a row.
 //                  Defaults to true.
 //
 @mixin column-gutter(
-  $context:     false,
-  $total:       $shelves-columns,
-  $gutter:      $shelves-gutter,
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter,
   $reset-first: true
 ) {
   margin-left: column-gutter($context, $total, $gutter);
-  
+
   @if $reset-first {
     &:first-child {
       @include reset-column-gutter;
     }
   }
 }
+
+// Clearfix mixin based on micro-clearfix:
+// http://nicolasgallagher.com/micro-clearfix-hack/
+@mixin shelves-clearfix {
+  &:before,
+  &:after {
+    content: " ";
+    display: table;
+  }
+
+  &:after {
+    clear: both;
+  }
+
+  @if $shelves-ie7-support {
+    *zoom: 1;
+  }
+}

data/scss/shelves/mixins/_generators.scss

@@ -9,7 +9,7 @@
 //                      Defaults to true.
 //   $nested-prefixes - Include prefix classes for neseted columns.
 //                      Defaults to true.
-//   $nested-suffixes - Include suffix classes  for neseted columns.
+//   $nested-suffixes - Include suffix classes for neseted columns.
 //                      Defaults to true.
 //   $nested-pushes   - Include push classes for neseted columns.
 //                      Defaults to false.
@@ -18,7 +18,7 @@
 //   $tablet          - Include tablet columns & resets. Defaults to true.
 //   $tablet-prefixes - Include prefix classes for tablet columns.
 //                      Defaults to false.
-//   $tablet-suffixes - Include suffix classes  for tablet columns.
+//   $tablet-suffixes - Include suffix classes for tablet columns.
 //                      Defaults to false.
 //   $tablet-pushes   - Include push classes for tablet columns.
 //                      Defaults to false.
@@ -27,7 +27,7 @@
 //   $mobile          - Include mobile columns & resets. Defaults to true.
 //   $mobile-prefixes - Include prefix classes for mobile columns.
 //                      Defaults to false.
-//   $mobile-suffixes - Include suffix classes  for mobile columns.
+//   $mobile-suffixes - Include suffix classes for mobile columns.
 //                      Defaults to false.
 //   $mobile-pushes   - Include push classes for mobile columns.
 //                      Defaults to false.
@@ -35,67 +35,66 @@
 //                      Defaults to false.
 //
 @mixin shelves(
-  $prefixes:         true,
-  $suffixes:         true,
-  $pushes:           true,
-  $pulls:            true,
-  $nested:           true,
-  $nested-prefixes:  true,
-  $nested-suffixes:  true,
-  $nested-pushes:    false,
-  $nested-pulls:     false,
-  $tablet:           true,
-  $tablet-prefixes:  false,
-  $tablet-suffixes:  false,
-  $tablet-pushes:    false,
-  $tablet-pulls:     false,
-  $mobile:           true,
-  $mobile-prefixes:  false,
-  $mobile-suffixes:  false,
-  $mobile-pushes:    false,
-  $mobile-pulls:     false
+  $prefixes: $shelves-prefixes,
+  $suffixes: $shelves-suffixes,
+  $pushes: $shelves-pushes,
+  $pulls: $shelves-pulls,
+  $nested: $shelves-nested,
+  $nested-prefixes: $shelves-nested-prefixes,
+  $nested-suffixes: $shelves-nested-suffixes,
+  $nested-pushes: $shelves-nested-pushes,
+  $nested-pulls: $shelves-nested-pulls,
+  $tablet: $shelves-tablet,
+  $tablet-prefixes: $shelves-tablet-prefixes,
+  $tablet-suffixes: $shelves-tablet-suffixes,
+  $tablet-pushes: $shelves-tablet-pushes,
+  $tablet-pulls: $shelves-tablet-pulls,
+  $mobile: $shelves-mobile,
+  $mobile-prefixes: $shelves-mobile-prefixes,
+  $mobile-suffixes: $shelves-mobile-suffixes,
+  $mobile-pushes: $shelves-mobile-pushes,
+  $mobile-pulls: $shelves-mobile-pulls
 ) {
-  
   @include shelves-base($reset-if-tablet: false, $reset-if-mobile: false);
   @include shelves-columns(
     $prefixes: $prefixes,
     $suffixes: $suffixes,
-    $pushes:   $pushes,
-    $pulls:    $pulls
+    $pushes: $pushes,
+    $pulls: $pulls
   );
-  
+
   @if $nested {
     @for $i from 1 to $shelves-columns - 1  {
       // Loop background through the columns
       // to cascade the nested column properties.
       $i: $shelves-columns - $i;
-    
+
       #{column-selector($shelves-column-name, $i)} {
         #{columns-selector($shelves-column-name)} {
           @include column-gutter($i, $reset-first: false);
         }
-        
+
         @include shelves-columns(
-          $context:  $i,
+          $context: $i,
           $prefixes: $nested-prefixes,
           $suffixes: $nested-suffixes,
-          $pushes:   $nested-pushes,
-          $pulls:    $nested-pulls
+          $pushes: $nested-pushes,
+          $pulls: $nested-pulls
         );
-      } 
+      }
     }
   }
-  
+
   @if $tablet {
-    @media screen and (max-width: 800px) {
+    @media screen and (max-width: $shelves-tablet-breakpoint) {
       @if $shelves-tablet-margin != $shelves-margin {
         .#{$shelves-container-name} {
           @include container($shelves-tablet-margin);
         }
       }
-      
+
       @include shelves-resets;
-      
+
       // Use the extra specificity from the row class
       // to apply tablet column properties even when nested
       .#{$shelves-row-name} {
@@ -103,30 +102,30 @@
           @include column-base($reset-if-tablet: false, $reset-if-mobile: false);
           @include column-gutter($total: $shelves-tablet-columns, $gutter: $shelves-tablet-gutter);
         }
-        
+
         @include shelves-columns(
           $column-name: $shelves-tablet-column-name,
-          $total:       $shelves-tablet-columns,
-          $gutter:      $shelves-tablet-gutter,
-          $prefixes:    $tablet-prefixes,
-          $suffixes:    $tablet-suffixes,
-          $pushes:      $tablet-pushes,
-          $pulls:       $tablet-pulls 
+          $total: $shelves-tablet-columns,
+          $gutter: $shelves-tablet-gutter,
+          $prefixes: $tablet-prefixes,
+          $suffixes: $tablet-suffixes,
+          $pushes: $tablet-pushes,
+          $pulls: $tablet-pulls
         );
       }
     }
   }
-  
+
   @if $mobile {
-    @media screen and (max-width: 480px) {
+    @media screen and (max-width: $shelves-mobile-breakpoint) {
       @if $shelves-mobile-margin != if($tablet, $shelves-margin, $shelves-tablet-margin) {
         .#{$shelves-container-name} {
           @include container($shelves-mobile-margin);
         }
       }
-      
+
       @include shelves-resets($reset-row: $tablet == false);
-    
+
       // Use the extra specificity from the row class
       // to apply mobile column properties even when nested
       .#{$shelves-row-name} {
@@ -134,15 +133,15 @@
           @include column-base($reset-if-tablet: false, $reset-if-mobile: false);
           @include column-gutter($total: $shelves-mobile-columns, $gutter: $shelves-mobile-gutter);
         }
-      
+
         @include shelves-columns(
           $column-name: $shelves-mobile-column-name,
-          $total:       $shelves-mobile-columns,
-          $gutter:      $shelves-mobile-gutter,
-          $prefixes:    $mobile-prefixes,
-          $suffixes:    $mobile-suffixes,
-          $pushes:      $mobile-pushes,
-          $pulls:       $mobile-pulls
+          $total: $shelves-mobile-columns,
+          $gutter: $shelves-mobile-gutter,
+          $prefixes: $mobile-prefixes,
+          $suffixes: $mobile-suffixes,
+          $pushes: $mobile-pushes,
+          $pulls: $mobile-pulls
         );
       }
     }
@@ -161,16 +160,16 @@
   .#{$shelves-container-name} {
     @include container;
   }
-  
+
   .#{$shelves-row-name} {
     @include row($reset-if-tablet: $reset-if-tablet, $reset-if-mobile: $reset-if-mobile);
   }
-  
+
   #{columns-selector($shelves-column-name)} {
     @include column-base($reset-if-tablet: $reset-if-tablet, $reset-if-mobile: $reset-if-mobile);
     @include column-gutter($reset-first: false);
   }
-  
+
   .#{$shelves-row-name} {
     #{columns-selector($shelves-column-name)} {
       &:first-child {
@@ -192,7 +191,7 @@
 //   $context     - The context of generated classes.
 //                  Defaults to the value of $total.
 //   $total       - The total number of columns in the grid.
-//                  Defaults to the value of $shelves-columns. 
+//                  Defaults to the value of $shelves-columns.
 //   $gutter      - The width of the gutter in the root context (in %).
 //                  Defaults to the value of $shelves-gutter.
 //   $prefixes    - Include prefix classes. Deafults to true.
@@ -202,22 +201,19 @@
 //
 @mixin shelves-columns(
   $column-name: $shelves-column-name,
-  $start:       1,
-  $end:         false,
-  $context:     false,
-  $total:       $shelves-columns,
-  $gutter:      $shelves-gutter,
-  $prefixes:    true,
-  $suffixes:    true,
-  $pushes:      true,
-  $pulls:       true
+  $start: 1,
+  $end: null,
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter,
+  $prefixes: true,
+  $suffixes: true,
+  $pushes: true,
+  $pulls: true
 ) {
-  @if $context == false or $context > $total {
-    $context: $total;
-  }
-  @if $end == false or $end > $context {
-    $end: $context;
-  }
+  $context: $total !default;
+  $end: $context !default;
+
   @for $i from $start to $end  {
     #{column-selector($column-name, $i)} {
       @include columns-width($i, $context, $total, $gutter);

data/scss/shelves/mixins/_modifiers.scss

@@ -5,15 +5,15 @@
 //   $context - The number of columns encapsulating the element.
 //              Defaults to the the value of $total.
 //   $total   - The total number of columns in the grid.
-//              Defaults to the value of $shelves-columns. 
+//              Defaults to the value of $shelves-columns.
 //   $gutter  - The width of the gutter in the root context (in %).
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin column-prefix(
   $n,
-  $context: false,
-  $total:   $shelves-columns,
-  $gutter:  $shelves-gutter
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter
 ) {
   padding-left: columns-distance($n, $context, $total, $gutter);
 }
@@ -25,15 +25,15 @@
 //   $context - The number of columns encapsulating the element.
 //              Defaults to the the value of $total.
 //   $total   - The total number of columns in the grid.
-//              Defaults to the value of $shelves-columns. 
+//              Defaults to the value of $shelves-columns.
 //   $gutter  - The width of the gutter in the root context (in %).
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin column-suffix(
   $n,
-  $context: false,
-  $total:   $shelves-columns,
-  $gutter:  $shelves-gutter
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter
 ) {
   padding-right: columns-distance($n, $context, $total, $gutter);
 }
@@ -45,15 +45,15 @@
 //   $context - The number of columns encapsulating the element.
 //              Defaults to the the value of $total.
 //   $total   - The total number of columns in the grid.
-//              Defaults to the value of $shelves-columns. 
+//              Defaults to the value of $shelves-columns.
 //   $gutter  - The width of the gutter in the root context (in %).
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin column-push(
   $n,
-  $context: false,
-  $total:   $shelves-columns,
-  $gutter:  $shelves-gutter
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter
 ) {
   left: columns-distance($n, $context, $total, $gutter);
 }
@@ -65,15 +65,15 @@
 //   $context - The number of columns encapsulating the element.
 //              Defaults to the the value of $total.
 //   $total   - The total number of columns in the grid.
-//              Defaults to the value of $shelves-columns. 
+//              Defaults to the value of $shelves-columns.
 //   $gutter  - The width of the gutter in the root context (in %).
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin column-pull(
   $n,
-  $context: false,
-  $total:   $shelves-columns,
-  $gutter:  $shelves-gutter
+  $context: null,
+  $total: $shelves-columns,
+  $gutter: $shelves-gutter
 ) {
   right: columns-distance($n, $context, $total, $gutter);
 }

data/scss/shelves/mixins/_resets.scss

@@ -17,8 +17,8 @@
   @include reset-column-pull;
   float: none;
   width: auto;
-  
-  @if $legacy-support-for-ie7 {
+
+  @if $shelves-ie7-support {
     *margin-right: 0px;
   }
 }

data/shelves.gemspec

@@ -15,9 +15,8 @@ Gem::Specification.new do |gem|
   gem.name          = 'shelves'
   gem.require_paths = ['lib']
   gem.version       = Shelves::VERSION
-  
-  gem.add_runtime_dependency     'sass',           '~> 3.1'
-  gem.add_runtime_dependency     'compass',        '~> 0.12'
-  gem.add_development_dependency 'sprockets',      '~> 2.3'
-  gem.add_development_dependency 'sprockets-sass', '~> 0.7'
+
+  gem.add_runtime_dependency 'sass', '~> 3.2'
+  gem.add_runtime_dependency 'choice', '~> 0.1'
+  gem.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelves
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70282995955920 !ruby/object:Gem::Requirement
+  requirement: &70316886411000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70282995955920
+  version_requirements: *70316886411000
 - !ruby/object:Gem::Dependency
-  name: compass
-  requirement: &70282995952420 !ruby/object:Gem::Requirement
+  name: choice
+  requirement: &70316886410360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70282995952420
+  version_requirements: *70316886410360
 - !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: &70282995949260 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70316886409620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *70282995949260
-- !ruby/object:Gem::Dependency
-  name: sprockets-sass
-  requirement: &70282995946200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: *70282995946200
+  version_requirements: *70316886409620
 description: The only responsive, fluid CSS grid with infinitely nestable columns.
 email:
 - me@petebrowne.com
-executables: []
+executables:
+- shelves
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,7 +57,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/shelves
 - lib/shelves.rb
+- lib/shelves/cli.rb
 - lib/shelves/extensions/compass.rb
 - lib/shelves/extensions/rails.rb
 - lib/shelves/extensions/sprockets.rb
@@ -94,12 +86,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 602854420926794406
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 602854420926794406
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11