modular-scale 2.0.0.alpha3 → 2.0.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a777d36ccbd68153d19bf54d896e50889f671e9
-  data.tar.gz: 6c75b152c6a6fe8c770e280c7209084ba0718316
+  metadata.gz: 04987e47c5704452df1374e46931ca1c58930915
+  data.tar.gz: 35fdeb87e81ed54c5e5a479d5f91440e5c8aa639
 SHA512:
-  metadata.gz: b448db85d605b2182d0318cd30b420f7e7513018c610389952d772f307421190b99df346822e16af90dd87b619340e998b2d7206c6691b81cd1b4491019ebce0
-  data.tar.gz: f8b9aa2177c557a13715be8554c152b0bd8efb5acb45c183722267485626f49bd4de0edac7db48acaf5296ec55a77d2523c52f6ca0b574dfeb64a8560ae5d379
+  metadata.gz: 9eb5e247d681d58eae471c5ef8e7acafd6c6ff00f24eba7ea0e13e841f7a34eb0e1ec4fecc050b1cde87276d930af41d9c64046de1e519e47cdcbea631f92369
+  data.tar.gz: 147c7dcb79a02546103c5411ccb60c9d6e6f1bad6d6ba19dfff51716fc2e634842cd94d082e41f735906dc0792f09bac490c8a97da4e5e901a6ca821d24d09fd

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.alpha3"
+  VERSION = "2.0.0.alpha4"
   DATE = "2013-12-20"
 end
 
@@ -24,6 +24,98 @@ end
 #  available on require of your extension without the need for users to import
 #  any partials. Uncomment below.
 
-# module Sass::Script::Functions
-# 
-# end
+module Sass::Script::Functions
+
+  # Let MS know that extra functionality is avalible
+  def ms_gem_installed()
+    Sass::Script::Bool.new(true)
+  end
+
+  def ms_gem_func(value, bases, ratios)
+
+    # Convert to native ruby things
+    rvalue  = value.value.to_i
+
+    if bases.class == Sass::Script::Number
+      bases  = [] << bases
+    else
+      bases  = bases.value.to_a
+    end
+    if ratios.class == Sass::Script::Number
+      ratios = [] << ratios
+    else
+      ratios = ratios.value.to_a
+    end
+
+    # Convert items in arrays to floating point numbers
+    rbases  = []
+    rratios = []
+    bases.each do |num|
+      rbases << num.value.to_f
+    end
+    ratios.each do |num|
+      rratios << num.value.to_f
+    end
+
+
+    # Blank array for return
+    r = [rbases[0]]
+
+    # loop through all possibilities
+    # NOTE THIS IS NOT FULLY FUNCTIONAL YET
+    # ONLY LOOPS THROUGH SOME/MOST OF THE POSSIBILITES
+    
+    rbases.each do |base|
+      rratios.each do |ratio|
+
+        # Find values on a positive scale
+        if rvalue > 0
+          # Find lower values on the scale
+          i = -1;
+          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)
+            r << (ratio ** i) * base
+            i = i + 1;
+          end
+
+        else
+
+          # Find lower values on the scale
+          i = 1;
+          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)
+            r << (ratio ** i) * base
+            i = i - 1;
+          end
+        end
+
+      end
+    end
+
+    # Sort and trim
+    r.sort!
+    r.uniq!
+
+    if rvalue < 0
+      r = r.keep_if { |a| a <= rbases[0] }
+      r.reverse!
+    end
+
+    # Final value
+    r = r[rvalue]
+
+    Sass::Script::Number.new(r)
+  end
+end

data/stylesheets/modular-scale/_function.scss

@@ -7,6 +7,21 @@
     @return ms-calc($Value, $Bases, $Ratios);
   }
   
+  // Do calculations directly in Ruby when avalible
+  @if $MS-gem-exists {
+
+    // Remove units from bases
+    $Unit: nth($Bases, 1) * 0 + 1;
+    $Unitless-Bases: ();
+    @each $Base in $Bases {
+      $Base: $Base/$Unit;
+      $Unitless-Bases: join($Unitless-Bases, $Base);
+    }
+    
+    // Calculate natively in Ruby
+    @return ms-gem-func($Value, $Unitless-Bases, $Ratios) * $Unit;
+  }
+  
   // Generate a list of all possible values
   $Return: ms-generate-list($Value, $Bases, $Ratios);
   

data/stylesheets/modular-scale/_tests.scss

@@ -2,7 +2,6 @@
 
 
 // Test if the pow() function exists
-
 @function ms-pow-exists() {
   @if pow(4, 2) == 16 {
     @return true;
@@ -10,4 +9,14 @@
   @return false;
 }
 
-$MS-pow-exists: ms-pow-exists();
+$MS-pow-exists: ms-pow-exists();
+
+// Test if MS was installed via the gem
+@function ms-gem-exists() {
+  @if ms-gem-installed() == true {
+    @return true;
+  }
+  @return false;
+}
+
+$MS-gem-exists: ms-gem-exists();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular-scale
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha3
+  version: 2.0.0.alpha4
 platform: ruby
 authors:
 - First Last
@@ -42,6 +42,7 @@ files:
 - stylesheets/modular-scale/_ratios.scss
 - stylesheets/modular-scale/_sort-list.scss
 - stylesheets/modular-scale/_tests.scss
+- stylesheets/modular-scale.zip
 homepage: http://extension.com
 licenses:
 - MIT