rouge 0.0.2 → 0.0.3

data/lib/rouge/lexers/text.rb

@@ -0,0 +1,11 @@
+module Rouge
+  module Lexers
+    class Text < Lexer
+      tag 'text'
+
+      def stream_tokens(stream, &b)
+        yield Token['Text'], stream
+      end
+    end
+  end
+end

data/lib/rouge/theme.rb

@@ -1,24 +1,37 @@
 module Rouge
   class Theme
+    class Style < Hash
+      def render(selector, &b)
+        return enum_for(:render, selector).to_a.join("\n") unless b
+
+        return if empty?
+
+        yield "#{selector} {"
+        yield "  color: #{self[:fg]};" if self[:fg]
+        yield "  background-color: #{self[:bg]};" if self[:bg]
+        yield "  font-weight: bold;" if self[:bold]
+        yield "  font-style: italic;" if self[:italic]
+        yield "  text-decoration: underline;" if self[:underline]
+
+        (self[:rules] || []).each do |rule|
+          yield "  #{rule};"
+        end
+
+        yield "}"
+      end
+    end
+
     class << self
       def styles
         @styles ||= {}
       end
 
-      def main_style
-        @main_style ||= {}
-      end
-
       def style(*tokens)
-        opts = {}
-        opts = tokens.pop if tokens.last.is_a? Hash
-
-        if tokens.empty?
-          @main_style = opts
-        end
+        style = Style.new
+        style.merge!(tokens.pop) if tokens.last.is_a? Hash
 
         tokens.each do |tok|
-          styles[tok.to_s] = opts
+          styles[tok.to_s] = style
         end
       end
 
@@ -41,59 +54,35 @@ module Rouge
 
   class CSSTheme < Theme
     def initialize(opts={})
-      @opts = opts
-    end
-
-    def render
-      out = []
-      stream { |line| out << line }
-      out.join("\n")
+      @scope = opts[:scope] || '.highlight'
     end
 
-    def stream(&b)
-      return enum_for(:stream) unless block_given?
+    def render(&b)
+      return enum_for(:render).to_a.join("\n") unless b
 
       self.class.styles.each do |tokname, style|
-        stream_single(Token[tokname], style, &b)
+        style.render(css_selector(Token[tokname]), &b)
       end
-
-      render_stanza('.highlight', self.class.main_style, &b)
     end
 
   private
-    def stream_single(tok, style, &b)
-      render_stanza(css_selector(tok), style, &b)
-    end
-
-    def render_stanza(selector, style, &b)
-      return if style.empty?
-
-      yield "#{selector} {"
-      yield "  color: #{style[:fg]};" if style[:fg]
-      yield "  background-color: #{style[:bg]};" if style[:bg]
-      yield "  font-weight: bold;" if style[:bold]
-      yield "  font-style: italic;" if style[:italic]
-      yield "  text-decoration: underline;" if style[:underline]
-
-      (style[:rules] || []).each do |rule|
-        yield "  #{rule};"
-      end
-
-      yield "}"
-    end
-
     def css_selector(token)
       tokens = [token]
       parent = token.parent
 
       inflate_token(token).map do |tok|
-        base = ".highlight"
-        base << " .#{tok.shortname}" unless tok.shortname.empty?
+        raise "unknown token: #{tok.inspect}" if tok.shortname.nil?
 
-        base
+        single_css_selector(tok)
       end.join(', ')
     end
 
+    def single_css_selector(token)
+      return @scope if token == Token['Text']
+
+      "#{@scope} .#{token.shortname}"
+    end
+
     # yield all of the tokens that should be styled the same
     # as the given token.  Essentially this recursively all of
     # the subtokens, except those which are more specifically

data/lib/rouge/themes/colorful.rb

@@ -0,0 +1,63 @@
+module Rouge
+  module Themes
+    # stolen from pygments
+    class Colorful < CSSTheme
+        style 'Text',                      :fg => "#bbbbbb", :bg => 'black'
+
+        style 'Comment',                   :fg => "#888"
+        style 'Comment.Preproc',           :fg => "#579"
+        style 'Comment.Special',           :fg => "#cc0000", :bold => true
+
+        style 'Keyword',                   :fg => "#080", :bold => true
+        style 'Keyword.Pseudo',            :fg => "#038"
+        style 'Keyword.Type',              :fg => "#339"
+
+        style 'Operator',                  :fg => "#333"
+        style 'Operator.Word',             :fg => "#000", :bold => true
+
+        style 'Name.Builtin',              :fg => "#007020"
+        style 'Name.Function',             :fg => "#06B", :bold => true
+        style 'Name.Class',                :fg => "#B06", :bold => true
+        style 'Name.Namespace',            :fg => "#0e84b5", :bold => true
+        style 'Name.Exception',            :fg => "#F00", :bold => true
+        style 'Name.Variable',             :fg => "#963"
+        style 'Name.Variable.Instance',    :fg => "#33B"
+        style 'Name.Variable.Class',       :fg => "#369"
+        style 'Name.Variable.Global',      :fg => "#d70", :bold => true
+        style 'Name.Constant',             :fg => "#036", :bold => true
+        style 'Name.Label',                :fg => "#970", :bold => true
+        style 'Name.Entity',               :fg => "#800", :bold => true
+        style 'Name.Attribute',            :fg => "#00C"
+        style 'Name.Tag',                  :fg => "#070"
+        style 'Name.Decorator',            :fg => "#555", :bold => true
+
+        style 'Literal.String',            :bg => "#fff0f0"
+        style 'Literal.String.Char',       :fg => "#04D"
+        style 'Literal.String.Doc',        :fg => "#D42"
+        style 'Literal.String.Interpol',   :bg => "#eee"
+        style 'Literal.String.Escape',     :fg => "#666", :bold => true
+        style 'Literal.String.Regex',      :fg => "#000", :bg => "#fff0ff"
+        style 'Literal.String.Symbol',     :fg => "#A60"
+        style 'Literal.String.Other',      :fg => "#D20"
+
+        style 'Literal.Number',            :fg => "#60E", :bold => true
+        style 'Literal.Number.Integer',    :fg => "#00D", :bold => true
+        style 'Literal.Number.Float',      :fg => "#60E", :bold => true
+        style 'Literal.Number.Hex',        :fg => "#058", :bold => true
+        style 'Literal.Number.Oct',        :fg => "#40E", :bold => true
+
+        style 'Generic.Heading',           :fg => "#000080", :bold => true
+        style 'Generic.Subheading',        :fg => "#800080", :bold => true
+        style 'Generic.Deleted',           :fg => "#A00000"
+        style 'Generic.Inserted',          :fg => "#00A000"
+        style 'Generic.Error',             :fg => "#FF0000"
+        style 'Generic.Emph',              :italic => true
+        style 'Generic.Strong',            :bold => true
+        style 'Generic.Prompt',            :fg => "#c65d09", :bold => true
+        style 'Generic.Output',            :fg => "#888"
+        style 'Generic.Traceback',         :fg => "#04D"
+
+        style 'Error',                     :fg => "#F00", :bg => "#FAA"
+    end
+  end
+end

