org-ruby 0.5.2 → 0.5.3

data/.bnsignore

@@ -0,0 +1,18 @@
+# The list of files that should be ignored by Mr Bones.
+# Lines that start with '#' are comments.
+#
+# A .gitignore file can be used instead by setting it as the ignore
+# file in your Rakefile:
+#
+#   Bones {
+#     ignore_file  '.gitignore'
+#   }
+#
+# For a project with a C extension, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage
+doc
+pkg

data/.gitignore

@@ -0,0 +1 @@
+*.tmproj

data/History.txt

@@ -1,3 +1,7 @@
+== 0.5.3 / 2010-02-15
+
+* Minor enhancement: Displays inline images
+
 == 0.5.2 / 2010-01-05
 
 * Refactored to improve layering.

data/bin/org-ruby

@@ -17,6 +17,10 @@ options_parser = OptionParser.new do |opts|
     options[:help] = true
   end
 
+  opts.on("-d", "--debug", "Run with $DEBUG true") do |v|
+    options[:debug] = true
+  end
+
   opts.on("-t", "--translate FORMAT", [:html, :textile],
           "Translate the ORG file to the specified format.") do |v|
     options[:format] = v
@@ -30,6 +34,7 @@ begin
   else
     data = IO.read(ARGV[0])
     p = Orgmode::Parser.new(data)
+    $DEBUG = true if options[:debug]
     puts p.to_html if options[:format] == :html
     puts p.to_textile if options[:format] == :textile
   end

data/lib/org-ruby.rb

@@ -3,7 +3,7 @@ unless defined? ::OrgRuby
 module OrgRuby
 
   # :stopdoc:
-  VERSION = '0.5.2'
+  VERSION = '0.5.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

@@ -145,6 +145,9 @@ module Orgmode
       str = @re_help.rewrite_emphasis(str) do |marker, s|
         "#{Tags[marker][:open]}#{s}#{Tags[marker][:close]}"
       end
+      str = @re_help.rewrite_images(str) do |link|
+        "<img src=\"#{link}\" />"
+      end
       str = @re_help.rewrite_links(str) do |link, text|
         text ||= link
         link = link.sub(/^file:(.*)::(.*?)$/) do

data/lib/org-ruby/output_buffer.rb

@@ -44,7 +44,7 @@ module Orgmode
       @headline_number_stack = []
 
       @logger = Logger.new(STDERR)
-      if ENV['DEBUG']
+      if ENV['DEBUG'] or $DEBUG
         @logger.level = Logger::DEBUG
       else
         @logger.level = Logger::WARN

data/lib/org-ruby/regexp_helper.rb

@@ -14,6 +14,9 @@ module Orgmode
   #
   # * Use +rewrite_links+ to get a chance to rewrite all org-mode
   #   links with suitable markup for the output.
+  #
+  # * Use +rewrite_images+ to rewrite all inline image links with suitable
+  #   markup for the output.
   class RegexpHelper
 
     ######################################################################
@@ -121,7 +124,7 @@ module Orgmode
     # +http://www.hotmail.com+. In both cases, the block returns an
     # HTML-style link, and that is how things will get recorded in
     # +result+.
-    def rewrite_links(str)
+    def rewrite_links(str) #  :yields: link, text
       i = str.gsub(@org_link_regexp) do |match|
         yield $1, nil
       end
@@ -129,6 +132,13 @@ module Orgmode
         yield $1, $2
       end
     end
+    
+    # Rewrites all of the inline image tags.
+    def rewrite_images(str) #  :yields: image_link
+      str.gsub(@org_img_regexp) do |match|
+        yield $1
+      end
+    end
 
     private
 
@@ -146,6 +156,9 @@ module Orgmode
       @org_link_regexp = /\[\[
                              ([^\]]*) # This is the URL
                           \]\]/x
+      @org_img_regexp = /\[\[
+          ([^\]]*\.(jpg|jpeg|gif|png)) # Like a normal URL, but must end with a specified extension
+        \]\]/xi
       @org_link_text_regexp = /\[\[
                                  ([^\]]*) # This is the URL
                                \]\[

data/spec/html_examples/inline-images.html

@@ -0,0 +1,10 @@
+<p class="title">Inline Images</p>
+<p>Per the org-mode <a href="http://orgmode.org/manual/Images-and-tables.html#Images-and-tables">spec</a>, you can include inline images as links without any descriptive link text, like this:</p>
+<p><img src="http://farm5.static.flickr.com/4049/4358074549_5efb8b4903.jpg" /></p>
+<p>I currently do not support the caption/link syntax, but I can include the inline image. I recognize the following image file types:</p>
+<ul>
+  <li>.jpg</li>
+  <li>.png</li>
+  <li>.gif</li>
+  <li>.jpeg</li>
+</ul>

data/spec/html_examples/inline-images.org

@@ -0,0 +1,15 @@
+Inline Images
+
+Per the org-mode [[http://orgmode.org/manual/Images-and-tables.html#Images-and-tables][spec]], you can include inline images as links without
+any descriptive link text, like this:
+
+[[http://farm5.static.flickr.com/4049/4358074549_5efb8b4903.jpg]]
+
+I currently do not support the caption/link syntax, but I can include
+the inline image. I recognize the following image file types:
+
+- .jpg
+- .png
+- .gif
+- .jpeg
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: org-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Brian Dewey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -08:00
+date: 2010-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,8 @@ extra_rdoc_files:
 - README.rdoc
 - bin/org-ruby
 files: 
+- .bnsignore
+- .gitignore
 - History.txt
 - README.rdoc
 - Rakefile
@@ -60,6 +62,7 @@ files:
 - lib/org-ruby/parser.rb
 - lib/org-ruby/regexp_helper.rb
 - lib/org-ruby/textile_output_buffer.rb
+- org-ruby.tmproj
 - spec/data/freeform-example.org
 - spec/data/freeform.org
 - spec/data/hyp-planning.org
@@ -97,6 +100,8 @@ files:
 - 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