style_train 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/style_train/sheet.rb

@@ -112,11 +112,15 @@ CSS
     
     def background( opts )
       str = ""
-      str << property('background-color', Color.new(opts[:color])) if opts[:color]
-      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]
+      if opts.is_a?(Hash)
+        str << property('background-color', Color.new(opts[:color])) if opts[:color]
+        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]
+      else
+        str << property('background', opts )
+      end
       str
     end
     
@@ -131,32 +135,51 @@ CSS
       end
     end
     
-    def border(opts={})
+    def border(*args)
+      str = ""
+      if args.size == 1
+        opts = args.first
+      else
+        opts = args.last || {}
+        none = true
+      end
+      
+      
       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
+          Array(only).flatten.each do |side| 
+            value = :none if none
+            str << property("border-#{side}", value) 
           end
-        else
-          property "border", value
+        else  
+          str << property( "border", value )
         end
       else
-        property "border", opts
+        str << property( "border", opts )
       end
+      
+      str
+    end
+    
+    ['left', 'right', 'top', 'bottom'].each do |side|
+      class_eval <<-RUBY
+        def border_#{side}(opts={})
+          property('border-#{side}', border_value(opts))
+        end
+      RUBY
     end
     
+    
     def border_value(opts)
-      color = opts[:color] || 'black'
-      style = opts[:style] || 'solid'
-      width = opts[:width] || '1px'
-      "#{width} #{style} #{color}"
+      if opts.is_a?(Hash)
+        color = opts[:color] || 'black'
+        style = opts[:style] || 'solid'
+        width = opts[:width] || opts[:size] || '1px'
+        "#{width} #{style} #{color}"
+      else
+        opts.to_s
+      end
     end
     
     def outline(opts={})
@@ -201,33 +224,29 @@ CSS
     
     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)  
+      if opts.is_a?(Hash)
+          str = ""
+          str << property('margin-left', opts[:left]) if opts[:left]
+          str << property('margin-top', opts[:top]) if opts[:top]
+          str << property('margin-bottom', opts[:bottom]) if opts[:bottom]
+          str << property('margin-right', opts[:right]) if opts[:right]
+          str
       else
-        str = ""
-        str << property('margin-left', opts[:left]) if opts[:left]
-        str << property('margin-top', opts[:top]) if opts[:top]
-        str << property('margin-bottom', opts[:bottom]) if opts[:bottom]
-        str << property('margin-right', opts[:right]) if opts[:right]
-        str
+        property('margin', opts)
       end
     end
     
     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
+      if opts.is_a?(Hash)
         str = ""
         str << property('padding-left', opts[:left]) if opts[:left]
         str << property('padding-top', opts[:top]) if opts[:top]
         str << property('padding-bottom', opts[:bottom]) if opts[:bottom]
         str << property('padding-right', opts[:right]) if opts[:right]
         str
+      else
+        property('padding', opts)
       end
     end
     
@@ -275,9 +294,18 @@ CSS
       end
     end
     
+    def opacity(value)
+      value = value.to_f
+      str = ""
+      str << property( 'opacity', value )
+      str << property( 'filter', "alpha(opacity=#{(value*100).to_i})")
+      str 
+    end
+    
     [
-      'color', 'display', 'float', 'clear', 'visibility', 'cursor', 'opacity',
-      'height', 'width', 'max_height', 'max_width', 'min_height', 'min_width' 
+      'color', 'display', 'float', 'clear', 'visibility', 'cursor',
+      'height', 'width', 'max_height', 'max_width', 'min_height', 'min_width',
+      "overflow_x", 'overflow_y', 'z_index' 
     ].each do |meth|
       class_eval <<-RUBY
         def #{meth}(value)
@@ -402,7 +430,7 @@ CSS
     
     def export opts={}
       name = file_name(opts[:file_name]) 
-      str = render (opts[:render_method] || :content), opts
+      str = render(opts[:render_method] || :content), opts
       File.open("#{StyleTrain.dir}/#{file_name}.css", 'w'){ |f| f.write(str) }
     end
     

data/spec/sheet_spec.rb

@@ -217,8 +217,9 @@ CSS
         @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'
+      it 'will create a background property if it receives a single non options argument' do
+        @sheet.background(:blue).should include 'background: blue'
+      end 
     end
     
     describe 'border' do
@@ -227,7 +228,11 @@ CSS
       end
       
       it 'takes the width it is passed in' do
-        @sheet.border(:width => 3.px).should include 'border: 3px solid black;'
+        @sheet.border(:width => 3.px).should include 'border: 3px solid black'
+      end
+      
+      it 'takes in the width as size too' do
+        @sheet.border(:size => 5.px).should include 'border: 5px solid black'
       end
       
       it 'takes in the color when it is passed in' do
@@ -251,6 +256,21 @@ CSS
       it 'should do :none' do
         @sheet.border(:none).should include 'border: none'
       end
+    
+      it 'should work with :only and :none' do
+        @sheet.border(:none, :only => [:bottom, :left]).should include(
+          'border-bottom: none', 'border-left: none'
+        )
+      end
+    
+      describe 'specific borders' do
+        it 'has a method for each side' do
+          @sheet.border_left.should include 'border-left: 1px solid black'
+          @sheet.border_right.should include 'border-right: 1px solid black'
+          @sheet.border_top.should include 'border-top: 1px solid black'
+          @sheet.border_bottom.should include 'border-bottom: 1px solid black'
+        end
+      end
     end
     
     describe 'outline' do
@@ -286,7 +306,7 @@ CSS
         end
       end
       
-      describe '#height' do
+      describe '#width' do
         it 'makes a height declaration' do
           @sheet.width(320.px).should include 'width: 320px;'
         end
@@ -299,6 +319,13 @@ CSS
           @sheet.min_width(200.px).should include 'min-width: 200px'
         end
       end
+      
+      describe '#dimensions' do
+        it 'takes an array'
+        it 'takes two arguments'
+        it 'takes an array and options with min and max'
+        it 'takes two dimension arguments and options with min and max'
+      end
     end
     
     describe 'position' do
@@ -560,12 +587,24 @@ CSS
         @sheet.color(StyleTrain::Color.new('#456')).should include 'color: #456'
       end
       
-      it 'overflows' do
+      it 'overflow' do
         @sheet.overflow(:hidden).should include 'overflow: hidden'
         @sheet.overflow(:x => :scroll).should include 'overflow-x: scroll'
         @sheet.overflow(:y => :auto).should include 'overflow-y: auto'
       end
       
+      it 'overflow_x' do
+        @sheet.overflow_x(:auto).should include 'overflow-x: auto'
+      end
+      
+      it 'overflow_y' do
+        @sheet.overflow_y(:scroll).should include 'overflow-y: scroll'
+      end
+      
+      it 'z_index' do
+        @sheet.z_index(3).should include 'z-index: 3'
+      end
+      
       it 'display' do
         @sheet.display(:block).should include 'display: block'
       end
@@ -583,7 +622,9 @@ CSS
       end
       
       it 'opacity' do
-        @sheet.opacity(0.5).should include 'opacity: 0.5'
+        str = @sheet.opacity(0.5)
+        str.should include 'opacity: 0.5'
+        str.should include 'filter: alpha(opacity=50)'
       end
     end
   end

data/style_train.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{style_train}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
-  s.date = %q{2011-03-02}
+  s.date = %q{2011-03-03}
   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: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 -08:00
+date: 2011-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency