modular-scale 2.0.0.alpha5 → 2.0.0

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.alpha5"
+  VERSION = "2.0.0"
   DATE = "2013-12-20"
 end
 
@@ -65,21 +65,26 @@ module Sass::Script::Functions
     # NOTE THIS IS NOT FULLY FUNCTIONAL YET
     # ONLY LOOPS THROUGH SOME/MOST OF THE POSSIBILITES
     
-    rbases.each do |base|
-      rratios.each do |ratio|
+    rratios.each do |ratio|
+      rbases.each do |base|
+
+        base_counter = 0
+
+        # Seed list with an initial value
+        r << base
 
         # Find values on a positive scale
-        if rvalue > 0
-          # Find lower values on the scale
-          i = -1;
+        if rvalue >= 0
+          # Find higher values on the scale
+          i = 0;
           while ((ratio ** i) * base) >= (rbases[0])
             r << (ratio ** i) * base
             i = i - 1;
           end
 
-          # Find higher possible values on the scale
-          i = 1;
-          while ((ratio ** i) * base) <= ((ratio ** rvalue) * base)
+          # Find lower possible values on the scale
+          i = 0;
+          while ((ratio ** i) * base) <= ((ratio ** (rvalue + 1)) * base)
             r << (ratio ** i) * base
             i = i + 1;
           end
@@ -87,15 +92,15 @@ module Sass::Script::Functions
         else
 
           # Find lower values on the scale
-          i = 1;
+          i = 0;
           while ((ratio ** i) * base) <= (rbases[0])
             r << (ratio ** i) * base
             i = i + 1;
           end
 
           # Find higher possible values on the scale
-          i = -1;
-          while ((ratio ** i) * base) >= ((ratio ** rvalue) * base)
+          i = 0;
+          while ((ratio ** i) * base) >= ((ratio ** (rvalue - 1)) * base)
             r << (ratio ** i) * base
             i = i - 1;
           end
@@ -108,10 +113,11 @@ module Sass::Script::Functions
     r.sort!
     r.uniq!
 
+
     if rvalue < 0
       r = r.keep_if { |a| a <= rbases[0] }
       # Final value
-      r = r[rvalue - 1]
+      r = r[(rvalue - 1)]
     else
       r = r[rvalue]
     end

data/stylesheets/_modular-scale-tests.scss

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

data/stylesheets/modular-scale/_function.scss

@@ -11,7 +11,7 @@
   @if $MS-gem-exists {
 
     // Remove units from bases
-    $Unit: nth($Bases, 1) * 0 + 1;
+    $Unit: nth($Bases, 1) * 0 + 1; // Extracts the unit from the base
     $Unitless-Bases: ();
     @each $Base in $Bases {
       $Base: $Base/$Unit;

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

@@ -28,9 +28,7 @@
       $Base-counter: 0;
       
       // Seed list with an initial value
-      @if $Base == $Base {
-        $MS-base-list: $Base;
-      }
+      $MS-base-list: $Base;
       
       // Find values on a positive scale
       @if $Value >= 0 {
@@ -54,7 +52,7 @@
       }
 
       // Find values on a negitive scale
-      @if $Value < 0 {
+      @else {
         
         // Find lower values on the scale
         $Base-counter: 1;

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: modular-scale
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha5
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - First Last
@@ -13,15 +14,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
 description: A generalized Compass extension to build off of
@@ -47,25 +50,29 @@ files:
 homepage: http://extension.com
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3329853190298866016
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: modular-scale
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: An easy to use system for writing and managing media queries.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a41d2f097a0279165903f7426bd0892afdc08cd0
-  data.tar.gz: eb01990d61ee5012f089180b06bd0a7ee9e4a002
-SHA512:
-  metadata.gz: 5eb6c45de955c5a6eca68e69d0da7fda2f6c1a7b0657a84e78a1c3ee188b8c2a32b82b1671850728d680e18975f66873497380f646af0b49ba50c859476d6903
-  data.tar.gz: 34d3e455fe63c42dc8d441ec158dbf086432ab1574ad4345bdf8d6126d8cf4532c2e4a1337715e9262c8d157797d8179c6dec17568b0e015e9c67f5db15dbf9b