org-ruby 0.9.0 → 0.9.1.gh

data/History.txt

@@ -1,3 +1,7 @@
+== 0.9.1 / 2013-02-13
+
+* Backport CGI::escapeHTML function from Ruby to have same output among different Ruby versions
+
 == 0.9.0 / 2014-02-08
 
 * Add explicit enable or disable of include file feature

data/lib/org-ruby.rb

@@ -24,7 +24,7 @@ require 'org-ruby/tilt'
 module OrgRuby
 
   # :stopdoc:
-  VERSION = '0.9.0'
+  VERSION = '0.9.1.gh'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/org-ruby/html_output_buffer.rb

@@ -1,15 +1,3 @@
-require 'cgi'
-begin
-  require 'pygments'
-rescue LoadError
-  # Pygments is not supported so we try instead with CodeRay
-  begin
-    require 'coderay'
-  rescue LoadError
-    # No code syntax highlighting
-  end
-end
-
 module Orgmode
 
   class HtmlOutputBuffer < OutputBuffer
@@ -52,6 +40,19 @@ module Orgmode
       @footnotes = {}
       @unclosed_tags = []
       @logger.debug "HTML export options: #{@options.inspect}"
+
+      unless @options[:skip_syntax_highlight]
+        begin
+          require 'pygments'
+        rescue LoadError
+          # Pygments is not supported so we try instead with CodeRay
+          begin
+            require 'coderay'
+          rescue LoadError
+            # No code syntax highlighting
+          end
+        end
+      end
     end
 
     # Output buffer is entering a new mode. Use this opportunity to
@@ -62,7 +63,7 @@ module Orgmode
 
       if HtmlBlockTag[mode]
         unless ((mode_is_table?(mode) and skip_tables?) or
-                (mode == :src and defined? Pygments))
+                (mode == :src and !@options[:skip_syntax_highlight] and defined? Pygments))
           css_class = case
                       when (mode == :src and @block_lang.empty?)
                         " class=\"src\""
@@ -93,7 +94,7 @@ module Orgmode
       m = super(mode)
       if HtmlBlockTag[m]
         unless ((mode_is_table?(m) and skip_tables?) or
-                (m == :src and defined? Pygments))
+                (m == :src and !@options[:skip_syntax_highlight] and defined? Pygments))
           add_paragraph if @new_paragraph
           @new_paragraph = true
           @logger.debug "</#{HtmlBlockTag[m]}>"
@@ -112,6 +113,8 @@ module Orgmode
         # NOTE: CodeRay and Pygments already escape the html once, so
         # no need to escapeHTML
         case
+        when (current_mode == :src and @options[:skip_syntax_highlight])
+          @buffer = escapeHTML @buffer
         when (current_mode == :src and defined? Pygments)
           lang = normalize_lang @block_lang
           @output << "\n" unless @new_paragraph == :start
@@ -140,7 +143,7 @@ module Orgmode
           @new_paragraph = true
         else
           # *NOTE* Don't use escape_buffer! through its sensitivity to @<text> forms
-          @buffer = CGI::escapeHTML @buffer
+          @buffer = escapeHTML @buffer
         end
 
         # Whitespace is significant in :code mode. Always output the
@@ -275,7 +278,7 @@ module Orgmode
     def inline_formatting(str)
       @re_help.rewrite_emphasis str do |marker, s|
         if marker == "=" or marker == "~"
-          s = CGI::escapeHTML s
+          s = escapeHTML s
           "<#{Tags[marker][:open]}>#{s}</#{Tags[marker][:close]}>"
         else
           "@<#{Tags[marker][:open]}>#{s}@</#{Tags[marker][:close]}>"
@@ -371,5 +374,29 @@ module Orgmode
         "#{$2}#{$3}"
       end
     end
+
+    # The CGI::escapeHTML function backported from the Ruby standard library
+    # as of commit fd2fc885b43283aa3d76820b2dfa9de19a77012f
+    #
+    # Implementation of the cgi module can change among Ruby versions
+    # so stabilizing on a single one here to avoid surprises.
+    #
+    # https://github.com/ruby/ruby/blob/trunk/lib/cgi/util.rb
+    #
+    # The set of special characters and their escaped values
+    TABLE_FOR_ESCAPE_HTML__ = {
+      "'" => '&#39;',
+      '&' => '&amp;',
+      '"' => '&quot;',
+      '<' => '&lt;',
+      '>' => '&gt;',
+    }
+    # Escape special characters in HTML, namely &\"<>
+    #   escapeHTML('Usage: foo "bar" <baz>')
+    #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
+    private
+    def escapeHTML(string)
+      string.gsub(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+    end
   end                           # class HtmlOutputBuffer
 end                             # module Orgmode

data/lib/org-ruby/parser.rb

@@ -303,10 +303,11 @@ module Orgmode
       export_options = {
         :decorate_title => @in_buffer_settings["TITLE"],
         :export_heading_number => export_heading_number?,
-        :export_todo => export_todo?,
-        :use_sub_superscripts =>  use_sub_superscripts?,
-        :export_footnotes => export_footnotes?,
-        :link_abbrevs => @link_abbrevs
+        :export_todo           => export_todo?,
+        :use_sub_superscripts  => use_sub_superscripts?,
+        :export_footnotes      => export_footnotes?,
+        :link_abbrevs          => @link_abbrevs,
+        :skip_syntax_highlight => @parser_options[:skip_syntax_highlight]
       }
       export_options[:skip_tables] = true if not export_tables?
       output = ""

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: org-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.9.1.gh
+  prerelease: 6
 platform: ruby
 authors:
 - Brian Dewey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypants
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70363196176300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,12 +21,7 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+  version_requirements: *70363196176300
 description: ! 'An org-mode parser written in Ruby. This gem contains Ruby routines
   for parsing org-mode files.The most
 
@@ -84,8 +79,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: org-ruby
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: This gem contains Ruby routines for parsing org-mode files.
 test_files: []
+has_rdoc: