Production and pushing gem

Author: scottkellum

Gemfile

@@ -2,5 +2,4 @@
 # the following line to use "https"
 source 'https://rubygems.org'
 
-gem "compass", "1.0.0.alpha.17"
-gem "sass", "3.3.0.rc.2"
+gem "compass", "> 0.12.0"

Gemfile.lock

@@ -32,5 +32,4 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  compass (= 1.0.0.alpha.17)
-  sass (= 3.3.0.rc.2)
+  compass (> 0.12.0)

bower.json

@@ -1,13 +1,10 @@
 {
-  "name": "my-extension",
+  "name": "modular-scale",
   "version": "2.0.alpha1",
   "main": "stylesheets/_modular-scale.scss",
   "ignore": [
     "**/.*",
     "node_modules",
     "components"
   ]
-  // "dependencies": {
-  //   "dependency": ">=1.0"
-  // }
 }

changelog.md

@@ -0,0 +1,12 @@
+# Version 2.0.0 (unreleased)
+  
+  This is a breaking version. You will need to refactor slightly in order to upgrade to this version from a pevious version.
+
+  * Complete re-write.
+  * ratios are variables, not functinos
+  * Common variables are scoped to "ms-"
+  * ms-lists() is the list functions
+  * No more mixins at all, only functions.
+  * Increased compatability with Sass 3.1 and up
+  * Compatability with LibSass
+  * Compass no longer required (non-integer values require Compass)

lib/modular-scale.rb

@@ -16,8 +16,8 @@
 #    a prerelease version
 #  Date is in the form of YYYY-MM-DD
 module ModularScale
-  VERSION = "2.0.alpha1"
-  DATE = "2013-07-23"
+  VERSION = "2.0.0.alpha1"
+  DATE = "2013-12-20"
 end
 
 # This is where any custom SassScript should be placed. The functions will be  

license.md

@@ -0,0 +1,36 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Scott Kellum, Mason Wendell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Modular Scale
+Copyright (C) 2013  Scott Kellum, Mason Wendell
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

modular-scale.gemspec

@@ -28,10 +28,14 @@ Gem::Specification.new do |s|
   # Uncomment those that you use.
 
   # README file
-  # s.files = ["README.md"]
+  s.files = ["readme.md"]
 
   # CHANGELOG
-  # s.files += ["CHANGELOG.md"]
+  s.files += ["changelog.md"]
+
+  s.license = "MIT"
+  
+  s.files = ["license.md"]
 
   # Library Files
   s.files += Dir.glob("lib/**/*.*")
@@ -52,6 +56,5 @@ Gem::Specification.new do |s|
   # These are Gem dependencies, not Compass dependencies. Including gems
   #  here will make sure the relevant gem and version are installed on the
   #  user's system when installing your gem.
-  s.add_dependency("sass",      [">=3.2.0"])
-  s.add_dependency("compass",   [">= 0.12.1"])
+  s.add_dependency("compass",   [">= 0.12.0"])
 end

stylesheets/modular-scale/_cache.scss

@@ -1,25 +1,25 @@
 // An empty cache map
-$ms-cache: ();
+$MS-cache: ();
 
-@function ms-cache($value, $bases, $ratios, $return) {
+@function ms-cache($Value, $Bases, $Ratios, $Return) {
 
-  $ms-new-map: ();
+  $MS-new-map: ();
 
-  @if $value >= 0 {
-    $ms-new-map: (
-      "#{$bases} #{$ratios}": (
-        pos:  $return,
+  @if $Value >= 0 {
+    $MS-new-map: (
+      "#{$Bases} #{$Ratios}": (
+        pos: $Return,
       ),
     );
   }  
 
-  @if $value < 0 {
-    $ms-new-map: (
-      "#{$bases} #{$ratios}": (
-        neg:  $return,
+  @if $Value < 0 {
+    $MS-new-map: (
+      "#{$Bases} #{$Ratios}": (
+        neg: $Return,
       ),
     );
   }  
 
-  @return map-merge($ms-cache, $ms-new-map);
+  @return map-merge($MS-cache, $MS-new-map);
 }

stylesheets/modular-scale/_calc.scss

@@ -1,17 +1,17 @@
-@function ms-calc($value, $base: $ms-base, $ratio: $ms-ratio) {
+@function ms-calc($Value, $Base: $ms-base, $Ratio: $ms-ratio) {
 
   // If pow exists use it.
   // It supports non-interger values!
-  @if $ms-pow-exists {
+  @if $MS-pow-exists {
 
     // The formula for figuring out modular scales is:
     // (r^v)*b
-    @return pow($ratio, $value) * $base;
+    @return pow($Ratio, $Value) * $Base;
   }
 
   // If not, use ms-pow().
   // Not as fast or capable of non-integer exponents.
   @else {
-    @return ms-pow($ratio, $value) * $base;
+    @return ms-pow($Ratio, $Value) * $Base;
   }
 }

stylesheets/modular-scale/_function-list.scss

@@ -1,60 +1,60 @@
 // Outputs a list of values instead of a single value
-@function ms-list($start: 0, $end: 0, $bases: $ms-base, $ratios: $ms-ratio) {
+@function ms-list($Start: 0, $End: 0, $Bases: $ms-base, $Ratios: $ms-ratio) {
 
-  $positive-return: ();
-  $negitive-return: ();
-  $return: ();
+  $Positive-return: ();
+  $Negitive-return: ();
+  $Return: ();
 
-  @if $end >= 0 {
+  @if $End >= 0 {
     // Generate a list of all possible values
-    $positive-return: ms-generate-list($end, $bases, $ratios);
+    $Positive-return: ms-generate-list($End, $Bases, $Ratios);
 
     // Sort the generated lists
-    $positive-return: ms-sort-list($positive-return);
+    $Positive-return: ms-sort-list($Positive-return);
 
     // Trim list
-    $trim-list: ();
+    $Trim-list: ();
     // If the starting value is a positive number
     // trim the positive return from that
-    @if $start >= 0 {
-      @for $i from ($start + 1) through $end + 1 {
-        $trim-list: join($trim-list, nth($positive-return, $i));
+    @if $Start >= 0 {
+      @for $i from ($Start + 1) through $End + 1 {
+        $Trim-list: join($Trim-list, nth($Positive-return, $i));
       }
     }
     // If not, then include everything up to the end.
     @else {
-      @for $i from 1 through $end + 1 {
-        $trim-list: join($trim-list, nth($positive-return, $i));
+      @for $i from 1 through $End + 1 {
+        $Trim-list: join($Trim-list, nth($Positive-return, $i));
       }
     }
-    $positive-return: $trim-list;
+    $Positive-return: $Trim-list;
   }
 
   // Generate a negitive list
-  @if $start < 0 {
+  @if $Start < 0 {
     // Generate a list of all possible values
-    $negitive-return: ms-generate-list($start, $bases, $ratios);
+    $Negitive-return: ms-generate-list($Start, $Bases, $Ratios);
 
     // Sort the generated lists
-    $negitive-return: ms-sort-list($negitive-return);
+    $Negitive-return: ms-sort-list($Negitive-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));
+    $Trim-list: ();
+    @if $End < 0 {
+      @for $i from abs($End) through abs($Start) {
+        $Trim-list: join($Trim-list, nth($Negitive-return, $i));
       }
     }
     @else {
-      @for $i from 1 through abs($start) {
-        $trim-list: join($trim-list, nth($negitive-return, $i));
+      @for $i from 1 through abs($Start) {
+        $Trim-list: join($Trim-list, nth($Negitive-return, $i));
       }
     }
-    $negitive-return: $trim-list;
+    $Negitive-return: $Trim-list;
   }
 
   // Join both positive and negitive possibilities.
-  $return: join($negitive-return, $positive-return);
+  $Return: join($Negitive-return, $Positive-return);
 
-  @return $return;
+  @return $Return;
 }

stylesheets/modular-scale/_function.scss

@@ -1,62 +1,62 @@
 // The main function that brings it all together
-@function ms($value: 0, $bases: $ms-base, $ratios: $ms-ratio) {
+@function ms($Value: 0, $Bases: $ms-base, $Ratios: $ms-ratio) {
 
   // If no multi-base or multi-ratio stuff is going on
   // then just retrn the basic calculaiton
-  @if length($bases) == 1 and length($ratios) == 1 {
-    @return ms-calc($value, $bases, $ratios);
+  @if length($Bases) == 1 and length($Ratios) == 1 {
+    @return ms-calc($Value, $Bases, $Ratios);
   }
 
   // Use cached values if they exist
-  @if $ms-maps-exist {
+  @if $MS-maps-exist {
     // Find the map
     // it's labeld with the base and ratio values
-    @if map-get($ms-cache, "#{$bases} #{$ratios}") {
+    @if map-get($MS-cache, "#{$Bases} #{$Ratios}") {
       // Positive list
-      $ms-pos: map-get(map-get($ms-cache, "#{$bases} #{$ratios}"), pos);
+      $MS-pos: map-get(map-get($MS-cache, "#{$Bases} #{$Ratios}"), pos);
       // See if the map matches the range
-      @if $value >= 0 and length($ms-pos) > $value {
-        @return nth($ms-pos, $value + 1);
+      @if $Value >= 0 and length($MS-pos) > $Value {
+        @return nth($MS-pos, $Value + 1);
       }
       // And again for negitive values
-      $ms-neg: map-get(map-get($ms-cache, "#{$bases} #{$ratios}"), neg);
-      @if $value < 0 and length($ms-neg) > abs($value - 1) {
-        @return nth($ms-neg, $value - 1);
+      $MS-neg: map-get(map-get($MS-cache, "#{$Bases} #{$Ratios}"), neg);
+      @if $Value < 0 and length($MS-neg) > abs($Value - 1) {
+        @return nth($MS-neg, $Value - 1);
       }
     }
     // If nothing matched criteria in map
     // then just carry on with calculaitons.
   }
 
   // Generate a list of all possible values
-  $return: ms-generate-list($value, $bases, $ratios);
+  $Return: ms-generate-list($Value, $Bases, $Ratios);
 
   // Sort the generated lists
-  $return: ms-sort-list($return);
+  $Return: ms-sort-list($Return);
 
   // Cache
-  @if $ms-maps-exist {
-    $ms-cache: ms-cache($value, $bases, $ratios, $return) !global;
+  @if $MS-maps-exist {
+    $MS-cache: ms-cache($Value, $Bases, $Ratios, $Return) !global;
   }
 
   // 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;
+  @if $Value >= 0 {
+    $Value: $Value + 1;
   }
   @else {
-    $value: $value - 1;
+    $Value: $Value - 1;
   }
 
   // Find the correct value in the list
-  $return: nth($return, $value);
+  $Return: nth($Return, $Value);
 
-  @return $return;
+  @return $Return;
 }
 
 // Same function, different name, for good measure.
-@function modular-scale($value: 0, $bases: $ms-base, $ratios: $ms-ratio) {
-  @return ms($value, $bases, $ratios);
+@function modular-scale($Value: 0, $Bases: $ms-base, $Ratios: $ms-ratio) {
+  @return ms($Value, $Bases, $Ratios);
 }