rouge 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf4afdd370e299029a9ec6d47a7742cb94208a1
-  data.tar.gz: a5cb0844af8b6be69ec296679c9ae5d28ed59034
+  metadata.gz: 62be258d2b0e790b9b5d6d0f3bb60f10c6289070
+  data.tar.gz: c82dd182157e45af5a1f4b085b07de6c04b9ae0c
 SHA512:
-  metadata.gz: 7fa77ad742055077ee715ec202ad8fd4d8929dbd8397d1c9d16b0ea0e8a84d6b118b13dbb255dfb643ab89c88d348f22d80d157b836d350555b2f4afe1989ba6
-  data.tar.gz: a5c77e2ab64220fcf42c8afc71185f5f03c8dee74dd6dc27fb54e5a88002806d3b63aeadb9db121507e0a8b539c1e36d4235ee4c82d9f4c0f4ae8262bc92233c
+  metadata.gz: b40ecda85a555cc87f3e97fdf8bfd34883c2d0fa57e41ab2d7e5d9e7520de9f1e4e535f00fe55e8a6fc86c9739d7129dece7367157f5d61b17e6572583e58743
+  data.tar.gz: 7484742aa3b5550cb327e565fbd332f63631dbf1121a62d74eb280a68e5ca333b1c40bdace57cc064c8a0a3dddccca0e14bc1f2d1c3a9aad605c39d330d72f90

data/lib/rouge/lexers/html.rb

@@ -37,6 +37,7 @@ module Rouge
         rule /<\s*style\s*/m do
           token Name::Tag
           @css.reset!
+          @lang = @css
           push :style_content
           push :tag
         end
@@ -124,13 +125,13 @@ module Rouge
 
       state :style_content do
         rule /[^<]+/ do
-          delegate @css
+          delegate @lang
         end
 
         rule %r(<\s*/\s*style\s*>)m, Name::Tag, :pop!
 
         rule /</ do
-          delegate @css
+          delegate @lang
         end
       end
     end

data/lib/rouge/lexers/javascript.rb

@@ -14,7 +14,7 @@ module Rouge
 
       tag 'javascript'
       aliases 'js'
-      filenames '*.js'
+      filenames '*.js', '*.mjs'
       mimetypes 'application/javascript', 'application/x-javascript',
                 'text/javascript', 'text/x-javascript'
 

data/lib/rouge/lexers/perl.rb

@@ -104,6 +104,7 @@ module Rouge
         rule /__END__\b/, Comment::Preproc, :end_part
         rule /\$\^[ADEFHILMOPSTWX]/, Name::Variable::Global
         rule /\$[\\"'\[\]&`+*.,;=%~?@$!<>(^\|\/-](?!\w)/, Name::Variable::Global
+        rule /[-+\/*%=<>&^\|!\\~]=?/, Operator
         rule /[$@%#]+/, Name::Variable, :varname
 
         rule /0_?[0-7]+(_[0-7]+)*/, Num::Oct
@@ -128,7 +129,6 @@ module Rouge
         rule /sub\s+/, Keyword, :funcname
         rule /\[\]|\*\*|::|<<|>>|>=|<=|<=>|={3}|!=|=~|!~|&&?|\|\||\.{1,3}/,
           Operator
-        rule /[-+\/*%=<>&^\|!\\~]=?/, Operator
         rule /[()\[\]:;,<>\/?{}]/, Punctuation
         rule(/(?=\w)/) { push :name }
       end

data/lib/rouge/lexers/swift.rb

@@ -112,8 +112,8 @@ module Rouge
           push :tuple
         end
 
-        rule /(?!\b(if|while|for|private|internal|unowned|switch|case)\b)\b#{id}(?=(\?|!)?\s*[({])/ do |m|
-          if m[1] == '(' && m[0] =~ /^[[:upper:]]/
+        rule /(?!\b(if|while|for|private|internal|unowned|switch|case)\b)\b#{id}(?=(\?|!)?\s*[(])/ do |m|
+          if m[0] =~ /^[[:upper:]]/
             token Keyword::Type
           else
             token Name::Function

data/lib/rouge/lexers/vue.rb

@@ -16,13 +16,15 @@ module Rouge
       end
 
       def lookup_lang(lang)
+        lang.downcase!
+        lang = lang.gsub(/["']*/, '')
         case lang
         when 'html' then HTML
         when 'css' then CSS
         when 'javascript' then Javascript
         when 'sass' then Sass
         when 'scss' then Scss
-        when 'coffee' then CoffeeScript
+        when 'coffee' then Coffeescript
           # TODO: add more when the lexers are done
         else
           PlainText
@@ -77,7 +79,7 @@ module Rouge
       state :lang_tag do
         rule /(lang\s*=)(\s*)("(?:\\.|[^\\])*?"|'(\\.|[^\\])*?'|[^\s>]+)/ do |m|
           groups Name::Attribute, Text, Str
-          @lang = lookup_lang(m[2])
+          @lang = lookup_lang(m[3])
         end
 
         mixin :tag

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "3.1.0"
+    "3.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email: