singularity-extras 0.0.3 → 1.0.0.alpha.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d23586f01c6d7ee68a3e5b840756640bdfd30f03
+  data.tar.gz: 115e07637bd714c2321865c7e6396b629c3bc0de
+SHA512:
+  metadata.gz: 494a180495f92834e83b7eb95f16dabd919c3923eecf214f227642e5bf40be1af55e0f9f63b5d6b4a9d3206cc1abe36f57d2d3d6f115a0be9f8269a6203cbf10
+  data.tar.gz: 4d0ba497d74d9b2eb667ffb4d5bb92623c3d3197903bac795929de18b9514cc959f18873ff184bb0f708156522604e61c53adcb3ca977db10f63ee83160e822d

data/lib/singularity-extras.rb

@@ -1,11 +1,10 @@
 require 'compass'
 require 'singularitygs'
 require 'modular-scale'
-require 'sassy-math'
 
 Compass::Frameworks.register("singularity-extras", :path => "#{File.dirname(__FILE__)}/..")
 
 module SingularityExtras
-  VERSION = "0.0.3"
-  DATE = "2012-04-24"
+  VERSION = "1.0.0.alpha.1"
+  DATE = "2013-01-17"
 end

data/stylesheets/_singularity-extras.scss

@@ -1,4 +1,4 @@
 @import "singularity-extras/helpers";
 @import "singularity-extras/generators";
-@import "singularity-extras/output";
+@import "singularity-extras/outputs";
 @import "singularity-extras/layouts";

data/stylesheets/singularity-extras/_outputs.scss

@@ -0,0 +1 @@
+@import "outputs/calc";

data/stylesheets/singularity-extras/generators/_ratio.scss

@@ -1,12 +1,19 @@
 // Creates a list based on a ratio
 // Valid options for $start: 'large' or 'small'
 @function ratio($ratio, $steps, $start: 'small') {
-  $x: 1;
   $return: ();
 
-  @for $i from 0 through $steps - 1 {
-    $xr: $x * pow($ratio, $i);
-    $return: append($return, $xr);
+  @for $i from 1 through $steps {
+    @if function-exists(pow) {
+      $return: append($return, pow($ratio, $i));
+    }
+    @else {
+      $x: $ratio;
+      @for $i from 2 through $i {
+        $x: $x * $ratio;
+      }
+      $return: append($return, $x);
+    }
   }
 
   @if $start == 'small' and $ratio < 1 {

data/stylesheets/singularity-extras/generators/_snap.scss

@@ -1,6 +1,10 @@
 // "Snaps" an asymmetric grid to a symmetric one by including gutters in the grid definitions
 // Will only work properly with integer asymmetric grids
 @function snap($grid, $gutter) {
+  @if not unitless($gutter) {
+    @return $grid;
+  }
+
   $holder: ();
 
   @each $column in $grid {

data/stylesheets/singularity-extras/outputs/_calc.scss

@@ -0,0 +1,204 @@
+$Singularity-Settings: map-merge($Singularity-Settings, ('calc include min-width': true));
+
+@function output-calc($Span-Map) {
+  // Set up Left/Right maps
+  $Return: ();
+
+  $Span: map-get($Span-Map, 'span');
+  $Location: map-get($Span-Map, 'location');
+
+  $Grid: map-get($Span-Map, 'grid');
+  $Gutter: map-get($Span-Map, 'gutter');
+  $Style: map-get($Span-Map, 'style');
+
+  @if unitless($Gutter) {
+    @warn "Calc output style uses fixed gutters (gutters with units). Please define fixed gutters to use calc";
+    @return $Return;
+  }
+
+  @if type-of($Grid) == 'number' {
+    @warn "Calc output style is designed to be used with asymmetric grids, especially with a mix of fixed and fluid columns. Please define an asymmetric grid.";
+    @return $Return;
+  }
+
+  $Start-Row: map-get($Span-Map, 'start row');
+  $End-Row: map-get($Span-Map, 'end row');
+
+  $Split-Gutter: map-get($Span-Map, 'split gutter');
+
+  $Direction: map-get($Span-Map, 'direction');
+  $Options: map-get($Span-Map, 'options');
+
+  $Dir: $Direction;
+  $Opp: opposite-direction($Dir);
+
+  $Width: '';
+  $Margin: null;
+  $Min-Width: '(';
+
+  $Fixed: ();
+  $Fluid: ();
+  $Fixed-Totals: ('px': 0, 'em': 0, '%': 0);
+  $Gutter-Totals: if(str-index($Style, 'split') > 0, $Gutter * length($Grid), $Gutter * (length($Grid) - 1));
+  $Fluid-Totals: 0;
+  $Fluid-Fixed-Sum: '';
+  $Single-Fluid: '';
+
+  @for $i from 1 through length($Grid) {
+    $Item: nth($Grid, $i);
+    @if not unitless($Item) {
+      $Fixed: map-merge($Fixed, ($i: $Item));
+    }
+    @else {
+      $Fluid: map-merge($Fluid, ($i: $Item));
+    }
+  }
+
+  @each $k, $v in $Fixed {
+    $Unit: unit($v);
+    $Running: map-get($Fixed-Totals, $Unit) + $v;
+    $Fixed-Totals: map-merge($Fixed-Totals, ($Unit: $Running));
+  }
+
+  @each $k, $v in $Fluid {
+    $Fluid-Totals: $Fluid-Totals + $v;
+  }
+
+  @each $k, $v in $Fixed-Totals {
+
+    @if $v != 0 {
+      $Fluid-Fixed-Sum: '#{$Fluid-Fixed-Sum}#{$v} + ';
+    }
+  }
+
+  // Width of a single fluid item, for calc()
+  $Single-Fluid: '((100% - (#{$Fluid-Fixed-Sum}#{$Gutter-Totals})) / (#{$Fluid-Totals}))';
+
+  // Margin Calculation
+  @if not $Start-Row or not $End-Row {
+    @if $Split-Gutter {
+      $Margin: '#{$Gutter / 2} + ';
+    }
+
+    @for $i from 1 to $Location {
+      @if unitless(nth($Grid, $i)) {
+        $Margin: '#{$Margin}(#{$Single-Fluid} * #{nth($Grid, $i)} + #{$Gutter}) + ';
+      }
+      @else {
+        $Margin: '#{$Margin}(#{nth($Grid, $i)} + #{$Gutter}) + ';
+      }
+    }
+  }
+  @if $Margin != null {
+    $Margin: str-slice($Margin, 0, -4);
+  }
+
+
+  // Width Calculation
+  @if $Span == 1 {
+    @if map-has-key($Fixed, $Location) {
+      $Return: map-merge($Return, ('width': map-get($Fixed, $Location)));
+    }
+    @else if map-has-key($Fluid, $Location) {
+      $Math: '(#{$Single-Fluid}) * #{nth($Grid, $Location)}';
+      $Span-Map: ('width': ('webkit': -webkit-calc(#{unquote($Math)}), 'standard': calc(#{unquote($Math)})));
+      $Return: map-merge($Return, $Span-Map);
+    }
+  }
+  @else {
+    $Location-End: $Location + ($Span - 1);
+    $Fixed-Counter: 0;
+    @for $i from $Location through $Location-End {
+      @if unitless(nth($Grid, $i)) {
+        $Width: '#{$Width}(#{$Single-Fluid} * #{nth($Grid, $i)}';
+      }
+      @else {
+        $Fixed-Counter: $Fixed-Counter + 1;
+        $Min-Width: '#{$Min-Width}#{nth($Grid, $i)} + #{$Gutter} + ';
+        $Width: '#{$Width}(#{nth($Grid, $i)}';
+      }
+
+
+      @if $i != $Location-End {
+        $Width: '#{$Width} + #{$Gutter}) + ';
+      }
+      @else {
+        $Min-Width: str-slice($Min-Width, 0, -4);
+        @if $Fixed-Counter == 1 {
+          $Min-Width: '#{$Min-Width} - #{$Gutter}';
+        }
+        $Min-Width: '#{$Min-Width})';
+        $Width: '#{$Width})';
+      }
+    }
+
+    $Min-Map: ('min-width': ('webkit' : -webkit-calc(#{unquote($Min-Width)}), 'standard': calc(#{unquote($Min-Width)}) ));
+    $Span-Map: ('width': ('webkit': -webkit-calc(#{unquote($Width)}), 'standard': calc(#{unquote($Width)}) ) );
+
+    @if sgs-get('calc include min-width') {
+      $Return: map-merge($Return, $Min-Map);
+    }
+    $Return: map-merge($Return, $Span-Map);
+  }
+
+  // Build margins and Floats
+  @if ($End-Row) {
+    $Return: map-merge($Return, ('float': $Opp));
+    $Return: map-merge($Return, ('margin-#{$Dir}': 0));
+
+    @if $Split-Gutter {
+      $Return: map-merge($Return, ('margin-#{$Opp}': $Gutter / 2));
+    }
+    @else {
+      $Return: map-merge($Return, ('margin-#{$Opp}': 0));
+    }
+  }
+  @else {
+    $Return: map-merge($Return, ('float': $Dir));
+    $Return: map-merge($Return, ('margin-#{$Opp}': -100%));
+
+    @if $Start-Row {
+      @if $Split-Gutter {
+        $Return: map-merge($Return, ('margin-#{$Dir}': $Gutter / 2));
+      }
+      @else {
+        $Return: map-merge($Return, ('margin-#{$Dir}': 0));
+      }
+    }
+    @else {
+      $Margin-Map: ('margin-#{$Dir}': ('webkit': -webkit-calc(#{unquote($Margin)}), 'standard': calc(#{unquote($Margin)})));
+      $Return: map-merge($Return, $Margin-Map);
+    }
+  }
+
+  @return $Return;
+}
+
+
+
+//////////////////////////////
+// Happy Syntax for Calc
+//
+// Makes working with Calc easier, as it moves Clear to a 1st class citizen of the mixin, and automatically builds the verbose grid-span mixin call
+//////////////////////////////
+@mixin calc-span($Span, $Location, $clear: false, $grid: false, $gutter: false, $gutter-style: false, $from: false) {
+
+  @if $gutter != false and unitless($gutter) {
+    @warn "Calc output style uses fixed gutters (gutters with units). Please define fixed gutters to use calc";
+  }
+
+  @if $grid != false and type-of($grid) == 'number' {
+    @warn "Calc output style is designed to be used with asymmetric grids, especially with a mix of fixed and fluid columns. Please define an asymmetric grid.";
+  }
+
+  $Options: ();
+  @if $clear {
+    $Options: map-merge($Options, ('clear': $clear));
+  }
+  @if $from {
+    $Options: map-merge($Options, ('from': $from));
+  }
+
+  $Options: if(length($Options) > 0, $Options, null);
+  @include grid-span($Span, $Location, $grid, $gutter, 'calc', $gutter-style, $Options);
+}

metadata

@@ -1,81 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: singularity-extras
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 1.0.0.alpha.1
 platform: ruby
-authors: 
+authors:
 - Scott Kellum
 - Sam Richard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-24 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: singularitygs
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0.rc.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sassy-math
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0.rc.1
+- !ruby/object:Gem::Dependency
   name: modular-scale
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 6
-        version: 1.0.6
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.alpha5
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.alpha5
 description: Advanced responsive grid system for Sass and Compass
-email: 
+email:
 - scott@scottkellum.com
 - snugug@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/singularity-extras.rb
 - stylesheets/_singularity-extras.scss
 - stylesheets/singularity-extras/_generators.scss
 - stylesheets/singularity-extras/_helpers.scss
 - stylesheets/singularity-extras/_layouts.scss
-- stylesheets/singularity-extras/_output.scss
+- stylesheets/singularity-extras/_outputs.scss
 - stylesheets/singularity-extras/generators/_compound.scss
 - stylesheets/singularity-extras/generators/_ratio-spiral.scss
 - stylesheets/singularity-extras/generators/_ratio.scss
@@ -84,36 +61,30 @@ files:
 - stylesheets/singularity-extras/helpers/_repeat.scss
 - stylesheets/singularity-extras/helpers/_reverse.scss
 - stylesheets/singularity-extras/layouts/_layout.scss
-has_rdoc: true
+- stylesheets/singularity-extras/outputs/_calc.scss
 homepage: http://singularity.gs
 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
-      - 2
-      version: "1.2"
+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.2'
 requirements: []
-
 rubyforge_project: singularity-extras
-rubygems_version: 1.3.6
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Singularity is a fluid grid system that can generate uniform columns as well as asymmetric and compound grids with tools to write grids as functions, mixins, or class based objects.
+specification_version: 4
+summary: Singularity is a fluid grid system that can generate uniform columns as well
+  as asymmetric and compound grids with tools to write grids as functions, mixins,
+  or class based objects.
 test_files: []
-