style_train 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/style_train/color_types/keyword_color.rb

@@ -154,7 +154,7 @@ module StyleTrain
    	 	:whitesmoke	=>	[245, 245, 245],
    	 	:yellow	=>	[255, 255, 0],
    	 	:yellowgreen	=>	[154, 205, 50],
-
+      :transparent => [0,0,0]
     }
 
     attr_reader :keyword

data/lib/style_train/sheet.rb

@@ -8,7 +8,7 @@ module StyleTrain
     end
     
     def render render_method = :content
-      self.output = ''
+      self.output = header
       if render_method == :content
         content
       else
@@ -17,6 +17,14 @@ module StyleTrain
       output
     end
     
+    def header
+<<-CSS
+/*
+  Generated by StlyeTrain CSS generator via the class #{self.class}
+*/
+CSS
+   end
+    
     def style(selector)
       self.output << "\n"
       if selector.is_a?(String) || TAGS.include?(selector)
@@ -69,7 +77,7 @@ module StyleTrain
     def background( opts )
       str = ""
       str << property('background-color', Color.new(opts[:color])) if opts[:color]
-      str << property('background-image', opts[:image]) if opts[:image]
+      str << property('background-image', "url('#{opts[:image]}')") if opts[:image]
       str << property('background-position', opts[:position]) if opts[:position]
       str << property('background-attachment', opts[:attachment]) if opts[:attachment]
       str << property('background-repeat', background_repeat_value(opts[:repeat])) if opts[:repeat]
@@ -80,25 +88,31 @@ module StyleTrain
       value = value.to_sym
       if value == :x || value == :y
         "repeat-#{value}"
+      elsif value == :none
+        'no-repeat'
       else
         value
       end
     end
     
     def border(opts={})
-      value = border_value(opts)
-      if only = opts[:only]
-        if only.is_a?(Array)
-          str = ""
-          only.each do |type|
-            str << property( "border-#{type}", value )
+      if opts.is_a?(Hash)
+        value = border_value(opts)
+        if only = opts[:only]
+          if only.is_a?(Array)
+            str = ""
+            only.each do |type|
+              str << property( "border-#{type}", value )
+            end
+            str
+          else
+            property "border-#{only}", value
           end
-          str
         else
-          property "border-#{only}", value
+          property "border", value
         end
       else
-        property "border", value
+        property "border", opts
       end
     end
     
@@ -116,7 +130,9 @@ module StyleTrain
     
     def text(opts)
       str = ""
-      str << property('font-family', opts[:font]) if opts[:font]
+      if family = opts[:font] || opts[:family]
+        str << property('font-family', family)
+      end
       str << property('font-weight', opts[:weight]) if opts[:weight]
       str << property('font-variant', opts[:variant]) if opts[:variant]
       str << property('font-style', opts[:style]) if opts[:style]
@@ -124,7 +140,9 @@ module StyleTrain
       str << property('color', opts[:color]) if opts[:color]
       str << property('text-direction', opts[:direction]) if opts[:direction]
       str << property('letter-spacing', opts[:spacing]) if opts[:spacing]
-      str << property('line-height', opts[:line_height]) if opts[:line_height]
+      if height = opts[:line_height] || opts[:height]
+        str << property('line-height', height)
+      end
       str << property('text-align', opts[:align]) if opts[:align]
       str << property('text-decoration', opts[:decoration]) if opts[:decoration]
       str << property('text-indent', opts[:indent]) if opts[:indent]
@@ -135,6 +153,8 @@ module StyleTrain
       str
     end
     
+    alias :font :text
+    
     def list(opts)
       str = ""
       str << property('list-style-image', opts[:image]) if opts[:image]
@@ -143,9 +163,12 @@ module StyleTrain
       str
     end
     
-    def margin(opts)
+    def margin(*opts)
+      opts = opts.size == 1 ? opts.first : opts
       if opts.is_a?(Array)
         property('margin', opts)
+      elsif opts.is_a?(String)
+        property('margin', opts)  
       else
         str = ""
         str << property('margin-left', opts[:left]) if opts[:left]
@@ -156,9 +179,12 @@ module StyleTrain
       end
     end
     
-    def padding(opts)
+    def padding(*opts)
+      opts = opts.size == 1 ? opts.first : opts
       if opts.is_a?(Array)
         property('padding', opts)
+      elsif opts.is_a?(String)
+        property('padding', opts)  
       else
         str = ""
         str << property('padding-left', opts[:left]) if opts[:left]
@@ -214,7 +240,7 @@ module StyleTrain
     end
     
     [
-      'color', 'display', 'float', 'clear', 'visibility', 'cursor',
+      'color', 'display', 'float', 'clear', 'visibility', 'cursor', 'opacity',
       'height', 'width', 'max_height', 'max_width', 'min_height', 'min_width' 
     ].each do |meth|
       class_eval <<-RUBY

data/lib/style_train/support/numbers.rb

@@ -1,23 +1,23 @@
 class Fixnum
-  def px
-    "#{self}px"
-  end
-  
-  def em
-    "#{self}em"
+  ['px', 'em', 'pt'].each do |meth|
+    class_eval <<-RUBY
+      def #{meth}
+        self.to_s + "#{meth}"
+      end
+    RUBY
   end
   
   def percent
     "#{self}%"
   end
-  
-  def pt
-    "#{self}pt"
-  end
 end
 
 class Float
-  def em
-    "#{self}em"
+  ['em', 'pt'].each do |meth|
+    class_eval <<-RUBY
+      def #{meth}
+        self.to_s + "#{meth}"
+      end
+    RUBY
   end
 end

data/spec/numbers_spec.rb

@@ -22,4 +22,8 @@ describe Float do
   it '#em converts to a string with em at the end' do
     1.5.em.should == '1.5em'
   end
+  
+  it '#pt converts to a string with % at the end' do
+    12.5.pt.should == '12.5pt'
+  end
 end

data/spec/sheet_spec.rb

@@ -3,6 +3,21 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 Sheet = StyleTrain::Sheet unless defined?( Sheet )
 
 describe Sheet do
+  class StyleSheet < StyleTrain::Sheet
+    def content
+      body { 
+        background :color => '#666'
+        text :font => 'verdana' 
+      }
+      
+      style('#wrapper'){
+        background :color => :white
+        margin [1.em, :auto]
+      }
+    end
+  end
+  
+  
   describe 'attributes' do
     before :all do
       @sheet = Sheet.new
@@ -27,8 +42,17 @@ describe Sheet do
       @sheet = Sheet.new
     end
     
+    it '#header describes the file generation' do
+      StyleSheet.new.header.should == <<-CSS
+/*
+  Generated by StlyeTrain CSS generator via the class StyleSheet
+*/
+CSS
+    end
+    
     it 'resets the output' do
-      @sheet.should_receive(:output=).with('')
+      @sheet.stub(:header).and_return('HEADER')
+      @sheet.should_receive(:output=).with('HEADER')
       @sheet.render
     end
     
@@ -166,7 +190,7 @@ describe Sheet do
       end
       
       it ':image will create a background-image property' do
-        @sheet.background(:image => "url('ok.png')").should include "background-image: url('ok.png');"
+        @sheet.background(:image => "ok.png").should include "background-image: url('ok.png');"
       end
       
       it ':position will create a background-position property' do
@@ -181,6 +205,10 @@ describe Sheet do
         @sheet.background(:repeat => :x).should include "background-repeat: repeat-x;"
       end
       
+      it ':repeat with :none will make a no-repeat value' do
+        @sheet.background(:repeat => :none).should include 'background-repeat: no-repeat'
+      end
+      
       it 'will create a background-color property if it receives a string that converts to a color' 
       it 'will create a background-color property if it receives a color'
     end
@@ -211,6 +239,10 @@ describe Sheet do
           'border-bottom: 1px solid black', 'border-left: 1px solid black'
         )
       end
