hum 0.0.1 → 0.0.2

data/lib/hum/exec.rb

@@ -76,7 +76,7 @@ module Hum
           #open css
           input = @files[:input]
           @machine = Engine.new
-          @machine.load(input)
+          @machine.load(input)          
           @machine.run
         rescue Exception => e
           puts e
@@ -88,9 +88,10 @@ module Hum
       def watch
         puts ">>> Hum is watching for changes. Press Ctrl-C to stop."
         begin
+          target = ""
           current_path = Dir.pwd 
           monitor = FSSM::Monitor.new
-          monitor.path current_path, "**/*.css" do
+          monitor.path current_path, ["**/*.scss", "**/*.sass"] do
             update do |b, input|
               puts ">>> Change found - #{input}..."
               @machine = Engine.new

data/lib/hum/version.rb

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

data/test/bad_file_test.rb

@@ -0,0 +1,28 @@
+dir_lib = File.dirname(__FILE__) + '/../lib'
+$:.unshift dir_lib unless $:.include?(dir_lib)
+
+require 'test/unit'
+require 'fileutils'
+require 'hum/engine'
+
+class HumText < Test::Unit::TestCase
+  
+  def setup
+    @machine = Hum::Engine.new
+  end
+
+  #testing invalid files
+  def test_invalid_file
+    #get a bad file
+    file = File.open("#{File.expand_path('../', __FILE__)}/other/bad.file", "r")
+    
+    #load it
+    @machine.load(file)
+    
+    #close it
+    file.close()
+    
+    #should fail
+    assert_equal(@machine.run_haml, "")
+  end
+end

data/test/engine_tests.rb

@@ -0,0 +1,132 @@
+dir_lib = File.dirname(__FILE__) + '/../lib'
+$:.unshift dir_lib unless $:.include?(dir_lib)
+
+require 'test/unit'
+require 'fileutils'
+require 'hum/engine'
+
+class HumText < Test::Unit::TestCase
+  
+  def setup
+    @machine = Hum::Engine.new
+  end
+
+  #test SASS files
+  def test_property_value
+    @file = "property_value"
+    quick_test
+  end
+
+  def test_nests
+    @file = "nests"
+    quick_test
+  end
+  
+  def test_single_line_nest
+    @file = "single_line_nest"
+    quick_test
+  end
+  
+  def test_parent_selector
+    @file = "parent_selector"
+    quick_test
+  end
+  
+  def test_siblings
+    @file = "siblings"
+    quick_test
+  end
+  
+  def test_insert_extra_child
+    @file = "insert_extra_child"
+    quick_test
+  end
+  
+  def test_parent_siblings
+    @file = "parent_siblings"
+    quick_test
+  end
+  
+  private
+
+  def quick_test
+    #start
+    start_engine
+    
+    #load sass
+    load_file
+    
+    #compare files
+    compare_files
+  end
+  
+  def long_test
+    #start
+    start_engine
+    
+    #load sass
+    load_file
+
+    #runs comparison on the SASS
+    compare_sass
+
+    #runs clean sass
+    compare_clean_sass
+
+    #parse clean CSS into hashes of data
+    compare_hashes
+
+    #compare HAML tags
+    compare_haml_tags
+
+    #compare HAML tags
+    compare_haml
+
+    #compare HTML
+    compare_html
+  end
+  
+  def start_engine
+    #path to folders
+    @path = File.expand_path('../', __FILE__)
+    
+    #the starting test
+    @sass = File.open("#{@path}/sass/#{@file}.sass", "r")
+    
+    #the matched result
+    @result = File.open("#{@path}/haml/#{@file}.haml", "r")
+  end
+
+  def load_file
+    @machine.load(@sass)
+    @sass.close()
+  end
+  
+  def compare_files
+    assert_equal(@machine.run_haml, @result.read)
+  end
+
+  def compare_sass
+    assert_equal(@machine.render_sass, File.open("#{@path}/long_test/#{@file}.sass", 'r').read)
+  end
+
+  def compare_clean_sass
+    assert_equal(@machine.clean_sass, File.open("#{@path}/long_test/#{@file}_clean.sass", 'r').read)
+  end
+
+  def compare_hashes
+    assert_equal(@machine.build_hashes.inspect.to_s, File.open("#{@path}/long_test/#{@file}.array", 'r').read)
+  end
+
+  def compare_haml_tags
+    assert_equal(@machine.render_haml_tags.inspect.to_s, File.open("#{@path}/long_test/#{@file}.haml_tags", 'r').read)
+  end
+
+  def compare_haml
+    assert_equal(@machine.output_haml, File.open("#{@path}/long_test/#{@file}.haml", 'r').read)
+  end
+
+  def compare_html
+    assert_equal(@machine.output_html, File.open("#{@path}/long_test/#{@file}_end.html", 'r').read)
+  end
+end

