org-ruby 0.6.2 → 0.6.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    org-ruby (0.6.1)
+    org-ruby (0.6.3)
       rubypants (>= 0.2.0)
 
 GEM
@@ -15,14 +15,14 @@ GEM
     little-plugger (1.1.3)
     loquacious (1.9.1)
     rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
+    rspec-mocks (2.10.1)
     rubypants (0.2.0)
     tilt (1.3.3)
 

data/History.txt

@@ -1,4 +1,8 @@
-== 0.6.2 / 2012-04-14
+== 0.6.3 / 2012-05-22
+
+* Minor enhancement: Correct handling of .org URIs in HTML markup routine (thanks, rayl)
+
+== 0.6.1 / 2012-04-14
 
 * Added encoding directive to support Ruby 1.9.2
 * Headlines with the COMMENT keyword, and the PROPERTIES drawer are not exported

data/lib/org-ruby.rb

@@ -3,7 +3,7 @@ unless defined? ::OrgRuby
 module OrgRuby
 
   # :stopdoc:
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/org-ruby/html_output_buffer.rb

@@ -215,7 +215,11 @@ module Orgmode
           "file:#{$1}"
         end
         link = link.sub(/^file:/i, "") # will default to HTTP
-        link = link.sub(/\.org$/i, ".html")
+
+        unless link.match(/:\/\/[^\/]*.org$/)
+          link = link.sub(/\.org$/i, ".html")          
+        end
+
         text = text.gsub(/([^\]]*\.(jpg|jpeg|gif|png))/xi) do |img_link|
           "<img src=\"#{img_link}\" />"
         end

