SassyLists 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 
+* `0.3.3`: removed dependence to `purge()` from all functions; fixed an issue with `sort()`; fixed an issue with error messages
 * `0.3.2`: removed dependence to `purge()` from `replace()`
 * `0.3.1`: added aliases and cleaned `to-string()`
 * `0.3.0`: adding `contains()`, `flatten()`, `union()`

data/lib/SassyLists.rb

@@ -5,8 +5,8 @@ Compass::Frameworks.register('SassyLists', :path => extension_path)
 #  Version is a number. If a version contains alphas, it will be created as a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module SassyLists
-  VERSION = "0.3.2"
-  DATE = "2013-11-05"
+  VERSION = "0.3.3"
+  DATE = "2013-11-06"
 end
 
 module Sass::Script::Functions

data/stylesheets/SassyLists/_insert-nth.scss

@@ -23,17 +23,17 @@
     $result: false;
 
     @if type-of($index) != number {
-        @warn "List index #{quote($index)} is not a number for `insert-nth`.";
+        @warn "List index #{$index} is not a number for `insert-nth`.";
         @return $result;
     }
 
     @else if $index < 1 {
-        @warn "List index #{quote($index)} must be a non-zero integer for `insert-nth`";
+        @warn "List index #{$index} must be a non-zero integer for `insert-nth`";
         @return $result;
     }
 
     @else if $index > length($list) {
-        @warn "List index is #{quote($index)} but list is only #{length($list)} items long for `insert-nth'.";
+        @warn "List index is #{$index} but list is only #{length($list)} items long for `insert-nth'.";
         @return $result;
     }
 
@@ -42,7 +42,9 @@
 
         @for $i from 1 through length($list) {
             @if $i == $index {
-                $result: append($result, $value);
+                @if $value != null and $value != "" {
+                    $result: append($result, $value);
+                }
             }
 
             $result: append($result, nth($list, $i));

data/stylesheets/SassyLists/_prepend.scss

@@ -13,5 +13,11 @@
 // @return [List]
 
 @function prepend($list, $value) {
-	@return purge(join($value, $list));
+    @if $value != null and $value != "" {
+		@return purge(join($value, $list));
+	}
+	
+	@else {
+		@return $list;
+	}
 }

data/stylesheets/SassyLists/_replace-nth.scss

@@ -24,7 +24,7 @@
     $result: false;
 
     @if type-of($index) != number {
-        @warn "List index #{quote($index)} is not a number for `replace-nth`/`remove-nth`.";
+        @warn "List index #{$index} is not a number for `replace-nth`/`remove-nth`.";
         @return $result;
     }
 
@@ -34,7 +34,7 @@
     }
 
     @else if abs($index) > length($list) {
-        @warn "List index is #{quote($index)} but list is only #{length($list)} item long for `replace-nth`/`remove-nth`.";
+        @warn "List index is #{$index} but list is only #{length($list)} item long for `replace-nth`/`remove-nth`.";
         @return $result;
     }
 
@@ -43,7 +43,9 @@
         $index: if($index < 0, length($list) + $index + 1, $index);  
 
         @for $i from 1 through length($list) {
-            $result: append($result, if($i == $index, $value, nth($list, $i)));
+            @if $value != null and $value != "" {
+                $result: append($result, if($i == $index, $value, nth($list, $i)));
+            }
         }
     }
 

data/stylesheets/SassyLists/_slice.scss

@@ -25,12 +25,12 @@
     $result: false;
       
     @if type-of($start) != number or type-of($end) != number {
-        @warn "List indexes #{quote($start)} and #{quote($end)} must be numbers for `slice`.";
+        @warn "List indexes #{$start} and #{$end} must be numbers for `slice`.";
         @return $result;
     }
      
     @else if $start > $end {
-        @warn "Start index is #{quote($start)} but has to be lesser than or equals to the end index (#{quote($end)}) for `slice`.";
+        @warn "Start index is #{$start} but has to be lesser than or equals to the end index (#{$end}) for `slice`.";
         @return $result;
     }
 
@@ -40,12 +40,12 @@
     }
 
     @else if $start > length($list) {
-        @warn "Start index is #{quote($start)} but list is only #{length($list)} items long for `slice`.";
+        @warn "Start index is #{$start} but list is only #{length($list)} items long for `slice`.";
         @return $result;
     }
      
     @else if $end > length($list) {
-        @warn "End index is #{quote($end)} but list is only #{length($list)} items long for `slice`.";
+        @warn "End index is #{$end} but list is only #{length($list)} items long for `slice`.";
         @return $result;
     }
 

data/stylesheets/SassyLists/_sort.scss

@@ -16,7 +16,7 @@
 // -------------------------------------------------------------------------------
 // @return [List]
 
-@function sort($list, $force: false) {
+@function sort($list) {
     $result : nth($list, 1);
 
     @if length($list) > 1 {
@@ -26,7 +26,7 @@
 
             @if type-of($item) == number {
 
-                @if unitless($item) and $force {
+                @if unitless($item) {
 
                     @if $item > last($result) {
                         $result: append($result, $item);
@@ -64,6 +64,6 @@
 }
 
 // Alias
-@function order($list, $force: false) {
-    @return sort($list, $force);
+@function order($list) {
+    @return sort($list);
 }

data/stylesheets/SassyLists/_sum.scss

@@ -18,7 +18,7 @@
     @each $item in $list {
         @if type-of($item) == number {
 
-            @if $force and unit($item) {
+            @if $force and not unitless($item) {
                 $item: $item / ($item * 0 + 1);
             }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SassyLists
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass