org-ruby 0.6.3 → 0.6.4

data/History.txt

@@ -1,3 +1,9 @@
+== 0.6.4 / 2012-07-08
+
+* Fixed lists behavior when code fragments, tables and examples were present
+* Remove code tags with lang class and use instead src-:lang like org-exporter
+* Fixed property drawers to consider properties with hyphens like :noweb-ref:
+
 == 0.6.3 / 2012-05-22
 
 * Minor enhancement: Correct handling of .org URIs in HTML markup routine (thanks, rayl)

data/bin/org-ruby

@@ -1,11 +1,7 @@
 #!/usr/bin/env ruby
-
-require File.expand_path(
-    File.join(File.dirname(__FILE__), %w[.. lib org-ruby]))
+require 'org-ruby'
 require 'optparse'
 
-# Put your code here
-
 options = {}
 options_parser = OptionParser.new do |opts|
   options[:help] = false
@@ -25,10 +21,20 @@ options_parser = OptionParser.new do |opts|
           "Translate the ORG file to the specified format.") do |v|
     options[:format] = v
   end
+
+  opts.on("-v", "--version", "Print version") do |v|
+    options[:version] = true
+  end
 end
 
 begin
   options_parser.parse!
+
+  if options[:version]
+    puts OrgRuby::VERSION
+    exit
+  end
+
   if (ARGV.length == 0) then
     puts options_parser
   else

data/lib/org-ruby.rb

@@ -1,9 +1,27 @@
-unless defined? ::OrgRuby
+$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
+
+# internal requires
+require 'org-ruby/parser'
+require 'org-ruby/regexp_helper'
+require 'org-ruby/line'
+require 'org-ruby/headline'
+require 'org-ruby/output_buffer'
+
+# HTML exporter
+require 'org-ruby/html_output_buffer'
+require 'org-ruby/html_symbol_replace'
+
+# Textile exporter
+require 'org-ruby/textile_output_buffer'
+require 'org-ruby/textile_symbol_replace'
+
+# Tilt support
+require 'org-ruby/tilt'
 
 module OrgRuby
 
   # :stopdoc:
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -14,22 +32,6 @@ module OrgRuby
     VERSION
   end
 
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, args.flatten)
-  end
-
   # Utility method used to require all files ending in .rb that lie in the
   # directory below this file that has the same name as the filename passed
   # in. Optionally, a specific _directory_ name can be passed in such that
@@ -43,8 +45,4 @@ module OrgRuby
     Dir.glob(search_me).sort.each {|rb| require rb}
   end
 
-end  # module OrgmodeParser
-
-OrgRuby.require_all_libs_relative_to(__FILE__)
-
-end                             # unless defined?
+end

data/lib/org-ruby/headline.rb

@@ -1,5 +1,3 @@
-require OrgRuby.libpath(*%w[org-ruby line])
-
 module Orgmode
 
   # Represents a headline in an orgmode file.

data/lib/org-ruby/html_output_buffer.rb

@@ -1,6 +1,3 @@
-require OrgRuby.libpath(*%w[org-ruby html_symbol_replace])
-require OrgRuby.libpath(*%w[org-ruby output_buffer])
-
 module Orgmode
 
   class HtmlOutputBuffer < OutputBuffer
@@ -44,6 +41,7 @@ module Orgmode
       end
       @options = opts
       @footnotes = {}
+      @unclosed_tags = []
       @logger.debug "HTML export options: #{@options.inspect}"
     end
 
@@ -54,16 +52,12 @@ module Orgmode
       if ModeTag[mode] then
         output_indentation
         css_class = ""
-        css_class = " class=\"src\"" if mode == :src
+        css_class = " class=\"src\"" if mode == :src and @block_lang.empty?
+        css_class = " class=\"src src-#{@block_lang}\"" if mode == :src and not @block_lang.empty?
         css_class = " class=\"example\"" if (mode == :example || mode == :inline_example)
         css_class = " style=\"text-align: center\"" if mode == :center
-        @logger.debug "#{mode}: <#{ModeTag[mode]}#{css_class}>\n" 
+        @logger.debug "#{mode}: <#{ModeTag[mode]}#{css_class}>\n"
         @output << "<#{ModeTag[mode]}#{css_class}>\n" unless mode == :table and skip_tables?
-        # Special case to add code tags to src blogs and specify language
-        if mode == :src
-          @logger.debug "<code class=\"#{@block_lang}\">\n"
-          @output << "<code class=\"#{@block_lang}\">\n"
-        end
         # Entering a new mode obliterates the title decoration
         @title_decoration = ""
       end
@@ -76,12 +70,19 @@ module Orgmode
       m = super(mode)
       if ModeTag[m] then
         output_indentation
-        if mode == :src
-          @logger.debug "</code>\n"
-          @output << "</code>\n"
+        # Need to close the floating li elements before closing the list
+        if (m == :unordered_list or
+            m == :ordered_list or
+            m == :definition_list) and 
+            (not @unclosed_tags.empty?)
+          close_floating_li_tags
         end
+
         @logger.debug "</#{ModeTag[m]}>\n"
         @output << "</#{ModeTag[m]}>\n" unless mode == :table and skip_tables?
+
+        # In case it was a sublist, close it here
+        close_last_li_tag_maybe
       end
     end
 
@@ -113,6 +114,11 @@ module Orgmode
           unless buffer_mode_is_table? and skip_tables?
             @logger.debug "FLUSH      ==========> #{@buffer_mode}"
             output_indentation
+            if ((@buffered_lines[0].plain_list?) and 
+                (@unclosed_tags.count == @list_indent_stack.count))
+              @output << @unclosed_tags.pop
+              output_indentation
+            end
             @output << "<#{HtmlBlockTag[@output_type]}#{@title_decoration}>"
             if (@buffered_lines[0].kind_of?(Headline)) then
               headline = @buffered_lines[0]
@@ -127,8 +133,19 @@ module Orgmode
                 output << "<span class=\"todo-keyword #{keyword}\">#{keyword} </span>"
               end
             end
-            @output << inline_formatting(@buffer) 
-            @output << "</#{HtmlBlockTag[@output_type]}>\n"
+            @output << inline_formatting(@buffer)
+
+            # Only close the list when it is the last element from that list,
+            # or when starting another list
+            if (@output_type == :unordered_list or 
+                @output_type == :ordered_list   or
+                @output_type == :definition_list) and 
+                (not @list_indent_stack.empty?)
+              @unclosed_tags.push("</#{HtmlBlockTag[@output_type]}>\n")
+              @output << "\n"
+            else
+              @output << "</#{HtmlBlockTag[@output_type]}>\n"
+            end
             @title_decoration = ""
           else
             @logger.debug "SKIP       ==========> #{@buffer_mode}"
@@ -214,12 +231,12 @@ module Orgmode
 
           "file:#{$1}"
         end
-        link = link.sub(/^file:/i, "") # will default to HTTP
-
-        unless link.match(/:\/\/[^\/]*.org$/)
-          link = link.sub(/\.org$/i, ".html")          
+        if link.match(/^file:.*\.org$/)
+          link = link.sub(/\.org$/i, ".html")
         end
 
+        link = link.sub(/^file:/i, "") # will default to HTTP
+
         text = text.gsub(/([^\]]*\.(jpg|jpeg|gif|png))/xi) do |img_link|
           "<img src=\"#{img_link}\" />"
         end
@@ -245,5 +262,29 @@ module Orgmode
       Orgmode.special_symbols_to_html(str)
       str
     end
+
+    def close_floating_li_tags
+      unless @final_list_node
+        unless @unclosed_tags.empty?
+          @output << "  " << @unclosed_tags.pop
+          output_indentation
+        end
+      end
+
+      @final_list_node = false
+    end
+
+    def close_last_li_tag_maybe
+      if (@list_indent_stack.count < @unclosed_tags.count) and not
+          (@list_indent_stack.empty? and @unclosed_tags.empty?)
+        output_indentation
+        @output << @unclosed_tags.pop
+        if (@list_indent_stack.count == @unclosed_tags.count) and not
+            (@list_indent_stack.empty? and @unclosed_tags.empty?)
+          @final_list_node = true
+          pop_mode
+        end
+      end
+    end
   end                           # class HtmlOutputBuffer
 end                             # module Orgmode

data/lib/org-ruby/line.rb

@@ -55,7 +55,7 @@ module Orgmode
       check_assignment_or_regexp(:property_drawer, PropertyDrawerRegexp)
     end
 
-    PropertyDrawerItemRegexp = /^\s*:(\w+):\s*(.*)$/i
+    PropertyDrawerItemRegexp = /^\s*:([0-9A-Za-z_\-]+):\s*(.*)$/i
 
     def property_drawer_item?
       @line =~ PropertyDrawerItemRegexp
@@ -94,12 +94,6 @@ module Orgmode
       check_assignment_or_regexp(:definition_list, DefinitionListRegexp)
     end
 
-    HorizontalRuleRegexp = /^\s*-{5,}\s*$/
-
-    def horizontal_rule?
-      check_assignment_or_regexp(:horizontal_rule, HorizontalRuleRegexp)
-    end
-
     OrderedListRegexp = /^\s*\d+(\.|\))\s+/
 
     def ordered_list?
@@ -110,6 +104,12 @@ module Orgmode
       @line.sub(OrderedListRegexp, "")
     end
 
+    HorizontalRuleRegexp = /^\s*-{5,}\s*$/
+
+    def horizontal_rule?
+      check_assignment_or_regexp(:horizontal_rule, HorizontalRuleRegexp)
+    end
+
     # Extracts meaningful text and excludes org-mode markup,
     # like identifiers for lists or headings.
     def output_text
@@ -137,7 +137,7 @@ module Orgmode
       check_assignment_or_regexp(:table_separator, /^\s*\|[-\|\+]*\s*$/)
     end
 
-    # Checks if this line is a table header. 
+    # Checks if this line is a table header.
     def table_header?
       @assigned_paragraph_type == :table_header
     end
@@ -234,7 +234,7 @@ module Orgmode
     # What's tricky is lines can have assigned types, so you need to check
     # the assigned type, if present, or see if the characteristic regexp
     # for the paragraph type matches if not present.
-    # 
+    #
     # call-seq:
     #     check_assignment_or_regexp(assignment, regexp) => boolean
     #

data/lib/org-ruby/output_buffer.rb

@@ -23,7 +23,7 @@ module Orgmode
     # This is the overall output buffer
     attr_reader :output
 
-    # This is the current type of output being accumulated. 
+    # This is the current type of output being accumulated.
     attr_accessor :output_type
 
     # This stack is used to do proper outline numbering of headlines.
@@ -83,7 +83,7 @@ module Orgmode
         @block_lang = line.block_lang if line.begin_block? and line.code_block_type?
         flush!
         maintain_list_indent_stack(line)
-        @output_type = line.paragraph_type 
+        @output_type = line.paragraph_type
       end
       push_mode(:inline_example) if line.inline_example? and current_mode != :inline_example and not line.property_drawer?
       pop_mode(:inline_example) if current_mode == :inline_example and !line.inline_example?
@@ -94,7 +94,7 @@ module Orgmode
       @buffered_lines.push(line)
     end
 
-    # Flushes everything currently in the accumulation buffer into the 
+    # Flushes everything currently in the accumulation buffer into the
     # output buffer. Derived classes must override this to actually move
     # content into the output buffer with the appropriate markup. This
     # method just does common bookkeeping cleanup.
@@ -142,7 +142,7 @@ module Orgmode
       @buffer << str
     end
 
-    # Gets the current list indent level. 
+    # Gets the current list indent level.
     def list_indent_level
       @list_indent_stack.length
     end
@@ -167,7 +167,7 @@ module Orgmode
     def maintain_list_indent_stack(line)
       if (line.plain_list?) then
         while (not @list_indent_stack.empty? \
-               and (@list_indent_stack.last > line.indent)) 
+               and (@list_indent_stack.last > line.indent))
           @list_indent_stack.pop
           pop_mode
         end
