html2md 0.1.1 → 0.1.2

data/README.md

@@ -31,7 +31,7 @@ This gem is built with Travis-ci.org. http://travis-ci.org/#!/pmorton/html2md
 
 Compatibility
 ==============
-Currently not compatiable with jruby, mainly because I am too lazy to fix the build issues. Compatiablity for jruby will be added in the near future.
+1.9 Compat + Jruby Support. Currently working through 1.8 support
 
 
 Contributing

data/Rakefile

@@ -14,6 +14,6 @@ end
 
 desc "Test"
 task :t, [] => [] do |taks,args| 
-  t = Html2Md.new(open("http://loremipsum.net/about.html").read)
+  t = Html2Md.new(File.read('./test.html'))
   puts t.parse
 end

data/features/assets/test.html

@@ -0,0 +1,44 @@
+<hr><h1>Header 1</h1>
+
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse sed pulvinar metus. Integer a ligula dolor. Maecenas malesuada nibh ac nulla tempus pulvinar at at neque. Integer non eleifend neque. Donec sed sapien nunc. Mauris imperdiet rutrum est in rhoncus. Pellentesque sollicitudin dapibus sapien vitae aliquam. Donec mollis dui at turpis tristique volutpat. Sed nec magna eget lectus convallis volutpat quis at odio. Fusce quis massa leo. Cras eget nisl erat. Aliquam aliquet consectetur risus, a venenatis dolor eleifend interdum. Fusce vel risus velit, non convallis enim.</p>
+
+<h2>Header 2</h2>
+
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse sed pulvinar metus. Integer a ligula dolor. Maecenas malesuada nibh ac nulla tempus pulvinar at at neque. Integer non eleifend neque. Donec sed sapien nunc. Mauris imperdiet rutrum est in rhoncus. Pellentesque sollicitudin dapibus sapien vitae aliquam. Donec mollis dui at turpis tristique volutpat. Sed nec magna eget lectus convallis volutpat quis at odio. Fusce quis massa leo. Cras eget nisl erat. Aliquam aliquet consectetur risus, a venenatis dolor eleifend interdum. Fusce vel risus velit, non convallis enim.</p>
+
+<h3>Header 3</h3>
+
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse sed pulvinar metus. Integer a ligula dolor. Maecenas malesuada nibh ac nulla tempus pulvinar at at neque. Integer non eleifend neque. Donec sed sapien nunc. Mauris imperdiet rutrum est in rhoncus. Pellentesque sollicitudin dapibus sapien vitae aliquam. Donec mollis dui at turpis tristique volutpat. Sed nec magna eget lectus convallis volutpat quis at odio. Fusce quis massa leo. Cras eget nisl erat. Aliquam aliquet consectetur risus, a venenatis dolor eleifend interdum. Fusce vel risus velit, non convallis enim.</p>
+
+<p>Un-Ordered List 1</p>
+
+<ul>
+<li>Item 1</li>
+<li>Item 2</li>
+<li>Item 3</li>
+</ul><p>Ordered List 1</p>
+
+<ol>
+<li>Item 1</li>
+<li>Item 2</li>
+<li>Item 3</li>
+</ol><p>Nested List</p>
+
+<ul>
+<li>Un-Ordered Item 1</li>
+<li>Un-Ordered Item 2
+
+<ol>
+<li>Ordered Item 1</li>
+<li>Ordered Item 2
+
+<ul>
+<li>Un-Ordered Item 1</li>
+</ul>
+</li>
+</ol>
+</li>
+<li>Un-Ordered Item 3</li>
+</ul><p><strong>Strong</strong></p>
+
+<p><em>Emphasis</em></p>

data/features/assets/test.md

