RubyGems - coderay - Versions diffs - 1.0.8 → 1.0.9.rc1 - Mend

coderay 1.0.8 → 1.0.9.rc1

Files changed (6) hide show

data/lib/coderay/scanners/html.rb +1 -1
data/lib/coderay/scanners/php.rb +2 -3
data/lib/coderay/scanners/ruby.rb +21 -12
data/lib/coderay/scanners/ruby/patterns.rb +18 -18
data/lib/coderay/version.rb +1 -1
metadata +9 -9

data/lib/coderay/scanners/html.rb CHANGED Viewed

@@ -101,7 +101,7 @@ module Scanners
           when :initial
             if match = scan(/<!--(?:.*?-->|.*)/m)
               encoder.text_token match, :comment
-            elsif match = scan(/<!DOCTYPE(?:.*?>|.*)/m)
+            elsif match = scan(/<!(\w+)(?:.*?>|.*)|\]>/m)
               encoder.text_token match, :doctype
             elsif match = scan(/<\?xml(?:.*?\?>|.*)/m)
               encoder.text_token match, :preprocessor

data/lib/coderay/scanners/php.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: utf-8
 module CodeRay
 module Scanners
@@ -11,7 +11,6 @@ module Scanners
     register_for :php
     file_extension 'php'
-    encoding 'BINARY'
     KINDS_NOT_LOC = HTML::KINDS_NOT_LOC
@@ -211,7 +210,7 @@ module Scanners
       HTML_INDICATOR = /<!DOCTYPE html|<(?:html|body|div|p)[> ]/i
-      IDENTIFIER = /[a-z_\x7f-\xFF][a-z0-9_\x7f-\xFF]*/i
+      IDENTIFIER = 'ä'[/[[:alpha:]]/] == 'ä' ? Regexp.new('[[:alpha:]_[^\0-\177]][[:alnum:]_[^\0-\177]]*') : Regexp.new('[a-z_\x7f-\xFF][a-z0-9_\x7f-\xFF]*', true)
       VARIABLE = /\$#{IDENTIFIER}/
       OPERATOR = /

data/lib/coderay/scanners/ruby.rb CHANGED Viewed