@@ -180,9 +180,9 @@ module Orgmode
 
         # Nothing
 
-      elsif ((line.paragraph_type == :paragraph) and
-             (not @list_indent_stack.empty? and
-              line.indent > @list_indent_stack.last))
+      elsif ((not line.plain_list?) and
+             (not @list_indent_stack.empty?) and
+             (line.indent > @list_indent_stack.last))
 
         # Nothing -- output this paragraph inside
         # the list block (ul/ol)
@@ -212,7 +212,7 @@ module Orgmode
 
       # Special case: Multiple blank lines get accumulated.
       return true if line.paragraph_type == :blank and @output_type == :blank
-      
+
       # Currently only "paragraphs" get accumulated with previous output.
       return false unless line.paragraph_type == :paragraph
       if ((@output_type == :ordered_list) or

data/lib/org-ruby/parser.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rubypants'
 
 module Orgmode
@@ -270,6 +269,10 @@ module Orgmode
 
           output_buffer << line.output_text
 
+        when :src
+
+          output_buffer << line.output_text << "\n"
+
         else
 
           if output_buffer.preserve_whitespace? then

data/lib/org-ruby/regexp_helper.rb

@@ -3,7 +3,7 @@ require 'logger'
 module Orgmode
 
   # = Summary
-  # 
+  #
   # This class contains helper routines to deal with the Regexp "black
   # magic" you need to properly parse org-mode files.
   #
@@ -121,7 +121,7 @@ module Orgmode
     # output format.
     #
     # = Usage
-    # 
+    #
     # Give this a block that expect the link and optional friendly
     # text. Return how that link should get formatted.
     #
@@ -161,7 +161,7 @@ module Orgmode
 
     def build_org_emphasis_regexp
       @org_emphasis_regexp = Regexp.new("([#{@pre_emphasis}]|^)\n" +
-                                        "(  [#{@markers}]  )\n" + 
+                                        "(  [#{@markers}]  )\n" +
                                         "(  [^#{@border_forbidden}]  | " +
                                         "  [^#{@border_forbidden}]#{@body_regexp}[^#{@border_forbidden}]  )\n" +
                                         "\\2\n" +

metadata

@@ -1,66 +1,71 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: org-ruby
-version: !ruby/object:Gem::Version
-  version: 0.6.3
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 4
+  version: 0.6.4
 platform: ruby
-authors:
+authors: 
 - Brian Dewey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rubypants
-  requirement: &70208184207000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
         version: 0.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70208184207000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bones
-  requirement: &70208184206440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 3
+        - 8
+        - 0
         version: 3.8.0
   type: :development
-  prerelease: false
-  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
-
-  HTML or textile. Currently, you cannot do much to customize the
-
-  conversion. The supplied textile conversion is optimized for
-
-  extracting "content" from the orgfile as opposed to "metadata." '
+  version_requirements: *id002
+description: "This gem contains Ruby routines for parsing org-mode files.The most\n\
+  significant thing this library does today is convert org-mode files to\n\
+  HTML or textile. Currently, you cannot do much to customize the\n\
+  conversion. The supplied textile conversion is optimized for\n\
+  extracting \"content\" from the orgfile as opposed to \"metadata.\" "
 email: bdewey@gmail.com
-executables:
+executables: 
 - org-ruby
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - README.rdoc
-- announcement.txt
 - bin/org-ruby
-files:
-- .bnsignore
-- .gitignore
-- Gemfile
-- Gemfile.lock
+files: 
 - History.txt
 - README.rdoc
-- Rakefile
-- TAGS
-- announcement.txt
 - bin/org-ruby
 - lib/org-ruby.rb
 - lib/org-ruby/headline.rb
@@ -73,132 +78,40 @@ files:
 - 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
 homepage: http://github.com/bdewey/org-ruby
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: org-ruby
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: This gem contains Ruby routines for parsing org-mode files.
-test_files:
+test_files: 
 - test/test_orgmode_parser.rb