hum 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -4,4 +4,8 @@
 
 ## 0.0.2
 
-* Added support for .sass and .scss files, added more tests
+* Added support for .sass and .scss files, added more tests
+
+## 0.0.3
+
+* Added support for other bits of .sass, better processing

data/README.md

@@ -16,10 +16,10 @@ Hum generates HTML from your SASS, SCSS or CSS.
 				.baz
 					color: red
 
-    #And crap out this HTML
+		#And crap out this HTML
 		<div class="foo">
 			<div class="bar">
-				<div class="baz"></div>
+				<div class="baz">Inner content</div>
 			</div>
 		</div>
 
@@ -41,7 +41,7 @@ Hum generates HTML from your SASS, SCSS or CSS.
 		#And crap out this HTML
 		<div class="foo">
 			<div class="bar">
-				<div class="baz"></div>
+				<div class="baz">Inner content</div>
 			</div>
 		</div>
 
@@ -56,14 +56,14 @@ Hum generates HTML from your SASS, SCSS or CSS.
 		.foo .bar{
 			font-size: 12px;
 		}
-		.foo .bar p{
+		.foo .bar .baz{
 			color: black;
 		}
 
 		#And crap out this HTML
 		<div class="foo">
 			<div class="bar">
-				<div class="baz"></div>
+				<div class="baz">Inner content</div>
 			</div>
 		</div>
 
@@ -73,4 +73,4 @@ You can also watch a directory for changes to your SASS and SCSS files by using
 
 ## Notes
 
-Just so you know, hum doesn't work well with mixins that include selectors yet.
+Hum doesn't work well with mixins that include selectors yet. Hum doesn't let you specify unique content for each HTML tag. Hum is pretty basic at the moment, so don't be too rough!  

data/lib/hum/array.rb

@@ -40,10 +40,12 @@ class Array
     #find the next one
     found = self.find_line(next_line)
     
-    until found.nil? or hash[:tab] == found[:tab]
+    until found.nil? or hash[:tab] >= found[:tab]
       
-      #collect it
-      kids << found[:line]
+      #collect it if not a mixin
+      if !found[:exclude]
+        kids << found[:line]
+      end
       
       #increment
       next_line += 1
@@ -69,9 +71,11 @@ class Array
     
     until found.nil? or next_line == hash[:line] or parent[:tab] == found[:tab]
       
-      #collect it
-      kids << found[:line]
-      
+      #collect it if not a mixin
+      if !found[:exclude]
+        kids << found[:line]
+      end
+    
       #increment
       next_line += 1
       

data/lib/hum/engine.rb

@@ -53,7 +53,7 @@ module Hum
         #close the output file
         @output_file.close()
         
-        puts "updated #{@output_name}!".green
+        puts "updated #{@output_name}".green
       end
       
       def run_haml
@@ -101,10 +101,19 @@ module Hum
       
       def clean_sass
         #remove all property: value; pairs
-        @sass.gsub!((/.*: .*/), "")
+        @sass.gsub!(/.*: .*/, "")
+        
+        #make sure tabs are two spaces
+        @sass.gsub!(/\t/, "  ")
+        
+        #make sure nested direct descendant is normal
+        @sass.gsub!(/\& > /, "")
+        
+        #make sure direct descendant is normal
+        @sass.gsub!(/ > /, " ")
         
         #remove duplicate new lines
-        @sass.gsub!((/\n+/), "\n")
+        @sass.gsub!(/\n+/, "\n")
       end
       
       def build_hashes
@@ -136,6 +145,12 @@ module Hum
         #process all tabs
         _process_tabs
         
+        #process all mixins by fixing the tabs and removing the mixin
+        _process_mixins
+
+        #process all special selectors, like pseudo elements
+        _process_special
+        
         @tree
       end
       
@@ -249,6 +264,58 @@ module Hum
         }
       end
       
+      def _process_mixins
+        #in each line
+        @tree.each { |hash|
+          
+          #for each select
+          hash[:select].each do |code|
+            
+            #if this is a mixin
+            if code.match(/\+/)
+              hash[:exclude] = true
+              
+            #if this is a named mixin
+            elsif code.match(/\=/)
+              
+              #ignore the hash on output
+              hash[:exclude] = true
+              
+              #find kids
+              kids = @tree.find_kids(hash)
+
+              #for each kid
+              kids.each { |kid|
+                
+                #find it
+                child = @tree.find_line(kid)
+                
+                #and reduce it by one
+                child[:tab] -= 1
+              }
+            end
+          end
+        }
+      end
+      
+      def _process_special
+        #in each line
+        @tree.each { |hash|
+          
+          #for each select
+          hash[:select].each do |code|
+            
+            #if this has a pseudo element
+            if code.match(/:/)
+              
+              #remove it
+              code.gsub!(/:.*/, "")
+            end
+            
+          end
+        }
+      end
+      
       def _grab_select(code)
         result = []
         temp = code.gsub(/\n/, "").gsub(/  /, "")
@@ -289,6 +356,11 @@ module Hum
           tag = tag.gsub("%#", "%div#")
         end
         
+        #give all links an href
+        if tag.match("%a")
+          tag = tag.gsub("%a", "%a{:href=>'#'}")
+        end
+        
         tag
       end
       
@@ -302,45 +374,50 @@ module Hum
         @haml += "\t%body\n"
         
         #time to build the HAML
-        @tree.each do |hash| 
-          extra = []
+        @tree.each do |hash|
           
-          #if there's a parent, find the extra kids
-          if !hash[:parent].nil?
-            extra = @tree.find_extra_kids(hash)
-          end
+          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| 
+            #for each generate the HAML line
+            hash[:haml].each { |haml_tag| 
             
-            #if no extra, just normal
-            if extra.empty?  
-              @haml += _generate_haml_line(haml_tag, hash)
+              #if no extra, just normal
+              if extra.empty?  
+                @haml += _generate_haml_line(haml_tag, hash)
             
-            #else extra
-            else  
+              #else extra
+              else  
               
-              #this hash has extra kids
-              hash[:extra] = true
+                #this hash has extra kids
+                hash[:extra] = true
               
-              @haml += _generate_haml_line(haml_tag, hash)
+                @haml += _generate_haml_line(haml_tag, hash)
               
-              #for each kid
-              extra.each { |line|
+                #for each kid
+                extra.each { |line|
                 
-                #get the hash
-                extra_hash = @tree.find_line(line)
+                  #get the hash
+                  extra_hash = @tree.find_line(line)
                 
-                #for each generate the HAML line
-                extra_hash[:haml].each do |haml_tag|
+                  #for each generate the HAML line
+                  extra_hash[:haml].each do |haml_tag|
                   
-                  #do it
-                  @haml += _generate_haml_line(haml_tag, extra_hash)
-                end
-              }
-            end
+                    #do it
+                    @haml += _generate_haml_line(haml_tag, extra_hash)
+                  end
+                }
+              end
 
-          }
+            }
+        
+          end
         end
         @haml
       end

data/lib/hum/version.rb

@@ -1,3 +1,3 @@
 module Hum
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/engine_tests.rb

@@ -46,7 +46,32 @@ class HumText < Test::Unit::TestCase
     @file = "parent_siblings"
     quick_test
   end
-  
+
+  def test_exclude_mixins
+    @file = "exclude_mixins"
+    quick_test
+  end
+
+  def test_direct_child
+    @file = "direct_child"
+    quick_test
+  end
+
+  def test_nested_direct_child
+    @file = "nested_direct_child"
+    quick_test
+  end
+
+  def test_anchor_links
+    @file = "anchor_links"
+    quick_test
+  end
+
+  def test_pseudo_elements
+    @file = "pseudo_elements"
+    quick_test
+  end
+
   private
 
   def quick_test

data/test/haml/anchor_links.haml

@@ -0,0 +1,5 @@
+%html
+	%head
+		%link{:type => 'text/css', :rel => 'stylesheet', :href => 'anchor_links.css'}
+	%body
+		%a{:href=>'#'} Inner content

data/test/haml/direct_child.haml

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

