shelves 0.2.0 → 0.2.1

data/lib/shelves.rb

@@ -12,12 +12,10 @@ module Shelves
   end
 end
 
-if defined? ::Rails
+if defined?(::Rails)
   require 'shelves/extensions/rails'
-elsif defined? ::Sprockets::Plugin
+elsif defined?(::Sprockets) && Sprockets.respond_to?(:append_path)
   require 'shelves/extensions/sprockets'
-elsif defined? ::Sprockets && Sprockets.respond_to?(:append_path)
-  Sprockets.append_path Shelves.stylesheets_path
 else
   require 'shelves/extensions/compass'
 end

data/lib/shelves/extensions/sprockets.rb

@@ -1,9 +1,3 @@
-require 'sprockets/plugin'
+require 'sprockets'
 
-module Shelves
-  module Extensions
-    class Sprockets < ::Sprockets::Plugin
-      append_path Shelves.stylesheets_path
-    end
-  end
-end
+Sprockets.append_path Shelves.stylesheets_path

data/lib/shelves/version.rb

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

data/scss/shelves/_functions.scss

@@ -10,11 +10,11 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @function column-width(
-  $context: nil,
+  $context: false,
   $total:   $shelves-columns,
   $gutter:  $shelves-gutter
 ) {
-  @if type-of($context) != 'number' or $context > $total {
+  @if $context == false {
     $context: $total;
   }
   
@@ -43,11 +43,11 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @function column-gutter(
-  $context: nil,
+  $context: false,
   $total:   $shelves-columns,
   $gutter:  $shelves-gutter
 ) {
-  @if type-of($context) != 'number' or $context > $total {
+  @if $context == false {
     $context: $total;
   }
   
@@ -77,11 +77,11 @@
 //
 @function columns-width(
   $n,
-  $context: nil,
+  $context: false,
   $total:   $shelves-columns,
   $gutter:  $shelves-gutter
 ) {
-  @if type-of($context) != 'number' or $context > $total {
+  @if $context == false or $context > $total {
     $context: $total;
   }
   
@@ -113,7 +113,7 @@
 //
 @function columns-distance(
   $n,
-  $context: nil,
+  $context: false,
   $total:   $shelves-columns,
   $gutter:  $shelves-gutter
 ) {

data/scss/shelves/mixins/_base.scss

@@ -71,7 +71,7 @@
 //
 @mixin column(
   $n,
-  $context:         nil,
+  $context:         false,
   $total:           $shelves-columns,
   $gutter:          $shelves-gutter,
   $reset-if-tablet: true,
@@ -126,7 +126,7 @@
 //
 @mixin columns-width(
   $n,
-  $context: nil,
+  $context: false,
   $total:   $shelves-columns,
   $gutter:  $shelves-gutter
 ) {
@@ -145,7 +145,7 @@
 //                  Defaults to true.
 //
 @mixin column-gutter(
-  $context:     nil,
+  $context:     false,
   $total:       $shelves-columns,
   $gutter:      $shelves-gutter,
   $reset-first: true

data/scss/shelves/mixins/_generators.scss

@@ -203,8 +203,8 @@
 @mixin shelves-columns(
   $column-name: $shelves-column-name,
   $start:       1,
-  $end:         nil,
-  $context:     nil,
+  $end:         false,
+  $context:     false,
   $total:       $shelves-columns,
   $gutter:      $shelves-gutter,
   $prefixes:    true,
@@ -212,10 +212,10 @@
   $pushes:      true,
   $pulls:       true
 ) {
-  @if type-of($context) != 'number' or $context > $total {
+  @if $context == false or $context > $total {
     $context: $total;
   }
-  @if type-of($end) != 'number' or $end > $context {
+  @if $end == false or $end > $context {
     $end: $context;
   }
   @for $i from $start to $end  {

data/scss/shelves/mixins/_modifiers.scss

@@ -11,7 +11,7 @@
 //
 @mixin column-prefix(
   $n,
-  $context: nil,
+  $context: false,
   $total:   $shelves-columns,
   $gutter:  $shelves-gutter
 ) {
@@ -31,7 +31,7 @@
 //
 @mixin column-suffix(
   $n,
-  $context: nil,
+  $context: false,
   $total:   $shelves-columns,
   $gutter:  $shelves-gutter
 ) {
@@ -51,7 +51,7 @@
 //
 @mixin column-push(
   $n,
-  $context: nil,
+  $context: false,
   $total:   $shelves-columns,
   $gutter:  $shelves-gutter
 ) {
@@ -71,7 +71,7 @@
 //
 @mixin column-pull(
   $n,
-  $context: nil,
+  $context: false,
   $total:   $shelves-columns,
   $gutter:  $shelves-gutter
 ) {

metadata

@@ -1,92 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelves
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Pete Browne
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sass
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70282995955920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: compass
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70282995955920
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: &70282995952420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 12
-        version: "0.12"
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sprockets
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70282995952420
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: &70282995949260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sprockets-sass
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70282995949260
+- !ruby/object:Gem::Dependency
+  name: sprockets-sass
+  requirement: &70282995946200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70282995946200
 description: The only responsive, fluid CSS grid with infinitely nestable columns.
-email: 
+email:
 - me@petebrowne.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -109,36 +84,26 @@ files:
 - shelves.gemspec
 homepage: https://github.com/petebrowne/shelves
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: The only responsive, fluid CSS grid with infinitely nestable columns.
 test_files: []
-