+      
+      it 'should do :none' do
+        @sheet.border(:none).should include 'border: none'
+      end
     end
     
     describe 'outline' do
@@ -358,6 +390,10 @@ describe Sheet do
         @sheet.text(:line_height => 2).should include 'line-height: 2'
       end
       
+      it 'uses alt syntax for line height' do
+        @sheet.text(:height => 2).should include 'line-height: 2'
+      end
+      
       it 'aligns' do
         @sheet.text(:align => :center).should include 'text-align: center'
       end
@@ -385,6 +421,14 @@ describe Sheet do
       it 'specifies word spacing' do
         @sheet.text(:word_spacing => 25.px).should include 'word-spacing: 25px'
       end
+      
+      it 'aliases to #font' do
+        @sheet.font(:word_spacing => 15.px).should include 'word-spacing: 15px'
+      end
+      
+      it 'uses the :family option as well as the :font to specify font face' do
+        @sheet.font(:family => 'Serif').should include 'font-family: Serif'
+      end
     end
     
     describe 'list' do
@@ -406,6 +450,14 @@ describe Sheet do
         @sheet.margin( [10.px, 20.px, 13.px] ).should include 'margin: 10px 20px 13px'
       end
       
+      it 'takes an arguments as an array' do
+        @sheet.margin( 15.px, 20.px ).should include 'margin: 15px 20px'
+      end
+      
+      it 'takes a single argument instead of an array' do
+        @sheet.margin( 25.px ).should include 'margin: 25px'
+      end
+      
       it 'takes :left and just makes that declaration' do
         @sheet.margin( :left => 30.px ).should include 'margin-left: 30px'
       end
@@ -428,6 +480,15 @@ describe Sheet do
         @sheet.padding( [10.px, 20.px, 13.px] ).should include 'padding: 10px 20px 13px'
       end
       
+      it 'takes an arguments as an array' do
+        @sheet.padding( 15.px, 20.px ).should include 'padding: 15px 20px'
+      end
+      
+      it 'takes a single argument instead of an array' do
+        @sheet.padding( 25.px ).should include 'padding: 25px'
+      end
+      
+      
       it 'takes :left and just makes that declaration' do
         @sheet.padding( :left => 30.px ).should include 'padding-left: 30px'
       end
@@ -512,6 +573,10 @@ describe Sheet do
       it 'visibility' do
         @sheet.visibility(:hidden).should include 'visibility: hidden'
       end
+      
+      it 'opacity' do
+        @sheet.opacity(0.5).should include 'opacity: 0.5'
+      end
     end
   end
   
@@ -689,20 +754,6 @@ describe Sheet do
     end
   end
 
-  class StyleSheet < StyleTrain::Sheet
-    def content
-      body { 
-        background :color => '#666'
-        text :font => 'verdana' 
-      }
-      
-      style('#wrapper'){
-        background :color => :white
-        margin [1.em, :auto]
-      }
-    end
-  end
-  
   describe 'subclassing' do
     it 'works' do
       StyleSheet.render.should include( 
@@ -749,4 +800,27 @@ CSS
       File.exists?(@dir + 'foo')
     end
   end
+  
+  describe 'alternative syntax' do
+    # Available operators for overloading 
+    # |, ^, &, <=>, ==, ===, =~, >, >=, <, <=, +, -, *, /, %, **, <<, >>, ~, +@, -@, [], []= (2 args)
+    
+    # input[:readonly]{ ... }
+    # input['type=text']{ ... }
+    # div :input { ... }
+    
+    
+    # how to handle :hover and other psuedo selectors
+    
+    # o :create_button {
+    #   
+      # o :hover {
+      #   
+      # }
+      
+      # < :active {
+      #   
+      # }
+    # }
+  end
 end

data/style_train.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{style_train}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
-  s.date = %q{2011-02-23}
+  s.date = %q{2011-02-25}
   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 = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: style_train
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -08:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency