org-ruby 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,8 @@
+== 0.9.4 / 2014-04-18
+
+* Track block names within the line properties
+* Add option to skip-syntax-highlighting explicitly
+
 == 0.9.3 / 2014-03-25
 
 * Fix code blocks prepended comma stripping

data/lib/org-ruby.rb

@@ -25,6 +25,7 @@ require 'org-ruby/tilt'
 module OrgRuby
 
   # :stopdoc:
+  VERSION = '0.9.4'
   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,14 +1,3 @@
-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
@@ -47,6 +36,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
@@ -57,7 +59,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\""
@@ -88,7 +90,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]}>"
@@ -107,6 +109,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

data/lib/org-ruby/line.rb

@@ -24,12 +24,16 @@ module Orgmode
     # type. This will then affect the value of +paragraph_type+.
     attr_accessor :assigned_paragraph_type
 
+    # In case more contextual info is needed we can put here
+    attr_accessor :properties
+
     def initialize(line, parser=nil, assigned_paragraph_type=nil)
       @parser = parser
       @line = line
       @indent = 0
       @line =~ /\s*/
       @assigned_paragraph_type = assigned_paragraph_type
+      @properties = { }
       determine_paragraph_type
       determine_major_mode
       @indent = $&.length unless blank?

data/lib/org-ruby/output_buffer.rb

@@ -250,8 +250,8 @@ module Orgmode
       false
     end
 
-    def buffer_indentation
-      return false
-    end
+    def buffer_indentation; false; end
+    def flush!; false; end
+    def output_footnotes!; false; end
   end                           # class OutputBuffer
 end                             # module Orgmode

data/lib/org-ruby/parser.rb

@@ -183,7 +183,10 @@ module Orgmode
           table_header_set = false if !line.table?
 
         when :example, :html, :src
-          set_mode_for_results_block_contents(previous_line, line) if previous_line
+          if previous_line
+            set_name_for_code_block(previous_line, line)
+            set_mode_for_results_block_contents(previous_line, line)
+          end
 
           # As long as we stay in code mode, force lines to be code.
           # Don't try to interpret structural items, like headings and tables.
@@ -200,6 +203,7 @@ module Orgmode
           mode = line.paragraph_type if line.begin_block?
 
           if previous_line
+            set_name_for_code_block(previous_line, line)
             set_mode_for_results_block_contents(previous_line, line)
 
             mode = :property_drawer if previous_line.property_drawer_begin_block?
@@ -274,6 +278,12 @@ module Orgmode
       include_data
     end
 
+    def set_name_for_code_block(previous_line, line)
+      previous_line.in_buffer_setting? do |key, value|
+        line.properties['block_name'] = value if key.downcase == 'name'
+      end
+    end
+
     def set_mode_for_results_block_contents(previous_line, line)
       if previous_line.start_of_results_code_block? \
         or previous_line.assigned_paragraph_type == :comment
@@ -331,7 +341,8 @@ module Orgmode
         :export_todo           => export_todo?,
         :use_sub_superscripts  => use_sub_superscripts?,
         :export_footnotes      => export_footnotes?,
-        :link_abbrevs          => @link_abbrevs
+        :link_abbrevs          => @link_abbrevs,
+        :skip_syntax_highlight => @parser_options[:skip_syntax_highlight]
       }
       export_options[:skip_tables] = true if not export_tables?
       output = ""

data/lib/org-ruby/version.rb

@@ -1,3 +1,3 @@
 module OrgRuby
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: org-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypants
-  requirement: &70204882859800 !ruby/object:Gem::Requirement
+  requirement: &70356891100960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70204882859800
+  version_requirements: *70356891100960
 description: An Org mode parser written in Ruby.
 email: waldemar.quevedo@gmail.com
 executables:
@@ -75,3 +75,4 @@ signing_key:
 specification_version: 3
 summary: This gem contains Ruby routines for parsing org-mode files.
 test_files: []
+has_rdoc: