modular-scale 2.0.0.alpha4 → 2.0.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04987e47c5704452df1374e46931ca1c58930915
-  data.tar.gz: 35fdeb87e81ed54c5e5a479d5f91440e5c8aa639
+  metadata.gz: a41d2f097a0279165903f7426bd0892afdc08cd0
+  data.tar.gz: eb01990d61ee5012f089180b06bd0a7ee9e4a002
 SHA512:
-  metadata.gz: 9eb5e247d681d58eae471c5ef8e7acafd6c6ff00f24eba7ea0e13e841f7a34eb0e1ec4fecc050b1cde87276d930af41d9c64046de1e519e47cdcbea631f92369
-  data.tar.gz: 147c7dcb79a02546103c5411ccb60c9d6e6f1bad6d6ba19dfff51716fc2e634842cd94d082e41f735906dc0792f09bac490c8a97da4e5e901a6ca821d24d09fd
+  metadata.gz: 5eb6c45de955c5a6eca68e69d0da7fda2f6c1a7b0657a84e78a1c3ee188b8c2a32b82b1671850728d680e18975f66873497380f646af0b49ba50c859476d6903
+  data.tar.gz: 34d3e455fe63c42dc8d441ec158dbf086432ab1574ad4345bdf8d6126d8cf4532c2e4a1337715e9262c8d157797d8179c6dec17568b0e015e9c67f5db15dbf9b

data/lib/modular-scale.rb

@@ -16,7 +16,7 @@ Compass::Frameworks.register('modular-scale', :path => extension_path)
 #    a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module ModularScale
-  VERSION = "2.0.0.alpha4"
+  VERSION = "2.0.0.alpha5"
   DATE = "2013-12-20"
 end
 
@@ -110,11 +110,12 @@ module Sass::Script::Functions
 
     if rvalue < 0
       r = r.keep_if { |a| a <= rbases[0] }
-      r.reverse!
+      # Final value
+      r = r[rvalue - 1]
+    else
+      r = r[rvalue]
     end
 
-    # Final value
-    r = r[rvalue]
 
     Sass::Script::Number.new(r)
   end

data/stylesheets/_modular-scale-tests.scss

@@ -0,0 +1,35 @@
+@if ms-list(-3, 3, 10 16, $major-third) != (6.5536 8 8.192 10 10.24 12.5 12.8) {
+  @warn "function ms-list(): FAIL";
+  @debug "function ms-list(-3, 3, 10 16, $major-third)";
+  @debug "Result:   (#{ms-list(-3, 3, 10 16, $major-third)})";
+  @debug "Intended: (6.5536 8 8.192 10 10.24 12.5 12.8)";
+}@else {
+  @debug "function ms-list(): PASS";
+}
+
+@if "#{ms(2, 16, $minor-sixth)}" != "40.96" {
+  @warn "function ms(): FAIL";
+  @debug "function ms(2, 16, $minor-sixth)";
+  @debug "Result:   #{ms(2, 16, $minor-sixth)}";
+  @debug "Intended: 40.96";
+}@else {
+  @debug "function ms(): PASS";
+}
+
+@if ms(2, 14 18, $major-second) != 15.75 {
+  @warn "function ms() multi-base: FAIL";
+  @debug "function ms(2, 14 18, $major-second)";
+  @debug "Result:   #{ms(2, 14 18, $major-second)}";
+  @debug "Intended: 15.75";
+}@else {
+  @debug "function ms() multi-base: PASS";
+}
+
+@if ms(-4, 12, $major-tenth $octave) != 1.92 {
+  @warn "function ms() multi-ratio: FAIL";
+  @debug "function ms(-4, 12, $major-tenth $octave)";
+  @debug "Result:   #{ms(-4, 12, $major-tenth $octave)}";
+  @debug "Intended: 1.92";
+}@else {
+  @debug "function ms() multi-ratio: PASS";
+}

data/stylesheets/modular-scale/_function-list.scss

@@ -1,6 +1,7 @@
 // Outputs a list of values instead of a single value
 @function ms-list($Start: 0, $End: 0, $Bases: $ms-base, $Ratios: $ms-ratio) {
   
+  // Seed results
   $Positive-return: ();
   $Negitive-return: ();
   $Return: ();
@@ -37,17 +38,24 @@
     
     // Sort the generated lists
     $Negitive-return: ms-sort-list($Negitive-return);
+    
+    // Reverse negitive list results.
+    $MS-new-return: ();
+    @each $i in $Negitive-return {
+      $MS-new-return: join($i, $MS-new-return);
+    }
+    $Negitive-return: $MS-new-return;
 
     // Trim list
     $Trim-list: ();
     @if $End < 0 {
-      @for $i from abs($End) through abs($Start) {
-        $Trim-list: join($Trim-list, nth($Negitive-return, $i));
+      @for $i from abs($End) through (abs($Start) + 2) {
+        $Trim-list: join(nth($Negitive-return, $i), $Trim-list);
       }
     }
     @else {
-      @for $i from 1 through abs($Start) {
-        $Trim-list: join($Trim-list, nth($Negitive-return, $i));
+      @for $i from 2 through (abs($Start) + 1) {
+        $Trim-list: join(nth($Negitive-return, $i), $Trim-list);
       }
     }
     $Negitive-return: $Trim-list;

data/stylesheets/modular-scale/_function.scss

@@ -28,17 +28,21 @@
   // Sort the generated lists
   $Return: ms-sort-list($Return);
 
+  // Reverse list if its negitive.
+  @if $Value < 0 {
+    $MS-new-return: ();
+    @each $i in $Return {
+      $MS-new-return: join($i, $MS-new-return);
+    }
+    $Return: $MS-new-return;
+  }
+  
   // Normalize value for counting from 1
   // Because CSS counts things from 1
   // So Sass does as well
   // So I get to write fun stuff like this
-  @if $Value >= 0 {
-    $Value: $Value + 1;
-  }
-  @else {
-    $Value: $Value - 1;
-  }
-
+  $Value: abs($Value) + 1;
+  
   // Find the correct value in the list
   $Return: nth($Return, $Value);
 

data/stylesheets/modular-scale/_generate-list.scss

@@ -1,3 +1,17 @@
+@function ms-reverse-list($list) {
+  @if length($list) > 1 {
+    @if nth($list, 1) > nth($list, length($list)) {
+      $MS-reversed-list: ();
+      @each $Value in $list {
+        $MS-reversed-list: join($Value, $MS-reversed-list);
+      }
+      @return $MS-reversed-list;
+    }
+  }
+  @return $list;
+}
+
+
 @function ms-generate-list($Value: 0, $Bases: $ms-base, $Ratios: $ms-ratio) {
 
   // Create blank lists
@@ -14,12 +28,12 @@
       $Base-counter: 0;
       
       // Seed list with an initial value
-      @if $Base == nth($Bases, 1) {
+      @if $Base == $Base {
         $MS-base-list: $Base;
       }
       
       // Find values on a positive scale
-      @if $Value > 0 {
+      @if $Value >= 0 {
         
         // Find lower values on the scale
         $Base-counter: -1;
@@ -28,6 +42,9 @@
           $Base-counter: $Base-counter - 1;
         }
         
+        // Ensure the list is smallest to largest
+        $MS-base-list: ms-reverse-list($MS-base-list);
+
         // Find higher possible values on the scale
         $Base-counter: 1;
         @while ms-calc($Base-counter, $Base, $Ratio) <= ms-calc($Value, nth($Bases, 1), $Ratio) {
@@ -46,6 +63,9 @@
           $Base-counter: $Base-counter + 1;
         }
 
+        // Ensure the list is smallest to largest
+        $MS-base-list: ms-reverse-list($MS-base-list);
+
         // Find higher possible values on the scale
         $Base-counter: -1;
         @while ms-calc($Base-counter, $Base, $Ratio) >= ms-calc($Value, nth($Bases, 1), $Ratio) {
@@ -56,18 +76,23 @@
           }
           $Base-counter: $Base-counter - 1;
         }
-      }
-      
-      // reverse list if its largest to smallest
-      @if length($MS-base-list) > 1 {
-        @if nth($MS-base-list, 1) > nth($MS-base-list, length($MS-base-list)) {
-          $ms-reversed-list: ();
-          @each $Value in $MS-base-list {
-            $ms-reversed-list: join($Value, $ms-reversed-list);
+        
+        // Trim outlier base.
+        @if length($Bases) > 1 {
+          @for $i from 2 through length($Bases) {
+            @if nth($MS-base-list, 1) > nth($Bases, 1) {
+              $MS-new-list: ();
+              @for $i from 2 through length($MS-base-list) {
+                $MS-new-list: join($MS-new-list, nth($MS-base-list, $i));
+              }
+              $MS-base-list: $MS-new-list;
+            }
           }
-          $MS-base-list: $ms-reversed-list;
         }
       }
+      
+      // reverse list if its largest to smallest
+      $MS-base-list: ms-reverse-list($MS-base-list);
 
       // Add new possibilities to the master list
       $MS-list: append($MS-list, $MS-base-list, comma);

data/stylesheets/modular-scale/_pow.scss

@@ -28,7 +28,8 @@
   // If the number is 0 or negitive
   // divide instead of multiply.
   @else {
-    @for $i from -1 to abs($Exponent) {
+    // Libsass doesn’t allow negitive values in loops
+    @for $i from (-1 + 1) to (abs($Exponent) + 1) {
       $Return: $Return / $Base;
     }
   }

data/stylesheets/modular-scale/_sort-list.scss

@@ -41,7 +41,6 @@
     }
   }
   
-
   // Run through remainder values in the list
   @while $A-counter <= length($A) {
     $Current: nth($A, $A-counter);
@@ -62,6 +61,8 @@
   @return $Return;
 }
 
+
+
 // Pull it all together
 @function ms-sort-list($Lists) {
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular-scale
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha4
+  version: 2.0.0.alpha5
 platform: ruby
 authors:
 - First Last
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - license.md
 - lib/modular-scale.rb
+- stylesheets/_modular-scale-tests.scss
 - stylesheets/_modular-scale.scss
 - stylesheets/modular-scale/_calc.scss
 - stylesheets/modular-scale/_function-list.scss