data/test/haml/insert_extra_child.haml

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

data/test/{hum/templates/nest/nest.haml → haml/nests.haml}

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

data/test/haml/parent_selector.haml

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

data/test/haml/parent_siblings.haml

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

data/test/{hum/templates/simple/simple.haml → haml/property_value.haml}

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

data/test/haml/siblings.haml

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

data/test/{hum/templates/single/single.haml → haml/single_line_nest.haml}

@@ -1,5 +1,7 @@
 %html
 	%head
-		%link{:type => 'text/css', :rel => 'stylesheet', :href => 'single.css'}
+		%link{:type => 'text/css', :rel => 'stylesheet', :href => 'single_line_nest.css'}
 	%body
-		%p Inner content
+		%div.foo
+			%div.bar
+				%p Inner content

data/test/other/example.scss

@@ -0,0 +1,6 @@
+.foo{
+	color: white;
+	.bar{
+		color: black;
+	}
+}

data/test/sass/insert_extra_child.sass

@@ -0,0 +1,8 @@
+.foo
+  color: white
+  .bar
+    color: black
+  &.baz
+    color: orange
+    p
+      color: red

data/test/sass/parent_selector.sass

@@ -0,0 +1,6 @@
+.foo
+	color: white
+  &.bar
+ 		color: black
+    .baz
+			color: red

data/test/sass/parent_siblings.sass

@@ -0,0 +1,6 @@
+.foo
+	color: white
+  .bar
+    color: black
+  &.baz, &.buz
+    color: red

data/test/sass/siblings.sass

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

data/test/{hum/templates/single/single.sass → sass/single_line_nest.sass}

@@ -1,2 +1,2 @@
-p
+.foo .bar p
   font-size: 12px

data/test/sass_convert_test.rb

@@ -0,0 +1,28 @@
+dir_lib = File.dirname(__FILE__) + '/../lib'
+$:.unshift dir_lib unless $:.include?(dir_lib)
+
+require 'test/unit'
+require 'fileutils'
+require 'hum/engine'
+
+class HumText < Test::Unit::TestCase
+  
+  def setup
+    @machine = Hum::Engine.new
+  end
+
+  #testing sass-convert
+  def test_sass_convert
+    #get a bad file
+    file = File.open("#{File.expand_path('../', __FILE__)}/other/example.scss", "r")
+    
+    #load it
+    @machine.load(file)
+    
+    #close it
+    file.close()
+    
+    #should fail
+    assert_not_nil(@machine.run_haml)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hum
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,41 +9,52 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-01-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2156577620 !ruby/object:Gem::Requirement
+  requirement: &2156281120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.12
   type: :runtime
   prerelease: false
-  version_requirements: *2156577620
+  version_requirements: *2156281120
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2156577180 !ruby/object:Gem::Requirement
+  requirement: &2156280380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156577180
+  version_requirements: *2156280380
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &2156576740 !ruby/object:Gem::Requirement
+  requirement: &2156279760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156576740
+  version_requirements: *2156279760
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: &2156279140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156279140
 description: Hum generates HTML from your SASS or CSS. View more info at github.com/jefweg/hum
 email:
 - jeff@jwegesin.com
@@ -66,80 +77,25 @@ files:
 - lib/hum/exec.rb
 - lib/hum/string.rb
 - lib/hum/version.rb
-- test/hum/templates/comma/comma.array
-- test/hum/templates/comma/comma.css
-- test/hum/templates/comma/comma.haml
-- test/hum/templates/comma/comma.haml_tags
-- test/hum/templates/comma/comma.html
-- test/hum/templates/comma/comma.sass
-- test/hum/templates/comma/comma_clean.sass
-- test/hum/templates/comma/comma_end.html
-- test/hum/templates/complex_parent/complex_parent.array
-- test/hum/templates/complex_parent/complex_parent.css
-- test/hum/templates/complex_parent/complex_parent.haml
-- test/hum/templates/complex_parent/complex_parent.haml_tags
-- test/hum/templates/complex_parent/complex_parent.html
-- test/hum/templates/complex_parent/complex_parent.sass
-- test/hum/templates/complex_parent/complex_parent_clean.sass
-- test/hum/templates/complex_parent/complex_parent_end.html
-- test/hum/templates/deep_nest/deep_nest.array
-- test/hum/templates/deep_nest/deep_nest.css
-- test/hum/templates/deep_nest/deep_nest.haml
-- test/hum/templates/deep_nest/deep_nest.haml_tags
-- test/hum/templates/deep_nest/deep_nest.html
-- test/hum/templates/deep_nest/deep_nest.sass
-- test/hum/templates/deep_nest/deep_nest_clean.sass
-- test/hum/templates/deep_nest/deep_nest_end.html
-- test/hum/templates/deep_nest/deep_nest_start.scss
-- test/hum/templates/line_nest/line_nest.array
-- test/hum/templates/line_nest/line_nest.css
-- test/hum/templates/line_nest/line_nest.haml
-- test/hum/templates/line_nest/line_nest.haml_tags
-- test/hum/templates/line_nest/line_nest.html
-- test/hum/templates/line_nest/line_nest.sass
-- test/hum/templates/line_nest/line_nest_clean.sass
-- test/hum/templates/line_nest/line_nest_end.html
-- test/hum/templates/nest/nest.array
-- test/hum/templates/nest/nest.css
-- test/hum/templates/nest/nest.haml
-- test/hum/templates/nest/nest.haml_tags
-- test/hum/templates/nest/nest.html
-- test/hum/templates/nest/nest.sass
-- test/hum/templates/nest/nest_clean.sass
-- test/hum/templates/nest/nest_end.html
-- test/hum/templates/parent_nest/parent_nest.array
-- test/hum/templates/parent_nest/parent_nest.css
-- test/hum/templates/parent_nest/parent_nest.haml
-- test/hum/templates/parent_nest/parent_nest.haml_tags
-- test/hum/templates/parent_nest/parent_nest.html
-- test/hum/templates/parent_nest/parent_nest.sass
-- test/hum/templates/parent_nest/parent_nest_clean.sass
-- test/hum/templates/parent_nest/parent_nest_end.html
-- test/hum/templates/parent_select/parent_select.array
-- test/hum/templates/parent_select/parent_select.css
-- test/hum/templates/parent_select/parent_select.haml
-- test/hum/templates/parent_select/parent_select.haml_tags
-- test/hum/templates/parent_select/parent_select.html
-- test/hum/templates/parent_select/parent_select.sass
-- test/hum/templates/parent_select/parent_select_clean.sass
-- test/hum/templates/parent_select/parent_select_end.html
-- test/hum/templates/simple/simple.array
-- test/hum/templates/simple/simple.css
-- test/hum/templates/simple/simple.haml
-- test/hum/templates/simple/simple.haml_tags
-- test/hum/templates/simple/simple.html
-- test/hum/templates/simple/simple.sass
-- test/hum/templates/simple/simple_clean.sass
-- test/hum/templates/simple/simple_end.html
-- test/hum/templates/single/single.array
-- test/hum/templates/single/single.css
-- test/hum/templates/single/single.haml
-- test/hum/templates/single/single.haml_tags
-- test/hum/templates/single/single.html
-- test/hum/templates/single/single.sass
-- test/hum/templates/single/single_clean.sass
-- test/hum/templates/single/single_end.html
-- test/run_tests.rb
+- test/bad_file_test.rb
+- test/engine_tests.rb
+- test/haml/insert_extra_child.haml
+- test/haml/nests.haml
+- test/haml/parent_selector.haml
+- test/haml/parent_siblings.haml
+- test/haml/property_value.haml
+- test/haml/siblings.haml
+- test/haml/single_line_nest.haml
+- test/other/bad.file
+- test/other/example.scss
+- test/sass/insert_extra_child.sass
+- test/sass/nests.sass
+- test/sass/parent_selector.sass
+- test/sass/parent_siblings.sass
+- test/sass/property_value.sass
+- test/sass/siblings.sass
+- test/sass/single_line_nest.sass
+- test/sass_convert_test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -165,77 +121,22 @@ signing_key:
 specification_version: 3
 summary: Generate HTML from your SASS or CSS
 test_files:
