rouge 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a7fb3b7ebd844675016c5515295713f72c36ded464d0a9bdb64e5929ab40f18
-  data.tar.gz: 19d434e8b8fa8ad3c12483ad03fe74b09ca46b76f7d2ba0b8867d7e0303bfc85
+  metadata.gz: 83340a3ee45685522d7b91daf3d85c87721430d3606ab761353099941f272f4e
+  data.tar.gz: 112aa358b29944ddbba5d837ae32bcd833a7c5c9d9b4100a952a265dc9c5459c
 SHA512:
-  metadata.gz: fc2d202d4258acaffdaf0bee314049bf55876ee89384ef5e8d5625df1994f4789c893b2119721c1e3f71afed4040e3988774fa9e71ae8f7996fd90cff158ae22
-  data.tar.gz: f93bbd478d426253369e29b3b2a7b806bc68a6397e78dcf73061ca0c5295ee800691aee291cef9ff7caeca610b98292c1b18bc67f54b214660b36edbb187b565
+  metadata.gz: d266d81096d98c4cbd51d0cc79edef8887a40465e749bfc51d32ae0a493b0be23e090234336a8accfdfe45d48e4a25d4bd50391f369d8901c5a1ec946071d604
+  data.tar.gz: 011ff0045c3de53ca6e1647651d3fe8cd722a57656d3d08ca4559a1dfb40b3940162c6502ff71ead6ebe0ff95a60e8924d2d50ee5c0b144bff344a6392563f7c

data/lib/rouge/cli.rb

@@ -5,6 +5,7 @@
 # to use this module, require 'rouge/cli'.
 
 require 'rbconfig'
+require 'uri'
 
 module Rouge
   class FileReader
@@ -348,7 +349,7 @@ module Rouge
       end
 
     private_class_method def self.parse_cgi(str)
-        pairs = CGI.parse(str).map { |k, v| [k.to_sym, v.first] }
+        pairs = URI.decode_www_form(str).map { |k, v| [k.to_sym, v] }
         Hash[pairs]
       end
     end

data/lib/rouge/formatters/html_legacy.rb

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
-# stdlib
-require 'cgi'
-
 module Rouge
   module Formatters
     # Transforms a token stream into HTML output.

data/lib/rouge/lexer.rb

@@ -3,8 +3,8 @@
 
 # stdlib
 require 'strscan'
-require 'cgi'
 require 'set'
+require 'uri'
 
 module Rouge
   # @abstract
@@ -52,17 +52,19 @@ module Rouge
         name, opts = str ? str.split('?', 2) : [nil, '']
 
         # parse the options hash from a cgi-style string
-        opts = CGI.parse(opts || '').map do |k, vals|
-          val = case vals.size
+        cgi_opts = Hash.new { |hash, key| hash[key] = [] }
+        URI.decode_www_form(opts || '').each do |k, val|
+          cgi_opts[k] << val
+        end
+        cgi_opts.transform_values! do |vals|
+          case vals.size
           when 0 then true
           when 1 then vals[0]
           else vals
           end
-
-          [ k.to_s, val ]
         end
 
-        opts = default_options.merge(Hash[opts])
+        opts = default_options.merge(cgi_opts)
 
         lexer_class = case name
         when 'guess', nil

data/lib/rouge/lexers/css.rb

@@ -154,7 +154,7 @@ module Rouge
           s-resize sans-serif saturation scale-down screen scroll
           se-resize semi-condensed semi-expanded separate serif show
           sides silent size slow slower small-caps small-caption smaller
-          smooth soft soft-light solid space-aroun space-between
+          smooth soft soft-light solid space-around space-between
           space-evenly span spell-out square start static status-bar sticky
           stretch sub subtract super sw-resize swap symbolic table
           table-caption table-cell table-column table-column-group
@@ -259,6 +259,7 @@ module Rouge
       end
 
       state :at_rule do
+        rule %r/(?:<=|>=|~=|\|=|\^=|\$=|\*=|<|>|=)/, Operator
         rule %r/{(?=\s*#{identifier}\s*:)/m, Punctuation, :at_stanza
         rule %r/{/, Punctuation, :at_body
         rule %r/;/, Punctuation, :pop!

data/lib/rouge/lexers/ini.rb

@@ -14,8 +14,8 @@ module Rouge
       identifier = /[\w\-.]+/
 
       state :basic do
+        rule %r/\s+/, Text::Whitespace
         rule %r/[;#].*?\n/, Comment
-        rule %r/\s+/, Text
         rule %r/\\\n/, Str::Escape
       end
 
@@ -23,11 +23,14 @@ module Rouge
         mixin :basic
 
         rule %r/(#{identifier})(\s*)(=)/ do
-          groups Name::Property, Text, Punctuation
+          groups Name::Property, Text::Whitespace, Punctuation
           push :value
         end
 
         rule %r/\[.*?\]/, Name::Namespace
+
+        # standalone option, supported by some INI parsers
+        rule %r/(.+?)/, Name::Attribute
       end
 
       state :value do

data/lib/rouge/lexers/lua.rb

@@ -105,7 +105,26 @@ module Rouge
         rule %r/\)/, Punctuation, :pop!
         rule %r/[(,]/, Punctuation
         rule %r/\s+/, Text
-        rule %r/"/, Str::Regex, :regex
+        rule %r/'/, Str::Regex, :regex_sq
+        rule %r/"/, Str::Regex, :regex_dq
+      end
+
+      state :regex_sq do
+        rule %r(') do
+          token Str::Regex
+          goto :regex_end
+        end
+
+        mixin :regex
+      end
+
+      state :regex_dq do
+        rule %r(") do
+          token Str::Regex
+          goto :regex_end
+        end
+
+        mixin :regex
       end
 
       state :regex do
@@ -151,13 +170,15 @@ module Rouge
       end
 
       state :sqs do
+        rule %r(\\'), Str::Escape
         rule %r('), Str::Single, :pop!
-        rule %r([^']+), Str::Single
+        rule %r([^'\\]+), Str::Single
       end
 
       state :dqs do
+        rule %r(\\"), Str::Escape
         rule %r("), Str::Double, :pop!
-        rule %r([^"]+), Str::Double
+        rule %r([^"\\]+), Str::Double
       end
     end
   end

data/lib/rouge/lexers/robot_framework.rb

@@ -10,7 +10,7 @@ module Rouge
       title "Robot Framework"
       desc 'Robot Framework is a generic open source automation testing framework (robotframework.org)'
 
-      filenames '*.robot'
+      filenames '*.robot', '*.resource'
       mimetypes 'text/x-robot'
 
       def initialize(opts = {})

data/lib/rouge/lexers/ruby.rb

@@ -297,7 +297,7 @@ module Rouge
           (
             [\p{L}_]\p{Word}*[!?]? |
             \*\*? | [-+]@? | [/%&\|^`~] | \[\]=? |
-            <<? | >>? | <=>? | >= | ===?
+            <=>? | <<? | >>? | >= | ===?
           )
         )x do |m|
           puts "matches: #{[m[0], m[1], m[2], m[3]].inspect}" if @debug

data/lib/rouge/lexers/toml.rb

@@ -11,63 +11,56 @@ module Rouge
       filenames '*.toml', 'Pipfile', 'poetry.lock'
       mimetypes 'text/x-toml'
 
-      # bare keys and quoted keys
-      identifier = %r/(?:\S+|"[^"]+"|'[^']+')/
-
-      state :basic do
-        rule %r/\s+/, Text
-        rule %r/#.*?$/, Comment
-        rule %r/(true|false)/, Keyword::Constant
-
-        rule %r/(#{identifier})(\s*)(=)(\s*)(\{)/ do
-          groups Name::Property, Text, Operator, Text, Punctuation
-          push :inline
-        end
-      end
-
       state :root do
-        mixin :basic
+        mixin :whitespace
 
-        rule %r/(?<!=)\s*\[.*?\]+/, Name::Namespace
+        mixin :key
 
-        rule %r/(#{identifier})(\s*)(=)/ do
-          groups Name::Property, Text, Punctuation
+        rule %r/(=)(\s*)/ do
+          groups Operator, Text::Whitespace
           push :value
         end
-      end
 
-      state :value do
-        rule %r/\n/, Text, :pop!
-        mixin :content
+        rule %r/\[\[?/, Keyword, :table_key
       end
 
-      state :content do
-        mixin :basic
-
-        rule %r/(#{identifier})(\s*)(=)/ do
-          groups Name::Property, Text, Punctuation
-        end
+      state :key do
+        rule %r/[A-Za-z0-9_-]+/, Name
 
-        rule %r/\d{4}-\d{2}-\d{2}(?:[Tt ]\d{2}:\d{2}:\d{2}(?:[Zz]|[+-]\d{2}:\d{2})?)?/, Literal::Date
-        rule %r/\d{2}:\d{2}:\d{2}/, Literal::Date
-
-        rule %r/[+-]?\d+(?:_\d+)*\.\d+(?:_\d+)*(?:[eE][+-]?\d+(?:_\d+)*)?/, Num::Float
-        rule %r/[+-]?\d+(?:_\d+)*[eE][+-]?\d+(?:_\d+)*/, Num::Float
-        rule %r/[+-]?(?:nan|inf)/, Num::Float
+        rule %r/"/, Str, :dq
+        rule %r/'/, Str, :sq
+        rule %r/\./, Punctuation
+      end
 
-        rule %r/0x\h+(?:_\h+)*/, Num::Hex
-        rule %r/0o[0-7]+(?:_[0-7]+)*/, Num::Oct
-        rule %r/0b[01]+(?:_[01]+)*/, Num::Bin
-        rule %r/[+-]?\d+(?:_\d+)*/, Num::Integer
+      state :table_key do
+        rule %r/[A-Za-z0-9_-]+/, Name
 
-        rule %r/"""/, Str, :mdq
         rule %r/"/, Str, :dq
-        rule %r/'''/, Str, :msq
         rule %r/'/, Str, :sq
-        mixin :esc_str
-        rule %r/\,/, Punctuation
-        rule %r/\[/, Punctuation, :array
-        rule %r/\{/, Punctuation, :inline
+        rule %r/\./, Keyword
+        rule %r/\]\]?/, Keyword, :pop!
+        rule %r/[ \t]+/, Text::Whitespace
+      end
+
+      state :value do
+        rule %r/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/, Literal::Date, :pop!
+        rule %r/\d\d:\d\d:\d\d(\.\d+)?/, Literal::Date, :pop!
+        rule %r/[+-]?\d+(?:_\d+)*\.\d+(?:_\d+)*(?:[eE][+-]?\d+(?:_\d+)*)?/, Num::Float, :pop!
+        rule %r/[+-]?\d+(?:_\d+)*[eE][+-]?\d+(?:_\d+)*/, Num::Float, :pop!
+        rule %r/[+-]?(?:nan|inf)/, Num::Float, :pop!
+        rule %r/0x\h+(?:_\h+)*/, Num::Hex, :pop!
+        rule %r/0o[0-7]+(?:_[0-7]+)*/, Num::Oct, :pop!
+        rule %r/0b[01]+(?:_[01]+)*/, Num::Bin, :pop!
+        rule %r/[+-]?\d+(?:_\d+)*/, Num::Integer, :pop!
+
+        rule %r/"""/, Str, [:pop!, :mdq]
+        rule %r/"/, Str, [:pop!, :dq]
+        rule %r/'''/, Str, [:pop!, :msq]
+        rule %r/'/, Str, [:pop!, :sq]
+
+        rule %r/(true|false)/, Keyword::Constant, :pop!
+        rule %r/\[/, Punctuation, [:pop!, :array]
+        rule %r/\{/, Punctuation, [:pop!, :inline]
       end
 
       state :dq do
@@ -101,15 +94,31 @@ module Rouge
       end
 
       state :array do
-        mixin :content
+        mixin :whitespace
+        rule %r/,/, Punctuation
+
         rule %r/\]/, Punctuation, :pop!
+
+        rule %r//, Token, :value
       end
 
       state :inline do
-        mixin :content
+        rule %r/[ \t]+/, Text::Whitespace
 
+        mixin :key
+        rule %r/(=)(\s*)/ do
+          groups Punctuation, Text::Whitespace
+          push :value
+        end
+
+        rule %r/,/, Punctuation
         rule %r/\}/, Punctuation, :pop!
       end
+
+      state :whitespace do
+        rule %r/\s+/, Text
+        rule %r/#.*?$/, Comment
+      end
     end
   end
 end

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "4.6.0"
+    "4.6.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Jeanine Adkisson