coderay 1.0.0.738.pre → 1.0.0.778.pre

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

@@ -27,7 +27,7 @@ module Scanners
 
     IDENT_KIND = WordList.new(:ident).
       add(RESERVED_WORDS, :reserved).
-      add(PREDEFINED_CONSTANTS, :pre_constant)
+      add(PREDEFINED_CONSTANTS, :predefined_constant)
 
     KEYWORD_NEW_STATE = WordList.new(:initial).
       add(%w[ def ], :def_expected).

data/lib/coderay/scanners/scheme.rb

@@ -84,13 +84,13 @@ module CodeRay
             if match = scan(/ \s+ | \\\n /x)
               encoder.text_token match, :space
             elsif match = scan(/['\(\[\)\]]|#\(/)
-              encoder.text_token match, :operator  # FIXME: was :operator_fat
+              encoder.text_token match, :operator
             elsif match = scan(/;.*/)
               encoder.text_token match, :comment
             elsif match = scan(/#\\(?:newline|space|.?)/)
               encoder.text_token match, :char
             elsif match = scan(/#[ft]/)
-              encoder.text_token match, :pre_constant
+              encoder.text_token match, :predefined_constant
             elsif match = scan(/#{IDENTIFIER}/o)
               encoder.text_token match, ident_kind[matched]
             elsif match = scan(/\./)

data/lib/coderay/scanners/sql.rb

@@ -5,26 +5,27 @@ module CodeRay module Scanners
 
     register_for :sql
     
-    RESERVED_WORDS = %w(
-      all and as before begin by case collate
-      constraint create else end engine exists
-      for foreign from group if inner is join key
-      like not on or order outer primary references replace
-      then to trigger union using values when where
+    KEYWORDS = %w(
+      all and any as before begin between by case check collate
+      each else end exists
+      for foreign from full group having if in inner is join
+      like not of on or order outer over references
+      then to union using values when where
       left right distinct
     )
     
     OBJECTS = %w(
-      database databases table tables column columns index
+      database databases table tables column columns fields index constraint
+      constraints transaction function procedure row key view trigger
     )
     
     COMMANDS = %w(
       add alter comment create delete drop grant insert into select update set
-      show
+      show prompt begin commit rollback replace truncate
     )
     
     PREDEFINED_TYPES = %w(
-      char varchar enum binary text tinytext mediumtext
+      char varchar varchar2 enum binary text tinytext mediumtext
       longtext blob tinyblob mediumblob longblob timestamp
       date time datetime year double decimal float int
       integer tinyint mediumint bigint smallint unsigned bit
@@ -33,16 +34,20 @@ module CodeRay module Scanners
     
     PREDEFINED_FUNCTIONS = %w( sum cast substring abs pi count min max avg now )
     
-    DIRECTIVES = %w( auto_increment unique default charset )
+    DIRECTIVES = %w( 
+      auto_increment unique default charset initially deferred
+      deferrable cascade immediate read write asc desc after
+      primary foreign return engine
+    )
     
     PREDEFINED_CONSTANTS = %w( null true false )
     
     IDENT_KIND = CaseIgnoringWordList.new(:ident).
-      add(RESERVED_WORDS, :reserved).
+      add(KEYWORDS, :keyword).
       add(OBJECTS, :type).
       add(COMMANDS, :class).
-      add(PREDEFINED_TYPES, :pre_type).
-      add(PREDEFINED_CONSTANTS, :pre_constant).
+      add(PREDEFINED_TYPES, :predefined_type).
+      add(PREDEFINED_CONSTANTS, :predefined_constant).
       add(PREDEFINED_FUNCTIONS, :predefined).
       add(DIRECTIVES, :directive)
     
@@ -56,6 +61,7 @@ module CodeRay module Scanners
       state = :initial
       string_type = nil
       string_content = ''
+      name_expected = false
       
       until eos?
         
@@ -70,7 +76,8 @@ module CodeRay module Scanners
           elsif match = scan(%r( /\* (!)? (?: .*? \*/ | .* ) )mx)
             encoder.text_token match, self[1] ? :directive : :comment
             
-          elsif match = scan(/ [-+*\/=<>;,!&^|()\[\]{}~%] | \.(?!\d) /x)
+          elsif match = scan(/ [*\/=<>:;,!&^|()\[\]{}~%] | [-+\.](?!\d) /x)
+            name_expected = true if match == '.' && check(/[A-Za-z_]/)
             encoder.text_token match, :operator
             
           elsif match = scan(/(#{STRING_PREFIXES})?([`"'])/o)
@@ -83,8 +90,8 @@ module CodeRay module Scanners
             encoder.text_token match, :delimiter
             
           elsif match = scan(/ @? [A-Za-z_][A-Za-z_0-9]* /x)
-            # FIXME: Don't match keywords after "."
-            encoder.text_token match, match[0] == ?@ ? :variable : IDENT_KIND[match.downcase]
+            encoder.text_token match, name_expected ? :ident : (match[0] == ?@ ? :variable : IDENT_KIND[match])
+            name_expected = false
             
           elsif match = scan(/0[xX][0-9A-Fa-f]+/)
             encoder.text_token match, :hex
@@ -92,14 +99,14 @@ module CodeRay module Scanners
           elsif match = scan(/0[0-7]+(?![89.eEfF])/)
             encoder.text_token match, :oct
             
-          elsif match = scan(/(?>\d+)(?![.eEfF])/)
+          elsif match = scan(/[-+]?(?>\d+)(?![.eEfF])/)
             encoder.text_token match, :integer
             
-          elsif match = scan(/\d[fF]|\d*\.\d+(?:[eE][+-]?\d+)?|\d+[eE][+-]?\d+/)
+          elsif match = scan(/[-+]?(?:\d[fF]|\d*\.\d+(?:[eE][+-]?\d+)?|\d+[eE][+-]?\d+)/)
             encoder.text_token match, :float
           
           elsif match = scan(/\\N/)
-            encoder.text_token match, :pre_constant
+            encoder.text_token match, :predefined_constant
             
           else
             encoder.text_token getch, :error

data/lib/coderay/scanners/text.rb

@@ -0,0 +1,26 @@
+module CodeRay
+  module Scanners
+    
+    # Scanner for plain text.
+    # 
+    # Yields just one token of the kind :plain.
+    # 
+    # Alias: +plaintext+, +plain+
+    class Text < Scanner
+      
+      register_for :text
+      title 'Plain text'
+      
+      KINDS_NOT_LOC = [:plain]  # :nodoc:
+      
+    protected
+      
+      def scan_tokens encoder, options
+        encoder.text_token string, :plain
+        encoder
+      end
+      
+    end
+    
+  end
+end

data/lib/coderay/styles/alpha.rb

@@ -30,8 +30,9 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
   background-color: #{numbers_background};
   color: gray;
   text-align: right;
-  -moz-user-select: none;
   -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
 }
 .CodeRay .line_numbers a, .CodeRay .no a {
   background-color: #{numbers_background} !important;
@@ -58,9 +59,9 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .c .dl { color:#444 }
 .c .ch { color:#444 }
 
-.ch { color:#04D }
-.ch .k { color:#04D }
-.ch .dl { color:#039 }
+.ch { color:#D20 }
+.ch .k { color:#D20 }
+.ch .dl { color:#710 }
 
 .cl { color:#B06; font-weight:bold }
 .cm { color:#A08 }
@@ -100,7 +101,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .pd { color:#369; font-weight:bold }
 .pp { color:#579 }
 .ps { color:#00C; font-weight:bold }
-.pt { color:#074; font-weight:bold }
+.pt { color:#0a5; font-weight:bold }
 .r  { color:#080; font-weight:bold }
 .kw { color:#080; font-weight:bold }
 
@@ -131,7 +132,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .ta { color:#070 }
 .ts { color:#D70; font-weight:bold }
 .ty { color:#339; font-weight:bold }
-.v  { color:#036 }
+.v  { color:#037 }
 .xt { color:#444 }
 
 .ins { background: hsla(120,100%,50%,0.2) }

data/lib/coderay/token_kinds.rb

@@ -9,7 +9,7 @@ module CodeRay
   # speedup
   TokenKinds.compare_by_identity if TokenKinds.respond_to? :compare_by_identity
   
-  TokenKinds.update with = {  # :nodoc:
+  TokenKinds.update(  # :nodoc:
     :annotation => 'at',
     :attribute_name => 'an',
     :attribute_value => 'av',
@@ -55,8 +55,8 @@ module CodeRay
     :oct => 'oc',
     :predefined => 'pd',
     :preprocessor => 'pp',
-    :pre_constant => 'pc',  # FIXME: rename to :predefined_constant
-    :pre_type => 'pt',  # FIXME: rename to :predefined_type
+    :predefined_constant => 'pc',
+    :predefined_type => 'pt',
     :pseudo_class => 'ps',
     :regexp => 'rx',
     :reserved => 'r',
@@ -80,8 +80,8 @@ module CodeRay
     :operator => false,  # 'op'
     
     :space => false,  # 'sp'
-    :plain => false,
-  }
+    :plain => false
+  )
   
   TokenKinds[:method]    = TokenKinds[:function]
   TokenKinds[:escape]    = TokenKinds[:delimiter]

data/test/functional/basic.rb

@@ -149,7 +149,7 @@ more code  # and another comment, in-line.
   
   def test_list_of_scanners
     assert_kind_of(Array, CodeRay::Scanners.list)
-    assert CodeRay::Scanners.list.include?(:plaintext)
+    assert CodeRay::Scanners.list.include?(:text)
   end
   
   def test_token_kinds

data/test/functional/examples.rb

@@ -65,16 +65,18 @@ Tokens                  26
   Non-Whitespace        15
 Bytes Total             31
 
-Token Types (5):
+Token Types (7):
   type                     count     ratio    size (average)
 -------------------------------------------------------------
   TOTAL                       26  100.00 %     1.2
   delimiter                    6   23.08 %     1.0
   operator                     5   19.23 %     1.0
   space                        5   19.23 %     1.0
-  begin_group                  3   11.54 %     0.0
+  key                          4   15.38 %     0.0
+  :begin_group                 3   11.54 %     0.0
+  :end_group                   3   11.54 %     0.0
   content                      3   11.54 %     4.3
-  end_group                    3   11.54 %     0.0
+  string                       2    7.69 %     0.0
   integer                      1    3.85 %     2.0
 
     STATISTIC

metadata

@@ -2,7 +2,7 @@
 name: coderay
 version: !ruby/object:Gem::Version 
   prerelease: 10
-  version: 1.0.0.738.pre
+  version: 1.0.0.778.pre
 platform: ruby
 authors: 
 - murphy
@@ -10,105 +10,102 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 Z
+date: 2011-06-12 00:00:00 Z
 dependencies: []
 
-description: |
-  Fast and easy syntax highlighting for selected languages, written in Ruby.
-  Comes with RedCloth integration and LOC counter.
-
-email: murphy@rubychan.de
+description: Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.
+email: 
+- murphy@rubychan.de
 executables: 
 - coderay
 - coderay_stylesheet
 extensions: []
 
 extra_rdoc_files: 
-- lib/README
+- README.rdoc
 - FOLDERS
 files: 
-- ./lib/coderay/duo.rb
-- ./lib/coderay/encoder.rb
-- ./lib/coderay/encoders/_map.rb
-- ./lib/coderay/encoders/comment_filter.rb
-- ./lib/coderay/encoders/count.rb
-- ./lib/coderay/encoders/debug.rb
-- ./lib/coderay/encoders/div.rb
-- ./lib/coderay/encoders/filter.rb
-- ./lib/coderay/encoders/html/css.rb
-- ./lib/coderay/encoders/html/numbering.rb
-- ./lib/coderay/encoders/html/output.rb
-- ./lib/coderay/encoders/html.rb
-- ./lib/coderay/encoders/json.rb
-- ./lib/coderay/encoders/lines_of_code.rb
-- ./lib/coderay/encoders/null.rb
-- ./lib/coderay/encoders/page.rb
-- ./lib/coderay/encoders/span.rb
-- ./lib/coderay/encoders/statistic.rb
-- ./lib/coderay/encoders/terminal.rb
-- ./lib/coderay/encoders/text.rb
-- ./lib/coderay/encoders/token_kind_filter.rb
-- ./lib/coderay/encoders/xml.rb
-- ./lib/coderay/encoders/yaml.rb
-- ./lib/coderay/for_redcloth.rb
-- ./lib/coderay/helpers/file_type.rb
-- ./lib/coderay/helpers/gzip.rb
-- ./lib/coderay/helpers/plugin.rb
-- ./lib/coderay/helpers/word_list.rb
-- ./lib/coderay/scanner.rb
-- ./lib/coderay/scanners/_map.rb
-- ./lib/coderay/scanners/c.rb
-- ./lib/coderay/scanners/clojure.rb
-- ./lib/coderay/scanners/cpp.rb
-- ./lib/coderay/scanners/css.rb
-- ./lib/coderay/scanners/debug.rb
-- ./lib/coderay/scanners/delphi.rb
-- ./lib/coderay/scanners/diff.rb
-- ./lib/coderay/scanners/groovy.rb
-- ./lib/coderay/scanners/html.rb
-- ./lib/coderay/scanners/java/builtin_types.rb
-- ./lib/coderay/scanners/java.rb
-- ./lib/coderay/scanners/java_script.rb
-- ./lib/coderay/scanners/json.rb
-- ./lib/coderay/scanners/nitro_xhtml.rb
-- ./lib/coderay/scanners/php.rb
-- ./lib/coderay/scanners/plaintext.rb
-- ./lib/coderay/scanners/python.rb
-- ./lib/coderay/scanners/raydebug.rb
-- ./lib/coderay/scanners/rhtml.rb
-- ./lib/coderay/scanners/ruby/patterns.rb
-- ./lib/coderay/scanners/ruby/string_state.rb
-- ./lib/coderay/scanners/ruby.rb
-- ./lib/coderay/scanners/scheme.rb
-- ./lib/coderay/scanners/sql.rb
-- ./lib/coderay/scanners/xml.rb
-- ./lib/coderay/scanners/yaml.rb
-- ./lib/coderay/style.rb
-- ./lib/coderay/styles/_map.rb
-- ./lib/coderay/styles/alpha.rb
-- ./lib/coderay/styles/cycnus.rb
-- ./lib/coderay/styles/murphy.rb
-- ./lib/coderay/token_kinds.rb
-- ./lib/coderay/tokens.rb
-- ./lib/coderay.rb
-- ./Rakefile
-- ./test/functional/basic.rb
-- ./test/functional/examples.rb
-- ./test/functional/for_redcloth.rb
-- ./test/functional/suite.rb
-- ./lib/README
-- ./LICENSE
-- lib/README
-- FOLDERS
+- lib/coderay/duo.rb
+- lib/coderay/encoder.rb
+- lib/coderay/encoders/_map.rb
+- lib/coderay/encoders/comment_filter.rb
+- lib/coderay/encoders/count.rb
+- lib/coderay/encoders/debug.rb
+- lib/coderay/encoders/div.rb
+- lib/coderay/encoders/filter.rb
+- lib/coderay/encoders/html/css.rb
+- lib/coderay/encoders/html/numbering.rb
+- lib/coderay/encoders/html/output.rb
+- lib/coderay/encoders/html.rb
+- lib/coderay/encoders/json.rb
+- lib/coderay/encoders/lines_of_code.rb
+- lib/coderay/encoders/null.rb
+- lib/coderay/encoders/page.rb
+- lib/coderay/encoders/span.rb
+- lib/coderay/encoders/statistic.rb
+- lib/coderay/encoders/terminal.rb
+- lib/coderay/encoders/text.rb
+- lib/coderay/encoders/token_kind_filter.rb
+- lib/coderay/encoders/xml.rb
+- lib/coderay/encoders/yaml.rb
+- lib/coderay/for_redcloth.rb
+- lib/coderay/helpers/file_type.rb
+- lib/coderay/helpers/gzip.rb
+- lib/coderay/helpers/plugin.rb
+- lib/coderay/helpers/word_list.rb
+- lib/coderay/scanner.rb
+- lib/coderay/scanners/_map.rb
+- lib/coderay/scanners/c.rb
+- lib/coderay/scanners/clojure.rb
+- lib/coderay/scanners/cpp.rb
+- lib/coderay/scanners/css.rb
+- lib/coderay/scanners/debug.rb
+- lib/coderay/scanners/delphi.rb
+- lib/coderay/scanners/diff.rb
+- lib/coderay/scanners/groovy.rb
+- lib/coderay/scanners/html.rb
+- lib/coderay/scanners/java/builtin_types.rb
+- lib/coderay/scanners/java.rb
+- lib/coderay/scanners/java_script.rb
+- lib/coderay/scanners/json.rb
+- lib/coderay/scanners/nitro_xhtml.rb
+- lib/coderay/scanners/php.rb
+- lib/coderay/scanners/python.rb
+- lib/coderay/scanners/raydebug.rb
+- lib/coderay/scanners/rhtml.rb
+- lib/coderay/scanners/ruby/patterns.rb
+- lib/coderay/scanners/ruby/string_state.rb
+- lib/coderay/scanners/ruby.rb
+- lib/coderay/scanners/scheme.rb
+- lib/coderay/scanners/sql.rb
+- lib/coderay/scanners/text.rb
+- lib/coderay/scanners/xml.rb
+- lib/coderay/scanners/yaml.rb
+- lib/coderay/style.rb
+- lib/coderay/styles/_map.rb
+- lib/coderay/styles/alpha.rb
+- lib/coderay/styles/cycnus.rb
+- lib/coderay/styles/murphy.rb
+- lib/coderay/token_kinds.rb
+- lib/coderay/tokens.rb
+- lib/coderay.rb
+- Rakefile
+- README.rdoc
+- LICENSE
+- test/functional/basic.rb
+- test/functional/examples.rb
+- test/functional/for_redcloth.rb
+- test/functional/suite.rb
 - bin/coderay
 - bin/coderay_stylesheet
+- FOLDERS
 homepage: http://coderay.rubychan.de
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - -SNw2
-- -mlib/README
+- -mREADME.rdoc
 - -t CodeRay Documentation
 require_paths: 
 - lib
@@ -117,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.2
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -127,9 +124,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: coderay
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Fast syntax highlighting for selected languages.
 test_files: 
-- ./test/functional/suite.rb
+- test/functional/basic.rb
+- test/functional/examples.rb
+- test/functional/for_redcloth.rb
+- test/functional/suite.rb