hum 0.0.5 → 0.0.6

data/CHANGELOG.md

@@ -16,4 +16,8 @@
 
 ## 0.0.5
 
-* Added better support for pseudo elements, fixed some bugs
+* Added better support for pseudo elements, fixed some bugs
+
+## 0.0.6
+
+* Added basic support for attribute selectors

data/README.md

@@ -1,9 +1,13 @@
 # Hum
 
-Hum generates HTML from your SASS, SCSS or CSS.
+Hum generates HTML from your SASS, SCSS or CSS. **For now you need Ruby 1.9 and above.** 
 
 `gem install hum`
 
+If you're using Windows also install this gem.
+
+`gem install win32console`
+
 ## SASS to HTML
 
 `hum [stylesheet].sass`

data/lib/hum/engine.rb

@@ -286,7 +286,7 @@ module Hum
               hash[:exclude] = true
               
             #if this is a named mixin
-            elsif code.match(/\=/)
+            elsif code.match(/^\=/)
               
               #ignore the hash on output
               hash[:exclude] = true
@@ -380,35 +380,62 @@ module Hum
           tag = tag.gsub("%#", "%div#")
         end
         
-        #give all links an href
-        if tag.match("%a")
+        #if anchor with class
+        if tag.match(/%a\./) 
+          
+          #get the data
+          data = /%a\.(?<tag_class>.*)/.match(tag)
+          
+          #make the tag
+          tag = "%a{:href=>'#',:class=>'#{data[:tag_class]}'}"
+        
+        #if anchor with ID  
+        elsif tag.match(/%a\#/)
+      
+          #get the data
+          data = /%a\#(?<tag_id>.*)/.match(tag)
+          
+          #make the tag
+          tag = "%a{:href=>'#',:id=>'#{data[:tag_id]}'}"
+          
+        #else just give it an link
+        elsif tag.match("%a")
           tag = tag.gsub("%a", "%a{:href=>'#'}")
         end
         
+        #if the tag has an attribute selector
+        if tag.match(/%.*\[.*\=.*\]/)
+          
+          #get the data
+          data = /(?<tag_element>%.*)\[(?<tag_attribute>.*)\=(?<tag_value>.*)\]/.match(tag)
+          
+          tag = data[:tag_element] + "{:#{data[:tag_attribute]}=>'#{data[:tag_value]}'}"
+          #make the tag
+        end
+        
         tag
       end
       
       #Output the HAML
       def _output_haml
-        
         #convert to HAML
         @haml = "%html\n"
         @haml += "\t%head\n"
         @haml += "\t\t%link{:type => 'text/css', :rel => 'stylesheet', :href => '#{@input_name.gsub(/\..*/, ".css")}'}\n"
         @haml += "\t%body\n"
-
+        
         #time to build the HAML
         @tree.each do |hash|
           
           if hash[:exclude] != true
             
             extra = []
-          
+            
             #if there's a parent, find the extra kids
             if !hash[:parent].nil?
               extra = @tree.find_extra_kids(hash)
             end
-          
+            
             #for each generate the HAML line
             hash[:haml].each { |haml_tag| 
             

data/lib/hum/version.rb

@@ -1,3 +1,3 @@
 module Hum
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/engine_tests.rb

@@ -87,6 +87,11 @@ class HumText < Test::Unit::TestCase
     quick_test
   end
 
+  def test_input_elements
+    @file = "input_elements"
+    quick_test
+  end
+  
   private
 
   def quick_test

data/test/haml/anchor_links.haml

@@ -3,3 +3,5 @@
 		%link{:type => 'text/css', :rel => 'stylesheet', :href => 'anchor_links.css'}
 	%body
 		%a{:href=>'#'} Inner content
+		%a{:href=>'#',:id=>'foo'} Inner content
+		%a{:href=>'#',:class=>'bar'} Inner content

data/test/haml/input_elements.haml

@@ -0,0 +1,8 @@
+%html
+	%head
+		%link{:type => 'text/css', :rel => 'stylesheet', :href => 'input_elements.css'}
+	%body
+		%div.foo
+			%input Inner content
+			%input.bar Inner content
+			%input{:type=>'text'} Inner content

data/test/sass/anchor_links.sass

@@ -5,4 +5,8 @@ a
 	&:active
 		color: red
 	&:hover
-		color: purple
+		color: purple
+a#foo
+	color: black
+a.bar
+	color: black

data/test/sass/input_elements.sass

@@ -0,0 +1,8 @@
+.foo
+	color: black
+	input
+		font-size: 10px
+	input.bar
+		font-size: 11px
+	input[type=text]
+		font-size: 12px

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hum
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2153477380 !ruby/object:Gem::Requirement
+  requirement: &2156393620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.12
   type: :runtime
   prerelease: false
-  version_requirements: *2153477380
+  version_requirements: *2156393620
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153476740 !ruby/object:Gem::Requirement
+  requirement: &2156392960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153476740
+  version_requirements: *2156392960
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &2153476140 !ruby/object:Gem::Requirement
+  requirement: &2156392320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *2153476140
+  version_requirements: *2156392320
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &2153475500 !ruby/object:Gem::Requirement
+  requirement: &2156391780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153475500
+  version_requirements: *2156391780
 description: Hum creates HTML from your sass, scss and css documents. View more info
   at github.com/jefweg/hum
 email:
@@ -85,6 +85,7 @@ files:
 - test/haml/direct_child.haml
 - test/haml/exclude_mixins.haml
 - test/haml/imports.haml
+- test/haml/input_elements.haml
 - test/haml/insert_extra_child.haml
 - test/haml/nested_direct_child.haml
 - test/haml/nests.haml
@@ -102,6 +103,7 @@ files:
 - test/sass/direct_child.sass
 - test/sass/exclude_mixins.sass
 - test/sass/imports.sass
+- test/sass/input_elements.sass
 - test/sass/insert_extra_child.sass
 - test/sass/nested_direct_child.sass
 - test/sass/nests.sass
@@ -145,6 +147,7 @@ test_files:
 - test/haml/direct_child.haml
 - test/haml/exclude_mixins.haml
 - test/haml/imports.haml
+- test/haml/input_elements.haml
 - test/haml/insert_extra_child.haml
 - test/haml/nested_direct_child.haml
 - test/haml/nests.haml
@@ -162,6 +165,7 @@ test_files:
 - test/sass/direct_child.sass
 - test/sass/exclude_mixins.sass
 - test/sass/imports.sass
+- test/sass/input_elements.sass
 - test/sass/insert_extra_child.sass
 - test/sass/nested_direct_child.sass
 - test/sass/nests.sass