rouge 2.2.1 → 3.0.0

data/lib/rouge/lexers/plist.rb

@@ -8,10 +8,6 @@ module Rouge
 
       mimetypes 'text/x-plist', 'application/x-plist'
 
-      def self.analyze_text(text)
-        return 0.6 if text.start_with?("// !$*UTF8*$!")
-      end
-
       state :whitespace do
         rule /\s+/, Text::Whitespace
       end

data/lib/rouge/lexers/praat.rb

@@ -10,8 +10,8 @@ module Rouge
 
       filenames '*.praat', '*.proc', '*.psc'
 
-      def self.analyze_text(text)
-        return 1 if text.shebang? 'praat'
+      def self.detect?(text)
+        return true if text.shebang? 'praat'
       end
 
       keywords = %w(

data/lib/rouge/lexers/prolog.rb

@@ -10,11 +10,6 @@ module Rouge
       filenames '*.pro', '*.P', '*.prolog', '*.pl'
       mimetypes 'text/x-prolog'
 
-      def self.analyze_text(text)
-        return 0.1 if text =~ /\A\w+(\(\w+\,\s*\w+\))*\./
-        return 0.1 if text.include? ':-'
-      end
-
       state :basic do
         rule /\s+/, Text
         rule /^#.*/, Comment::Single

data/lib/rouge/lexers/properties.rb

@@ -10,10 +10,6 @@ module Rouge
       filenames '*.properties'
       mimetypes 'text/x-java-properties'
 
-      def self.analyze_text(text)
-        return 0.1 if text =~ /\A\[[\w.-]+\]\s*\w+=\w+/
-      end
-
       identifier = /[\w.-]+/
 
       state :basic do

data/lib/rouge/lexers/puppet.rb

@@ -9,9 +9,9 @@ module Rouge
       aliases 'pp'
       filenames '*.pp'
 
-      def self.analyze_text(text)
-        return 1 if text.shebang? 'puppet-apply'
-        return 1 if text.shebang? 'puppet'
+      def self.detect?(text)
+        return true if text.shebang? 'puppet-apply'
+        return true if text.shebang? 'puppet'
       end
 
       def self.keywords

data/lib/rouge/lexers/python.rb

@@ -10,8 +10,8 @@ module Rouge
       filenames '*.py', '*.pyw', '*.sc', 'SConstruct', 'SConscript', '*.tac'
       mimetypes 'text/x-python', 'application/x-python'
 
-      def self.analyze_text(text)
-        return 1 if text.shebang?(/pythonw?(3|2(\.\d)?)?/)
+      def self.detect?(text)
+        return true if text.shebang?(/pythonw?(3|2(\.\d)?)?/)
       end
 
       def self.keywords

data/lib/rouge/lexers/q.rb

@@ -32,10 +32,6 @@ module Rouge
         ]
       end
 
-      def self.analyze_text(text)
-        return 0
-      end
-
       state :root do
         # q allows a file to start with a shebang
         rule /#!(.*?)$/, Comment::Preproc, :top

data/lib/rouge/lexers/r.rb

@@ -43,8 +43,8 @@ module Rouge
         trigamma trunc unclass untracemem UseMethod xtfrm
       )
 
-      def self.analyze_text(text)
-        return 1 if text.shebang? 'Rscript'
+      def self.detect?(text)
+        return true if text.shebang? 'Rscript'
       end
 
       state :root do

data/lib/rouge/lexers/racket.rb

@@ -9,10 +9,11 @@ module Rouge
       filenames '*.rkt', '*.rktd', '*.rktl'
       mimetypes 'text/x-racket', 'application/x-racket'
 
-      def self.analyze_text(text)
-        text = text.strip
-        return 1 if text.start_with? '#lang racket'
-        return 0.6 if text =~ %r(\A#lang [a-z/-]+$)i
+      def self.detect?(text)
+        text =~ /\A#lang\s*(.*?)$/
+        lang_attr = $1
+        return false unless lang_attr
+        return true if lang_attr =~ /racket|scribble/
       end
 
       def self.keywords

data/lib/rouge/lexers/ruby.rb

@@ -13,8 +13,8 @@ module Rouge
 
       mimetypes 'text/x-ruby', 'application/x-ruby'
 
-      def self.analyze_text(text)
-        return 1 if text.shebang? 'ruby'
+      def self.detect?(text)
+        return true if text.shebang? 'ruby'
       end
 
       state :symbols do

data/lib/rouge/lexers/rust.rb

@@ -10,8 +10,8 @@ module Rouge
       filenames '*.rs'
       mimetypes 'text/x-rust'
 
-      def self.analyze_text(text)
-        return 1 if text.shebang? 'rustc'
+      def self.detect?(text)
+        return true if text.shebang? 'rustc'
       end
 
       def self.keywords

data/lib/rouge/lexers/sed.rb

@@ -10,8 +10,8 @@ module Rouge
       filenames '*.sed'
       mimetypes 'text/x-sed'
 
-      def self.analyze_text(text)
-        return 1 if text.shebang? 'sed'
+      def self.detect?(text)
+        return true if text.shebang? 'sed'
       end
 
       class Regex < RegexLexer

data/lib/rouge/lexers/shell.rb

@@ -13,8 +13,8 @@ module Rouge
 
       mimetypes 'application/x-sh', 'application/x-shellscript'
 
-      def self.analyze_text(text)
-        text.shebang?(/(ba|z|k)?sh/) ? 1 : 0
+      def self.detect?(text)
+        return true if text.shebang?(/(ba|z|k)?sh/)
       end
 
       KEYWORDS = %w(

data/lib/rouge/lexers/smarty.rb

@@ -10,17 +10,6 @@ module Rouge
       filenames '*.tpl', '*.smarty'
       mimetypes 'application/x-smarty', 'text/x-smarty'
 
-      def self.analyze_text(text)
-        rv = 0.0
-        rv += 0.15 if text =~ /\{if\s+.*?\}.*?\{\/if\}/
-        rv += 0.15 if text =~ /\{include\s+file=.*?\}/
-        rv += 0.15 if text =~ /\{foreach\s+.*?\}.*?\{\/foreach\}/
-        rv += 0.01 if text =~ /\{\$.*?\}/
-        return rv
-      end
-
-
-
       def self.builtins
         @builtins ||= %w(
           append assign block call capture config_load debug extends

data/lib/rouge/lexers/sml.rb

@@ -28,10 +28,6 @@ module Rouge
       id = /[\w']+/i
       symbol = %r([!%&$#/:<=>?@\\~`^|*+-]+)
 
-      def self.analyze_text(text)
-        return 0
-      end
-
       state :whitespace do
         rule /\s+/m, Text
         rule /[(][*]/, Comment, :comment

data/lib/rouge/lexers/tap.rb

@@ -9,10 +9,6 @@ module Rouge
 
       mimetypes 'text/x-tap', 'application/x-tap'
 
-      def self.analyze_text(text)
-        return 0
-      end
-
       state :root do
         # A TAP version may be specified.
         rule /^TAP version \d+\n/, Name::Namespace

data/lib/rouge/lexers/tcl.rb

@@ -9,10 +9,10 @@ module Rouge
       filenames '*.tcl'
       mimetypes 'text/x-tcl', 'text/x-script.tcl', 'application/x-tcl'
 
-      def self.analyze_text(text)
-        return 1 if text.shebang? 'tclsh'
-        return 1 if text.shebang? 'wish'
-        return 1 if text.shebang? 'jimsh'
+      def self.detect?(text)
+        return true if text.shebang? 'tclsh'
+        return true if text.shebang? 'wish'
+        return true if text.shebang? 'jimsh'
       end
 
       KEYWORDS = %w(

data/lib/rouge/lexers/tex.rb

@@ -11,8 +11,8 @@ module Rouge
       filenames '*.tex', '*.aux', '*.toc', '*.sty', '*.cls'
       mimetypes 'text/x-tex', 'text/x-latex'
 
-      def self.analyze_text(text)
-        return 1 if text =~ /\A\s*\\(documentclass|input|documentstyle|relax|ProvidesPackage|ProvidesClass)/
+      def self.detect?(text)
+        return true if text =~ /\A\s*\\(documentclass|input|documentstyle|relax|ProvidesPackage|ProvidesClass)/
       end
 
       command = /\\([a-z]+|\s+|.)/i

data/lib/rouge/lexers/toml.rb

@@ -10,10 +10,6 @@ module Rouge
       filenames '*.toml'
       mimetypes 'text/x-toml'
 
-      def self.analyze_text(text)
-        return 0.1 if text =~ /\A\[[\w.]+\]\s*\w+\s*=\s*("\w+")+/
-      end
-
       identifier = /[\w.\S]+/
 
       state :basic do

data/lib/rouge/lexers/tulip.rb

@@ -9,9 +9,8 @@ module Rouge
 
       mimetypes 'text/x-tulip', 'application/x-tulip'
 
-      def self.analyze_text(text)
-        return 1 if text.shebang? 'tulip'
-        return 0
+      def self.detect?(text)
+        return true if text.shebang? 'tulip'
       end
 
       id = /[a-z][\w-]*/i

data/lib/rouge/lexers/turtle.rb

@@ -12,29 +12,21 @@ module Rouge
         application/trig
       )
 
-      def self.analyze_text(text)
-        start = text[0..1000]
-        return 0.5 if start =~ %r(@prefix\b)
-        return 0.5 if start =~ %r(@base\b)
-        return 0.4 if start =~ %r(PREFIX\b)i
-        return 0.4 if start =~ %r(BASE\b)i
-      end
-
       state :root do
         rule /@base\b/, Keyword::Declaration
         rule /@prefix\b/, Keyword::Declaration
         rule /true\b/, Keyword::Constant
         rule /false\b/, Keyword::Constant
-        
+
         rule /""".*?"""/m, Literal::String
         rule /"([^"\\]|\\.)*"/, Literal::String
         rule /'''.*?'''/m, Literal::String
         rule /'([^'\\]|\\.)*'/, Literal::String
-        
+
         rule /#.*$/, Comment::Single
-        
+
         rule /@[^\s,.; ]+/, Name::Attribute
-        
+
         rule /[+-]?[0-9]+\.[0-9]*E[+-]?[0-9]+/, Literal::Number::Float
         rule /[+-]?\.[0-9]+E[+-]?[0-9]+/, Literal::Number::Float
         rule /[+-]?[0-9]+E[+-]?[0-9]+/, Literal::Number::Float
@@ -53,7 +45,7 @@ module Rouge
         rule /\[/, Punctuation
         rule /\]/, Punctuation
         rule /\^\^/, Punctuation
-        
+
         rule /<[^>]*>/, Name::Label
 
         rule /base\b/i, Keyword::Declaration
@@ -65,7 +57,6 @@ module Rouge
 
         rule /[^:;<>#\@"\(\).\[\]\{\} ]+:/, Name::Namespace
         rule /[^:;<>#\@"\(\).\[\]\{\} ]+/, Name
-        
       end
     end
   end

data/lib/rouge/lexers/vue.rb

@@ -15,10 +15,6 @@ module Rouge
         @js = Javascript.new(options)
       end
 
-      def self.analyze_text(text)
-        return 0
-      end
-
       def lookup_lang(lang)
         case lang
         when 'html' then HTML

data/lib/rouge/lexers/wollok.rb

@@ -8,10 +8,6 @@ module Rouge
       tag 'wollok'
       filenames *%w(*.wlk *.wtest *.wpgm)
 
-      def self.analyze_text(_text)
-        0.3
-      end
-
       keywords = %w(new super return if else var const override constructor)
 
       entity_name = /[a-zA-Z][a-zA-Z0-9]*/

data/lib/rouge/lexers/xml.rb

@@ -15,12 +15,10 @@ module Rouge
         application/atom+xml
       )
 
-      def self.analyze_text(text)
-        return 0.9 if text.doctype?
-        return 0.8 if text =~ /\A<\?xml\b/
-        start = text[0..1000]
-        return 0.6 if start =~ %r(<xml\b)
-        return 0.3 if start =~ %r(<.+?>.*?</.+?>)m
+      def self.detect?(text)
+        return false if text.doctype?(/html/)
+        return true if text =~ /\A<\?xml\b/
+        return true if text.doctype?
       end
 
       state :root do

data/lib/rouge/lexers/yaml.rb

@@ -10,9 +10,9 @@ module Rouge
       aliases 'yml'
       filenames '*.yaml', '*.yml'
 
-      def self.analyze_text(text)
+      def self.detect?(text)
         # look for the %YAML directive
-        return 1 if text =~ /\A\s*%YAML/m
+        return true if text =~ /\A\s*%YAML/m
       end
 
       SPECIAL_VALUES = Regexp.union(%w(true false null))

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "2.2.1"
+    "3.0.0"
   end
 end

data/rouge.gemspec

@@ -15,4 +15,5 @@ Gem::Specification.new do |s|
   s.files = Dir['Gemfile', 'LICENSE', 'rouge.gemspec', 'lib/**/*.rb', 'lib/**/*.yml', 'bin/rougify', 'lib/rouge/demos/*']
   s.executables = %w(rougify)
   s.licenses = ['MIT', 'BSD-2-Clause']
+  s.required_ruby_version = '>= 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -163,11 +163,13 @@ files:
 - lib/rouge/formatters/null.rb
 - lib/rouge/formatters/terminal256.rb
 - lib/rouge/guesser.rb
+- lib/rouge/guessers/disambiguation.rb
 - lib/rouge/guessers/filename.rb
 - lib/rouge/guessers/glob_mapping.rb
 - lib/rouge/guessers/mimetype.rb
 - lib/rouge/guessers/modeline.rb
 - lib/rouge/guessers/source.rb
+- lib/rouge/guessers/util.rb
 - lib/rouge/lexer.rb
 - lib/rouge/lexers/abap.rb
 - lib/rouge/lexers/actionscript.rb
@@ -340,7 +342,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -348,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rouge
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments