susy 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f0703eaf4d2da077dae12a6cc87086bc68788e
-  data.tar.gz: 0d2a5410f36d02ebf68f4149af66e7658dfd89b0
+  metadata.gz: d596116854611c65dd0359ef05187bb0828a1e97
+  data.tar.gz: 87578160029e758da8e07c52e23903e889e1e3fb
 SHA512:
-  metadata.gz: e3f227a8dc3d4cff8512a2ab2aaa637e9863ca16d941c4d3d6cd0084019501edd098f089c7b8b67dcb77fed5c417f7b98814e8cb3a7cb0d4b273fc24100af8df
-  data.tar.gz: b16019c24a18eabfbf85188230c489b4b5db282d756d781ed7abe4e06719b883806afbffc58d44678a0fc72d93807f3ca0740ea5217f52ef18d1bf019d9516c3
+  metadata.gz: a675b09d9def187b2ba942bdb31035323a9dd97f846f77b0e2f340372cd0d73a800ef0fd836ec4da786d1c55c7b4c52f57205b573c4fa3884edbd70f1bc1055b
+  data.tar.gz: 659275cd3214d5b7430bebe88393ff713230d255e9fe44d72f8dfda65784d350e84b6f84ef3940e5a6c682052b7b513e9a73fff7719ccfad31c439c853bb65bd

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/docs/changelog.rst

@@ -1,7 +1,21 @@
 Changelog
 =========
 
-2.0.0 — Mar 10 2013
+
+2.1.0 - Mar 13 2014
+-------------------
+
+- Rename core math functions, and prepare for decomposition.
+
+  + ``column-count()`` => ``susy-count()``
+  + ``column-sum()`` => ``susy-sum()``
+  + ``column-span()`` => ``susy-slice()``
+  + ``column-span-sum()`` => ``susy()``
+
+- Add tests for core math validation.
+
+
+2.0.0 — Mar 10 2014
 -------------------
 
 - New susyone tests for split-columns, is-default-layout, medialayout, columns,

data/sass/susy/_math.scss

@@ -1,7 +1,4 @@
 // Math
 // ====
 
-@import "math/maps";
-@import "math/settings";
-@import "math/validation";
-@import "math/columns";
+@import "math/su";

data/sass/susy/language/_susy.scss

@@ -1,6 +1,8 @@
 // Susy Next Syntax
 // ================
 
+$susy-version: 2.0;
+
 @import "../math";
 @import "../output/float";
 

data/sass/susy/language/_susyone.scss

@@ -1,6 +1,8 @@
 // ---------------------------------------------------------------------------
 // Partials
 
+$susy-version: 1.5;
+
 @import "susyone/settings";
 @import "susyone/functions";
 @import "susyone/grid";
@@ -8,4 +10,4 @@
 @import "susyone/padding";
 @import "susyone/margin";
 @import "susyone/media";
-@import "susyone/background";
+@import "susyone/background";

data/sass/susy/math/_su.scss

@@ -0,0 +1,7 @@
+// Su
+// ==
+
+@import "su/maps";
+@import "su/settings";
+@import "su/validation";
+@import "su/grid";

data/sass/susy/math/{_columns.scss → su/_grid.scss}

@@ -1,6 +1,7 @@
 // Column math
 // ===========
 
+
 // Is Symmetrical
 // --------------
 // Returns true if a grid is symmetrical.
@@ -12,24 +13,33 @@
   @return if(type-of($columns) == number, $columns, null);
 }
 
-// Columns Count
-// -------------
+
+// Susy Count
+// ----------
 // Find the number of columns in a given layout
 // - [$columns]   : <number> | <list>
-@function column-count(
+@function susy-count(
   $columns: map-get($susy-defaults, columns)
 ) {
   $columns: valid-columns($columns);
   @return is-symmetrical($columns) or length($columns);
 }
 
-// Column Sum
-// ----------
+@function column-count(
+  $columns: map-get($susy-defaults, columns)
+) {
+  @warn "[function] column-count() has been renamed susy-count().";
+  @return susy-count($columns);
+}
+
+
+// Susy Sum
+// --------
 // Find the total sum of column-units in a layout
 // - [$columns]   : <number> | <list>
 // - [$gutters]   : <ratio>
 // - [$spread]    : false/narrow | wide | wider
-@function column-sum(
+@function susy-sum(
   $columns  : map-get($susy-defaults, columns),
   $gutters  : map-get($susy-defaults, gutters),
   $spread   : false
@@ -38,7 +48,7 @@
   $gutters: valid-gutters($gutters);
 
   $spread: if($spread == wide, 0, if($spread == wider, 1, -1));
-  $gutter-sum: (column-count($columns) + $spread) * $gutters;
+  $gutter-sum: (susy-count($columns) + $spread) * $gutters;
   $column-sum: is-symmetrical($columns);
 
   @if not $column-sum {
@@ -50,13 +60,23 @@
   @return $column-sum + $gutter-sum;
 }
 
-// Column Span
-// -----------
+@function column-sum(
+  $columns  : map-get($susy-defaults, columns),
+  $gutters  : map-get($susy-defaults, gutters),
+  $spread   : false
+) {
+  @warn "[function] column-sum() has been renamed susy-sum().";
+  @return susy-sum($columns, $gutters, $spread);
+}
+
+
+// Susy Slice
+// ----------
 // Return a subset of columns at a given location.
 // - $span        : <number>
 // - $location    : <number>
 // - [$columns]   : <number> | <list>
-@function column-span(
+@function susy-slice(
   $span,
   $location,
   $columns: map-get($susy-defaults, columns)
@@ -75,15 +95,25 @@
   @return $sub-columns;
 }
 
-// Column Span Sum
-// ---------------
+@function column-span(
+  $span,
+  $location,
+  $columns: map-get($susy-defaults, columns)
+) {
+  @warn "[function] column-span() has been renamed susy-slice().";
+  @return susy-slice($span, $location, $columns);
+}
+
+
+// Susy
+// ----
 // Find the sum of a column-span.
 // - $span        : <number>
 // - $location    : <number>
 // - [$columns]   : <number> | <list>
 // - [$gutters]   : <ratio>
 // - [$spread]    : false/narrow | wide | wider
-@function column-span-sum(
+@function susy(
   $span,
   $location     : false,
   $columns      : map-get($susy-defaults, columns),
@@ -92,7 +122,18 @@
 ) {
   $columns: valid-columns($columns);
   $gutters: valid-gutters($gutters);
-  $span: column-span($span, $location, $columns);
+  $span: susy-slice($span, $location, $columns);
+
+  @return susy-sum($span, $gutters, $spread);
+}
 
-  @return column-sum($span, $gutters, $spread);
+@function column-span-sum(
+  $span,
+  $location     : false,
+  $columns      : map-get($susy-defaults, columns),
+  $gutters      : map-get($susy-defaults, gutters),
+  $spread       : false
+) {
+  @warn "[function] column-span-sum() has been renamed susy().";
+  @return susy($span, $location, $columns, $gutters, $spread);
 }

data/sass/susy/math/{_settings.scss → su/_settings.scss}

@@ -1,10 +1,6 @@
 // Settings
 // ========
 
-// Version
-// -------
-$susy-version: 2.0;
-
 
 // Default Settings
 // ----------------
@@ -71,4 +67,3 @@ $susy: () !default;
 
   @return $_return;
 }
-

data/sass/susy/math/{_validation.scss → su/_validation.scss}

@@ -1,6 +1,7 @@
 // Math Validation
 // ===============
 
+
 // Valid Columns
 // -------------
 // Check that a column setting is valid.
@@ -14,10 +15,13 @@
   @if $type == number and unitless($columns) {
     $return: $columns;
   } @else if $type == list {
-    $fail: false;
+    $fail: null;
     @each $col in $columns {
-      $number: if(type-of($col == number), true, null);
-      $fail: $fail or if($number and unitless($col), null, true);
+      @if type-of($col) == number {
+        $fail: $fail or if(unitless($col), null, true);
+      } @else {
+        $fail: true;
+      }
     }
     $return: if($fail, $return, $columns);
   }
@@ -31,6 +35,7 @@
   @return $return;
 }
 
+
 // Valid Gutters
 // -------------
 // Check that a gutter setting is valid.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susy
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Eric Suzanne
@@ -76,10 +76,11 @@ files:
 - sass/susy/language/susyone/_media.scss
 - sass/susy/language/susyone/_padding.scss
 - sass/susy/language/susyone/_settings.scss
-- sass/susy/math/_columns.scss
-- sass/susy/math/_maps.scss
-- sass/susy/math/_settings.scss
-- sass/susy/math/_validation.scss
+- sass/susy/math/_su.scss
+- sass/susy/math/su/_grid.scss
+- sass/susy/math/su/_maps.scss
+- sass/susy/math/su/_settings.scss
+- sass/susy/math/su/_validation.scss
 - sass/susy/output/_float.scss
 - sass/susy/output/_shared.scss
 - sass/susy/output/_support.scss