upmark 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    upmark (0.1.1)
+    upmark (0.1.2)
       parslet
 
 GEM

data/lib/upmark/transform/markdown.rb

@@ -7,11 +7,15 @@ module Upmark
 
       rule(text: simple(:value)) { value.to_s }
 
-      element(:p)  {|element| "#{element[:children].join}\n\n" }
-      element(:h1) {|element| "# #{element[:children].join}" }
-      element(:h2) {|element| "## #{element[:children].join}" }
-      element(:h3) {|element| "### #{element[:children].join}" }
-      element(:li) {|element| "#{element[:children].join}" }
+      def self.text(element)
+        element[:children].join.gsub(/(\n)+/, '\1')
+      end
+
+      element(:p)  {|element| "#{text(element)}\n\n" }
+      element(:h1) {|element| "# #{text(element)}" }
+      element(:h2) {|element| "## #{text(element)}" }
+      element(:h3) {|element| "### #{text(element)}" }
+      element(:li) {|element| "#{text(element)}" }
 
       element(:ul) do |element|
         children = element[:children].map {|value| value.strip != "" ? value : nil }.compact
@@ -27,9 +31,8 @@ module Upmark
         attributes = map_attributes_subtree(element[:attributes])
         href       = attributes[:href]
         title      = attributes[:title]
-        children   = element[:children].join
 
-        %Q{[#{children}](#{href} "#{title}")}
+        %Q{[#{text(element)}](#{href} "#{title}")}
       end
 
       element(:img) do |element|
@@ -41,8 +44,8 @@ module Upmark
         %Q{![#{alt_text}](#{href} "#{title}")}
       end
 
-      element(:b, :strong) {|element| "**#{element[:children].join}**" }
-      element(:i, :em)     {|element| "*#{element[:children].join}*" }
+      element(:b, :strong) {|element| "**#{text(element)}**" }
+      element(:i, :em)     {|element| "*#{text(element)}*" }
 
       element(:br) { "\n" }
 
@@ -56,7 +59,7 @@ module Upmark
         }
       ) do |element|
         attributes = map_attributes_subtree(element[:attributes])
-        children    = element[:children].join
+        children   = element[:children].join
         name       = element[:name]
 
         attributes_list =

data/lib/upmark/version.rb

@@ -1,3 +1,3 @@
 module Upmark
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/acceptance/upmark_spec.rb

@@ -28,7 +28,8 @@ describe Upmark, ".convert" do
     let(:html) { <<-HTML.strip }
 <p>messenger <strong>bag</strong> skateboard</p>
 
-<p>art party<br />organic</p>
+<p>art party<br />
+organic</p>
     HTML
 
     it { should == <<-MD.strip }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upmark
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70363456228720 !ruby/object:Gem::Requirement
+  requirement: &70263069806220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363456228720
+  version_requirements: *70263069806220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70363456228280 !ruby/object:Gem::Requirement
+  requirement: &70263069805760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363456228280
+  version_requirements: *70263069805760
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &70363456227680 !ruby/object:Gem::Requirement
+  requirement: &70263069779220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363456227680
+  version_requirements: *70263069779220
 description: Upmark has the skills to convert your HTML to Markdown.
 email: dev@theconversation.edu.au
 executables: