rouge 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5ef3d5ad63da7030f7010aa8a8cf106ab9e996a
-  data.tar.gz: 57de8eafa29b51cce4cb7370b9848a9791b1ec5c
+  metadata.gz: 655cf7caf531705969ba4dd70fb14e844d402ace
+  data.tar.gz: 7c9aa4d4c38cdf6664fd65aefd61ef487f6946bb
 SHA512:
-  metadata.gz: 9177cafdf9183ecf4f9a28044fae665cd2fc26e684e1168ca591139e52f87ff40d426cc74a8b2520cceaa3824395c28009839de6fd9b1b4695b106ce362b7835
-  data.tar.gz: 4b9e68100dce51cf3475d581b40285ed7194857824c5356158b1502a59940d323f06b0de0169a842338e047b87a58773a92a93d70e1628e5f29d573d99dfcaab
+  metadata.gz: 1a2f19f1a538b2adb688dfdd921dfae66062dc8a3d6966c3fd9ad27165f3e00fe7451fce1078d3967605e30e04469ff5acc469b485b37f97d5f131e090d61783
+  data.tar.gz: 5e4103ce369d28143b452d912f91f733b2369eeb098ee4aa6fc388f88404a0519dd1845919401caea10f2c42838fe32fbbdd53ab1cbe7a715f9d910323876c32

data/lib/rouge/formatters/html.rb

@@ -43,7 +43,7 @@ module Rouge
         tokens.each do |tok, val|
           span(tok, val, &b)
         end
-        yield '</pre>' if @wrap
+        yield "</pre>\n" if @wrap
       end
 
       def stream_tableized(tokens)
@@ -82,8 +82,8 @@ module Rouge
         yield '</pre>'
         yield '</td>'
 
-        yield '</tr></tbody></table>'
-        yield '</div>' if @wrap
+        yield "</tr></tbody></table>\n"
+        yield "</div>\n" if @wrap
       end
 
       TABLE_FOR_ESCAPE_HTML = {

data/lib/rouge/lexers/python.rb

@@ -11,41 +11,49 @@ module Rouge
         return 1 if text.shebang?(/pythonw?(3|2(\.\d)?)?/)
       end
 
-      keywords = %w(
-        assert break continue del elif else except exec
-        finally for global if lambda pass print raise
-        return try while yield as with
-      )
-
-      builtins = %w(
-        __import__ abs all any apply basestring bin bool buffer
-        bytearray bytes callable chr classmethod cmp coerce compile
-        complex delattr dict dir divmod enumerate eval execfile exit
-        file filter float frozenset getattr globals hasattr hash hex id
-        input int intern isinstance issubclass iter len list locals
-        long map max min next object oct open ord pow property range
-        raw_input reduce reload repr reversed round set setattr slice
-        sorted staticmethod str sum super tuple type unichr unicode
-        vars xrange zip
-      )
-
-      builtins_pseudo = %w(self None Ellipsis NotImplemented False True)
-
-      exceptions = %w(
-        ArithmeticError AssertionError AttributeError
-        BaseException DeprecationWarning EOFError EnvironmentError
-        Exception FloatingPointError FutureWarning GeneratorExit IOError
-        ImportError ImportWarning IndentationError IndexError KeyError
-        KeyboardInterrupt LookupError MemoryError NameError
-        NotImplemented NotImplementedError OSError OverflowError
-        OverflowWarning PendingDeprecationWarning ReferenceError
-        RuntimeError RuntimeWarning StandardError StopIteration
-        SyntaxError SyntaxWarning SystemError SystemExit TabError
-        TypeError UnboundLocalError UnicodeDecodeError
-        UnicodeEncodeError UnicodeError UnicodeTranslateError
-        UnicodeWarning UserWarning ValueError VMSError Warning
-        WindowsError ZeroDivisionError
-      )
+      def self.keywords
+        @keywords ||= %w(
+          assert break continue del elif else except exec
+          finally for global if lambda pass print raise
+          return try while yield as with
+        )
+      end
+
+      def self.builtins
+        @builtins ||= %w(
+          __import__ abs all any apply basestring bin bool buffer
+          bytearray bytes callable chr classmethod cmp coerce compile
+          complex delattr dict dir divmod enumerate eval execfile exit
+          file filter float frozenset getattr globals hasattr hash hex id
+          input int intern isinstance issubclass iter len list locals
+          long map max min next object oct open ord pow property range
+          raw_input reduce reload repr reversed round set setattr slice
+          sorted staticmethod str sum super tuple type unichr unicode
+          vars xrange zip
+        )
+      end
+
+      def self.builtins_pseudo
+        @builtins_pseudo ||= %w(self None Ellipsis NotImplemented False True)
+      end
+
+      def self.exceptions
+        @exceptions ||= %w(
+          ArithmeticError AssertionError AttributeError
+          BaseException DeprecationWarning EOFError EnvironmentError
+          Exception FloatingPointError FutureWarning GeneratorExit IOError
+          ImportError ImportWarning IndentationError IndexError KeyError
+          KeyboardInterrupt LookupError MemoryError NameError
+          NotImplemented NotImplementedError OSError OverflowError
+          OverflowWarning PendingDeprecationWarning ReferenceError
+          RuntimeError RuntimeWarning StandardError StopIteration
+          SyntaxError SyntaxWarning SystemError SystemExit TabError
+          TypeError UnboundLocalError UnicodeDecodeError
+          UnicodeEncodeError UnicodeError UnicodeTranslateError
+          UnicodeWarning UserWarning ValueError VMSError Warning
+          WindowsError ZeroDivisionError
+        )
+      end
 
       identifier =        /[a-z_][a-z0-9_]*/i
       dotted_identifier = /[a-z_.][a-z0-9_.]*/i
@@ -64,8 +72,6 @@ module Rouge
         rule /(in|is|and|or|not)\b/, Operator::Word
         rule /!=|==|<<|>>|[-~+\/*%=<>&^|.]/, Operator
 
-        rule /(?:#{keywords.join('|')})\b/, Keyword
-
         rule /(def)((?:\s|\\\s)+)/ do
           groups Keyword, Text
           push :funcname
@@ -86,10 +92,6 @@ module Rouge
           push :import
         end
 
-        # using negative lookbehind so we don't match property names
-        rule /(?<!\.)(?:#{builtins.join('|')})/, Name::Builtin
-        rule /(?<!\.)(?:#{builtins_pseudo.join('|')})/, Name::Builtin::Pseudo
-
         # TODO: not in python 3
         rule /`.*?`/, Str::Backtick
         rule /(?:r|ur|ru)"""/i, Str, :tdqs
@@ -102,6 +104,22 @@ module Rouge
         rule /u?'/i,            Str, :escape_sqs
 
         rule /@#{dotted_identifier}/i, Name::Decorator
+
+        # using negative lookbehind so we don't match property names
+        rule /(?<!\.)#{identifier}/ do |m|
+          if self.class.keywords.include? m[0]
+            token Keyword
+          elsif self.class.exceptions.include? m[0]
+            token Name::Builtin
+          elsif self.class.builtins.include? m[0]
+            token Name::Builtin
+          elsif self.class.builtins_pseudo.include? m[0]
+            token Name::Builtin::Pseudo
+          else
+            token Name
+          end
+        end
+
         rule identifier, Name
 
         rule /(\d+\.\d*|\d*\.\d+)(e[+-]?[0-9]+)?/i, Num::Float

data/lib/rouge/regex_lexer.rb

@@ -99,6 +99,11 @@ module Rouge
             puts "    popping stack: #{1}" if @debug
             @stack.pop or raise 'empty stack!'
           end
+        when :push
+          proc do |stream|
+            puts "    pushing #{@stack.last.name}" if @debug
+            @stack.push(@stack.last)
+          end
         when Symbol
           proc do |stream|
             puts "    yielding #{tok.qualname}, #{stream[0].inspect}" if @debug

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "1.3.2"
+    "1.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Jay Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -20,158 +20,158 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
-- bin/rougify
-- lib/rouge.rb
-- lib/rouge/cli.rb
-- lib/rouge/demos/c
-- lib/rouge/demos/clojure
-- lib/rouge/demos/coffeescript
-- lib/rouge/demos/common_lisp
-- lib/rouge/demos/conf
-- lib/rouge/demos/cpp
-- lib/rouge/demos/csharp
-- lib/rouge/demos/css
-- lib/rouge/demos/diff
-- lib/rouge/demos/elixir
-- lib/rouge/demos/erb
-- lib/rouge/demos/erlang
-- lib/rouge/demos/factor
-- lib/rouge/demos/gherkin
-- lib/rouge/demos/go
-- lib/rouge/demos/groovy
-- lib/rouge/demos/haml
-- lib/rouge/demos/handlebars
-- lib/rouge/demos/haskell
-- lib/rouge/demos/html
-- lib/rouge/demos/http
-- lib/rouge/demos/ini
-- lib/rouge/demos/io
-- lib/rouge/demos/java
-- lib/rouge/demos/javascript
-- lib/rouge/demos/json
-- lib/rouge/demos/literate_coffeescript
-- lib/rouge/demos/literate_haskell
-- lib/rouge/demos/llvm
-- lib/rouge/demos/lua
-- lib/rouge/demos/make
-- lib/rouge/demos/markdown
-- lib/rouge/demos/matlab
-- lib/rouge/demos/moonscript
-- lib/rouge/demos/nginx
-- lib/rouge/demos/objective_c
-- lib/rouge/demos/ocaml
-- lib/rouge/demos/perl
-- lib/rouge/demos/php
-- lib/rouge/demos/plaintext
-- lib/rouge/demos/prolog
-- lib/rouge/demos/puppet
-- lib/rouge/demos/python
-- lib/rouge/demos/r
-- lib/rouge/demos/racket
-- lib/rouge/demos/ruby
-- lib/rouge/demos/rust
-- lib/rouge/demos/sass
-- lib/rouge/demos/scala
-- lib/rouge/demos/scheme
-- lib/rouge/demos/scss
-- lib/rouge/demos/sed
-- lib/rouge/demos/shell
-- lib/rouge/demos/smalltalk
-- lib/rouge/demos/sml
-- lib/rouge/demos/sql
-- lib/rouge/demos/tcl
-- lib/rouge/demos/tex
-- lib/rouge/demos/toml
-- lib/rouge/demos/vb
-- lib/rouge/demos/viml
-- lib/rouge/demos/xml
-- lib/rouge/demos/yaml
+- rouge.gemspec
+- lib/rouge/token.rb
+- lib/rouge/version.rb
+- lib/rouge/util.rb
+- lib/rouge/theme.rb
+- lib/rouge/lexer.rb
+- lib/rouge/template_lexer.rb
 - lib/rouge/formatter.rb
+- lib/rouge/plugins/redcarpet.rb
+- lib/rouge/cli.rb
 - lib/rouge/formatters/html.rb
 - lib/rouge/formatters/terminal256.rb
-- lib/rouge/lexer.rb
-- lib/rouge/lexers/c.rb
+- lib/rouge/themes/thankful_eyes.rb
+- lib/rouge/themes/base16.rb
+- lib/rouge/themes/github.rb
+- lib/rouge/themes/monokai.rb
+- lib/rouge/themes/colorful.rb
+- lib/rouge/text_analyzer.rb
+- lib/rouge/regex_lexer.rb
+- lib/rouge/lexers/html.rb
+- lib/rouge/lexers/smalltalk.rb
 - lib/rouge/lexers/clojure.rb
-- lib/rouge/lexers/coffeescript.rb
-- lib/rouge/lexers/common_lisp.rb
-- lib/rouge/lexers/conf.rb
-- lib/rouge/lexers/cpp.rb
-- lib/rouge/lexers/csharp.rb
-- lib/rouge/lexers/css.rb
-- lib/rouge/lexers/diff.rb
-- lib/rouge/lexers/elixir.rb
-- lib/rouge/lexers/erb.rb
-- lib/rouge/lexers/erlang.rb
+- lib/rouge/lexers/plain_text.rb
+- lib/rouge/lexers/sass/common.rb
+- lib/rouge/lexers/sass.rb
 - lib/rouge/lexers/factor.rb
-- lib/rouge/lexers/gherkin.rb
-- lib/rouge/lexers/gherkin/keywords.rb
-- lib/rouge/lexers/go.rb
+- lib/rouge/lexers/csharp.rb
+- lib/rouge/lexers/php/builtins.rb
+- lib/rouge/lexers/nginx.rb
+- lib/rouge/lexers/llvm.rb
+- lib/rouge/lexers/scala.rb
+- lib/rouge/lexers/perl.rb
 - lib/rouge/lexers/groovy.rb
-- lib/rouge/lexers/haml.rb
-- lib/rouge/lexers/handlebars.rb
-- lib/rouge/lexers/haskell.rb
-- lib/rouge/lexers/html.rb
-- lib/rouge/lexers/http.rb
-- lib/rouge/lexers/ini.rb
-- lib/rouge/lexers/io.rb
-- lib/rouge/lexers/java.rb
-- lib/rouge/lexers/javascript.rb
+- lib/rouge/lexers/sed.rb
+- lib/rouge/lexers/coffeescript.rb
 - lib/rouge/lexers/literate_coffeescript.rb
-- lib/rouge/lexers/literate_haskell.rb
-- lib/rouge/lexers/llvm.rb
-- lib/rouge/lexers/lua.rb
-- lib/rouge/lexers/lua/builtins.rb
-- lib/rouge/lexers/make.rb
-- lib/rouge/lexers/markdown.rb
-- lib/rouge/lexers/matlab.rb
-- lib/rouge/lexers/matlab/builtins.rb
+- lib/rouge/lexers/racket.rb
+- lib/rouge/lexers/diff.rb
+- lib/rouge/lexers/viml/keywords.rb
+- lib/rouge/lexers/css.rb
+- lib/rouge/lexers/toml.rb
 - lib/rouge/lexers/moonscript.rb
-- lib/rouge/lexers/nginx.rb
-- lib/rouge/lexers/objective_c.rb
-- lib/rouge/lexers/ocaml.rb
-- lib/rouge/lexers/perl.rb
-- lib/rouge/lexers/php.rb
-- lib/rouge/lexers/php/builtins.rb
-- lib/rouge/lexers/plain_text.rb
-- lib/rouge/lexers/prolog.rb
 - lib/rouge/lexers/puppet.rb
-- lib/rouge/lexers/python.rb
-- lib/rouge/lexers/r.rb
-- lib/rouge/lexers/racket.rb
 - lib/rouge/lexers/ruby.rb
+- lib/rouge/lexers/http.rb
+- lib/rouge/lexers/xml.rb
+- lib/rouge/lexers/handlebars.rb
+- lib/rouge/lexers/php.rb
+- lib/rouge/lexers/tcl.rb
+- lib/rouge/lexers/tex.rb
+- lib/rouge/lexers/gherkin.rb
+- lib/rouge/lexers/vb.rb
 - lib/rouge/lexers/rust.rb
-- lib/rouge/lexers/sass.rb
-- lib/rouge/lexers/sass/common.rb
-- lib/rouge/lexers/scala.rb
-- lib/rouge/lexers/scheme.rb
+- lib/rouge/lexers/ini.rb
 - lib/rouge/lexers/scss.rb
-- lib/rouge/lexers/sed.rb
+- lib/rouge/lexers/javascript.rb
 - lib/rouge/lexers/shell.rb
-- lib/rouge/lexers/smalltalk.rb
+- lib/rouge/lexers/erlang.rb
+- lib/rouge/lexers/yaml.rb
+- lib/rouge/lexers/make.rb
+- lib/rouge/lexers/objective_c.rb
+- lib/rouge/lexers/lua.rb
+- lib/rouge/lexers/viml.rb
+- lib/rouge/lexers/java.rb
+- lib/rouge/lexers/common_lisp.rb
 - lib/rouge/lexers/sml.rb
+- lib/rouge/lexers/scheme.rb
+- lib/rouge/lexers/haml.rb
+- lib/rouge/lexers/erb.rb
+- lib/rouge/lexers/literate_haskell.rb
+- lib/rouge/lexers/c.rb
+- lib/rouge/lexers/gherkin/keywords.rb
+- lib/rouge/lexers/io.rb
+- lib/rouge/lexers/elixir.rb
+- lib/rouge/lexers/lua/builtins.rb
+- lib/rouge/lexers/go.rb
+- lib/rouge/lexers/python.rb
+- lib/rouge/lexers/cpp.rb
 - lib/rouge/lexers/sql.rb
-- lib/rouge/lexers/tcl.rb
-- lib/rouge/lexers/tex.rb
-- lib/rouge/lexers/toml.rb
-- lib/rouge/lexers/vb.rb
-- lib/rouge/lexers/viml.rb
-- lib/rouge/lexers/viml/keywords.rb
-- lib/rouge/lexers/xml.rb
-- lib/rouge/lexers/yaml.rb
-- lib/rouge/plugins/redcarpet.rb
-- lib/rouge/regex_lexer.rb
-- lib/rouge/template_lexer.rb
-- lib/rouge/text_analyzer.rb
-- lib/rouge/theme.rb
-- lib/rouge/themes/base16.rb
-- lib/rouge/themes/colorful.rb
-- lib/rouge/themes/github.rb
-- lib/rouge/themes/monokai.rb
-- lib/rouge/themes/thankful_eyes.rb
-- lib/rouge/token.rb
-- lib/rouge/util.rb
-- lib/rouge/version.rb
-- rouge.gemspec
+- lib/rouge/lexers/haskell.rb
+- lib/rouge/lexers/matlab.rb
+- lib/rouge/lexers/matlab/builtins.rb
+- lib/rouge/lexers/r.rb
+- lib/rouge/lexers/markdown.rb
+- lib/rouge/lexers/ocaml.rb
+- lib/rouge/lexers/prolog.rb
+- lib/rouge/lexers/conf.rb
+- lib/rouge.rb
+- bin/rougify
+- lib/rouge/demos/erlang
+- lib/rouge/demos/moonscript
+- lib/rouge/demos/sass
+- lib/rouge/demos/ruby
+- lib/rouge/demos/factor
+- lib/rouge/demos/smalltalk
+- lib/rouge/demos/yaml
+- lib/rouge/demos/handlebars
+- lib/rouge/demos/tex
+- lib/rouge/demos/racket
+- lib/rouge/demos/elixir
+- lib/rouge/demos/php
+- lib/rouge/demos/tcl
+- lib/rouge/demos/html
+- lib/rouge/demos/shell
+- lib/rouge/demos/perl
+- lib/rouge/demos/prolog
+- lib/rouge/demos/r
+- lib/rouge/demos/scala
+- lib/rouge/demos/viml
+- lib/rouge/demos/haskell
+- lib/rouge/demos/css
+- lib/rouge/demos/conf
+- lib/rouge/demos/haml
+- lib/rouge/demos/literate_haskell
+- lib/rouge/demos/io
+- lib/rouge/demos/c
+- lib/rouge/demos/scss
+- lib/rouge/demos/llvm
+- lib/rouge/demos/literate_coffeescript
+- lib/rouge/demos/python
+- lib/rouge/demos/make
+- lib/rouge/demos/clojure
+- lib/rouge/demos/java
+- lib/rouge/demos/csharp
+- lib/rouge/demos/go
+- lib/rouge/demos/javascript
+- lib/rouge/demos/sed
+- lib/rouge/demos/common_lisp
+- lib/rouge/demos/groovy
+- lib/rouge/demos/sml
+- lib/rouge/demos/nginx
+- lib/rouge/demos/vb
+- lib/rouge/demos/toml
+- lib/rouge/demos/gherkin
+- lib/rouge/demos/http
+- lib/rouge/demos/rust
+- lib/rouge/demos/json
+- lib/rouge/demos/markdown
+- lib/rouge/demos/plaintext
+- lib/rouge/demos/xml
+- lib/rouge/demos/lua
+- lib/rouge/demos/erb
+- lib/rouge/demos/cpp
+- lib/rouge/demos/coffeescript
+- lib/rouge/demos/objective_c
+- lib/rouge/demos/sql
+- lib/rouge/demos/puppet
+- lib/rouge/demos/matlab
+- lib/rouge/demos/ini
+- lib/rouge/demos/ocaml
+- lib/rouge/demos/scheme
+- lib/rouge/demos/diff
 homepage: http://github.com/jayferd/rouge
 licenses:
 - MIT (see LICENSE file)
@@ -182,17 +182,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rouge
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments