coderay 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: ee0871415d85030050fc0e1f6c87294618b1b187cd88b8a3742729d81de21deb360eafd0dbe17f5cce7fa038f2a9a4800e36f67f5454792c96738c262a355e95
-  data.tar.gz: c795a801222d0e0b8602d2585958ce909628d2864fae5c19e5dfe7a0503fdf15cad4e784b47430e1ced879c27ac703472afc240a40477221d8dff954c8438701
-SHA1: 
-  metadata.gz: b802ccaafa2572e07f1102d0ddf3f4c385bc4b37
-  data.tar.gz: 19b8a2745ba53ff3c84ebe243cb2bdc84055fc76
+---
+SHA256:
+  metadata.gz: 0c0890d58def476dafbfe55ddf09fffa98621eefedc78a2d412e15bc0977b86c
+  data.tar.gz: da2b370828afa384e4c29797030ec1b29961921816641532170ee5fc70c7cd72
+SHA512:
+  metadata.gz: 68d2a7c3fc24064c891ca96469c15f5e83725905cfaee2450c959837a8fb6721d91169a562b54ac8d8e24b1f5ac1bb2def6425114ba1eb6361cfbc791905f5b5
+  data.tar.gz: 66264030b91ae0f7b32e6e1bbda73889f01984f6556e805b0bfc55fa6a5c3c0da0def08ee3f0c879aba74efa6b2f74911e45f6c0af42bd98a068df54621a622a

data/lib/coderay/encoders/html/output.rb

@@ -76,8 +76,6 @@ module Encoders
             apply_title! title
           end
           self
-        when nil
-          return self
         else
           raise "Unknown value %p for :wrap" % element
         end

data/lib/coderay/scanners/c.rb

@@ -37,7 +37,7 @@ module Scanners
       add(PREDEFINED_CONSTANTS, :predefined_constant)  # :nodoc:
 
     ESCAPE = / [rbfntv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x  # :nodoc:
-    UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x  # :nodoc:
+    UNICODE_ESCAPE = / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x  # :nodoc:
     
   protected
     

data/lib/coderay/scanners/cpp.rb

@@ -49,7 +49,7 @@ module Scanners
       add(PREDEFINED_CONSTANTS, :predefined_constant)  # :nodoc:
 
     ESCAPE = / [rbfntv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x  # :nodoc:
-    UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x  # :nodoc:
+    UNICODE_ESCAPE = / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x  # :nodoc:
 
   protected
 

data/lib/coderay/scanners/diff.rb

@@ -109,7 +109,7 @@ module Scanners
               for deleted_line, inserted_line in deleted_lines.zip(inserted_lines)
                 pre, deleted_part, inserted_part, post = diff deleted_line, inserted_line
                 content_scanner_entry_state = content_scanner.state
-                deleted_lines_tokenized  << content_scanner.tokenize([pre, deleted_part, post], :tokens => Tokens.new)
+                deleted_lines_tokenized << content_scanner.tokenize([pre, deleted_part, post], :tokens => Tokens.new)
                 content_scanner.state = content_scanner_entry_state || :initial
                 inserted_lines_tokenized << content_scanner.tokenize([pre, inserted_part, post], :tokens => Tokens.new)
               end
@@ -212,7 +212,7 @@ module Scanners
       # does not precede the leftmost one from the left.
       j = -1
       j -= 1 while j >= j_min && a[j] == b[j]
-      return a[0...i], a[i..j], b[i..j], (j < -1) ? a[j+1..-1] : ''
+      return a[0...i], a[i..j], b[i..j], (j < -1) ? a[j + 1..-1] : ''
     end
     
   end

data/lib/coderay/scanners/groovy.rb

@@ -22,8 +22,8 @@ module Scanners
       add(GROOVY_MAGIC_VARIABLES, :local_variable)  # :nodoc:
     
     ESCAPE = / [bfnrtv$\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x  # :nodoc:
-    UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} /x  # :nodoc: no 4-byte unicode chars? U[a-fA-F0-9]{8}
-    REGEXP_ESCAPE =  / [bfnrtv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} | \d | [bBdDsSwW\/] /x  # :nodoc:
+    UNICODE_ESCAPE = / u[a-fA-F0-9]{4} /x  # :nodoc: no 4-byte unicode chars? U[a-fA-F0-9]{8}
+    REGEXP_ESCAPE = / [bfnrtv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} | \d | [bBdDsSwW\/] /x  # :nodoc:
     
     # TODO: interpretation inside ', ", /
     STRING_CONTENT_PATTERN = {

data/lib/coderay/scanners/java.rb

@@ -20,7 +20,7 @@ module Scanners
     MAGIC_VARIABLES = %w[ this super ]  # :nodoc:
     TYPES = %w[
       boolean byte char class double enum float int interface long
-      short void
+      short void var
     ] << '[]'  # :nodoc: because int[] should be highlighted as a type
     DIRECTIVES = %w[
       abstract extends final implements native private protected public
@@ -38,7 +38,7 @@ module Scanners
       add(DIRECTIVES, :directive)  # :nodoc:
     
     ESCAPE = / [bfnrtv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x  # :nodoc:
-    UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x  # :nodoc:
+    UNICODE_ESCAPE = / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x  # :nodoc:
     STRING_CONTENT_PATTERN = {
       "'" => /[^\\']+/,
       '"' => /[^\\"]+/,

data/lib/coderay/scanners/java_script.rb

@@ -40,8 +40,8 @@ module Scanners
       add(KEYWORDS, :keyword)  # :nodoc:
     
     ESCAPE = / [bfnrtv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x  # :nodoc:
-    UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x  # :nodoc:
-    REGEXP_ESCAPE =  / [bBdDsSwW] /x  # :nodoc:
+    UNICODE_ESCAPE = / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x  # :nodoc:
+    REGEXP_ESCAPE = / [bBdDsSwW] /x  # :nodoc:
     STRING_CONTENT_PATTERN = {
       "'" => /[^\\']+/,
       '"' => /[^\\"]+/,
@@ -100,7 +100,6 @@ module Scanners
             # TODO: scan over nested tags
             xml_scanner.tokenize match, :tokens => encoder
             value_expected = false
-            next
             
           elsif match = scan(/ [-+*=<>?:;,!&^|(\[{~%]+ | \.(?!\d) /x)
             value_expected = true

data/lib/coderay/scanners/lua.rb

@@ -76,7 +76,7 @@ module Scanners
             encoder.text_token(match, :comment)
           
           elsif match = scan(/\[=*\[/)     # [[ long (possibly multiline) string ]]
-            num_equals = match.count("=") # Number must match for comment end
+            num_equals = match.count("=") # Number must match for string end
             encoder.begin_group(:string)
             encoder.text_token(match, :delimiter)
             state = :long_string

data/lib/coderay/scanners/python.rb

@@ -63,7 +63,7 @@ module Scanners
     
     NAME = / [[:alpha:]_] \w* /x  # :nodoc:
     ESCAPE = / [abfnrtv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x  # :nodoc:
-    UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} | N\{[-\w ]+\} /x  # :nodoc:
+    UNICODE_ESCAPE = / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} | N\{[-\w ]+\} /x  # :nodoc:
     
     OPERATOR = /
       \.\.\. |          # ellipsis

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

@@ -60,7 +60,7 @@ module Scanners
     
     QUOTE_TO_TYPE = {
       '`' => :shell,
-      '/'=> :regexp,
+      '/' => :regexp,
     }
     QUOTE_TO_TYPE.default = :string
     

data/lib/coderay/scanners/sql.rb

@@ -29,7 +29,7 @@ module Scanners
       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
+      integer tinyint mediumint bigint smallint unsigned bit numeric
       bool boolean hex bin oct
     )
     

data/lib/coderay/tokens.rb

@@ -39,6 +39,9 @@ module CodeRay
   # You can serialize it to a JSON string and store it in a database, pass it
   # around to encode it more than once, send it to other algorithms...
   class Tokens < Array
+    # Remove Array#filter that is a new alias for Array#select on Ruby 2.6,
+    # for method_missing called with filter method.
+    undef_method :filter if instance_methods.include?(:filter)
     
     # The Scanner instance that created the tokens.
     attr_accessor :scanner

data/lib/coderay/version.rb

@@ -1,3 +1,3 @@
 module CodeRay
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,27 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: coderay
-version: !ruby/object:Gem::Version 
-  version: 1.1.2
+version: !ruby/object:Gem::Version
+  version: 1.1.3
 platform: ruby
-authors: 
+authors:
 - Kornelius Kalnbach
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2017-09-03 00:00:00 Z
+date: 2020-05-30 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.
-email: 
+description: Fast and easy syntax highlighting for selected languages, written in
+  Ruby. Comes with RedCloth integration and LOC counter.
+email:
 - murphy@rubychan.de
-executables: 
+executables:
 - coderay
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README_INDEX.rdoc
-files: 
+files:
 - MIT-LICENSE
 - README_INDEX.rdoc
 - bin/coderay
@@ -98,33 +96,29 @@ files:
 - lib/coderay/tokens_proxy.rb
 - lib/coderay/version.rb
 homepage: http://coderay.rubychan.de
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
-rdoc_options: 
-- -SNw2
-- -mREADME_INDEX.rdoc
-- -t CodeRay Documentation
-require_paths: 
+rdoc_options:
+- "-SNw2"
+- "-mREADME_INDEX.rdoc"
+- "-t CodeRay Documentation"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: coderay
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Fast syntax highlighting for selected languages.
 test_files: []
-