color-schemer 0.1.2 → 0.1.3

data/color-schemer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{color-schemer}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5")
   s.authors = ["Scott Kellum", "Mason Wendell"]

data/lib/color-schemer.rb

@@ -1,9 +1,9 @@
 require 'compass'
 Compass::Frameworks.register("color-schemer", :path => "#{File.dirname(__FILE__)}/..")
 
-module ModularScale
+module ColorSchemer
   
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
   DATE = "2011-09-15"
 
 end

data/stylesheets/_color-schemer.sass

@@ -13,89 +13,93 @@ $base-color: #f00 !default
 $color-scheme: mono !default
 $hue-offset: 20 !default
 $brightness-offset: 10% !default
-$color-theory: rgb !default
+$color-model: rgb !default
 $equalize: false !default
 
 // Normalizer credit to Mason Wendell: https://github.com/canarymason/The-Coding-Designers-Survival-Kit/blob/master/sass/partials/lib/variables/_color_schemes.sass
 @function equalize($color)
   @return hsl(hue($color), 100%, 50%)
 
-// Complement based on Claude Boutet's color wheel
-@function boutet-complement($color)
+// RYB color model complement
+@function ryb-complement($color)
   $hue: round(hue($color)/ 10) // find and round hue
+  $newhue: $hue
+  $sat: saturation($color)
+  $lite: lightness($color)
   // Manually adjusted values until these can be mathmatically explained.
   @if $hue == 0
-    @return adjust-hue(invert($color), -60) // Start with red
+    $newhue: hue(adjust-hue(invert($color), -60)) // Start with red
   @if $hue == 1
-    @return adjust-hue(invert($color), -50)
+    $newhue: hue(adjust-hue(invert($color), -50))
   @if $hue == 2
-    @return adjust-hue(invert($color), -40)
+    $newhue: hue(adjust-hue(invert($color), -40))
   @if $hue == 3
-    @return adjust-hue(invert($color), -25)
+    $newhue: hue(adjust-hue(invert($color), -25))
   @if $hue == 4
-    @return adjust-hue(invert($color), 0)
+    $newhue: hue(adjust-hue(invert($color), 0))
   @if $hue == 5
-    @return adjust-hue(invert($color), 25)
+    $newhue: hue(adjust-hue(invert($color), 25))
   @if $hue == 6
-    @return adjust-hue(invert($color), 38)
+    $newhue: hue(adjust-hue(invert($color), 38))
   @if $hue == 7
-    @return adjust-hue(invert($color), 44)
+    $newhue: hue(adjust-hue(invert($color), 44))
   @if $hue == 8
-    @return adjust-hue(invert($color), 52)
+    $newhue: hue(adjust-hue(invert($color), 52))
   @if $hue == 9
-    @return adjust-hue(invert($color), 58)
+    $newhue: hue(adjust-hue(invert($color), 58))
   @if $hue == 10
-    @return adjust-hue(invert($color), 59)
+    $newhue: hue(adjust-hue(invert($color), 59))
   @if $hue == 11
-    @return adjust-hue(invert($color), 60)
+    $newhue: hue(adjust-hue(invert($color), 60))
   @if $hue == 12
-    @return adjust-hue(invert($color), 60) // Green is halfway through the Boutet scale.
+    $newhue: hue(adjust-hue(invert($color), 60)) // Green is halfway through the RYB model.
   @if $hue == 13
-    @return adjust-hue(invert($color), 55)
+    $newhue: hue(adjust-hue(invert($color), 55))
   @if $hue == 14
-    @return adjust-hue(invert($color), 50)
+    $newhue: hue(adjust-hue(invert($color), 50))
   @if $hue == 15
-    @return adjust-hue(invert($color), 45)
+    $newhue: hue(adjust-hue(invert($color), 45))
   @if $hue == 16
-    @return adjust-hue(invert($color), 40)
+    $newhue: hue(adjust-hue(invert($color), 40))
   @if $hue == 17
-    @return adjust-hue(invert($color), 35)
+    $newhue: hue(adjust-hue(invert($color), 35))
   @if $hue == 18
-    @return adjust-hue(invert($color), 30)
+    $newhue: hue(adjust-hue(invert($color), 30))
   @if $hue == 19
-    @return adjust-hue(invert($color), 25)
+    $newhue: hue(adjust-hue(invert($color), 25))
   @if $hue == 20
-    @return adjust-hue(invert($color), 20)
+    $newhue: hue(adjust-hue(invert($color), 20))
   @if $hue == 21
-    @return adjust-hue(invert($color), 15)
+    $newhue: hue(adjust-hue(invert($color), 15))
   @if $hue == 22
-    @return adjust-hue(invert($color), -5)
+    $newhue: hue(adjust-hue(invert($color), -5))
   @if $hue == 23
-    @return adjust-hue(invert($color), -8)
+    $newhue: hue(adjust-hue(invert($color), -8))
   @if $hue == 24
-    @return adjust-hue(invert($color), -17)
+    $newhue: hue(adjust-hue(invert($color), -17))
   @if $hue == 25
-    @return adjust-hue(invert($color), -25)
+    $newhue: hue(adjust-hue(invert($color), -25))
   @if $hue == 26
-    @return adjust-hue(invert($color), -30)
+    $newhue: hue(adjust-hue(invert($color), -30))
   @if $hue == 27
-    @return adjust-hue(invert($color), -35)
+    $newhue: hue(adjust-hue(invert($color), -35))
   @if $hue == 28
-    @return adjust-hue(invert($color), -40)
+    $newhue: hue(adjust-hue(invert($color), -40))
   @if $hue == 29
-    @return adjust-hue(invert($color), -43)
+    $newhue: hue(adjust-hue(invert($color), -43))
   @if $hue == 30
-    @return adjust-hue(invert($color), -46)
+    $newhue: hue(adjust-hue(invert($color), -46))
   @if $hue == 31
-    @return adjust-hue(invert($color), -49)
+    $newhue: hue(adjust-hue(invert($color), -49))
   @if $hue == 32
-    @return adjust-hue(invert($color), -52)
+    $newhue: hue(adjust-hue(invert($color), -52))
   @if $hue == 33
-    @return adjust-hue(invert($color), -54)
+    $newhue: hue(adjust-hue(invert($color), -54))
   @if $hue == 34
-    @return adjust-hue(invert($color), -57)
+    $newhue: hue(adjust-hue(invert($color), -57))
   @if $hue == 35
-    @return adjust-hue(invert($color), -60)
+    $newhue: hue(adjust-hue(invert($color), -60))
+  @return hsl($newhue,$sat,$lite)
 
 // Add percentage of white to a color
 @function tint($color, $percent)
@@ -105,7 +109,7 @@ $equalize: false !default
 @function shade($color, $percent)
   @return mix(black, $color, $percent)
 
-@function color-schemer($color-location, $base-color, $color-scheme, $hue-offset)
+@function color-schemer($color-location:$color-location,$base-color:$base-color,$color-scheme:$color-scheme,$hue-offset:$hue-offset)
   // Primary, just return the base-color.
   @if $equalize
     $base-color: equalize($base-color)
@@ -116,12 +120,12 @@ $equalize: false !default
     @if $color-scheme == mono
       @return lighten($base-color, $brightness-offset)
     @if $color-scheme == complement
-      @if $color-theory == boutet
-        @return boutet-complement($base-color)
+      @if $color-model == ryb
+        @return ryb-complement($base-color)
       @return complement($base-color)
     @if $color-scheme == triad
-      @if $color-theory == boutet
-        @return adjust-hue(boutet-complement($base-color), $hue-offset)
+      @if $color-model == ryb
+        @return adjust-hue(ryb-complement($base-color), $hue-offset)
       @return adjust-hue(complement($base-color), $hue-offset)
     @if $color-scheme == tetrad
       @return adjust-hue($base-color, $hue-offset)
@@ -137,12 +141,12 @@ $equalize: false !default
     @if $color-scheme == complement
       @return lighten($base-color, $brightness-offset)
     @if $color-scheme == triad
-      @if $color-theory == boutet
-        @return adjust-hue(boutet-complement($base-color), -$hue-offset)
+      @if $color-model == ryb
+        @return adjust-hue(ryb-complement($base-color), -$hue-offset)
       @return adjust-hue(complement($base-color), -$hue-offset)
     @if $color-scheme == tetrad
-      @if $color-theory == boutet
-        @return boutet-complement($base-color)
+      @if $color-model == ryb
+        @return ryb-complement($base-color)
       @return complement($base-color)
     @if $color-scheme == analogic
       @return adjust-hue($base-color, -$hue-offset)
@@ -158,23 +162,17 @@ $equalize: false !default
     @if $color-scheme == triad
       @return darken($base-color, $brightness-offset)
     @if $color-scheme == tetrad
-      @if $color-theory == boutet
-        @return adjust-hue(boutet-complement($base-color), $hue-offset)
+      @if $color-model == ryb
+        @return adjust-hue(ryb-complement($base-color), $hue-offset)
       @return adjust-hue(complement($base-color), $hue-offset)
     @if $color-scheme == analogic
       @return darken($base-color, $brightness-offset)
     @if $color-scheme == accented-analogic
-      @if $color-theory == boutet
-        @return boutet-complement($base-color)
+      @if $color-model == ryb
+        @return ryb-complement($base-color)
       @return complement($base-color)
     @warn "Oops! You didn’t properly define $color-scheme (complement, triad...)"
   @warn "Oops! You didn’t properly define $color-location (primary, secondary...)"
 
-// Write your basic color scheme
-$primary: color-schemer(primary) !default
-$secondary: color-schemer(secondary) !default
-$tertiary: color-schemer(tertiary) !default
-$quadrary: color-schemer(quadrary) !default
-
 // Tell other files that this is loaded.
 $color-schemer-loaded: true

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: color-schemer
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Scott Kellum
@@ -22,9 +23,11 @@ dependencies:
   name: compass
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 11
@@ -54,16 +57,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 17
       segments: 
       - 1
       - 3
@@ -72,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: color-schemer
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Create color schemes with ease.