nwodkram 0.2 → 0.3

data/README.md

@@ -16,7 +16,7 @@ My use case was to migrate a blog from wordpress.com to something more civilised
 ## Supports ##
 
 *tags*:
-    p, a, img, ul, ol, li, h1, h2, h3, em, strong
+    p, a, img, ul, ol, li, h1, h2, h3, em, strong, blockquote
 
 *rubies*:
 tested with MRI ruby 1.8.7 and 1.9.2 (preview1)

data/lib/nwodkram_parser.rb

@@ -2,16 +2,17 @@ class NwodkramParser < Nokogiri::XML::SAX::Document
 
   attr_accessor :attr, :name
 
-  MARKDOWN = { 'p'      => [""                                                               , "\n"],
-               'a'      => ["["                                                              , lambda { "](#{@attr['href']})" }],
-               'img'    => [ lambda {"![#{@attr['title'] || @attr['alt']}](#{@attr['src']})"}, ""],
-               'li'     => [ lambda { @parent == "ul" ? "* " : "1. " }                       , "\n"],
-               'code'   => [""                                                               , ""],
-               'h1'     => ["# "                                                             , " #\n" ],
-               'h2'     => ["## "                                                            , " ##\n" ],
-               'h3'     => ["### "                                                           , " ###\n"],
-               'em'     => ["*"                                                              , "*"],
-               'strong' => ["**"                                                             , "**"] }
+  MARKDOWN = { 'p'          => [""                                                               , "\n"],
+               'a'          => ["["                                                              , lambda { "](#{@attr['href']})" }],
+               'img'        => [ lambda {"![#{@attr['title'] || @attr['alt']}](#{@attr['src']})"}, ""],
+               'li'         => [ lambda { @parent == "ul" ? "* " : "1. " }                       , "\n"],
+               'code'       => [""                                                               , ""],
+               'h1'         => ["# "                                                             , " #\n" ],
+               'h2'         => ["## "                                                            , " ##\n" ],
+               'h3'         => ["### "                                                           , " ###\n"],
+               'em'         => ["*"                                                              , "*"],
+               'blockquote' => ["> "                                                              , ""],
+               'strong'     => ["**"                                                             , "**"] }
 
   def start_element(name,attributes = [])
     @name, @attr = name, attr_hash(attributes)
@@ -20,6 +21,7 @@ class NwodkramParser < Nokogiri::XML::SAX::Document
   end
 
   def end_element(name)
+    @name = name
     MARKDOWN[name] ? print(local_value(MARKDOWN[name][1])) : print("")
   end
 
@@ -32,11 +34,10 @@ class NwodkramParser < Nokogiri::XML::SAX::Document
       }
     when "img"
       print "" # image doesn't contain any children, normally
-    when 'p','h1','h2','h3', 'li', 'ul','ol'
+    when 'p','h1','h2','h3', 'li', 'ul','ol','blockquote'
       print string.chomp
     else
-      # getting rid of annoying newlines
-      string[0] == 10 ? print("\n") : print(string)
+      print string
     end
   end
 

data/nwodkram.gemspec

@@ -1,13 +1,14 @@
 Gem::Specification.new do |s|
   s.name = 'nwodkram'
-  s.version = '0.2'
-  s.date = '2010-05-01'
+  s.version = '0.3'
+  s.date = '2010-05-12'
 
   s.description = 'Convert html into markdown'
-  s.summary = 'Convert html into markdown'
+  s.summary = 'Convert html into markdown - this might be useful when going from a traditional blog to a more text-based blog.'
 
   s.authors = ['Elise Huard']
   s.email = 'nwodkram@elisehuard.be'
+  s.homepage = 'http://github.com/elisehuard/nwodkram'
 
   s.files = %w[
               README.md

data/spec/nwodkram_spec.rb

@@ -64,6 +64,18 @@ describe "converting html to markdown" do
     html.to_markdown.should == markdown
   end
 
+  it "should convert a blockquote" do
+    markdown = "> boo !\n\n that was scary\n"
+    html = markdown.to_html
+    html.to_markdown.should == markdown
+  end
+
+  it "should convert a text with several bits of code" do
+    html = File.open(File.expand_path(File.dirname(__FILE__) + "/code_test.txt")).read
+    markdown = html.to_markdown
+    markdown.to_html.should == html
+  end
+
   # the ultimate test: convert the readme
   it "should convert a whole text" do
     markdown = File.open(File.expand_path(File.dirname(__FILE__) + "/../README.md")).read

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'rubygems'
 require 'spec'
 require 'nwodkram'
 require 'bluecloth' # markdown converter to test against
-require 'rspec/matchers'
+require 'spec/matchers'
 
 Spec::Runner.configure do |config|
 end
@@ -17,7 +17,7 @@ class String
   end
 end
 
-Rspec::Matchers.define :convert_to_html_and_back do
+Spec::Matchers.define :convert_to_html_and_back do
   match do |markdown|
     html = markdown.to_html
     html.to_markdown == markdown

metadata

@@ -1,11 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nwodkram
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Elise Huard
@@ -13,23 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 +02:00
+date: 2010-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 1
         version: 1.4.1
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: Convert html into markdown
 email: nwodkram@elisehuard.be
 executables: []
@@ -49,7 +41,7 @@ files:
 - spec/rcov.opts
 - spec/nwodkram_spec.rb
 has_rdoc: true
-homepage: 
+homepage: http://github.com/elisehuard/nwodkram
 licenses: []
 
 post_install_message: 
@@ -61,22 +53,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Convert html into markdown
+summary: Convert html into markdown - this might be useful when going from a traditional blog to a more text-based blog.
 test_files: 
 - spec/nwodkram_spec.rb