style_train 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/style_train/sheet.rb

@@ -15,15 +15,18 @@ module StyleTrain
       else
         send render_method
       end
+      
+      render_array(opts)
+    end
+    
+    def render_array opts={}
       if opts[:type] 
         render_type = opts[:type]
-        joiner = "\n"
       else
         render_type = :full
-        joiner = "\n\n"
       end
       
-      output.map{|s| s.is_a?(String) ? s : s.render( render_type ) }.join(joiner)
+      output.map{|s| s.is_a?(String) ? s : s.render( render_type ) }.join("\n")
     end
     
     def header
@@ -34,8 +37,40 @@ module StyleTrain
 CSS
    end
     
-    def style(*selectors)
-      s = Style.new(:selectors => selectors, :level => level, :context => context)
+    def style_options
+      {:level => level, :context => context}
+    end
+    
+    def style(*selectors, &block)
+      s = Style.new( style_options.merge(:selectors => selectors) )
+      add_style_to_queue(s, &block)
+    end
+    
+    alias :c :style
+    
+    def id(*selectors, &block)
+      selectors = selectors.map{|s| "##{s}"}
+      style(*selectors, &block)
+    end
+    
+    def concat(*selectors, &block)
+      s = Style.new( style_options.merge(:selectors => selectors, :concat => true ) )
+      add_style_to_queue(s, &block)
+    end
+    
+    alias :cat :concat
+    
+    def child(*selectors, &block)
+      s = Style.new( style_options.merge(:selectors => selectors, :child => true))
+      add_style_to_queue(s, &block)
+    end
+    
+    def attr(*selector, &block)
+      selector = selector.map{|s| "[#{s}]"}
+      concat(*selector, &block)
+    end
+    
+    def add_style_to_queue(s, &block)
       self.output << s
       self.contexts.unshift( s )
       if block_given?
@@ -50,15 +85,15 @@ CSS
       contexts.first
     end
     
-    alias :c :style
-    
     TAGS = StyleTrain::Style::TAGS
     
     TAGS.each do |tag|
       class_eval <<-RUBY
         def #{tag}(*selectors, &block)
           if selectors.size > 0
-            selectors = selectors.map{ |e| '#{tag}' + '.' + e.to_s }
+            selectors = selectors.map do |e|
+              '#{tag}' + StyleTrain::Style.selector(e, :exclude_tags => true) 
+            end  
             style( *selectors, &block )
           else
             style( '#{tag}', &block )

data/lib/style_train/style.rb

@@ -1,19 +1,24 @@
 module StyleTrain
   class Style
-    attr_accessor :selectors, :level, :properties
+    attr_accessor :selectors, :level, :properties, :opts
     
     def initialize(opts)
+      self.opts = opts
       self.level = opts[:level].to_i
       self.selectors = []
       self.properties = []
       set_selectors opts[:selectors], opts[:context] && opts[:context].selectors
     end
     
+    def spacing(value)
+      PSUEDOS.include?(value) || opts[:concat] ? '' : ' '
+    end
+    
     def set_selectors values, contexts
       if contexts
         contexts.each do |context|
           values.each do |value|
-            self.selectors << "#{context} #{make_selector(value)}"
+            self.selectors << "#{context}#{spacing(value)}#{make_selector(value)}"
           end
         end
       else
@@ -37,18 +42,44 @@ module StyleTrain
       :tr, :tt, :u, :ul, :var
     ]
     
+    PSUEDOS = [
+      :link, :visited, :hover, :active, :target, :before, :after, 
+      :enabled, :disabled, :checked, :focus
+    ]
+    
     def make_selector(value)
-      value.is_a?(String) || TAGS.include?(value) ? "#{value}" : ".#{value}"
+      self.class.selector(value, opts)
+    end
+    
+    def self.selector(value, opts={})
+      value = if value.is_a?(String) || (!opts[:exclude_tags] && TAGS.include?(value))
+        value.to_s 
+      elsif PSUEDOS.include?(value)
+        ":#{value}"
+      else
+        ".#{value}"
+      end
+      opts[:child] ? "> #{value}" : value
     end
     
     INDENT = '  '
     
     def render(type=:full)
-      type == :full ? render_full : render_linear
+      if properties.empty?
+        render_empty
+      elsif type == :full
+        render_full
+      else
+        render_linear
+      end
     end
     
     alias :to_s :render
     
+    def render_empty
+      "#{indent}/* #{selectors.join(', ')} {} */"
+    end
+    
     def render_full
       str = ""
       

data/spec/sheet_spec.rb

@@ -79,7 +79,7 @@ CSS
       @sheet.output = ["bar", "baz"]
       @sheet.stub(:output=)
       @sheet.stub(:content)
-      @sheet.render.should == "bar\n\nbaz"
+      @sheet.render.should == "bar\nbaz"
     end
     
     it 'joins with one line break when a render type is specified' do
@@ -135,9 +135,19 @@ CSS
       
       it "should add a style for '#{tag}'" do
         @sheet.send(tag)
-        @sheet.output.first.render.should include "#{tag} {\n}"
+        @sheet.output.first.render.should include "#{tag} {}"
       end
     end
+    
+    it 'should correctly concatenate the selector' do
+      @sheet.div(:hover)
+      @sheet.div(:foo)
+      @sheet.div(:p)
+      str = @sheet.render_array
+      str.should match /div:hover/
+      str.should match /div.foo/
+      str.should match /div.p/
+    end
   end
   
   describe 'properties' do
@@ -762,12 +772,10 @@ CSS
   background-color: #666;
   font-family: verdana;
 }
-
 #wrapper {
   background-color: white;
   margin: 1em auto;
 }
-
 .foo {
   color: red;
 }"
@@ -816,6 +824,10 @@ CSS
         div( :next, :again ){
           color :red
         }
+        
+        id(:wrapper) {
+          margin 1.em, :auto
+        }
       end
     end
     
@@ -824,7 +836,7 @@ CSS
     end
     
     it 'aliases #style to #s' do
-      @sheet.render.should match /^\.abridged_syntax/
+      @sheet.render.should match /.abridged_syntax \{/
     end
     
     it 'assigns multiple arguments to comma separated' do
@@ -845,6 +857,10 @@ div.again {
 }"
     end
     
+    it 'makes id selectors' do
+      @sheet.render.should include '#wrapper {'
+    end
+    
     describe 'nesting' do
       class Nested < Sheet
         def content
@@ -887,8 +903,8 @@ div.again {
       end
       
       it 'should indent the nested style to the right level' do
-        @output.should match /^\W{2}*form label \{$/
-        @output.should match /^\W{4}*form label \{$/
+        @output.should match /^\W{2}form label \{$/
+        @output.should match /^\W{4}form label input \{$/
       end
       
       it 'puts property declarations after a nested style in the right place' do
@@ -907,10 +923,93 @@ form {
       end
     end
     
-    # input[:readonly]{ ... }
-    # input['type=text']{ ... }
-    # how to handle :hover and other psuedo selectors
-    # p.classy < a 
+    describe 'joining/concatenating' do
+      class Joiner < Sheet
+        def content
+          c(:foo) {
+            background :color => :blue
+            concat(:bar){
+              color :white
+            }
+            concat(:hover){
+              background :color => :lightyellow
+            }
+            c(:focus){
+              background :color => :gold
+            }
+          }
+        end
+      end
+      
+      it 'should make a style for the concatenated selectors' do
+        Joiner.render.should include ".foo.bar {"
+      end
+      
+      it 'should make a concatenated selector for psuedo selectors with concat' do
+        Joiner.render.should include '.foo:hover {'
+      end
+      
+      it 'should make a concatenated selector for psuedo selectors regardless' do
+        Joiner.render.should include '.foo:focus {'
+      end
+    end
+    
+    describe 'child direct descendant' do
+      class Childish < Sheet
+        def content
+          c(:foo) {
+            background :color => :blue
+            child(:bar, :p) {
+              background :color => :red
+            }
+          }
+        end
+      end
+      
+      before :all do
+        @str = Childish.render
+      end
+      
+      it 'correctly builds selectors for classes' do
+        @str.should include '.foo > .bar'
+      end
+      
+      it 'correctly builds selectors for tags' do
+        @str.should include '.foo > p'
+      end
+      
+      it 'should render embedded properties' do
+        @str.should include "background-color: red"
+      end
+    end
+    
+    describe 'attribute' do
+      class Attr < Sheet
+        def content
+          c(:input) {
+            background :color => :blue
+            attr(:disabled) {
+              color :grey
+            }
+          }
+        end
+      end
+      
+      before :all do
+        @str = Attr.render
+      end
+      
+      
+      it 'should concatenate the selector' do
+        @str.should include "input[disabled]"
+      end
+      
+      it 'should render embedded properties' do
+        @str.should include "color: grey"
+      end
+    end
+    
+    
     # #css method on objects that allows instance eval of blocks globally
   end
 end

data/spec/style_spec.rb

@@ -26,6 +26,28 @@ describe Style do
     it 'takes into account the context' do
       Style.new(:selectors => @selectors, :context => @context).selectors.should == ['a.special p', 'a.special .classy']
     end
+    
+    it 'makes the correct selectors with the :concat option' do
+      Style.new(:selectors => [:hover, :classy], :context => @context, :concat => :true).selectors.should == [
+        'a.special:hover', 'a.special.classy'
+      ]
+    end
+    
+    it 'makes the correct selectors with the :child option' do
+      Style.new(:selectors => [:bar, :p], :context => @context, :child => :true).selectors.should == [
+        'a.special > .bar', 'a.special > p'
+      ]
+    end
+    
+    it 'concatenates psuedo selectors automatically' do
+      Style.new(:selectors => [:hover, :classy], :context => @context).selectors.should == [
+        'a.special:hover', 'a.special .classy'
+      ]
+    end
+    
+    it 'excludes tags when requested' do
+      Style.selector(:p, :exclude_tags => :true)
+    end
   end
   
   describe 'properties' do
@@ -43,19 +65,25 @@ describe Style do
   
   describe 'rendering' do
     describe 'types' do
-      before :all do
-        @style = Style.new(:selectors => @selectors)
+      before do
+        @style = Style.new(:selectors => @selectors, :level => 2)
       end
       
       it 'renders full by default' do
+        @style.properties << "foo:bar"
         @style.should_receive(:render_full)
         @style.render
       end
     
       it 'renders minimized if an argument is passed in' do
+        @style.properties << "foo:bar"
         @style.should_receive(:render_linear)
         @style.render(:something_else)
       end
+      
+      it 'renders a commented line if the declaration is empty' do
+        @style.render.should == "    /* p, .classy {} */"
+      end
     end
     
     describe 'full' do

data/style_train.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{style_train}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kane Baccigalupi"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2011-03-02}
   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 = [
@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
     "spec/color/keyword_color_spec.rb",
     "spec/color/rgb_color_spec.rb",
     "spec/generated_files/.gitkeep",
-    "spec/integration.css",
     "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: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Kane Baccigalupi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,6 @@ files:
 - spec/color/keyword_color_spec.rb
 - spec/color/rgb_color_spec.rb
 - spec/generated_files/.gitkeep
-- spec/integration.css
 - spec/integration_spec.rb
 - spec/numbers_spec.rb
 - spec/sheet_spec.rb

data/spec/integration.css

@@ -1,89 +0,0 @@
-/*
-  Generated by StlyeTrain CSS generator via the class Cohuman
-*/
-body {
-  font-family: Verdana Sans;
-  font-size: 13px;
-  line-height: 1.5;
-}
-
-h1 {
-  font-size: 25px;
-}
-
-h2 {
-  font-size: 23px;
-}
-
-h3 {
-  font-size: 18px;
-}
-
-h3 {
-  margin-left: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-right: 0;
-}
-
-h4 {
-  font-size: 16px;
-}
-
-h5 {
-  font-size: 11px;
-}
-
-h6 {
-  font-size: 10px;
-}
-
-hr {
-  border: none;
-  height: 1px;
-  color: gray;
-  background-color: gray;
-}
-
-.create_button {
-  font-weight: bold;
-  font-size: 8em;
-  border: 1px solid black;
-  color: gray;
-  cursor: pointer;
-  padding: 0 0.5em;
-}
-
-.activity_button {
-  display: inline-block;
-  position: relative;
-  overflow: visible;
-  padding-left: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  padding-right: 0;
-  font-weight: bold;
-  font-size: 0.8em;
-  cursor: pointer;
-  color: gray;
-  border: 1px solid black;
-}
-
-.user_info {
-  padding: 10px 10px 0px 10px;
-  width: 500px;
-  overflow-x: hidden;
-}
-
-  .user_info h1 {
-    margin: -4px 0 -2px 0;
-    font-size: 1.5em;
-  }
-
-  .user_info .my_class {
-    padding: 2em;
-  }
-
-  .user_info < p {
-    padding: 1em;
-  }