style_train 0.3.2 → 0.4.0

data/spec/numbers_spec.rb

@@ -16,6 +16,10 @@ describe Fixnum do
   it '#pt converts to a string with % at the end' do
     42.pt.should == '42pt'
   end
+  
+  it '#degrees converts to a snring with degrees at the end' do
+    42.degrees.should == '42degrees'
+  end
 end
 
 describe Float do
@@ -23,7 +27,15 @@ describe Float do
     1.5.em.should == '1.5em'
   end
   
-  it '#pt converts to a string with % at the end' do
+  it '#pt converts to a string with pt at the end' do
     12.5.pt.should == '12.5pt'
   end
+  
+  it '#percent converts to a string with % at the end' do
+    30.25.percent.should == '30.25%'
+  end
+  
+  it '#degrees converts to a snring with degrees at the end' do
+    42.5.degrees.should == '42.5degrees'
+  end
 end

data/spec/sheet_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 Sheet = StyleTrain::Sheet unless defined?( Sheet )
+Color = StyleTrain::Color unless defined?( Color )
 
 describe Sheet do
   class StyleSheet < StyleTrain::Sheet
@@ -194,7 +195,7 @@ CSS
     
     describe 'background' do
       it ':color will create a background-color property' do
-        @sheet.background(:color => :white).should include 'background-color: white;'
+        @sheet.background(:color => :white).should include "background-color: #{Color.new(:white)};"
       end
       
       it ':image will create a background-image property' do
@@ -584,7 +585,7 @@ CSS
     
     describe 'duplicate declarations' do
       it 'color' do
-        @sheet.color(StyleTrain::Color.new('#456')).should include 'color: #456'
+        @sheet.color(StyleTrain::Color.new('#456')).should include 'color: #445566'
       end
       
       it 'overflow' do
@@ -621,10 +622,23 @@ CSS
         @sheet.visibility(:hidden).should include 'visibility: hidden'
       end
       
-      it 'opacity' do
-        str = @sheet.opacity(0.5)
-        str.should include 'opacity: 0.5'
-        str.should include 'filter: alpha(opacity=50)'
+      describe 'opacity' do
+        it 'has a simple declaration' do
+          str = @sheet.opacity(0.5)
+          str.should include 'opacity: 0.5'
+          str.should_not include 'filter: alpha(opacity=50)' # IE creates a gray box with alpha
+        end
+      
+        it 'has a separate alpha declaration' do
+          str = @sheet.alpha(50)
+          str.should include 'filter: alpha(opacity=50)'
+        end
+        
+        it '#opacity can take :alpha option as an argument' do
+          str = @sheet.opacity(0.5, :alpha => true)
+          str.should include 'opacity: 0.5'
+          str.should include 'filter: alpha(opacity=50)'
+        end
       end
     end
   end
@@ -810,11 +824,11 @@ CSS
     it 'works' do
       StyleSheet.render.should include( 
 "body {
-  background-color: #666;
+  background-color: #666666;
   font-family: verdana;
 }
 #wrapper {
