html2haml 1.0.0.beta.1 → 1.0.0.beta.2

data/README.md

@@ -15,7 +15,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install html2haml
+    $ gem install html2haml --pre
 
 ## Usage
 

data/html2haml.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Html2haml::VERSION
 
-  gem.add_dependency 'hpricot'
+  gem.add_dependency 'hpricot', '~> 0.8.6'
+  gem.add_dependency 'erubis', '~> 2.7.0'
+  gem.add_dependency 'ruby_parser', '~> 3.1.1'
   gem.add_dependency 'haml', '>= 3.2.0.beta.1'
-  gem.add_development_dependency 'erubis'
-  gem.add_development_dependency 'ruby_parser'
-  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'simplecov', '~> 0.7.1'
+  gem.add_development_dependency 'minitest', '~> 4.4.0'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'minitest'
 end

data/lib/html2haml.rb

@@ -1,4 +1,4 @@
-require "html2haml/version"
+require File.expand_path("../html2haml/version", __FILE__)
 require "haml/util"
 require "haml/parser"
 require "haml/error"

data/lib/html2haml/html.rb

@@ -319,7 +319,7 @@ module Haml
           if child.is_a?(::Hpricot::Text)
             if !child.to_s.include?("\n")
               text = child.to_haml(tabs + 1, options)
-              return output + " " + text.lstrip.gsub(/^\\/, '') unless text.chomp.include?("\n")
+              return output + " " + text.lstrip.gsub(/^\\/, '') unless text.chomp.include?("\n") || text.empty?
               return output + "\n" + text
             elsif ["pre", "textarea"].include?(name) ||
                 (name == "code" && parent.is_a?(::Hpricot::Elem) && parent.name == "pre")

data/lib/html2haml/version.rb

@@ -1,3 +1,3 @@
 module Html2haml
-  VERSION = "1.0.0.beta.1"
+  VERSION = "1.0.0.beta.2"
 end

data/test/html2haml_test.rb

@@ -290,6 +290,12 @@ HAML
 HTML
   end
 
+  def test_haml_tags_should_be_on_new_line_after_tag_with_blank_content
+    xml  = "<weight> </weight>\n<pages>102</pages>"
+    haml = "%weight\n%pages 102"
+    assert_equal haml, render(xml)
+  end
+
   # Encodings
 
   unless RUBY_VERSION < "1.9"

metadata

@@ -1,136 +1,146 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: html2haml
-version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.1
+version: !ruby/object:Gem::Version 
+  hash: 309340781
   prerelease: 6
+  segments: 
+  - 1
+  - 0
+  - 0
+  - beta
+  - 2
+  version: 1.0.0.beta.2
 platform: ruby
-authors:
+authors: 
 - Norman Clarke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: hpricot
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+
+date: 2013-01-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0.beta.1
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 8
+        - 6
+        version: 0.8.6
   type: :runtime
+  name: hpricot
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0.beta.1
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
+        version: 2.7.0
+  type: :runtime
   name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 1
+        - 1
+        version: 3.1.1
+  type: :runtime
   name: ruby_parser
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 309340683
+        segments: 
+        - 3
+        - 2
+        - 0
+        - beta
+        - 1
+        version: 3.2.0.beta.1
+  type: :runtime
+  name: haml
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 7
+        - 1
+        version: 0.7.1
   type: :development
+  name: simplecov
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 4
+        - 4
+        - 0
+        version: 4.4.0
   type: :development
+  name: minitest
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  name: rake
+  version_requirements: *id007
 description: Converts HTML into Haml
-email:
+email: 
 - norman@njclarke.com
-executables:
+executables: 
 - html2haml
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -149,32 +159,40 @@ files:
 - test/test_helper.rb
 homepage: http://haml.info
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 3443034388567895554
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Converts HTML into Haml
-test_files:
+test_files: 
 - test/erb_test.rb
 - test/html2haml_test.rb
 - test/test_helper.rb