diff options
| author | murphy <murphy@rubychan.de> | 2009-12-31 02:56:55 +0000 |
|---|---|---|
| committer | murphy <murphy@rubychan.de> | 2009-12-31 02:56:55 +0000 |
| commit | 46b83c9c5384a299cdc8d8c5381259b1f6d0e4aa (patch) | |
| tree | e2930e60c4324f7a17f923ba68c15a6bab5d5576 /lib/coderay/encoders/json.rb | |
| parent | 77fc494cbdbde2719875fb0d7caf2454ef298fca (diff) | |
| download | coderay-46b83c9c5384a299cdc8d8c5381259b1f6d0e4aa.tar.gz | |
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)
Diffstat (limited to 'lib/coderay/encoders/json.rb')
| -rw-r--r-- | lib/coderay/encoders/json.rb | 7 |
1 files changed, 6 insertions, 1 deletions
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 |