data/lib/rouge/themes/thankful_eyes.rb

@@ -18,32 +18,36 @@ module Rouge
       backlit =        '#4df4ff'
       schrill =        '#ffb000'
 
-      style :fg => unicorn, :bg => krasna
+      style 'Text', :fg => unicorn, :bg => krasna
 
       style 'Comment', :fg => cool_as_ice
       style 'Error',
             'Generic.Error', :fg => aluminum1, :bg => scarletred2
       style 'Keyword', :fg => sandy, :bold => true
-      style 'Operator', :fg => backlit, :bold => true
+      style 'Operator',
+            'Punctuation', :fg => backlit, :bold => true
       style 'Comment.Preproc',
             'Comment.Multiline',
             'Comment.Single',
             'Comment.Special', :fg => cool_as_ice, :italic => true
       style 'Generic.Deleted', :fg => scarletred2
+      style 'Generic.Inserted', :fg => go_get_it
       style 'Generic.Emph', :italic => true
       style 'Generic.Subheading', :fg => '#800080', :bold => true
       style 'Generic.Traceback', :fg => '#0040D0'
       style 'Keyword.Constant', :fg => pink_merengue, :bold => true
       style 'Keyword.Namespace',
             'Keyword.Pseudo',
-            'Keyword.Reserved', :fg => schrill, :bold => true
+            'Keyword.Reserved',
+            'Generic.Heading', :fg => schrill, :bold => true
       style 'Keyword.Type',
             'Name.Constant',
             'Name.Class',
             'Name.Decorator',
             'Name.Namespace',
             'Name.Builtin.Pseudo',
-            'Name.Exception', :fg => go_get_it, :bold => true
+            'Name.Exception',
+            'Name.Tag', :fg => go_get_it, :bold => true
       style 'Literal.Number', :fg => pink_merengue, :bold => true
       style 'Literal.String', :fg => dune, :bold => true
       style 'Literal.String.Escape',
@@ -51,15 +55,13 @@ module Rouge
             'Literal.String.Interpol',
             'Literal.String.Other',
             'Literal.String.Symbol', :fg => backlit, :bold => true
-      style 'Name.Attribute', :fg => '#7D9029'
       style 'Name.Builtin', :fg => sandy
       style 'Name.Entity', :fg => '#999999', :bold => true
-      style 'Name.Label', :fg => '#A0A000'
-      style 'Name.Tag', :fg => '#008000', :bold => true
       style 'Text.Whitespace', :fg => '#BBBBBB'
       style 'Name.Variable',
-            'Name.Function', :fg => chilly
-
+            'Name.Function',
+            'Name.Label',
+            'Name.Attribute', :fg => chilly
     end
   end
 end

data/lib/rouge/token.rb

@@ -3,6 +3,7 @@ module Rouge
     attr_reader :name
     attr_reader :parent
     attr_accessor :shortname
+    alias to_s name
 
     def make_single(name)
       name = name.to_s
@@ -40,6 +41,15 @@ module Rouge
       @sub_tokens ||= {}
     end
 
+    def ancestors(&b)
+      return enum_for(:ancestors) unless block_given?
+
+      if parent
+        yield self
+        parent.ancestors(&b)
+      end
+    end
+
     def ===(other)
       immediate = if self.class == other.class
         self == other
@@ -62,17 +72,19 @@ module Rouge
       end
 
       def get(name)
+        return name if name.is_a? Token
+
         base[name]
       end
 
+      alias [] get
+
       def token(name, shortname)
         tok = get(name)
         tok.shortname = shortname
         tok
       end
 
-      alias [] get
-
       def each_token(&b)
         recurse = proc do |token|
           b.call(token)

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.0.2"
+    "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies: []
 description: see the description for now
 email:
@@ -21,7 +21,12 @@ files:
 - Gemfile
 - lib/rouge/lexers/shell.rb
 - lib/rouge/lexers/javascript.rb
+- lib/rouge/lexers/diff.rb
+- lib/rouge/lexers/text.rb
+- lib/rouge/lexers/html.rb
+- lib/rouge/lexers/css.rb
 - lib/rouge/themes/thankful_eyes.rb
+- lib/rouge/themes/colorful.rb
 - lib/rouge/token.rb
 - lib/rouge/formatters/html.rb
 - lib/rouge/version.rb