markdown2confluence 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2UyY2I1YjZmYTU5ZTkwODg0NzA5OGU1ZDZkMDEyODI3MzhjOWFlMw==
+  data.tar.gz: !binary |-
+    NWZmYWM5NzUwODMxYWFlYzVmMjgzODZjYTY0M2IyZjY5YjgyYWNmOQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    M2I5MGRmYmQwZjllMzAxMGE2N2U5MDBlZGY0ZTFlMzkzODM5ZDAyY2JjZmVm
+    ZjkyMTA4NTVmN2FkNjBlYTUwMjNjOWE1ZTRkOWM4MmE3MWVhZmVlYWUyNjRh
+    MTc2OWNiYjdlZGIwYTU1Y2QwNTY4YzY2ODM5NDVmYTQ0NDM1ZGM=
+  data.tar.gz: !binary |-
+    MzIxMGViNjM1OWY0M2NkYzI2ODlkMjEzNWQwYjU2YWY1MDMwYzAyMGNmOWFk
+    ZTQ0MTlkODQ1ZGJhYTVkNDgwOThhOWYyODMyZjg2N2EyZDhlMGJiMTYzYTMx
+    OWZjNWE1YTI4ZjkyNDcyOTRmZWExZTRlM2RmODQyZWE1ZTUwNTk=

data/.rvmrc

@@ -1,3 +1,3 @@
-rvm use ruby-1.8.7
+rvm use ruby-1.9.3
 rvm gemset use markdown2confluence
 alias markdown2confluence="bundle exec markdown2confluence"

data/Gemfile

@@ -1,3 +1,3 @@
 source "http://rubygems.org"
 
-gem "markdown2confluence", :path => "."
+gemspec

data/README.markdown

@@ -1,5 +1,5 @@
 This code is a quick hack for converting markdown to [Atlassian confluence](http://atlassian.com/confluence) markup language.
-It's nowhere near doing a full conversion, but I will continue to improve where possible.
+It's not a 100% full conversion, but I find it rather usuable already. I will continue to improve where possible.
 
 The gem is based on [Kramdown](https://github.com/gettalong/kramdown)
 

data/Rakefile

@@ -1,2 +1,9 @@
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = false
+end

data/bin/markdown2confluence

@@ -2,17 +2,12 @@
 
 require 'markdown2confluence'
 
-filename=ARGV[0]
-if ARGV.size < 1
-puts "We need at least on file argument"
-exit -1
-  end
+filename = ARGV[0]
+abort "We need at least on file argument" if ARGV.size < 1
 
 begin
-  text=File.read(filename)
-
-  s=Kramdown::Document.new(text).to_confluence
-  puts s
+  text = File.read(filename)
+  puts Kramdown::Document.new(text).to_confluence
 rescue Exception => ex
   warn "There was an error running the convertor: \n#{ex}"
 end

data/lib/markdown2confluence/convertor/confluence.rb

@@ -82,10 +82,9 @@ module Kramdown
       end
 
       def convert_p(el, indent)
-        "#{' '*indent}#{inner(el, indent)}\n\n"
+        "#{' '*indent}#{inner(el, indent)}\n"
       end
 
-
       def convert_blockquote(el, indent)
         "#{' '*indent}bq. #{inner(el, indent)}\n"
       end
@@ -106,7 +105,7 @@ module Kramdown
       alias :convert_dl :convert_ul
 
       def convert_li(el, indent)
-        "#{'-'}#{inner(el, indent)}"
+        "#{'-'*(indent/2)}#{inner(el, 0)}"
       end
 
       alias :convert_dd :convert_li
@@ -119,7 +118,7 @@ module Kramdown
         markup=case el.value
                when "iframe" then "{iframe:src=#{el.attr["src"]}}"
                when "pre" then
-                 if  inner(el,indent).strip.match(/\n/)
+                 if inner(el,indent).strip.match(/\n/)
                    "{code}#{inner(el,indent)}{code}"
                  else
                    "{{#{inner(el,indent).strip}}}"
@@ -161,17 +160,15 @@ module Kramdown
       end
 
       def convert_a(el, indent)
-        text=inner(el,indent)
-        link=el.attr['href']
-        markup="[#{text+'|' unless text.nil?}#{link}]"
-        return markup
+        text   = inner(el,indent)
+        link   = el.attr['href']
+        "[#{text+'|' unless text.nil?}#{link}]"
       end
 
       def convert_img(el, indent)
-        src=el.attr['src']
-        alt=el.attr['alt']
-        markup="!#{src}#{"|alt=" unless alt.nil?}!"
-        return markup
+        src = el.attr['src']
+        alt = el.attr['alt']
+        alt.to_s.empty? ? "!#{src}!" : "!#{src}|alt=#{alt}!"
       end
 
       def convert_codeblock(el, indent)

data/lib/markdown2confluence/version.rb

@@ -2,5 +2,5 @@ module Markdown2Confluence
 end
 
 unless defined?(Markdown2Confluence::VERSION)
-  ::Markdown2Confluence::VERSION = "0.0.2"
+  ::Markdown2Confluence::VERSION = "0.0.3"
 end

data/markdown2confluence.gemspec

@@ -12,13 +12,19 @@ Gem::Specification.new do |s|
   s.description = %q{Based on Kramdown, a convert object .to_confluence}
 
   s.required_rubygems_version = ">= 1.3.6"
+  s.required_ruby_version = '>= 1.9.3'
   s.rubyforge_project         = "markdown2confluence"
 
   s.add_dependency "kramdown"
   s.add_dependency "nokogiri"
+  
+  s.add_development_dependency('rake', "~> 0.9.2")
+  s.add_development_dependency('activesupport', '>= 3.0.0')
+  s.add_development_dependency('turn')
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'
+  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
 end
 

data/test/markdown2confluence_test.rb

@@ -0,0 +1,85 @@
+require 'test_helper'
+
+class Markdown2ConfluenceTest < ActiveSupport::TestCase
+  test "header 1" do
+    assert_equal "h1. Hello\n", confluence("# Hello")
+  end
+
+  test "heading 2" do
+    assert_equal "h2. Hello\n", confluence("## Hello")
+  end
+
+  test "heading 3" do
+    assert_equal "h3. Hello\n", confluence("### Hello")
+  end
+
+  test "heading 4" do
+    assert_equal "h4. Hello\n", confluence("#### Hello")
+  end
+
+  test "unordered list" do
+    list =  "* this\n"
+    list << "* is\n"
+    list << "* a\n"
+    list << "* list\n"
+    confluence_list = list.gsub("*", "-   ")
+    assert_equal confluence_list, confluence(list)
+  end
+
+  # FIX - failing test
+  test "ordered list" do
+    assert_equal "1. this\n2. is\n3. a\n4. list\n", confluence("1. this\n2. is\n3. a\n4. list\n" )
+  end
+
+  test "strong text" do
+    assert_equal "*strong*\n", confluence("**strong**")
+  end
+
+  test "italics text" do
+    assert_equal "_some text here_\n", confluence("*some text here*")
+  end
+
+  test "inline code" do
+    assert_equal "{{hello world}}\n", confluence("`hello world`")
+  end
+
+  test "block of code" do
+    code = "    this is code\n"
+    assert_equal "{code}this is code\n{code}\n", confluence(code)
+  end
+
+  # FIX - failing test
+  test "strikethrough" do
+    assert_equal "-strikethrough text-\n", confluence("~~strikethrough text~~")
+  end
+
+  # FIX - failing test
+  test "quote" do
+    assert_equal "bq. this is a quote", confluence("> this is a quote")
+  end
+
+  test "hyperlink" do
+    assert_equal "[github|http://github.com]\n", confluence("[github](http://github.com)")
+  end
+
+  test "image link without alt" do
+    assert_equal "!http://github.com/logo.png!\n", confluence("![](http://github.com/logo.png)")
+  end
+
+  test "image link with alt" do
+    assert_equal "!http://github.com/logo.png|alt=logo!\n", confluence("![logo](http://github.com/logo.png)")
+  end
+
+  test "horizontal rule" do
+    assert_equal "----\n", confluence("* * *")
+    assert_equal "----\n", confluence("***")
+    assert_equal "----\n", confluence("*****")
+    assert_equal "----\n", confluence("---------------------------------------")
+  end
+
+private
+
+  def confluence(text)
+    Kramdown::Document.new(text).to_confluence
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'test/unit'
+require 'active_support/test_case'
+require 'turn'
+require 'markdown2confluence'

metadata

@@ -1,60 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: markdown2confluence
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Patrick Debois
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+date: 2013-11-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: kramdown
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  version_requirements: *id002
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Based on Kramdown, a convert object .to_confluence
-email: 
+email:
 - patrick.debois@jedi.be
-executables: 
+executables:
 - markdown2confluence
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -65,40 +98,30 @@ files:
 - lib/markdown2confluence/convertor/confluence.rb
 - lib/markdown2confluence/version.rb
 - markdown2confluence.gemspec
+- test/markdown2confluence_test.rb
+- test/test_helper.rb
 homepage: http://github.com/jedi4ever/markdown2confluence/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.3
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: markdown2confluence
-rubygems_version: 1.8.12
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Convert Markdown to confluence wiki style
-test_files: []
-
+test_files:
+- test/test_helper.rb