@@ -0,0 +1,41 @@
+********
+
+Header 1
+========
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse sed pulvinar metus. Integer a ligula dolor. Maecenas malesuada nibh ac nulla tempus pulvinar at at neque. Integer non eleifend neque. Donec sed sapien nunc. Mauris imperdiet rutrum est in rhoncus. Pellentesque sollicitudin dapibus sapien vitae aliquam. Donec mollis dui at turpis tristique volutpat. Sed nec magna eget lectus convallis volutpat quis at odio. Fusce quis massa leo. Cras eget nisl erat. Aliquam aliquet consectetur risus, a venenatis dolor eleifend interdum. Fusce vel risus velit, non convallis enim.
+
+Header 2
+--------
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse sed pulvinar metus. Integer a ligula dolor. Maecenas malesuada nibh ac nulla tempus pulvinar at at neque. Integer non eleifend neque. Donec sed sapien nunc. Mauris imperdiet rutrum est in rhoncus. Pellentesque sollicitudin dapibus sapien vitae aliquam. Donec mollis dui at turpis tristique volutpat. Sed nec magna eget lectus convallis volutpat quis at odio. Fusce quis massa leo. Cras eget nisl erat. Aliquam aliquet consectetur risus, a venenatis dolor eleifend interdum. Fusce vel risus velit, non convallis enim.
+
+### Header 3
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse sed pulvinar metus. Integer a ligula dolor. Maecenas malesuada nibh ac nulla tempus pulvinar at at neque. Integer non eleifend neque. Donec sed sapien nunc. Mauris imperdiet rutrum est in rhoncus. Pellentesque sollicitudin dapibus sapien vitae aliquam. Donec mollis dui at turpis tristique volutpat. Sed nec magna eget lectus convallis volutpat quis at odio. Fusce quis massa leo. Cras eget nisl erat. Aliquam aliquet consectetur risus, a venenatis dolor eleifend interdum. Fusce vel risus velit, non convallis enim.
+
+Un-Ordered List 1
+
+  - Item 1
+  - Item 2
+  - Item 3
+
+Ordered List 1
+
+  1. Item 1
+  2. Item 2
+  3. Item 3
+
+Nested List
+
+  - Un-Ordered Item 1
+  - Un-Ordered Item 2
+    1. Ordered Item 1
+    2. Ordered Item 2
+      - Un-Ordered Item 1
+  - Un-Ordered Item 3
+
+**Strong**
+
+_Emphasis_
+

data/features/markdown.feature

@@ -4,7 +4,7 @@ Feature: Markdown
   Scenario: Create a H Rule (HR) element
     * HTML <hr/>
     * I say parse
-    * The markdown should be (\n* * * * *\n)
+    * The markdown should be (********\n)
 
   Scenario: Create a hard break (BR) element
     * HTML <br/>
@@ -49,7 +49,7 @@ Feature: Markdown
   Scenario: Complex List
     * HTML <ul><li>First</li><li> <ol><li>First<ul><li>First</li><li>Second</li></ul></li><li>Second</li> </ol>Second</li><ul>
     * I say parse
-    * The markdown should be (\n  - First\n  - \n    1. First\n      - First\n      - Second\n\n    2. Second\nSecond\n\n)
+    * The markdown should be (\n  - First\n  - \n    1. First\n      - First\n      - Second\n    2. Second\nSecond\n\n)
 
   Scenario: Emphasis (em) element
     * HTML <em>Emphasis</em>
@@ -77,21 +77,26 @@ Feature: Markdown
     * The markdown should be (This is in a span) 
 
   Scenario: Character data should not have new lines  
-    * HTML This is character data \n
+    * HTML <p>This is character data \n\n\n\n</p>  
     * I say parse
     * The markdown should be (This is character data \n\n) 
 
   Scenario: First level headers 
     * HTML <h1>This is a H1 Element</h1>
     * I say parse
-    * The markdown should be (\nThis is a H1 Element\n====================\n) 
+    * The markdown should be (\nThis is a H1 Element\n====================\n\n) 
 
   Scenario: Second level headers 
     * HTML <h2>This is a H2 Element</h2>
     * I say parse
-    * The markdown should be (\nThis is a H2 Element\n--------------------\n)
+    * The markdown should be (\nThis is a H2 Element\n--------------------\n\n)
 
   Scenario: Third level headers 
     * HTML <h3>This is a H3 Element</h3>
     * I say parse
-    * The markdown should be (\n### This is a H3 Element\n)
+    * The markdown should be (\n### This is a H3 Element\n\n)
+
+  Scenario: Full File Conversion 
+    * File (./features/assets/test.html)
+    * I say parse
+    * The mardown should be equal to (./features/assets/test.md)

data/features/step_definitions/markdown_steps.rb

@@ -15,10 +15,18 @@ Given /HTML (.*)/ do |n|
   @html2md.source = n.gsub("\\n", "\n")
 end
 
+Given /File \((.*)\)/ do |n|
+  @html2md.source = File.read(n)
+end
+
 When /I say parse/ do
   @result = @html2md.parse
 end
 
 Then /The markdown should be \((.*)\)/ do |result|
   @result.should == result.gsub("\\n", "\n")
+end
+
+Then /The mardown should be equal to \((.*)\)/ do |file|
+  @result.gsub("\\n","\n").should == File.read(file)
 end

data/lib/html2md/VERSION.rb

@@ -1,3 +1,3 @@
 class Html2Md
-  VERSION = "0.1.1"
-end
+  VERSION = "0.1.2"
+end

data/lib/html2md/document.rb

@@ -11,7 +11,6 @@ class Html2Md
       @markdown = ''
       @last_href = nil
       @allowed_tags = ['tr','td','th','table']
-      @current_list = -1
       @list_tree = []
       @last_cdata_length = 0
 
@@ -34,9 +33,9 @@ class Html2Md
     end
 
     def start_element name, attributes = []
+      #@markdown << name
       start_name = "start_#{name}".to_sym
       both_name = "start_and_end_#{name}".to_sym
-
       if self.respond_to?(both_name)
         self.send( both_name, attributes )
       elsif self.respond_to?(start_name)
@@ -48,9 +47,9 @@ class Html2Md
     end
 
     def end_element name, attributes = []
+      #@markdown << name
       end_name = "end_#{name}".to_sym
       both_name = "start_and_end_#{name}".to_sym
-
       if self.respond_to?(both_name)
         self.send( both_name, attributes )
       elsif self.respond_to?(end_name)
@@ -61,7 +60,7 @@ class Html2Md
     end
 
     def start_hr(attributes)
-      @markdown << "\n* * * * *\n"
+      @markdown << "********\n"
     end
 
     def end_hr(attributes)
@@ -89,7 +88,7 @@ class Html2Md
     end
 
     def end_p(attributes)
-      @markdown << "\n\n"
+      @markdown << "\n\n" unless @list_tree[-1]
     end
 
     def start_h1(attributes)
@@ -101,7 +100,7 @@ class Html2Md
       @last_cdata_length.times do
         @markdown << "="
       end
-      @markdown << "\n"
+      @markdown << "\n\n"
     end
 
     def start_h2(attributes)
@@ -113,7 +112,7 @@ class Html2Md
       @last_cdata_length.times do
         @markdown << "-"
       end
-      @markdown << "\n"
+      @markdown << "\n\n"
     end
 
     def start_h3(attributes)
@@ -121,7 +120,7 @@ class Html2Md
     end
 
     def end_h3(attributes)
-      @markdown << "\n"
+      @markdown << "\n\n"
     end
 
     def start_a(attributes)
@@ -157,21 +156,23 @@ class Html2Md
     end
 
     def start_ul(attributes)
+      @markdown << "\n" #if @list_tree[-1]
       @list_tree.push( { :type => :ul, :current_element => 0 } )
-      @markdown << "\n"
     end
 
     def end_ul(attributes)
       @list_tree.pop
+      @markdown << "\n" unless @list_tree[-1]
     end
 
     def start_ol(attributes)
+      @markdown << "\n"# if @list_tree[-1]
       @list_tree.push( { :type => :ol, :current_element => 0 } )
-      @markdown << "\n"
     end
 
     def end_ol(attributes)
       @list_tree.pop
+      @markdown << "\n" unless @list_tree[-1]
     end
 
     def start_li(attributes)
@@ -192,18 +193,22 @@ class Html2Md
     end
 
     def end_li(attributes)
-      @markdown << "\n"
+      @markdown << "\n" if @markdown[-1] != "\n" and @markdown[-1] != 10
     end
 
     def characters c
       @last_cdata_length = c.chomp.length
       if @list_tree[-1]
-        @markdown << c.chomp.lstrip.rstrip
+        @markdown << c.gsub(/\n(\s*)?/,"").lstrip
       else
-        @markdown << c.chomp
+        @markdown << c.gsub(/\n(\s*)?/,"")
       end
     end
 
+    def end_document
+      @markdown.gsub!(/\n{2,}/,"\n\n")
+    end
+
     
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html2md
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-03-23 00:00:00.000000000 Z
 dependencies: []
 description: ! '  Converts Basic HTML to markdown
 
@@ -25,6 +25,8 @@ files:
 - lib/html2md/document.rb
 - lib/html2md/VERSION.rb
 - lib/html2md.rb
+- features/assets/test.html
+- features/assets/test.md
 - features/markdown.feature
 - features/step_definitions/markdown_steps.rb
 homepage: http://github.com/pmorton/html2md