rouge 0.2.12 → 0.2.13

data/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'minitest'
-gem 'wrong', '~> 0.6.2'
+gem 'wrong'
 
 gem 'rake'
 

data/lib/rouge/lexers/clojure.rb

@@ -6,7 +6,7 @@ module Rouge
       tag 'clojure'
       aliases 'clj'
 
-      filenames '*.clj'
+      filenames '*.clj', '*.cljs'
 
       mimetypes 'text/x-clojure', 'application/x-clojure'
 

data/lib/rouge/regex_lexer.rb

@@ -368,6 +368,3 @@ module Rouge
     end
   end
 end
-
-class Regexp
-end

data/lib/rouge/token.rb

@@ -98,6 +98,7 @@ module Rouge
     # XXX IMPORTANT XXX
     # For compatibility, this list must be kept in sync with
     # pygments.token.STANDARD_TYPES
+    # please see https://github.com/jayferd/rouge/wiki/List-of-tokens
     token 'Text',                        ''
     token 'Text.Whitespace',             'w'
     token 'Error',                       'err'

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "0.2.12"
+    "0.2.13"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -37,110 +37,107 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - rouge.gemspec
+- lib/rouge/token.rb
+- lib/rouge/version.rb
 - lib/rouge/util.rb
-- lib/rouge/lexers/nginx.rb
-- lib/rouge/lexers/python.rb
-- lib/rouge/lexers/sql.rb
-- lib/rouge/lexers/common_lisp.rb
-- lib/rouge/lexers/erb.rb
-- lib/rouge/lexers/conf.rb
-- lib/rouge/lexers/scheme.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/themes/thankful_eyes.rb
+- lib/rouge/themes/base16.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/xml.rb
-- lib/rouge/lexers/shell.rb
-- lib/rouge/lexers/haml.rb
-- lib/rouge/lexers/ruby.rb
-- lib/rouge/lexers/make.rb
-- lib/rouge/lexers/scss.rb
-- lib/rouge/lexers/perl.rb
-- lib/rouge/lexers/javascript.rb
-- lib/rouge/lexers/diff.rb
-- lib/rouge/lexers/io.rb
-- lib/rouge/lexers/viml.rb
-- lib/rouge/lexers/rust.rb
+- lib/rouge/lexers/sass.rb
+- lib/rouge/lexers/factor.rb
 - lib/rouge/lexers/csharp.rb
-- lib/rouge/lexers/objective_c.rb
-- lib/rouge/lexers/smalltalk.rb
 - lib/rouge/lexers/php/builtins.rb
-- lib/rouge/lexers/asp.rb
-- lib/rouge/lexers/haskell.rb
-- lib/rouge/lexers/c.rb
+- lib/rouge/lexers/nginx.rb
+- lib/rouge/lexers/perl.rb
+- lib/rouge/lexers/groovy.rb
 - lib/rouge/lexers/sed.rb
-- lib/rouge/lexers/handlebars.rb
-- lib/rouge/lexers/tex.rb
+- lib/rouge/lexers/coffeescript.rb
 - lib/rouge/lexers/text.rb
-- lib/rouge/lexers/html.rb
-- lib/rouge/lexers/markdown.rb
-- lib/rouge/lexers/java.rb
+- lib/rouge/lexers/diff.rb
+- lib/rouge/lexers/viml/keywords.rb
+- lib/rouge/lexers/css.rb
+- lib/rouge/lexers/ruby.rb
+- lib/rouge/lexers/xml.rb
+- lib/rouge/lexers/handlebars.rb
 - lib/rouge/lexers/php.rb
-- lib/rouge/lexers/yaml.rb
-- lib/rouge/lexers/session.rb
-- lib/rouge/lexers/coffeescript.rb
 - lib/rouge/lexers/tcl.rb
-- lib/rouge/lexers/css.rb
+- lib/rouge/lexers/tex.rb
+- lib/rouge/lexers/rust.rb
+- lib/rouge/lexers/scss.rb
+- lib/rouge/lexers/javascript.rb
+- lib/rouge/lexers/shell.rb
+- lib/rouge/lexers/yaml.rb
+- lib/rouge/lexers/make.rb
+- lib/rouge/lexers/viml.rb
+- lib/rouge/lexers/java.rb
+- lib/rouge/lexers/common_lisp.rb
+- lib/rouge/lexers/scheme.rb
+- lib/rouge/lexers/haml.rb
+- lib/rouge/lexers/erb.rb
+- lib/rouge/lexers/c.rb
+- lib/rouge/lexers/io.rb
+- lib/rouge/lexers/python.rb
 - lib/rouge/lexers/cpp.rb
-- lib/rouge/lexers/factor.rb
-- lib/rouge/lexers/viml/keywords.rb
-- lib/rouge/lexers/groovy.rb
-- lib/rouge/lexers/sass.rb
-- lib/rouge/plugins/redcarpet.rb
-- lib/rouge/themes/thankful_eyes.rb
-- lib/rouge/themes/colorful.rb
-- lib/rouge/themes/base16.rb
-- lib/rouge/token.rb
-- lib/rouge/formatters/html.rb
-- lib/rouge/formatters/terminal256.rb
-- lib/rouge/text_analyzer.rb
-- lib/rouge/version.rb
-- lib/rouge/formatter.rb
-- lib/rouge/regex_lexer.rb
-- lib/rouge/cli.rb
-- lib/rouge/lexer.rb
-- lib/rouge/template_lexer.rb
-- lib/rouge/theme.rb
+- lib/rouge/lexers/sql.rb
+- lib/rouge/lexers/haskell.rb
+- lib/rouge/lexers/markdown.rb
+- lib/rouge/lexers/conf.rb
 - lib/rouge.rb
 - bin/rougify
-- lib/rouge/demos/coffeescript
-- lib/rouge/demos/haml
-- lib/rouge/demos/smalltalk
-- lib/rouge/demos/html
-- lib/rouge/demos/clojure
-- lib/rouge/demos/cpp
-- lib/rouge/demos/scss
-- lib/rouge/demos/xml
-- lib/rouge/demos/haskell
-- lib/rouge/demos/factor
-- lib/rouge/demos/erb
 - lib/rouge/demos/sass
-- lib/rouge/demos/tex
-- lib/rouge/demos/scheme
-- lib/rouge/demos/diff
-- lib/rouge/demos/markdown
-- lib/rouge/demos/io
-- lib/rouge/demos/javascript
-- lib/rouge/demos/json
-- lib/rouge/demos/css
 - lib/rouge/demos/ruby
-- lib/rouge/demos/php
-- lib/rouge/demos/shell
-- lib/rouge/demos/make
-- lib/rouge/demos/sed
-- lib/rouge/demos/java
+- lib/rouge/demos/factor
+- lib/rouge/demos/smalltalk
 - lib/rouge/demos/yaml
-- lib/rouge/demos/sql
-- lib/rouge/demos/groovy
-- lib/rouge/demos/conf
-- lib/rouge/demos/nginx
-- lib/rouge/demos/rust
+- lib/rouge/demos/handlebars
+- lib/rouge/demos/tex
+- lib/rouge/demos/php
 - lib/rouge/demos/tcl
-- lib/rouge/demos/csharp
-- lib/rouge/demos/c
+- lib/rouge/demos/html
+- lib/rouge/demos/shell
 - lib/rouge/demos/perl
 - lib/rouge/demos/text
 - lib/rouge/demos/viml
-- lib/rouge/demos/handlebars
+- lib/rouge/demos/haskell
+- lib/rouge/demos/css
+- lib/rouge/demos/conf
+- lib/rouge/demos/haml
+- lib/rouge/demos/io
+- lib/rouge/demos/c
+- lib/rouge/demos/scss
 - lib/rouge/demos/python
+- lib/rouge/demos/make
+- lib/rouge/demos/clojure
+- lib/rouge/demos/java
+- lib/rouge/demos/csharp
+- lib/rouge/demos/javascript
+- lib/rouge/demos/sed
 - lib/rouge/demos/common_lisp
+- lib/rouge/demos/groovy
+- lib/rouge/demos/nginx
+- lib/rouge/demos/rust
+- lib/rouge/demos/json
+- lib/rouge/demos/markdown
+- lib/rouge/demos/xml
+- lib/rouge/demos/erb
+- lib/rouge/demos/cpp
+- lib/rouge/demos/coffeescript
+- lib/rouge/demos/sql
+- lib/rouge/demos/scheme
+- lib/rouge/demos/diff
 homepage: http://github.com/jayferd/rouge
 licenses: []
 post_install_message: 

data/lib/rouge/lexers/asp.rb

@@ -1,17 +0,0 @@
-module Rouge
-  module Lexers
-    class ASP < TemplateLexer
-      tag 'asp'
-      aliases 'asp.net'
-
-      default_options :parent => XML
-
-      state :root do
-        rule /(<%[@=#]?)(.*?)(%>)/ do
-          group 'Name.Tag'
-          group 'Other
-        end
-      end
-    end
-  end
-end

data/lib/rouge/lexers/objective_c.rb

@@ -1,104 +0,0 @@
-module Rouge
-  module Lexers
-    class ObjectiveC < RegexLexer
-      tag 'objective_c'
-      aliases 'objective-c', 'objectivec', 'obj_c', 'obj-c', 'objc'
-      # XXX TODO: objc has .h files too
-      filenames '*.m'
-      mimetypes 'text/x-objective-c'
-
-      id = /[a-zA-Z$_][a-zA-Z0-9$_]*/
-
-      def self.decorators
-        @decorators = Set.new %w(
-          private protected public encode synchronized try throw catch
-          finally end property synthesize dynamic selector
-        )
-      end
-
-      def self.keywords_type
-        @keywords_type ||= Set.new %w(
-          int long float short double char unsigned signed void id BOOL
-          IBOutlet IBAction SEL
-        )
-      end
-
-      def self.keywords
-        @keywords ||= Set.new %w(
-          auto break case const continue default do else enum extern
-          for goto if register restricted return sizeof static struct
-          switch typedef union volatile virtual while in
-        )
-      end
-
-      def self.reserved
-        @reserved ||= Set.new %w(
-          inline naked restrict thread typename
-          _inline _naked _restrict _thread _typename
-          __inline __naked __restrict __thread __typename
-
-          __asm __int8 __based __except __int16 __stdcall __cdecl
-          __fastcall __int32 __declspec __finally __int64 __try __leave
-        )
-      end
-
-      state :whitespace do
-        rule /^\s*#if\s+0/, 'Comment', :if0
-        rule /^\s*#/, 'Comment.Preproc', :macro
-        rule /\n/, 'Text'
-        rule /\s+/, 'Text'
-        rule /\\\n/, 'Literal.String.Escape'
-        rule %r(//(\\.|.)*?\n), 'Comment.Single'
-        rule %r(/[*].*?[*]/), 'Comment.Multiline'
-      end
-
-      state :statements do
-        rule /[L@]?"/, 'Literal.String', :string
-        rule /(L|@)?'(\\[0-7]{1,3}|\\x[a-fA-F0-9]{1,2}|[^\\'\n]|\\.)'/,
-          'Literal.String.Char'
-        rule /(\d+[.]\d*|[.]\d+|\d+)e[+-]?\d+l?/i, 'Literal.Number.Float'
-        rule /(\d+[.]\d*|[.]\d+)f?/i, 'Literal.Number.Float'
-        rule /\d+f/i, 'Literal.Number.Float'
-        rule /0x[0-9a-f]+l?/i, 'Literal.Number.Hex'
-        rule /0[0-7]+l?/i, 'Literal.Number.Oct'
-        rule /\d+l?/i, 'Literal.Number.Integer'
-        rule %r([~!%^&*+=|?:<>/-]), 'Operator'
-        rule /[()\[\],.]/, 'Punctuation'
-
-        rule /#{id}:(?!:)/, 'Name.Label'
-
-        rule /@(#{id})/ do |m|
-          if self.class.decorators.include? m[1]
-            token 'Keyword'
-          else
-            token 'Error'
-          end
-        end
-
-        rule /(TRUE|FALSE|nil|NULL)\b/, 'Name.Builtin'
-
-        rule id do |m|
-          name = m[0]
-
-          if self.class.keywords.include? name
-            token 'Keyword'
-          elsif self.class.keywords_type.include? name
-            token 'Keyword.Type'
-          elsif self.class.reserved.include? name
-            token 'Keyword.Reserved'
-          end
-        end
-      end
-
-      state :root do
-        mixin :whitespace
-
-        rule %r(
-          ([a-zA-Z0-9_*\s]+?[\s*]) # return arguments
-          (#{id}) # method name
-          (\s*[(][^;]*?[)]) # signature
-        )x
-      end
-    end
-  end
-end

data/lib/rouge/lexers/session.rb

@@ -1,47 +0,0 @@
-module Rouge
-  module Lexers
-    class Session < TemplateLexer
-      desc 'an interactive session of another language'
-      tag 'session'
-
-      default_options :prompt => /(\A|\n)[^$#]+[$#]/
-      default_options :parent => 'shell'
-
-      def prompt_regex
-        @prompt_regex ||= option(:prompt).tap do |prompt|
-          Regexp === prompt ? prompt : Regexp.new(prompt)
-        end
-      end
-
-      def stream_tokens(str, &b)
-        scanner = StringScanner.new(str)
-
-        until scanner.eos?
-          if scanner.scan(prompt_regex)
-            debug { "prompt: #{scanner[0].inspect}" }
-            yield Token['Generic.Heading'], scanner[0]
-
-            scanner.scan(line_regex)
-            debug { "line: #{scanner[0].inspect}" }
-
-            parent.lex(scanner[0], :continue => true, &b)
-          end
-
-          scanner.scan(until_prompt_regex)
-          debug { "(#{until_prompt_regex.inspect}: #{scanner[0].inspect}" }
-          yield Token['Generic.Output'], scanner[0]
-        end
-      end
-
-      private
-
-      def line_regex
-        @line_regex ||= /(\\.|.)*?\n/
-      end
-
-      def until_prompt_regex
-        @until_prompt_regex ||= /.*?(?=#{prompt_regex})|.*/m
-      end
-    end
-  end
-end