markdown2confluence 0.0.1e → 0.0.1f

data/bin/markdown2confluence

@@ -10,6 +10,7 @@ exit -1
 
 begin
   text=File.read(filename)
+
   s=Kramdown::Document.new(text).to_confluence
   puts s
 rescue Exception => ex

data/lib/markdown2confluence/convertor/confluence.rb

@@ -82,7 +82,7 @@ module Kramdown
       end
 
       def convert_p(el, indent)
-          "#{' '*indent}#{inner(el, indent)}\n\n"
+        "#{' '*indent}#{inner(el, indent)}\n\n"
       end
 
 
@@ -115,10 +115,10 @@ module Kramdown
 
       def convert_html_element(el, indent)
         markup=case el.value
-          when "iframe" then "{iframe:src=#{el.attr["src"]}}"
-          when "pre" then "{code}#{inner(el,indent)}{code}"
-          else inner(el, indent)
-        end
+               when "iframe" then "{iframe:src=#{el.attr["src"]}}"
+               when "pre" then "{code}#{inner(el,indent)}{code}"
+               else inner(el, indent)
+               end
       end
 
       def convert_xml_comment(el, indent)
@@ -168,11 +168,11 @@ module Kramdown
       end
 
       def convert_codeblock(el, indent)
-          "{code}#{el.value}{code}\n"
+        "{code}#{el.value}{code}\n"
       end
 
       def convert_codespan(el, indent)
-          "{code}#{el.value}{code}\n"
+        "{code}#{el.value}{code}\n"
       end
 
       def convert_footnote(el, indent)
@@ -192,27 +192,37 @@ module Kramdown
       end
 
       def convert_entity(el, indent)
-         inner(el,indent)
+        inner(el,indent)
       end
 
       def convert_typographic_sym(el, indent)
-         inner(el,indent)
+        inner(el,indent)
       end
 
       def convert_smart_quote(el, indent)
-         "'"
+        "'"
       end
 
       def convert_math(el, indent)
-         inner(el,indent)
+        inner(el,indent)
       end
 
       def convert_abbreviation(el, indent)
-         inner(el,indent)
+        inner(el,indent)
       end
 
       def convert_root(el, indent)
-        inner(el, indent)
+        handle_iframes(inner(el, indent))
+      end
+
+      def handle_iframes(text)
+        markup=text.gsub(/<iframe.*iframe>/) { |match| 
+          doc =Nokogiri::HTML::DocumentFragment.parse(match)
+          element=doc.search('iframe').first
+          attributes=element.attributes.map{ |at| "#{at[1].name}=#{at[1].value}"}
+          "{iframe:#{attributes.join('|')}}#{element.text}{iframe}"
+        }
+        return markup
       end
 
     end

data/lib/markdown2confluence/version.rb

@@ -2,5 +2,5 @@ module Markdown2Confluence
 end
 
 unless defined?(Markdown2Confluence::VERSION)
-  ::Markdown2Confluence::VERSION = "0.0.1e"
+  ::Markdown2Confluence::VERSION = "0.0.1f"
 end

data/lib/markdown2confluence.rb

@@ -1,2 +1,3 @@
 require 'kramdown'
+require 'nokogiri'
 require 'markdown2confluence/convertor/confluence'

data/markdown2confluence.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "markdown2confluence"
 
   s.add_dependency "kramdown"
+  s.add_dependency "nokogiri"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: markdown2confluence
 version: !ruby/object:Gem::Version 
-  hash: 34
+  hash: 35
   prerelease: 5
   segments: 
   - 0
   - 0
   - 1
-  - e
-  version: 0.0.1e
+  - f
+  version: 0.0.1f
 platform: ruby
 authors: 
 - Patrick Debois
@@ -32,6 +32,20 @@ dependencies:
   prerelease: false
   name: kramdown
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  name: nokogiri
+  version_requirements: *id002
 description: Based on Kramdown, a convert object .to_confluence
 email: 
 - patrick.debois@jedi.be