coderay 1.0.0.788.pre → 1.0.0.798.pre

data/Rakefile

@@ -2,7 +2,6 @@ $:.unshift File.dirname(__FILE__) unless $:.include? '.'
 
 ROOT = '.'
 LIB_ROOT = File.join ROOT, 'lib'
-EXTRA_RDOC_FILES = %w(README.rdoc FOLDERS)
 
 task :default => :test
 

data/bin/coderay

@@ -30,7 +30,7 @@ usage:
 defaults:
   language   detect from input file name or shebang; fall back to plain text
   input      STDIN
-  format     detect from output file name or use terminal; fall back to HTML page
+  format     detect from output file name or use terminal; fall back to HTML
   output     STDOUT
 
 common:

data/lib/coderay/duo.rb

@@ -21,7 +21,7 @@ module CodeRay
     # Create a new Duo, holding a lang and a format to highlight code.
     # 
     # simple:
-    #   CodeRay::Duo[:ruby, :page].highlight 'bla 42'
+    #   CodeRay::Duo[:ruby, :html].highlight 'bla 42'
     # 
     # with options:
     #   CodeRay::Duo[:ruby, :html, :hint => :debug].highlight '????::??'

data/lib/coderay/encoders/_map.rb

@@ -2,15 +2,16 @@ module CodeRay
 module Encoders
   
   map \
-    :loc  => :lines_of_code,
-    :term => :terminal,
-    :tty  => :terminal,
-    :plain => :text,
-    :plaintext => :text,
+    :loc             => :lines_of_code,
+    :html            => :page,
+    :plain           => :text,
+    :plaintext       => :text,
     :remove_comments => :comment_filter,
-    :stats => :statistic
+    :stats           => :statistic,
+    :term            => :terminal,
+    :tty             => :terminal
   
-  # No default because Tokens#nonsense would not raise NoMethodError.
+  # No default because Tokens#nonsense should raise NoMethodError.
   
 end
 end

data/lib/coderay/encoders/div.rb

@@ -1,22 +1,23 @@
 module CodeRay
 module Encoders
-
+  
   load :html
   
   # Wraps HTML output into a DIV element, using inline styles by default.
   # 
   # See Encoders::HTML for available options.
   class Div < HTML
-
+    
     FILE_EXTENSION = 'div.html'
-
+    
     register_for :div
-
+    
     DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge \
-      :css => :style,
-      :wrap => :div
-
+      :css          => :style,
+      :wrap         => :div,
+      :line_numbers => false
+    
   end
-
+  
 end
 end

data/lib/coderay/encoders/html.rb

@@ -91,7 +91,7 @@ module Encoders
     
     register_for :html
     
-    FILE_EXTENSION = 'html'
+    FILE_EXTENSION = 'snippet.html'
     
     DEFAULT_OPTIONS = {
       :tab_width => 8,

data/lib/coderay/encoders/html/output.rb

@@ -126,7 +126,7 @@ module Encoders
       TABLE = Template.new <<-TABLE
 <table class="CodeRay"><tr>
   <td class="line_numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre><%LINE_NUMBERS%></pre></td>
-  <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }"><%CONTENT%></pre></td>
+  <td class="code"><pre><%CONTENT%></pre></td>
 </tr></table>
       TABLE
 

data/lib/coderay/encoders/json.rb

@@ -22,7 +22,7 @@ module Encoders
     rescue LoadError
       begin
         require 'rubygems'
-        gem "json#{'-jruby' if defined? JRUBY_VERSION}"
+        gem "json"
         require 'json'
       rescue LoadError
         $stderr.puts "The JSON encoder needs the JSON library.\n" \

data/lib/coderay/encoders/page.rb

@@ -14,8 +14,8 @@ module Encoders
     register_for :page
     
     DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge \
-      :css => :class,
-      :wrap => :page,
+      :css          => :class,
+      :wrap         => :page,
       :line_numbers => :table
     
   end

data/lib/coderay/encoders/span.rb

@@ -1,22 +1,23 @@
 module CodeRay
 module Encoders
-
+  
   load :html
-
+  
   # Wraps HTML output into a SPAN element, using inline styles by default.
   # 
   # See Encoders::HTML for available options.
   class Span < HTML
-
+    
     FILE_EXTENSION = 'span.html'
