remark 0.3.1 → 0.3.2

data/README.markdown

@@ -3,6 +3,8 @@ Remark — HTML→Markdown tool
 
 <i>Remark</i> parses HTML and delivers proper Markdown.
 
+    $ [sudo] gem install remark
+
 Usage
 -----
 

data/Rakefile

@@ -2,30 +2,3 @@ desc "renders the spec/sample.html to Markdown"
 task :sample do
   system %(ruby -Ilib -rubygems bin/remark spec/sample.html)
 end
-
-desc "generates .gemspec file"
-task :gemspec do
-  spec = Gem::Specification.new do |gem|
-    gem.name = "remark"
-    gem.version = '0.3.0'
-    
-    gem.summary = "HTML to Markdown converter"
-    gem.email = "mislav.marohnic@gmail.com"
-    gem.homepage = "http://github.com/mislav/remark"
-    gem.authors = ["Mislav Marohnić"]
-    gem.has_rdoc = false
-    
-    gem.files = FileList['Rakefile', '{bin,lib,rails,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files`.split("\n")
-    gem.executables = Dir['bin/*'].map { |f| File.basename(f) }
-  end
-  
-  spec_string = spec.to_ruby
-  
-  begin
-    Thread.new { eval("$SAFE = 3\n#{spec_string}", binding) }.join 
-  rescue
-    abort "unsafe gemspec: #{$!}"
-  else
-    File.open("#{spec.name}.gemspec", 'w') { |file| file.write spec_string }
-  end
-end

data/lib/remark/hpricot_ext.rb

@@ -51,9 +51,9 @@ Hpricot::Container.module_eval do
         end
         
         all << child_content
+        previous_was_block = current_is_block
       end
       
-      previous_was_block = current_is_block
       all
     end
     
@@ -83,7 +83,7 @@ Hpricot::Elem.module_eval do
     return to_s unless markdown_supported_attributes?
 
     case name
-    when 'div', 'noscript'
+    when 'div', 'noscript', 'body'
       super
     when 'p'
       super
@@ -105,13 +105,21 @@ Hpricot::Elem.module_eval do
       code = inner_text
       code.index('`') ? "`` #{code} ``" : "`#{code}`"
     when 'a'
-      remark_link(super, self['href'], self['title'], options)
+      if self['name']
+        text = super
+        text = '' if text.blank?
+        %(<a name="#{self['name']}">#{text}</a>)
+      else
+        remark_link(super, self['href'], self['title'], options)
+      end
     when 'img'
       '!' + remark_link(self['alt'], self['src'], self['title'], :reference_links => false)
     when 'blockquote'
       super.indent('> ')
     when 'br'
       "  \n" + inner_html
+    when 'hr'
+      '* * *'
     else
       to_s
     end
@@ -158,12 +166,13 @@ Hpricot::Elem.module_eval do
   
   def markdown_supported_attributes?
     case name
-    when 'div'
+    when 'div', 'body'
       true
     when 'a'
-      attribute_names_match?('href', 'title')
+      attribute_names_match?('href', 'title') or
+        attribute_names_match?('name')
     when 'img'
-      attribute_names_match?(%w(alt src), 'title')
+      attribute_names_match?('src', %w(alt title))
     when 'ol', 'ul'
       attributes.empty? and children.all? do |item|
         not item.elem? or (item.name == 'li' and item.attributes.empty?)

data/spec/hpricot_ext_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+require 'rspec'
 require 'remark/hpricot_ext'
 
 describe Hpricot, "remark extensions" do
@@ -39,6 +41,7 @@ describe Hpricot, "remark extensions" do
 end
             </pre>
           </div>
+          <img src='moo.jpg'>
           <img src='moo.jpg' alt='cow'>
           <img src='moo.jpg' alt='cow' width='16'>
           
@@ -50,7 +53,9 @@ end
             bar <code>baz</code></p>
             <p>Foo</p><br><br><p>Bar</p><br>
           </div>
-          
+
+          <hr>
+
           <ul>
             <li>First</li>
             <li>Second</li>
@@ -113,6 +118,7 @@ end
   end
   
   it "should support image tags" do
+    remark('img').should == '![](moo.jpg)'
     remark('img[@alt]').should == '![cow](moo.jpg)'
     remark('img[@width]').should == '<img src="moo.jpg" alt="cow" width="16" />'
   end
@@ -134,5 +140,9 @@ end
   it "should support ordered list" do
     remark('ol').should == "1. First\n2. Second"
   end
+
+  it "renders horizontal rule" do
+    remark('hr').should == "* * *"
+  end
 end
 

data/spec/remark_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+require 'rspec'
 require 'remark'
 
 describe Remark do
@@ -154,4 +156,23 @@ describe Remark do
       remark(@html, :scope => '#div2').should == "Only 2 paragraphs\n\nHow disappointing"
     end
   end
+
+  it "handles direct children of BODY and anchors" do
+    html = <<-HTML
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <title>Sectioned</title>
+    </head>
+    <body class="chapter">
+      <p>Just my luck.</p>
+
+      <a name="section3" />
+      <h2>3. The Red Sun Rises</h2>
+    </body>
+    </html>
+    HTML
+    remark(html).should == "Just my luck.\n\n<a name=\"section3\"></a>\n\n## 3. The Red Sun Rises"
+  end
 end

metadata

@@ -1,46 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: remark
-version: !ruby/object:Gem::Version 
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.2
+  prerelease: 
 platform: ruby
-authors: 
-- "Mislav Marohni\xC4\x87"
+authors:
+- Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-11-25 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-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.8.2
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.8.2
-    version: 
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.9'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
-description: Remark turns simple HTML documents or content in web pages to Markdown source.
+      - !ruby/object:Gem::Version
+        version: '2.9'
+description: Remark turns simple HTML documents or content in web pages to Markdown
+  source.
 email: mislav.marohnic@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - bin/remark
 - lib/remark/core_ext.rb
@@ -51,33 +60,29 @@ files:
 - spec/sample.html
 - README.markdown
 - LICENSE
-has_rdoc: false
-homepage: http://github.com/mislav/remark
+homepage: https://github.com/mislav/remark
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: HTML to Markdown converter
 test_files: []
-
+has_rdoc: