org-ruby 0.7.0 → 0.7.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.7.1 / 2012-08-04
+
+* Make source code blocks from lisp dialects use Pygments scheme lexer
+* Bugfix: Make Coderay fallback to text lexer when unsupported lang is set
+
 == 0.7.0 / 2012-07-08
 
 * Highlight source code blocks using Pygments or CodeRay when available

data/lib/org-ruby.rb

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

data/lib/org-ruby/html_output_buffer.rb

@@ -110,18 +110,25 @@ module Orgmode
         # Only try to colorize #+BEGIN_SRC blocks with a specified language,
         # but we still have to catch the cases when a lexer for the language was not available
         if not @block_lang.empty? and (defined? Pygments or defined? CodeRay)
+          lang = normalize_lang(@block_lang)
+
           # NOTE: CodeRay and Pygments already escape the html once, so no need to escape_buffer!
           if defined? Pygments
             begin
-              @buffer = Pygments.highlight(@buffer, :lexer => @block_lang)
+              @buffer = Pygments.highlight(@buffer, :lexer => lang)
             rescue ::RubyPython::PythonError
               # Not supported lexer from Pygments, we fallback on using the text lexer
               @buffer = Pygments.highlight(@buffer, :lexer => 'text')
             end
           elsif defined? CodeRay
-            # CodeRay might throw a warning when unsupported lang is set
+            # CodeRay might throw a warning when unsupported lang is set,
+            # then fallback to using the text lexer
             silence_warnings do
-              @buffer = CodeRay.scan(@buffer, @block_lang).html(:wrap => nil, :css => :style)
+              begin
+                @buffer = CodeRay.scan(@buffer, lang).html(:wrap => nil, :css => :style)
+              rescue ArgumentError
+                @buffer = CodeRay.scan(@buffer, 'text').html(:wrap => nil, :css => :style)
+              end
             end
           end
         else
@@ -336,6 +343,15 @@ module Orgmode
       end
     end
 
+    def normalize_lang(lang)
+      case lang
+      when 'emacs-lisp', 'common-lisp', 'lisp'
+        'scheme'
+      else
+        lang
+      end
+    end
+
     # Helper method taken from Rails
     # https://github.com/rails/rails/blob/c2c8ef57d6f00d1c22743dc43746f95704d67a95/activesupport/lib/active_support/core_ext/kernel/reporting.rb#L10
     def silence_warnings

data/lib/org-ruby/line.rb

@@ -146,7 +146,7 @@ module Orgmode
       table_row? or table_separator? or table_header?
     end
 
-    BlockRegexp = /^\s*#\+(BEGIN|END)_(\w*)\s*(\w*)?/i
+    BlockRegexp = /^\s*#\+(BEGIN|END)_(\w*)\s*([0-9A-Za-z_\-]*)?/i
 
     def begin_block?
       @line =~ BlockRegexp && $1 =~ /BEGIN/i

metadata

@@ -1,69 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: org-ruby
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.7.1
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - Brian Dewey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rubypants
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70185642496880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bones
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70185642496880
+- !ruby/object:Gem::Dependency
+  name: bones
+  requirement: &70185642496060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 3
-        - 8
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.8.0
   type: :development
-  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.\" "
+  prerelease: false
+  version_requirements: *70185642496060
+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." '
 email: bdewey@gmail.com
-executables: 
+executables:
 - org-ruby
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - README.rdoc
 - bin/org-ruby
-files: 
+files:
 - History.txt
 - README.rdoc
 - bin/org-ruby
@@ -78,40 +65,30 @@ files:
 - lib/org-ruby/textile_output_buffer.rb
 - lib/org-ruby/textile_symbol_replace.rb
 - lib/org-ruby/tilt.rb
-- test/test_orgmode_parser.rb
 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      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/test_orgmode_parser.rb
+test_files: []