coderay 0.8.312 → 0.8.357

data/lib/README

@@ -18,7 +18,7 @@ And with line numbers.
 * is what everybody should have on their website
 * solves all your problems and makes the girls run after you
 
-Version: 0.8.3
+Version: 0.8.4
 Author:: murphy (Kornelius Kalnbach)
 Contact:: murphy rubychan de
 Website:: coderay.rubychan.de[http://coderay.rubychan.de]

data/lib/coderay/for_redcloth.rb

@@ -15,7 +15,9 @@ module CodeRay
     def self.install
       gem 'RedCloth', '>= 4.0.3' rescue nil
       require 'redcloth'
-      raise 'CodeRay.for_redcloth needs RedCloth 4.0.3 or later.' unless RedCloth::VERSION.to_s >= '4.0.3'
+      unless RedCloth::VERSION.to_s >= '4.0.3'
+        raise 'CodeRay.for_redcloth needs RedCloth version 4.0.3 or later.'
+      end
       RedCloth::TextileDoc.send :include, ForRedCloth::TextileDoc
       RedCloth::Formatters::HTML.module_eval do
         def unescape(html)
@@ -30,6 +32,11 @@ module CodeRay
         undef_method :code, :bc_open, :bc_close, :escape_pre
         def code(opts)  # :nodoc:
           opts[:block] = true
+          if !opts[:lang] && RedCloth::VERSION.to_s >= '4.2.0'
+            # simulating pre-4.2 behavior
+            opts[:text].sub!(/\A\[(\w+)\]/, '')
+            opts[:lang] = $1
+          end
           if opts[:lang] && !filter_coderay
             require 'coderay'
             @in_bc ||= nil

data/lib/coderay/scanners/ruby.rb

@@ -175,7 +175,7 @@ module Scanners
               ## experimental!
               value_expected = :set if check(/#{patterns::VALUE_FOLLOWS}/o)
             
-            elsif last_token_dot and match = scan(/#{patterns::METHOD_NAME_OPERATOR}/o)
+            elsif last_token_dot and match = scan(/#{patterns::METHOD_NAME_OPERATOR}|\(/o)
               kind = :ident
               value_expected = :set if check(/#{patterns::VALUE_FOLLOWS}/o)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: coderay
 version: !ruby/object:Gem::Version 
-  version: 0.8.312
+  version: 0.8.357
 platform: ruby
 authors: 
 - murphy
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-23 00:00:00 +01:00
+date: 2009-10-02 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: "CodeRay is a Ruby library for syntax highlighting. I try to make CodeRay easy to use and intuitive, but at the same time fully featured, complete, fast and efficient.  Usage is simple: require 'coderay' code = 'some %q(weird (Ruby) can't shock) me!' puts CodeRay.scan(code, :ruby).html"
+description: "  CodeRay is a Ruby library for syntax highlighting.\n  I try to make CodeRay easy to use and intuitive, but at the same time\n  fully featured, complete, fast and efficient.\n\n  Usage is simple:\n    require 'coderay'\n    code = 'some %q(weird (Ruby) can't shock) me!'\n    puts CodeRay.scan(code, :ruby).html\n"
 email: murphy@rubychan.de
 executables: 
 - coderay
@@ -65,8 +65,6 @@ files:
 - ./lib/coderay/scanners/ruby/patterns.rb
 - ./lib/coderay/scanners/ruby.rb
 - ./lib/coderay/scanners/scheme.rb
-- ./lib/coderay/scanners/sql.Keith.rb
-- ./lib/coderay/scanners/sql.rb
 - ./lib/coderay/scanners/xml.rb
 - ./lib/coderay/scanners/yaml.rb
 - ./lib/coderay/style.rb
@@ -82,6 +80,8 @@ files:
 - ./FOLDERS
 has_rdoc: true
 homepage: http://coderay.rubychan.de
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - -SNw2
@@ -105,9 +105,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: coderay
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: CodeRay is a fast syntax highlighter engine for many languages.
 test_files: []
 

data/lib/coderay/scanners/sql.Keith.rb

@@ -1,143 +0,0 @@
-module CodeRay
-module Scanners
-  
-  # by Keith Pitt
-  class SQL < Scanner
-
-    register_for :sql
-    
-    include Streamable
-
-    RESERVED_WORDS = %w(
-      all alter and any as asc at authid avg begin between 
-      body bulk by case char check close cluster coalesce 
-      collect comment commit compress connect constant create
-      current currval cursor day declare default delete 
-      desc distinct do drop else elsif end exception exclusive
-      execute exists exit extends extract fetch for forall 
-      from function goto group having heap hour if immediate in 
-      index indicator insert interface intersect
-      interval into is isolation java level like limited lock
-      loop max min minus minute mlslabel mod mode month natural 
-      naturaln new nextval nocopy not nowait null nullif
-      number_base ocirowid of on opaque open operator option or 
-      order organization others out package partition pctfree 
-      pls_integer positive positiven pragma prior private procedure 
-      public raise range raw real record ref release return reverse 
-      rollback row rowid rownum rowtype savepoint second select
-      separate set share space sql sqlcode sqlerrm start 
-      stddev subtype successful sum synonym sysdate table then
-      timezone_region timezone_abbr timezone_minute 
-      to trigger true type uid union unique update 
-      use user validate values variance view when 
-      whenever where while with work write year zone
-    )
-
-    PREDEFINED_TYPES = %w(
-      array bigint bit binary blob boolean binary_integer char
-      character clob date decimal double float char_base
-      int integer nchar nclob smallint timestamp long number
-      timestamp_hour timestamp_minute varchar varying smallint
-      varchar2 nvarchar money time
-    )
-
-    PREDEFINED_CONSTANTS = %w(
-      NULL true false
-    )
-
-    IDENT_KIND = CaseIgnoringWordList.new(:ident).
-      add(RESERVED_WORDS, :reserved).
-      add(PREDEFINED_TYPES, :pre_type).
-      add(PREDEFINED_CONSTANTS, :pre_constant)
-
-    def scan_tokens tokens, options
-
-      state = :initial
-      
-      until eos?
-
-        kind = nil
-        match = nil
-        
-        case state
-
-        when :initial
-
-          if scan(/ \s+ | \\\n /x)
-            kind = :space
-
-          elsif scan(%r! -- [^\n\\]* (?: \\. [^\n\\]* )* | /\* (?: .*? \*/ | .* ) !mx)
-            kind = :comment
-
-          elsif scan(/ [-+*\/=<>?:;,!&^|()~%]+ | \.(?!\d) /x)
-            kind = :operator
-
-          elsif match = scan(/ [A-Za-z_][A-Za-z_0-9]* /x)
-            kind = IDENT_KIND[match]
-            if kind == :ident and check(/:(?!:)/)
-              match << scan(/:/)
-              kind = :label
-            end
-
-          elsif match = scan(/'/)
-            tokens << [:open, :string]
-            state = :string
-            kind = :delimiter
-
-          elsif scan(/(?:\d+)(?![.eEfF])/)
-            kind = :integer
-
-          elsif scan(/\d[fF]?|\d*\.\d+(?:[eE][+-]?\d+)?[fF]?|\d+[eE][+-]?\d+[fF]?/)
-            kind = :float
-
-          else
-            getch
-            kind = :error
-
-          end
-
-        when :string
-          if scan(/[^\\\n']+/)
-            kind = :content
-          elsif scan(/'/)
-            tokens << ["'", :delimiter]
-            tokens << [:close, :string]
-            state = :initial
-            next
-          elsif scan(/ \\ (?: #{ESCAPE} | #{UNICODE_ESCAPE} ) /mox)
-            kind = :char
-          elsif scan(/ \\ | $ /x)
-            tokens << [:close, :string]
-            kind = :error
-            state = :initial
-          else
-            raise_inspect "else case \" reached; %p not handled." % peek(1), tokens
-          end
-
-        else
-          raise_inspect 'Unknown state', tokens
-
-        end
-
-        match ||= matched
-        if $DEBUG and not kind
-          raise_inspect 'Error token %p in line %d' %
-            [[match, kind], line], tokens
-        end
-        raise_inspect 'Empty token', tokens unless match
-
-        tokens << [match, kind]
-
-      end
-
-      if state == :string
-        tokens << [:close, :string]
-      end
-
-      tokens
-    end
-
-  end
-
-end
-end

data/lib/coderay/scanners/sql.rb

@@ -1,154 +0,0 @@
-module CodeRay module Scanners
-  
-  # by Josh Goebel
-  class SQL < Scanner
-
-    register_for :sql
-    
-    RESERVED_WORDS = %w(
-      create table index trigger drop primary key set select
-      insert update delete replace into
-      on from values before and or if exists case when
-      then else as group order by avg where
-      join inner outer union engine not
-      like
-    )
-    
-    PREDEFINED_TYPES = %w(
-      char varchar 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
-      bool boolean
-    )
-    
-    PREDEFINED_FUNCTIONS = %w( sum cast abs pi count min max avg )
-    
-    DIRECTIVES = %w( auto_increment unique default charset )
-
-    PREDEFINED_CONSTANTS = %w( null true false )
-    
-    IDENT_KIND = CaseIgnoringWordList.new(:ident).
-      add(RESERVED_WORDS, :reserved).
-      add(PREDEFINED_TYPES, :pre_type).
-      add(PREDEFINED_CONSTANTS, :pre_constant).
-      add(PREDEFINED_FUNCTIONS, :predefined).
-      add(DIRECTIVES, :directive)
-    
-    ESCAPE = / [rbfnrtv\n\\\/'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x
-    UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x
-
-    def scan_tokens tokens, options
-
-      state = :initial
-      string_type = nil
-      string_content = ''
-
-      until eos?
-
-        kind = nil
-        match = nil
-
-        if state == :initial
-          
-          if scan(/ \s+ | \\\n /x)
-            kind = :space
-          
-          elsif scan(/^(?:--\s|#).*/)
-            kind = :comment
-
-          elsif scan(%r! /\* (?: .*? \*/ | .* ) !mx)
-            kind = :comment
-
-          elsif scan(/ [-+*\/=<>;,!&^|()\[\]{}~%] | \.(?!\d) /x)
-            kind = :operator
-            
-          elsif match = scan(/ [A-Za-z_][A-Za-z_0-9]* /x)
-            kind = IDENT_KIND[match.downcase]
-            
-          elsif match = scan(/[`"']/)
-            tokens << [:open, :string]
-            string_type = matched
-            state = :string
-            kind = :delimiter
-            
-          elsif scan(/0[xX][0-9A-Fa-f]+/)
-            kind = :hex
-            
-          elsif scan(/0[0-7]+(?![89.eEfF])/)
-            kind = :oct
-            
-          elsif scan(/\d+(?![.eEfF])/)
-            kind = :integer
-            
-          elsif scan(/\d[fF]?|\d*\.\d+(?:[eE][+-]?\d+)?[fF]?|\d+[eE][+-]?\d+[fF]?/)
-            kind = :float
-
-          else
-            getch
-            kind = :error
-            
-          end
-          
-        elsif state == :string
-          if match = scan(/[^\\"'`]+/)
-            string_content << match
-            next
-          elsif match = scan(/["'`]/)
-            if string_type == match
-              if peek(1) == string_type  # doubling means escape
-                string_content << string_type << getch
-                next
-              end
-              unless string_content.empty?
-                tokens << [string_content, :content]
-                string_content = ''
-              end
-              tokens << [matched, :delimiter]
-              tokens << [:close, :string]
-              state = :initial
-              string_type = nil
-              next
-            else
-              string_content << match
-            end
-            next
-          elsif scan(/ \\ (?: #{ESCAPE} | #{UNICODE_ESCAPE} ) /mox)
-            unless string_content.empty?
-              tokens << [string_content, :content]
-              string_content = ''
-            end
-            kind = :char
-          elsif match = scan(/ \\ . /mox)
-            string_content << match
-            next
-          elsif scan(/ \\ | $ /x)
-            unless string_content.empty?
-              tokens << [string_content, :content]
-              string_content = ''
-            end
-            kind = :error
-            state = :initial
-          else
-            raise "else case \" reached; %p not handled." % peek(1), tokens
-          end
-          
-        else
-          raise 'else-case reached', tokens
-          
-        end
-        
-        match ||= matched
-#        raise [match, kind], tokens if kind == :error
-        
-        tokens << [match, kind]
-        
-      end
-#      RAILS_DEFAULT_LOGGER.info tokens.inspect
-      tokens
-      
-    end
-
-  end
-
-end end