cache escaped tokens, reduce HTML enc setup time

1 files changed, 23 insertions, 23 deletions

diff --git a/lib/coderay/encoders/html/css.rb b/lib/coderay/encoders/html/css.rb
index 164d7f8..32470b4 100644
--- a/lib/coderay/encoders/html/css.rb
+++ b/lib/coderay/encoders/html/css.rb
@@ -3,25 +3,23 @@ module Encoders
 
   class HTML
     class CSS  # :nodoc:
-
-      attr :stylesheet
-
-      def CSS.load_stylesheet style = nil
-        CodeRay::Styles[style]
-      end
-
       def initialize style = :default
-        @styles = Hash.new
-        style = CSS.load_stylesheet style
-        @stylesheet = [
-          style::CSS_MAIN_STYLES,
-          style::TOKEN_COLORS.gsub(/^(?!$)/, '.CodeRay ')
+        @style = style
+      end
+      
+      def stylesheet
+        @stylesheet ||= CodeRay::Styles[@style]
+      end
+      
+      def css
+        [
+          stylesheet::CSS_MAIN_STYLES,
+          stylesheet::TOKEN_COLORS.gsub(/^(?!$)/, '.CodeRay ')
         ].join("\n")
-        parse style::TOKEN_COLORS
       end
-
+      
       def get_style_for_css_classes css_classes
-        cl = @styles[css_classes.first]
+        cl = styles[css_classes.first]
         return '' unless cl
         style = ''
         1.upto css_classes.size do |offset|
@@ -46,14 +44,16 @@ module Encoders
       |
         ( [^\n]+ )           # $3 = error
       /mx
-      def parse stylesheet
-        stylesheet.scan CSS_CLASS_PATTERN do |selectors, style, error|
-          raise "CSS parse error: '#{error.inspect}' not recognized" if error
-          for selector in selectors.split(',')
-            classes = selector.scan(/[-\w]+/)
-            cl = classes.pop
-            @styles[cl] ||= Hash.new
-            @styles[cl][classes] = style.to_s.strip.delete(' ').chomp(';')
+      def styles
+        @styles ||= Hash.new.tap do |styles|
+          stylesheet::TOKEN_COLORS.scan CSS_CLASS_PATTERN do |selectors, style, error|
+            raise "CSS parse error: '#{error.inspect}' not recognized" if error
+            for selector in selectors.split(',')
+              classes = selector.scan(/[-\w]+/)
+              cl = classes.pop
+              styles[cl] ||= Hash.new
+              styles[cl][classes] = style.to_s.strip.delete(' ').chomp(';')
+            end
           end
         end
       end