data/org-ruby.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "org-ruby"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Dewey"]
-  s.date = "2012-04-14"
+  s.date = "2012-05-22"
   s.description = "This gem contains Ruby routines for parsing org-mode files.The most\nsignificant thing this library does today is convert org-mode files to\nHTML or textile. Currently, you cannot do much to customize the\nconversion. The supplied textile conversion is optimized for\nextracting \"content\" from the orgfile as opposed to \"metadata.\" "
   s.email = "bdewey@gmail.com"
   s.executables = ["org-ruby"]
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "announcement.txt", "bin/org-ruby"]
-  s.files = [".bnsignore", "Gemfile", "Gemfile.lock", "History.txt", "README.rdoc", "Rakefile", "TAGS", "announcement.txt", "bin/org-ruby", "lib/org-ruby.rb", "lib/org-ruby/headline.rb", "lib/org-ruby/html_output_buffer.rb", "lib/org-ruby/html_symbol_replace.rb", "lib/org-ruby/line.rb", "lib/org-ruby/output_buffer.rb", "lib/org-ruby/parser.rb", "lib/org-ruby/regexp_helper.rb", "lib/org-ruby/textile_output_buffer.rb", "lib/org-ruby/textile_symbol_replace.rb", "lib/org-ruby/tilt.rb", "org-ruby.gemspec", "spec/data/freeform-example.org", "spec/data/freeform.org", "spec/data/hyp-planning.org", "spec/data/remember.org", "spec/headline_spec.rb", "spec/html_examples/advanced-code.html", "spec/html_examples/advanced-code.org", "spec/html_examples/advanced-lists.html", "spec/html_examples/advanced-lists.org", "spec/html_examples/block_code.html", "spec/html_examples/block_code.org", "spec/html_examples/blockcomment.html", "spec/html_examples/blockcomment.org", "spec/html_examples/blockquote.html", "spec/html_examples/blockquote.org", "spec/html_examples/center.html", "spec/html_examples/center.org", "spec/html_examples/code-comment.html", "spec/html_examples/code-comment.org", "spec/html_examples/comment-trees.html", "spec/html_examples/comment-trees.org", "spec/html_examples/custom-seq-todo.html", "spec/html_examples/custom-seq-todo.org", "spec/html_examples/custom-todo.html", "spec/html_examples/custom-todo.org", "spec/html_examples/custom-typ-todo.html", "spec/html_examples/custom-typ-todo.org", "spec/html_examples/deflist.html", "spec/html_examples/deflist.org", "spec/html_examples/entities.html", "spec/html_examples/entities.org", "spec/html_examples/escape-pre.html", "spec/html_examples/escape-pre.org", "spec/html_examples/export-exclude-only.html", "spec/html_examples/export-exclude-only.org", "spec/html_examples/export-keywords.html", "spec/html_examples/export-keywords.org", "spec/html_examples/export-tags.html", "spec/html_examples/export-tags.org", "spec/html_examples/export-title.html", "spec/html_examples/export-title.org", "spec/html_examples/footnotes.html", "spec/html_examples/footnotes.org", "spec/html_examples/horizontal_rule.html", "spec/html_examples/horizontal_rule.org", "spec/html_examples/html-literal.html", "spec/html_examples/html-literal.org", "spec/html_examples/inline-formatting.html", "spec/html_examples/inline-formatting.org", "spec/html_examples/inline-images.html", "spec/html_examples/inline-images.org", "spec/html_examples/link-features.html", "spec/html_examples/link-features.org", "spec/html_examples/lists.html", "spec/html_examples/lists.org", "spec/html_examples/metadata-comment.html", "spec/html_examples/metadata-comment.org", "spec/html_examples/only-list.html", "spec/html_examples/only-list.org", "spec/html_examples/only-table.html", "spec/html_examples/only-table.org", "spec/html_examples/skip-header.html", "spec/html_examples/skip-header.org", "spec/html_examples/skip-table.html", "spec/html_examples/skip-table.org", "spec/html_examples/subsupscript-nil.html", "spec/html_examples/subsupscript-nil.org", "spec/html_examples/subsupscript.html", "spec/html_examples/subsupscript.org", "spec/html_examples/tables.html", "spec/html_examples/tables.org", "spec/html_examples/text.html", "spec/html_examples/text.org", "spec/line_spec.rb", "spec/output_buffer_spec.rb", "spec/parser_spec.rb", "spec/regexp_helper_spec.rb", "spec/spec_helper.rb", "spec/textile_examples/block_code.org", "spec/textile_examples/block_code.textile", "spec/textile_examples/blockquote.org", "spec/textile_examples/blockquote.textile", "spec/textile_examples/center.org", "spec/textile_examples/center.textile", "spec/textile_examples/footnotes.org", "spec/textile_examples/footnotes.textile", "spec/textile_examples/keywords.org", "spec/textile_examples/keywords.textile", "spec/textile_examples/links.org", "spec/textile_examples/links.textile", "spec/textile_examples/lists.org", "spec/textile_examples/lists.textile", "spec/textile_examples/single-space-plain-list.org", "spec/textile_examples/single-space-plain-list.textile", "spec/textile_examples/tables.org", "spec/textile_examples/tables.textile", "spec/textile_output_buffer_spec.rb", "tasks/test_case.rake", "test/test_orgmode_parser.rb", "util/gen-special-replace.el"]
+  s.files = [".bnsignore", ".gitignore", "Gemfile", "Gemfile.lock", "History.txt", "README.rdoc", "Rakefile", "TAGS", "announcement.txt", "bin/org-ruby", "lib/org-ruby.rb", "lib/org-ruby/headline.rb", "lib/org-ruby/html_output_buffer.rb", "lib/org-ruby/html_symbol_replace.rb", "lib/org-ruby/line.rb", "lib/org-ruby/output_buffer.rb", "lib/org-ruby/parser.rb", "lib/org-ruby/regexp_helper.rb", "lib/org-ruby/textile_output_buffer.rb", "lib/org-ruby/textile_symbol_replace.rb", "lib/org-ruby/tilt.rb", "org-ruby.gemspec", "spec/data/freeform-example.org", "spec/data/freeform.org", "spec/data/hyp-planning.org", "spec/data/remember.org", "spec/headline_spec.rb", "spec/html_examples/advanced-code.html", "spec/html_examples/advanced-code.org", "spec/html_examples/advanced-lists.html", "spec/html_examples/advanced-lists.org", "spec/html_examples/block_code.html", "spec/html_examples/block_code.org", "spec/html_examples/blockcomment.html", "spec/html_examples/blockcomment.org", "spec/html_examples/blockquote.html", "spec/html_examples/blockquote.org", "spec/html_examples/center.html", "spec/html_examples/center.org", "spec/html_examples/code-comment.html", "spec/html_examples/code-comment.org", "spec/html_examples/comment-trees.html", "spec/html_examples/comment-trees.org", "spec/html_examples/custom-seq-todo.html", "spec/html_examples/custom-seq-todo.org", "spec/html_examples/custom-todo.html", "spec/html_examples/custom-todo.org", "spec/html_examples/custom-typ-todo.html", "spec/html_examples/custom-typ-todo.org", "spec/html_examples/deflist.html", "spec/html_examples/deflist.org", "spec/html_examples/entities.html", "spec/html_examples/entities.org", "spec/html_examples/escape-pre.html", "spec/html_examples/escape-pre.org", "spec/html_examples/export-exclude-only.html", "spec/html_examples/export-exclude-only.org", "spec/html_examples/export-keywords.html", "spec/html_examples/export-keywords.org", "spec/html_examples/export-tags.html", "spec/html_examples/export-tags.org", "spec/html_examples/export-title.html", "spec/html_examples/export-title.org", "spec/html_examples/footnotes.html", "spec/html_examples/footnotes.org", "spec/html_examples/horizontal_rule.html", "spec/html_examples/horizontal_rule.org", "spec/html_examples/html-literal.html", "spec/html_examples/html-literal.org", "spec/html_examples/inline-formatting.html", "spec/html_examples/inline-formatting.org", "spec/html_examples/inline-images.html", "spec/html_examples/inline-images.org", "spec/html_examples/link-features.html", "spec/html_examples/link-features.org", "spec/html_examples/lists.html", "spec/html_examples/lists.org", "spec/html_examples/metadata-comment.html", "spec/html_examples/metadata-comment.org", "spec/html_examples/only-list.html", "spec/html_examples/only-list.org", "spec/html_examples/only-table.html", "spec/html_examples/only-table.org", "spec/html_examples/skip-header.html", "spec/html_examples/skip-header.org", "spec/html_examples/skip-table.html", "spec/html_examples/skip-table.org", "spec/html_examples/subsupscript-nil.html", "spec/html_examples/subsupscript-nil.org", "spec/html_examples/subsupscript.html", "spec/html_examples/subsupscript.org", "spec/html_examples/tables.html", "spec/html_examples/tables.org", "spec/html_examples/text.html", "spec/html_examples/text.org", "spec/line_spec.rb", "spec/output_buffer_spec.rb", "spec/parser_spec.rb", "spec/regexp_helper_spec.rb", "spec/spec_helper.rb", "spec/textile_examples/block_code.org", "spec/textile_examples/block_code.textile", "spec/textile_examples/blockquote.org", "spec/textile_examples/blockquote.textile", "spec/textile_examples/center.org", "spec/textile_examples/center.textile", "spec/textile_examples/footnotes.org", "spec/textile_examples/footnotes.textile", "spec/textile_examples/keywords.org", "spec/textile_examples/keywords.textile", "spec/textile_examples/links.org", "spec/textile_examples/links.textile", "spec/textile_examples/lists.org", "spec/textile_examples/lists.textile", "spec/textile_examples/single-space-plain-list.org", "spec/textile_examples/single-space-plain-list.textile", "spec/textile_examples/tables.org", "spec/textile_examples/tables.textile", "spec/textile_output_buffer_spec.rb", "tasks/test_case.rake", "test/test_orgmode_parser.rb", "util/gen-special-replace.el"]
   s.homepage = "http://github.com/bdewey/org-ruby"
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/spec/html_examples/link-features.html

@@ -6,3 +6,15 @@
 <h1>Search links</h1>
 <p>This is a search link into code-comment.org.</p>
 <p><a href="code-comment.html">Code Comment</a></p>
+<h1>Correct handling of .org URIs in HTML markup routine (thanks @rayl!)</h1>
+<ul>
+  <li><a href="http://foo.com">foo.com website</a></li>
+  <li><a href="http://foo.org">foo.org website</a></li>
+</ul>
+<h1>In these links, .org is converted to .html</h1>
+<ul>
+  <li><a href="http://foo.org/foo.html">foo.org/foo.org</a></li>
+  <li><a href="http://localhost:4567/foo.html">localhost:4567/foo.org</a></li>
+  <li><a href="path.html">file:path.org label</a></li>
+  <li><a href="notes/path.html">file:notes/path.org label</a></li>
+</ul>

data/spec/html_examples/link-features.org

@@ -17,3 +17,19 @@ sections within documents, etc.
   This is a search link into code-comment.org.
 
   [[file:code-comment.org::*Code%20Comment][Code Comment]]
+
+* Correct handling of .org URIs in HTML markup routine (thanks @rayl!)
+
+- [[http://foo.com][foo.com website]]
+
+- [[http://foo.org][foo.org website]]
+
+* In these links, .org is converted to .html
+
+- [[http://foo.org/foo.org][foo.org/foo.org]]
+
+- [[http://localhost:4567/foo.org][localhost:4567/foo.org]]
+
+- [[file:path.org][file:path.org label]]
+
+- [[file:notes/path.org][file:notes/path.org label]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: org-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000Z
+date: 2012-05-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypants
-  requirement: &70290787144340 !ruby/object:Gem::Requirement
+  requirement: &70208184207000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70290787144340
+  version_requirements: *70208184207000
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &70290787142880 !ruby/object:Gem::Requirement
+  requirement: &70208184206440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.8.0
   type: :development
   prerelease: false
-  version_requirements: *70290787142880
+  version_requirements: *70208184206440
 description: ! 'This gem contains Ruby routines for parsing org-mode files.The most
 
   significant thing this library does today is convert org-mode files to