-
+    
     register_for :span
-
+    
     DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge \
-      :css => :style,
-      :wrap => :span
-
+      :css          => :style,
+      :wrap         => :span,
+      :line_numbers => false
+    
   end
-
+  
 end
 end

data/lib/coderay/helpers/file_type.rb

@@ -88,8 +88,8 @@ module CodeRay
       'groovy'   => :groovy,
       'gvy'      => :groovy,
       'h'        => :c,
-      'htm'      => :html,
-      'html'     => :html,
+      'htm'      => :page,
+      'html'     => :page,
       'html.erb' => :rhtml,
       'java'     => :java,
       'js'       => :java_script,
@@ -101,6 +101,7 @@ module CodeRay
       'php3'     => :php,
       'php4'     => :php,
       'php5'     => :php,
+      'prawn'    => :ruby,
       'py'       => :python,
       'py3'      => :python,
       'pyw'      => :python,
@@ -111,11 +112,12 @@ module CodeRay
       'rhtml'    => :rhtml,
       'rjs'      => :ruby,
       'rpdf'     => :ruby,
+      'ru'       => :ruby,
       'rxml'     => :ruby,
       'sch'      => :scheme,
       'sql'      => :sql,
       'ss'       => :scheme,
-      'xhtml'    => :xhtml,
+      'xhtml'    => :page,
       'xml'      => :xml,
       'yaml'     => :yaml,
       'yml'      => :yaml,
@@ -127,9 +129,10 @@ module CodeRay
     TypeFromShebang = /\b(?:ruby|perl|python|sh)\b/
     
     TypeFromName = {
-      'Capfile' => :ruby,
+      'Capfile'  => :ruby,
       'Rakefile' => :ruby,
       'Rantfile' => :ruby,
+      'Gemfile'  => :ruby,
     }
     
   end

data/lib/coderay/helpers/plugin.rb

@@ -271,7 +271,7 @@ module CodeRay
     
     def aliases
       plugin_host.load_plugin_map
-      plugin_host.plugin_hash.inject [] do |aliases, (key, value)|
+      plugin_host.plugin_hash.inject [] do |aliases, (key, _)|
         aliases << key if plugin_host[key] == self
         aliases
       end

data/lib/coderay/scanners/php.rb

@@ -354,7 +354,7 @@ module Scanners
           
           elsif match = scan(/<<<(?:(#{RE::IDENTIFIER})|"(#{RE::IDENTIFIER})"|'(#{RE::IDENTIFIER})')/o)
             encoder.begin_group :string
-            warn 'heredoc in heredoc?' if heredoc_delimiter
+            # warn 'heredoc in heredoc?' if heredoc_delimiter
             heredoc_delimiter = Regexp.escape(self[1] || self[2] || self[3])
             encoder.text_token match, :delimiter
             states.push self[3] ? :sqstring : :dqstring

data/lib/coderay/scanners/ruby.rb

@@ -381,10 +381,10 @@ module Scanners
               end
             else
               case esc = getch
-              when state.delim, '\\'
-                encoder.text_token match + esc, :char
               when nil
                 encoder.text_token match, :content
+              when state.delim, '\\'
+                encoder.text_token match + esc, :char
               else
                 encoder.text_token match + esc, :content
               end

data/lib/coderay/styles/alpha.rb

@@ -135,18 +135,18 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .v  { color:#037 }
 .xt { color:#444 }
 
-.ins { background: hsla(120,100%,50%,0.2) }
-.del { background: hsla(0,100%,50%,0.2) }
-.chg { color: #aaf; background: #007; }
+.ins { background: hsla(120,100%,50%,0.1) }
+.del { background: hsla(0,100%,50%,0.1) }
+.chg { color: #bbf; background: #007; }
 .head { color: #f8f; background: #505 }
 .head .filename { color: white; }
 
 .del .eye { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
 .ins .eye { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
 
-.ins .ins { color: #080; background:transparent; font-weight:bold }
-.del .del { color: #800; background:transparent; font-weight:bold }
-.chg .chg { color: #66f }
+.ins .ins { color: #0c0; background:transparent; font-weight:bold }
+.del .del { color: #c00; background:transparent; font-weight:bold }
+.chg .chg { color: #88f }
 .head .head { color: #f4f }
     TOKENS
 

data/test/functional/basic.rb

@@ -64,7 +64,7 @@ class BasicTest < Test::Unit::TestCase
   end
   
   def test_highlight
-    assert_match '<div class="code"><pre>test</pre></div>', CodeRay.highlight('test', :python)
+    assert_match '<pre>test</pre>', CodeRay.highlight('test', :python)
   end
   
   def test_highlight_file
@@ -173,7 +173,7 @@ more code  # and another comment, in-line.
   
   def test_encoder_file_extension
     assert_nothing_raised do
-      assert_equal 'html', CodeRay::Encoders::HTML::FILE_EXTENSION
+      assert_equal 'html', CodeRay::Encoders::Page::FILE_EXTENSION
       assert_equal 'cocoa', Milk::FILE_EXTENSION
       assert_equal 'cocoa', Milk.new.file_extension
       assert_equal 'honeybee', HoneyBee::FILE_EXTENSION

data/test/functional/examples.rb

@@ -24,7 +24,7 @@ end
 <a href="#n2" name="n2">2</a>
 <a href="#n3" name="n3">3</a>
 </pre></td>
-  <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }"><span style="color:#00D">5</span>.times <span style="color:#080;font-weight:bold">do</span>
+  <td class="code"><pre><span style="color:#00D">5</span>.times <span style="color:#080;font-weight:bold">do</span>
   puts <span style="background-color:hsla(0,100%,50%,0.08)"><span style="color:#710">'</span><span style="color:#D20">Hello, world!</span><span style="color:#710">'</span></span>
 <span style="color:#080;font-weight:bold">end</span></pre></td>
 </tr></table>
@@ -38,7 +38,7 @@ end
 <table class="CodeRay"><tr>
   <td class="line_numbers" title="double click to toggle" ondblclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre>
 </pre></td>
-  <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }">puts <span class="s"><span class="dl">&quot;</span><span class="k">Hello, world!</span><span class="dl">&quot;</span></span></pre></td>
+  <td class="code"><pre>puts <span class="s"><span class="dl">&quot;</span><span class="k">Hello, world!</span><span class="dl">&quot;</span></span></pre></td>
 </tr></table>
 
 </body>

metadata

@@ -2,15 +2,15 @@
 name: coderay
 version: !ruby/object:Gem::Version 
   prerelease: 10
-  version: 1.0.0.788.pre
+  version: 1.0.0.798.pre
 platform: ruby
 authors: 
-- murphy
+- Kornelius Kalnbach
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 Z
+date: 2011-07-08 00:00:00 Z
 dependencies: []
 
 description: Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.
@@ -22,7 +22,6 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- FOLDERS
 files: 
 - lib/coderay/duo.rb
 - lib/coderay/encoder.rb
@@ -96,7 +95,6 @@ files:
 - test/functional/for_redcloth.rb
 - test/functional/suite.rb
 - bin/coderay
-- FOLDERS
 homepage: http://coderay.rubychan.de
 licenses: []
 

data/FOLDERS

@@ -1,49 +0,0 @@
-= CodeRay - folder structure
-
-== bench - Benchmarking system
-
-All benchmarking stuff goes here.
-
-Test inputs are stored in files named <code>example.<lang></code>.
-Test outputs go to <code>bench/test.<encoder-default-file-extension></code>.
-
-Run <code>bench/bench.rb</code> to get a usage description.
-
-Run <code>rake bench</code> to perform an example benchmark.
-
-
-== bin - Scripts
-
-Executional files for CodeRay.
-
-coderay:: The CodeRay executable.
-coderay_stylesheet:: Prints the default stylesheet.
-
-== demo - Demos and functional tests
-
-Demonstrational scripts to show of CodeRay's features.
-
-Run them as functional tests with <code>rake test:demos</code>.
-
-
-== etc - Lots of stuff
-
-Some addidtional files for CodeRay, mainly graphics and Vim scripts.
-
-
-== lib - CodeRay library code
-
-This is the base directory for the CodeRay library.
-
-
-== rake_helpers - Rake helper libraries
-
-Some files to enhance Rake, including the Autumnal Rdoc template and some scripts.
-
-
-== test - Tests
-
-In the subfolder scanners/ are the scanners tests.
-Each language has its own subfolder and sub-suite.
-
-Run with <code>rake test</code>.