RubyGems - html2haml - Versions diffs - 1.0.0 → 1.0.1 - Mend

html2haml 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

data/Changelog.markdown ADDED

@@ -0,0 +1,10 @@
+# HTML2Haml Changelog
+## 1.0.1
+Rescue from `RubyParser::SyntaxError` in check for valid ruby.
+## 1.0.0
+* Extracted from Haml and released as an independent gem. For changes from
+  previous versions, see the Haml changelog.

data/MIT-LICENSE CHANGED

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2012 Hampton Catlin, Nathan Weizenbaum and Norman Clarke
+Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum and Norman Clarke
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md CHANGED

@@ -1,7 +1,6 @@
 # Html2haml
-Converts HTML to Haml. This is in the process of being extracted from the Haml
-gem.
+Converts HTML to Haml.
 ## Installation
@@ -15,7 +14,7 @@ And then execute:
 Or install it yourself as:
-    $ gem install html2haml --pre
+    $ gem install html2haml
 ## Usage
@@ -38,3 +37,24 @@ See `html2haml --help`:
             --unix-newlines              Use Unix-style newlines in written files.
         -?, -h, --help                   Show this message
         -v, --version                    Print version
+## License
+Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum and Norman Clarke
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/html2haml/html.rb CHANGED

@@ -369,8 +369,16 @@ module Haml
         original_indent = content[/\A(\s*)/, 1]
         if content.split("\n").all? {|l| l.strip.empty? || l =~ /^#{original_indent}/}
           content.gsub!(/^#{original_indent}/, tabulate(tabs + 1))
+        else
+          # Indentation is inconsistent. Strip whitespace from start and indent all
+          # to ensure valid Haml.
+          content.lstrip!
+          content.gsub!(/^/, tabulate(tabs + 1))
         end
+        content.rstrip!
+        content << "\n"
         "#{tabulate(tabs)}:#{filter}\n#{content}"
       end

data/lib/html2haml/html/erb.rb CHANGED

@@ -99,7 +99,7 @@ module Haml
       # @return [Boolean]
       def valid_ruby?(code)
         RubyParser.new.parse(code)
-      rescue Racc::ParseError
+      rescue Racc::ParseError, RubyParser::SyntaxError
         false
       end

data/lib/html2haml/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Html2haml
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/erb_test.rb CHANGED

@@ -457,6 +457,15 @@ HAML
 ERB
   end
+  def test_can_parse_ruby_19_hashes_as_arguments
+    erb =  "<%= foobar 'foo', {bar: 'baz'} %>"
+    begin
+      Haml::HTML::ERB.new(erb)
+    rescue
+      flunk "should not raise an error"
+    end
+  end
   def test_should_wrap_in_silent
     assert_equal(<<HTML.rstrip, Haml::HTML::ERB.new(<<ERB).src)
 <haml:silent> some_variable_or_function \n</haml:silent>

data/test/html2haml_test.rb CHANGED

@@ -237,6 +237,41 @@ HAML
 HTML
   end
+  def test_style_to_css_filter_with_following_content
+    assert_equal(<<HAML.rstrip, render(<<HTML))
+%head
+  :css
+    foo {
+        bar: baz;
+    }
+%body Hello
+HAML
+<head>
+  <style type="text/css">
+      foo {
+          bar: baz;
+      }
+  </style>
+</head>
+<body>Hello</body>
+HTML
+  end
+  def test_filter_with_inconsistent_indentation
+    assert_equal(<<HAML.rstrip, render(<<HTML))
+:css
+  foo {
+      badly: indented;
+  }
+HAML
+<style type="text/css">
+  foo {
+    badly: indented;
+}
+</style>
+HTML
+  end
   def test_inline_conditional_comment
     assert_equal(<<HAML.rstrip, render(<<HTML))
 /[if foo] bar baz

metadata CHANGED

@@ -1,138 +1,133 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: html2haml
-version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  prerelease: false
+  segments:
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
-authors:
+authors:
 - Norman Clarke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2013-02-16 00:00:00 -03:00
+default_executable:
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.6
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 8
+        - 6
         version: 0.8.6
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency
   name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version
+        segments:
+        - 2
+        - 7
+        - 0
         version: 2.7.0
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency
   name: ruby_parser
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version
+        segments:
+        - 3
+        - 1
+        - 1
         version: 3.1.1
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency
   name: haml
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.rc.1
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.0.0.rc.1
   prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        segments:
+        - 4
+        - 0
+        - 0
+        - rc
+        - 1
+        version: 4.0.0.rc.1
   type: :runtime
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 7
+        - 1
         version: 0.7.1
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.4.0
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version
+        segments:
+        - 4
+        - 4
+        - 0
         version: 4.4.0
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        segments:
+        - 0
+        version: "0"
   type: :development
+  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
+- Changelog.markdown
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -147,37 +142,37 @@ files:
 - test/erb_test.rb
 - test/html2haml_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: http://haml.info
 licenses: []
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      segments:
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      segments:
       - 0
-      hash: -2842773532910026005
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      segments:
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      segments:
       - 0
-      hash: -2842773532910026005
-      version: '0'
+      version: "0"
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 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