-- test/hum/templates/comma/comma.array
-- test/hum/templates/comma/comma.css
-- test/hum/templates/comma/comma.haml
-- test/hum/templates/comma/comma.haml_tags
-- test/hum/templates/comma/comma.html
-- test/hum/templates/comma/comma.sass
-- test/hum/templates/comma/comma_clean.sass
-- test/hum/templates/comma/comma_end.html
-- test/hum/templates/complex_parent/complex_parent.array
-- test/hum/templates/complex_parent/complex_parent.css
-- test/hum/templates/complex_parent/complex_parent.haml
-- test/hum/templates/complex_parent/complex_parent.haml_tags
-- test/hum/templates/complex_parent/complex_parent.html
-- test/hum/templates/complex_parent/complex_parent.sass
-- test/hum/templates/complex_parent/complex_parent_clean.sass
-- test/hum/templates/complex_parent/complex_parent_end.html
-- test/hum/templates/deep_nest/deep_nest.array
-- test/hum/templates/deep_nest/deep_nest.css
-- test/hum/templates/deep_nest/deep_nest.haml
-- test/hum/templates/deep_nest/deep_nest.haml_tags
-- test/hum/templates/deep_nest/deep_nest.html
-- test/hum/templates/deep_nest/deep_nest.sass
-- test/hum/templates/deep_nest/deep_nest_clean.sass
-- test/hum/templates/deep_nest/deep_nest_end.html
-- test/hum/templates/deep_nest/deep_nest_start.scss
-- test/hum/templates/line_nest/line_nest.array
-- test/hum/templates/line_nest/line_nest.css
-- test/hum/templates/line_nest/line_nest.haml
-- test/hum/templates/line_nest/line_nest.haml_tags
-- test/hum/templates/line_nest/line_nest.html
-- test/hum/templates/line_nest/line_nest.sass
-- test/hum/templates/line_nest/line_nest_clean.sass
-- test/hum/templates/line_nest/line_nest_end.html
-- test/hum/templates/nest/nest.array
-- test/hum/templates/nest/nest.css
-- test/hum/templates/nest/nest.haml
-- test/hum/templates/nest/nest.haml_tags
-- test/hum/templates/nest/nest.html
-- test/hum/templates/nest/nest.sass
-- test/hum/templates/nest/nest_clean.sass
-- test/hum/templates/nest/nest_end.html
-- test/hum/templates/parent_nest/parent_nest.array
-- test/hum/templates/parent_nest/parent_nest.css
-- test/hum/templates/parent_nest/parent_nest.haml
-- test/hum/templates/parent_nest/parent_nest.haml_tags
-- test/hum/templates/parent_nest/parent_nest.html
-- test/hum/templates/parent_nest/parent_nest.sass
-- test/hum/templates/parent_nest/parent_nest_clean.sass
-- test/hum/templates/parent_nest/parent_nest_end.html
-- test/hum/templates/parent_select/parent_select.array
-- test/hum/templates/parent_select/parent_select.css
-- test/hum/templates/parent_select/parent_select.haml
-- test/hum/templates/parent_select/parent_select.haml_tags
-- test/hum/templates/parent_select/parent_select.html
-- test/hum/templates/parent_select/parent_select.sass
-- test/hum/templates/parent_select/parent_select_clean.sass
-- test/hum/templates/parent_select/parent_select_end.html
-- test/hum/templates/simple/simple.array
-- test/hum/templates/simple/simple.css
-- test/hum/templates/simple/simple.haml
-- test/hum/templates/simple/simple.haml_tags
-- test/hum/templates/simple/simple.html
-- test/hum/templates/simple/simple.sass
-- test/hum/templates/simple/simple_clean.sass
-- test/hum/templates/simple/simple_end.html
-- test/hum/templates/single/single.array
-- test/hum/templates/single/single.css
-- test/hum/templates/single/single.haml
-- test/hum/templates/single/single.haml_tags
-- test/hum/templates/single/single.html
-- test/hum/templates/single/single.sass
-- test/hum/templates/single/single_clean.sass
-- test/hum/templates/single/single_end.html
-- test/run_tests.rb
+- test/bad_file_test.rb
+- test/engine_tests.rb
+- test/haml/insert_extra_child.haml
+- test/haml/nests.haml
+- test/haml/parent_selector.haml
+- test/haml/parent_siblings.haml
+- test/haml/property_value.haml
+- test/haml/siblings.haml
+- test/haml/single_line_nest.haml
+- test/other/bad.file
+- test/other/example.scss
+- test/sass/insert_extra_child.sass
+- test/sass/nests.sass
+- test/sass/parent_selector.sass
+- test/sass/parent_siblings.sass
+- test/sass/property_value.sass
+- test/sass/siblings.sass
+- test/sass/single_line_nest.sass
+- test/sass_convert_test.rb