-  background-color: white;
+  background-color: #FFFFFF;
   margin: 1em auto;
 }
 .foo {
@@ -885,7 +899,7 @@ CSS
 .first,
 .second,
 .third {
-  background-color: black;
+  background-color: #000000;
 }
 CSS
     end
@@ -1020,7 +1034,7 @@ form {
       end
       
       it 'should render embedded properties' do
-        @str.should include "background-color: red"
+        @str.should include "background-color: #{Color.new(:red)}"
       end
     end
     

data/spec/themed_sheet_spec.rb

@@ -9,12 +9,12 @@ describe ThemedSheet do
   
   FooeyTheme.new(:default, {
     :foo => '#666',
-    :bar => 'white'
+    :bar => :white
   })
   
   FooeyTheme.new(:inverted, {
     :foo => '#CCC',
-    :bar => 'black'
+    :bar => :black
   })
   
   class FooeySheet <  ThemedSheet

data/style_train.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{style_train}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
-  s.date = %q{2011-03-03}
+  s.date = %q{2011-03-23}
   s.description = %q{style_train builds CSS using pure Ruby, not a DSL interpreted via Ruby. This allows inheritance, modules, instance level calculations and all the goodness Ruby can offer.}
   s.email = %q{baccigalupi@gmail.com}
   s.extra_rdoc_files = [
@@ -22,11 +22,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/style_train.rb",
     "lib/style_train/color.rb",
-    "lib/style_train/color_types/color_type.rb",
-    "lib/style_train/color_types/hex_color.rb",
-    "lib/style_train/color_types/hsl_color.rb",
-    "lib/style_train/color_types/keyword_color.rb",
-    "lib/style_train/color_types/rgb_color.rb",
     "lib/style_train/sheet.rb",
     "lib/style_train/style.rb",
     "lib/style_train/support/gnash.rb",
@@ -38,11 +33,7 @@ Gem::Specification.new do |s|
     "research/contexting.rb",
     "research/overview.txt",
     "research/stylesheet.txt",
-    "spec/color/color_spec.rb",
-    "spec/color/color_type_spec.rb",
-    "spec/color/hex_color_spec.rb",
-    "spec/color/keyword_color_spec.rb",
-    "spec/color/rgb_color_spec.rb",
+    "spec/color_spec.rb",
     "spec/generated_files/.gitkeep",
     "spec/integration_spec.rb",
     "spec/numbers_spec.rb",
@@ -60,11 +51,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{style_train builds CSS with Ruby}
   s.test_files = [
-    "spec/color/color_spec.rb",
-    "spec/color/color_type_spec.rb",
-    "spec/color/hex_color_spec.rb",
-    "spec/color/keyword_color_spec.rb",
-    "spec/color/rgb_color_spec.rb",
+    "spec/color_spec.rb",
     "spec/integration_spec.rb",
     "spec/numbers_spec.rb",
     "spec/sheet_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: style_train
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -08:00
+date: 2011-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,11 +47,6 @@ files:
 - VERSION
 - lib/style_train.rb
 - lib/style_train/color.rb
-- lib/style_train/color_types/color_type.rb
-- lib/style_train/color_types/hex_color.rb
-- lib/style_train/color_types/hsl_color.rb
-- lib/style_train/color_types/keyword_color.rb
-- lib/style_train/color_types/rgb_color.rb
 - lib/style_train/sheet.rb
 - lib/style_train/style.rb
 - lib/style_train/support/gnash.rb
@@ -63,11 +58,7 @@ files:
 - research/contexting.rb
 - research/overview.txt
 - research/stylesheet.txt
-- spec/color/color_spec.rb
-- spec/color/color_type_spec.rb
-- spec/color/hex_color_spec.rb
-- spec/color/keyword_color_spec.rb
-- spec/color/rgb_color_spec.rb
+- spec/color_spec.rb
 - spec/generated_files/.gitkeep
 - spec/integration_spec.rb
 - spec/numbers_spec.rb
@@ -114,11 +105,7 @@ signing_key:
 specification_version: 3
 summary: style_train builds CSS with Ruby
 test_files: 
-- spec/color/color_spec.rb
-- spec/color/color_type_spec.rb
-- spec/color/hex_color_spec.rb
-- spec/color/keyword_color_spec.rb
-- spec/color/rgb_color_spec.rb
+- spec/color_spec.rb
 - spec/integration_spec.rb
 - spec/numbers_spec.rb
 - spec/sheet_spec.rb

data/lib/style_train/color_types/color_type.rb

@@ -1,233 +0,0 @@
-module StyleTrain
-  class ColorType 
-    # ERROR CLASSES
-    class PercentageError < ArgumentError
-      def message 
-        @message ||= 'Percentages must be between 0 and 100'
-      end
-    end 
-  
-    class ByteNumberError < ArgumentError
-      def message 
-        @message ||= 'Byte numbers must be between 0 and 255'
-      end
-    end
-  
-    class AlphaError < ArgumentError
-      def message 
-        @message ||= 'Alpha must be between 0.0 and 1.0'
-      end
-    end
-  
-    # ATTRIBUTES  
-    attr_accessor :r, :g, :b 
-    attr_reader :alpha 
-  
-    # INITIALIZATION
-    def initialize( opts )
-      if self.class.is_color?(opts)
-        build_from_color(opts)
-      else
-        opts = Gnash.new(opts)
-        color = opts[:color]
-        self.alpha = opts[:alpha] 
-        type_initialize( color, opts )
-      end  
-    end
-  
-    def type_initialize( color, opts ) 
-      raise NotYetImplemented, "type_initialize must be implemented for #{self}"
-    end  
-  
-    def alpha=( value ) 
-      value = (value || 1.0).to_f   
-      raise AlphaError if value > 1.0 || value < 0.0
-      @alpha = value 
-    end 
-  
-    def build_from_color( color ) 
-      self.r = color.r
-      self.g = color.g
-      self.b = color.b
-      self.alpha = color.alpha
-      build
-    end 
-  
-    def build 
-      raise NotImplementedError, "#build must be implemented for #{self.class}"
-    end   
-  
-    def self.is_color?( color )
-      color.is_a? ColorType 
-    end 
-  
-    # INSTANCE METHODS 
-    # conversion
-    def to( color_type )
-      klass = self.class.color_type_class(color_type)
-      raise ArgumentError, 'color type not supported' unless klass
-      self.class == klass ? self : klass.new( self )
-    end
-  
-    # comparison
-    def =~( color )
-      if color.is_a?( ColorType ) 
-        self.r == color.r && self.g == color.g && self.b == color.b 
-      elsif color.is_a?( Color )
-        self =~ color.delegate
-      end    
-    end
-  
-    def ==( color )
-      (self =~ color) && self.alpha == color.alpha
-    end 
-  
-    def ===( color )
-      (self == color) && self.class == color.class
-    end 
-  
-    # blending
-    def mix( color, mix_ratio=0.5 )
-      mix_ratio = 1-mix_ratio
-      mixed = self.dup
-      mixed.r = ratio(self.r, color.r, mix_ratio)
-      mixed.g = ratio(self.g, color.g, mix_ratio)
-      mixed.b = ratio(self.b, color.b, mix_ratio)
-      mixed.alpha = ratio(self.alpha, color.alpha, mix_ratio, false)
-      mixed.build
-      mixed
-    end
-  
-    def layer( color )
-      layered = self.dup 
-      ratio = 1 - color.alpha
-      layered.r = self.class.blend( self.r, color.r, ratio )
-      layered.g = self.class.blend( self.g, color.g, ratio )
-      layered.b = self.class.blend( self.b, color.b, ratio )
-      layered.alpha = self.class.blend_alphas( self.alpha, color.alpha ) 
-      layered.build
-      layered
-    end
-  
-    def self.blend(first, second, ratio) 
-      ratio(first, second, ratio)
-    end    
-  
-    def self.average(first, second, round=true)
-      ratio(first, second, round)
-    end
-    
-    def self.ratio(first, second, first_ratio=0.5, round=true)
-      second_ratio = 1-first_ratio
-      value = first*first_ratio + second*second_ratio
-      round ? value.round : value 
-    end
-    
-    def ratio *args
-      self.class.ratio *args
-    end 
-  
-    def average *args
-      self.class.average *args
-    end 
-    
-  
-    def self.blend_alphas(first, second)
-      base, blender = first > second ? [first, second] : [second, first]
-      difference = 1.0 - base
-      base + difference * blender
-    end         
-  
-    # rendering
-    def render(opts=nil) 
-      alpha? ? render_as_rgba : render_as_given
-    end
-  
-    def to_s(opts=nil)
-      render(opts)
-    end   
-  
-    def render_as_given 
-      raise NotImplementedError, "#render_as_given must be implemented for #{self.class}"
-    end     
-  
-    def render_as_rgba
-      "rgba( #{self.r}, #{self.g}, #{self.b}, #{self.alpha} )"
-    end
-  
-    def alpha?
-      self.alpha != 1.0
-    end    
-  
-    # CLASS METHODS 
-  
-    def self.make(opts)
-      begin
-        new(opts)
-      rescue
-        nil
-      end    
-    end  
-      
-    # These can't contain real classes because it will create a dependency loop.
-    def self.color_opts
-      @color_opts ||= Gnash.new(
-        :rgb => 'StyleTrain::RGBcolor',
-        :keyword => 'StyleTrain::KeywordColor', 
-        :hex => 'StyleTrain::HexColor' 
-        # :hsl => 'HSLcolor' # when this class exists
-      ) 
-    end 
-   
-    # So they are replaced on usage with the actual constants, as needed
-    def self.color_type_class( color_type )
-      klass = color_opts[ color_type ]
-      if klass.class == String
-        color_opts[color_type] = klass.constantize
-      else
-        klass
-      end   
-    end
-  
-    def self.color_types  
-      unless @types_built
-        color_opts.each do |key, klass|
-          self.color_type_class( key )
-        end  
-        @types_built = true
-      end   
-      color_opts.values
-    end      
-  
-    def self.percentage( str )
-      if str.class == String && str.match(/^([\d.]*)%$/) 
-        number = $1.to_f
-        raise PercentageError if number > 100.0 || number < 0.0
-        number
-      else  
-        false
-      end  
-    end
-  
-    def self.byte( str ) 
-      str.to_i if valid_byte?( str, true )    
-    end
-  
-    def self.valid_byte?( number, raise_exe=false )
-      num = number.to_i
-      v = num <= 255 && num >= 0 
-      raise ByteNumberError if v != true && raise_exe
-      v
-    end  
-  
-    def self.percent_to_byte( number ) 
-      raise PercentageError  if number > 100.0 || number < 0.0 
-      ( number * 2.55 ).round
-    end
-  
-    def self.byte_to_percentage( number )
-      raise ByteNumberError if number > 255.0 || number < 0.0 
-      ( number/2.55 ).round
-    end                
-  end
-end