From 46b83c9c5384a299cdc8d8c5381259b1f6d0e4aa Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Thu, 31 Dec 2009 02:56:55 +0000
Subject: Fixed example tests.

* test:clean task also deletes .expected.html files
* LinesOfCode encoder can deal with tokens that have no scanner.
  Tests were added for this.
* JSON encoder load rubygems if necessary.
* NEW :loc as an alias for :lines_of_code
* NEW Scanner methods marshal_dump, marshal_load
  FIXED Tokens dumping (failed while trying to dump @scanner)
---
 lib/coderay/encoders/json.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/coderay/encoders/json.rb')

diff --git a/lib/coderay/encoders/json.rb b/lib/coderay/encoders/json.rb
index 072f334..7aa077c 100644
--- a/lib/coderay/encoders/json.rb
+++ b/lib/coderay/encoders/json.rb
@@ -10,7 +10,12 @@ module Encoders
     
   protected
     def setup options
-      require 'json'
+      begin
+        require 'json'
+      rescue LoadError
+        require 'rubygems'
+        require 'json'
+      end
       @out = []
     end
     
-- 
cgit v1.2.1