data/test/haml/exclude_mixins.haml

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

data/test/haml/nested_direct_child.haml

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

data/test/haml/pseudo_elements.haml

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

data/test/sass/anchor_links.sass

@@ -0,0 +1,2 @@
+a
+	color: blue

data/test/sass/direct_child.sass

@@ -0,0 +1,2 @@
+.foo > .bar
+	color: red

data/test/sass/exclude_mixins.sass

@@ -0,0 +1,6 @@
+=foo
+	.bar
+		+border-radius(10px)
+		color: black
+		.baz
+			color: white

data/test/sass/nested_direct_child.sass

@@ -0,0 +1,4 @@
+.foo
+	color: black
+	& > p
+		color: white

data/test/sass/pseudo_elements.sass

@@ -0,0 +1,3 @@
+.foo
+	.bar:last-of-type
+		color: white

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hum
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-15 00:00:00.000000000Z
+date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2156281120 !ruby/object:Gem::Requirement
+  requirement: &2153483860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.12
   type: :runtime
   prerelease: false
-  version_requirements: *2156281120
+  version_requirements: *2153483860
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2156280380 !ruby/object:Gem::Requirement
+  requirement: &2153483160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156280380
+  version_requirements: *2153483160
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &2156279760 !ruby/object:Gem::Requirement
+  requirement: &2153482500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156279760
+  version_requirements: *2153482500
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &2156279140 !ruby/object:Gem::Requirement
+  requirement: &2153481820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2156279140
+  version_requirements: *2153481820
 description: Hum generates HTML from your SASS or CSS. View more info at github.com/jefweg/hum
 email:
 - jeff@jwegesin.com
@@ -79,20 +79,30 @@ files:
 - lib/hum/version.rb
 - test/bad_file_test.rb
 - test/engine_tests.rb
+- test/haml/anchor_links.haml
+- test/haml/direct_child.haml
+- test/haml/exclude_mixins.haml
 - test/haml/insert_extra_child.haml
+- test/haml/nested_direct_child.haml
 - test/haml/nests.haml
 - test/haml/parent_selector.haml
 - test/haml/parent_siblings.haml
 - test/haml/property_value.haml
+- test/haml/pseudo_elements.haml
 - test/haml/siblings.haml
 - test/haml/single_line_nest.haml
 - test/other/bad.file
 - test/other/example.scss
+- test/sass/anchor_links.sass
+- test/sass/direct_child.sass
+- test/sass/exclude_mixins.sass
 - test/sass/insert_extra_child.sass
+- test/sass/nested_direct_child.sass
 - test/sass/nests.sass
 - test/sass/parent_selector.sass
 - test/sass/parent_siblings.sass
 - test/sass/property_value.sass
+- test/sass/pseudo_elements.sass
 - test/sass/siblings.sass
 - test/sass/single_line_nest.sass
 - test/sass_convert_test.rb
@@ -123,20 +133,30 @@ summary: Generate HTML from your SASS or CSS
 test_files:
 - test/bad_file_test.rb
 - test/engine_tests.rb
+- test/haml/anchor_links.haml
+- test/haml/direct_child.haml
+- test/haml/exclude_mixins.haml
 - test/haml/insert_extra_child.haml
+- test/haml/nested_direct_child.haml
 - test/haml/nests.haml
 - test/haml/parent_selector.haml
 - test/haml/parent_siblings.haml
 - test/haml/property_value.haml
+- test/haml/pseudo_elements.haml
 - test/haml/siblings.haml
 - test/haml/single_line_nest.haml
 - test/other/bad.file
 - test/other/example.scss
+- test/sass/anchor_links.sass
+- test/sass/direct_child.sass
+- test/sass/exclude_mixins.sass
 - test/sass/insert_extra_child.sass
+- test/sass/nested_direct_child.sass
 - test/sass/nests.sass
 - test/sass/parent_selector.sass
 - test/sass/parent_siblings.sass
 - test/sass/property_value.sass
+- test/sass/pseudo_elements.sass
 - test/sass/siblings.sass
 - test/sass/single_line_nest.sass
 - test/sass_convert_test.rb