@@ -94,18 +94,27 @@ module Scanners
             if !method_call_expected &&
                match = scan(unicode ? /#{patterns::METHOD_NAME}/uo :
                                       /#{patterns::METHOD_NAME}/o)
-              value_expected = false
               kind = patterns::IDENT_KIND[match]
-              if kind == :ident
-                if match[/\A[A-Z]/] && !(match[/[!?]$/] || match?(/\(/))
-                  kind = :constant
+              if kind == :ident && value_expected != :colon_expected && scan(/:(?!:)/)
+                value_expected = true
+                encoder.text_token match, :key
+                encoder.text_token ':',   :operator
+              else
+                value_expected = false
+                if kind == :ident
+                  if match[/\A[A-Z]/] && !(match[/[!?]$/] || match?(/\(/))
+                    kind = :constant
+                  end
+                elsif kind == :keyword
+                  state = patterns::KEYWORD_NEW_STATE[match]
+                  if patterns::KEYWORDS_EXPECTING_VALUE[match]
+                    value_expected = match == 'when' ? :colon_expected : true
+                  end
                 end
-              elsif kind == :keyword
-                state = patterns::KEYWORD_NEW_STATE[match]
-                value_expected = true if patterns::KEYWORDS_EXPECTING_VALUE[match]
+                value_expected = true if !value_expected && check(/#{patterns::VALUE_FOLLOWS}/o)
+                encoder.text_token match, kind
               end
-              value_expected = true if !value_expected && check(/#{patterns::VALUE_FOLLOWS}/o)
-              encoder.text_token match, kind
             elsif method_call_expected &&
                match = scan(unicode ? /#{patterns::METHOD_AFTER_DOT}/uo :
@@ -119,9 +128,9 @@ module Scanners
               value_expected = check(/#{patterns::VALUE_FOLLOWS}/o)
             # OPERATORS #
-            elsif !method_call_expected && match = scan(/ (\.(?!\.)|::) | (?: \.\.\.? | ==?=? | [,\(\[\{] )() | [\)\]\}] /x)
+            elsif !method_call_expected && match = scan(/ (\.(?!\.)|::) | ( \.\.\.? | ==?=? | [,\(\[\{] ) | [\)\]\}] /x)
               method_call_expected = self[1]
-              value_expected = !method_call_expected && self[2]
+              value_expected = !method_call_expected && !!self[2]
               if inline_block_stack
                 case match
                 when '{'
@@ -213,7 +222,7 @@ module Scanners
               encoder.text_token match, :integer
             elsif match = scan(/ %=? | <(?:<|=>?)? | \? /x)
-              value_expected = true
+              value_expected = match == '?' ? :colon_expected : true
               encoder.text_token match, :operator
             elsif match = scan(/`/)

data/lib/coderay/scanners/ruby/patterns.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # encoding: utf-8
 module CodeRay
 module Scanners
   module Ruby::Patterns  # :nodoc: all
     KEYWORDS = %w[
       and def end in or unless begin
       defined? ensure module redo super until
@@ -12,7 +12,7 @@ module Scanners
       while alias class elsif if not return
       undef yield
     ]
     # See http://murfy.de/ruby-constants.
     PREDEFINED_CONSTANTS = %w[
       nil true false self
@@ -24,19 +24,19 @@ module Scanners
       RUBY_PLATFORM RUBY_RELEASE_DATE RUBY_REVISION RUBY_VERSION
       __FILE__ __LINE__ __ENCODING__
     ]
     IDENT_KIND = WordList.new(:ident).
       add(KEYWORDS, :keyword).
       add(PREDEFINED_CONSTANTS, :predefined_constant)
     KEYWORD_NEW_STATE = WordList.new(:initial).
       add(%w[ def ], :def_expected).
       add(%w[ undef ], :undef_expected).
       add(%w[ alias ], :alias_expected).
       add(%w[ class module ], :module_expected)
-    IDENT = 'ä'[/[[:alpha:]]/] == 'ä' ? /[[:alpha:]_][[:alnum:]_]*/ : /[^\W\d]\w*/
+    IDENT = 'ä'[/[[:alpha:]]/] == 'ä' ? Regexp.new('[[:alpha:]_[^\0-\177]][[:alnum:]_[^\0-\177]]*') : /[^\W\d]\w*/
     METHOD_NAME = / #{IDENT} [?!]? /ox
     METHOD_NAME_OPERATOR = /
       \*\*?           # multiplication and power
@@ -57,25 +57,25 @@ module Scanners
     GLOBAL_VARIABLE = / \$ (?: #{IDENT} | [1-9]\d* | 0\w* | [~&+`'=\/,;_.<>!@$?*":\\] | -[a-zA-Z_0-9] ) /ox
     PREFIX_VARIABLE = / #{GLOBAL_VARIABLE} | #{OBJECT_VARIABLE} /ox
     VARIABLE = / @?@? #{IDENT} | #{GLOBAL_VARIABLE} /ox
     QUOTE_TO_TYPE = {
       '`' => :shell,
       '/'=> :regexp,
     }
     QUOTE_TO_TYPE.default = :string
     REGEXP_MODIFIERS = /[mousenix]*/
     DECIMAL = /\d+(?:_\d+)*/
     OCTAL = /0_?[0-7]+(?:_[0-7]+)*/
     HEXADECIMAL = /0x[0-9A-Fa-f]+(?:_[0-9A-Fa-f]+)*/
     BINARY = /0b[01]+(?:_[01]+)*/
     EXPONENT = / [eE] [+-]? #{DECIMAL} /ox
     FLOAT_SUFFIX = / #{EXPONENT} | \. #{DECIMAL} #{EXPONENT}? /ox
     FLOAT_OR_INT = / #{DECIMAL} (?: #{FLOAT_SUFFIX} () )? /ox
     NUMERIC = / (?: (?=0) (?: #{OCTAL} | #{HEXADECIMAL} | #{BINARY} ) | #{FLOAT_OR_INT} ) /ox
     SYMBOL = /
       :
       (?:
@@ -85,7 +85,7 @@ module Scanners
       )
     /ox
     METHOD_NAME_OR_SYMBOL = / #{METHOD_NAME_EX} | #{SYMBOL} /ox
     SIMPLE_ESCAPE = /
         [abefnrstv]
       |  [0-7]{1,3}
@@ -110,7 +110,7 @@ module Scanners
       | \\ #{ESCAPE}
       )
     /mox
     # NOTE: This is not completely correct, but
     # nobody needs heredoc delimiters ending with \n.
     HEREDOC_OPEN = /
@@ -122,13 +122,13 @@ module Scanners
         ( [^\n]*? ) \3     # $4 = delim
       )
     /mx
     RUBYDOC = /
       =begin (?!\S)
       .*?
       (?: \Z | ^=end (?!\S) [^\n]* )
     /mx
     DATA = /
       __END__$
       .*?
@@ -136,7 +136,7 @@ module Scanners
     /mx
     RUBYDOC_OR_DATA = / #{RUBYDOC} | #{DATA} /xo
     # Checks for a valid value to follow. This enables
     # value_expected in method calls without parentheses.
     VALUE_FOLLOWS = /

data/lib/coderay/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module CodeRay
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

metadata CHANGED Viewed

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: coderay
 version: !ruby/object:Gem::Version
-  version: 1.0.8
-  prerelease:
+  version: 1.0.9.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Kornelius Kalnbach
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies: []
 description: Fast and easy syntax highlighting for selected languages, written in
   Ruby. Comes with RedCloth integration and LOC counter.
@@ -90,10 +90,10 @@ files:
 - test/functional/examples.rb
 - test/functional/for_redcloth.rb
 - test/functional/suite.rb
-- !binary |-
-  YmluL2NvZGVyYXk=
+- bin/coderay
 homepage: http://coderay.rubychan.de
-licenses: []
+licenses:
+- MIT
 post_install_message:
 rdoc_options:
 - -SNw2
@@ -110,12 +110,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: coderay
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key:
 specification_version: 3
 summary: Fast syntax highlighting for selected languages.