rouge 1.3.1 → 1.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a5ef3d5ad63da7030f7010aa8a8cf106ab9e996a
+  data.tar.gz: 57de8eafa29b51cce4cb7370b9848a9791b1ec5c
+SHA512:
+  metadata.gz: 9177cafdf9183ecf4f9a28044fae665cd2fc26e684e1168ca591139e52f87ff40d426cc74a8b2520cceaa3824395c28009839de6fd9b1b4695b106ce362b7835
+  data.tar.gz: 4b9e68100dce51cf3475d581b40285ed7194857824c5356158b1502a59940d323f06b0de0169a842338e047b87a58773a92a93d70e1628e5f29d573d99dfcaab

data/Gemfile

@@ -7,17 +7,17 @@ gem 'wrong'
 
 gem 'rake'
 
-gem 'racc'
-
 # don't try to install redcarpet under jruby
 gem 'redcarpet', :platforms => :ruby
 
-# for visual tests
-gem 'sinatra'
-gem 'shotgun'
+group :development do
+  gem 'pry'
 
-# docs
-gem 'yard'
-gem 'github-markup'
+  # docs
+  gem 'yard'
+  gem 'github-markup'
 
-gem 'pry'
+  # for visual tests
+  gem 'sinatra'
+  gem 'shotgun'
+end

data/lib/rouge/lexer.rb

@@ -17,13 +17,6 @@ module Rouge
         new(opts).lex(stream, &b)
       end
 
-      def load_const(const_name, relpath)
-        return if Lexers.const_defined?(const_name)
-
-        root = Pathname.new(__FILE__).dirname.join('lexers')
-        load root.join(relpath)
-      end
-
       def default_options(o={})
         @default_options ||= {}
         @default_options.merge!(o)
@@ -427,4 +420,13 @@ module Rouge
       0
     end
   end
+
+  module Lexers
+    def self.load_const(const_name, relpath)
+      return if const_defined?(const_name)
+
+      root = Pathname.new(__FILE__).dirname.join('lexers')
+      load root.join(relpath)
+    end
+  end
 end

data/lib/rouge/lexers/c.rb

@@ -95,7 +95,8 @@ module Rouge
         mixin :whitespace
         rule /L?"/, Str, :string
         rule %r(L?'(\\.|\\[0-7]{1,3}|\\x[a-f0-9]{1,2}|[^\\'\n])')i, Str::Char
-        rule %r((\d+\.\d*|\.\d+|\d+)[e][+-]?\d+[lu]*)i, Num::Float
+        rule %r((\d+[.]\d*|[.]?\d+)e[+-]?\d+[lu]*)i, Num::Float
+        rule %r(\d+e[+-]?\d+[lu]*)i, Num::Float
         rule /0x[0-9a-f]+[lu]*/i, Num::Hex
         rule /0[0-7]+[lu]*/i, Num::Oct
         rule /\d+[lu]*/i, Num::Integer

data/lib/rouge/lexers/cpp.rb

@@ -1,6 +1,6 @@
 module Rouge
   module Lexers
-    Lexer.load_const :C, 'c.rb'
+    load_const :C, 'c.rb'
 
     class Cpp < C
       desc "The C++ programming language"
@@ -37,8 +37,17 @@ module Rouge
         rule /(?:__offload|__blockingoffload|__outer)\b/, Keyword::Pseudo
       end
 
+      # digits with optional inner quotes
+      # see www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3781.pdf
+      dq = /\d('?\d)*/
+
       prepend :statements do
         rule /class\b/, Keyword, :classname
+        rule %r((#{dq}[.]#{dq}?|[.]#{dq})(e[+-]?#{dq}[lu]*)?)i, Num::Float
+        rule %r(#{dq}e[+-]?#{dq}[lu]*)i, Num::Float
+        rule /0x\h('?\h)*[lu]*/i, Num::Hex
+        rule /0[0-7]('?[0-7])*[lu]*/i, Num::Oct
+        rule /#{dq}[lu]*/i, Num::Integer
       end
 
       state :classname do

data/lib/rouge/lexers/moonscript.rb

@@ -2,7 +2,7 @@
 
 module Rouge
   module Lexers
-    Lexer.load_const :Lua, 'lua.rb'
+    load_const :Lua, 'lua.rb'
 
     class Moonscript < RegexLexer
       desc "Moonscript (http://www.moonscript.org)"

data/lib/rouge/lexers/objective_c.rb

@@ -1,6 +1,6 @@
 module Rouge
   module Lexers
-    Lexer.load_const :C, 'c.rb'
+    load_const :C, 'c.rb'
 
     class ObjectiveC < C
       tag 'objective_c'

data/lib/rouge/lexers/ruby.rb

@@ -320,6 +320,11 @@ module Rouge
           goto :slash_regex
         end
 
+        rule /(\s*)(%=)/ do
+          groups Text, Operator
+          goto :expr_start
+        end
+
         rule(%r((?=\s*/))) { pop! }
 
         rule(//) { goto :expr_start }

data/lib/rouge/lexers/sass.rb

@@ -1,6 +1,6 @@
 module Rouge
   module Lexers
-    Lexer.load_const :SassCommon, 'sass/common.rb'
+    load_const :SassCommon, 'sass/common.rb'
 
     class Sass < SassCommon
       include Indentation

data/lib/rouge/lexers/scss.rb

@@ -1,6 +1,6 @@
 module Rouge
   module Lexers
-    Lexer.load_const :SassCommon, 'sass/common.rb'
+    load_const :SassCommon, 'sass/common.rb'
 
     class Scss < SassCommon
       desc "SCSS stylesheets (sass-lang.com)"

data/lib/rouge/version.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 1.3.1
-  prerelease: 
+  version: 1.3.2
 platform: ruby
 authors:
 - Jay Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -21,182 +20,181 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
-- 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
+- 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
+- lib/rouge/formatter.rb
 - lib/rouge/formatters/html.rb
 - lib/rouge/formatters/terminal256.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/lexer.rb
+- lib/rouge/lexers/c.rb
 - lib/rouge/lexers/clojure.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/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/sed.rb
 - lib/rouge/lexers/coffeescript.rb
-- lib/rouge/lexers/literate_coffeescript.rb
-- lib/rouge/lexers/racket.rb
-- lib/rouge/lexers/diff.rb
-- lib/rouge/lexers/viml/keywords.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/toml.rb
-- lib/rouge/lexers/moonscript.rb
-- lib/rouge/lexers/puppet.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/diff.rb
+- lib/rouge/lexers/elixir.rb
+- lib/rouge/lexers/erb.rb
+- lib/rouge/lexers/erlang.rb
+- lib/rouge/lexers/factor.rb
 - lib/rouge/lexers/gherkin.rb
-- lib/rouge/lexers/vb.rb
-- lib/rouge/lexers/rust.rb
+- lib/rouge/lexers/gherkin/keywords.rb
+- lib/rouge/lexers/go.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/scss.rb
-- lib/rouge/lexers/javascript.rb
-- lib/rouge/lexers/shell.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/io.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/javascript.rb
+- lib/rouge/lexers/literate_coffeescript.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/llvm.rb
+- lib/rouge/lexers/lua.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/haskell.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/r.rb
-- lib/rouge/lexers/markdown.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/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
+- 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/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/scss.rb
+- lib/rouge/lexers/sed.rb
+- lib/rouge/lexers/shell.rb
+- lib/rouge/lexers/smalltalk.rb
+- lib/rouge/lexers/sml.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
 homepage: http://github.com/jayferd/rouge
 licenses:
 - MIT (see LICENSE file)
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rouge
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A pure-ruby colorizer based on pygments
 test_files: []
 has_rdoc: