rouge 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f82ff03bdf4a459c29452a02d4e3b220f5153588
-  data.tar.gz: a4d96c1f9407192aa7df705eb4d8d6925b0e85fd
+  metadata.gz: 93796c1d767a05a20dba729e4a35759571e8fe79
+  data.tar.gz: ad2c926cffb004c214e4d285c57c19a2b5c4e2e3
 SHA512:
-  metadata.gz: b630dfbb83ed9a4913f2bf427a8d410348ec82c36f4d950209921ca08df736a473051da8b31cc9dfb3927941adbd2584e6adf2db40dad39d8f8f4ce392babdad
-  data.tar.gz: 1165e7a648cd8b0e112b31ce9889256b4c41cde6cdee8d74de302225caf14af8d022cc2a5aa348aee31c08d89249a7515078fd6d0cc223c62b783a6e7b817120
+  metadata.gz: 8f39f87c0fbc32086f5de2668e73bb41083505d25d638691bccfa569baebbf9384f9cfa6997a100dd989e54df095f65250edba317d0541a126dd754077358c72
+  data.tar.gz: c8093c3490d759fc9363744ee4fa34896bc4785da2a7bb797aa48b6e74eb225cce4dbb5d890e06a72374cc9c1f00d4c3b48b706d09c4cc0d4181bee5178eb8d5

data/lib/rouge/lexer.rb

@@ -292,7 +292,7 @@ module Rouge
 
       # @private
       def assert_utf8!(str)
-        return if %w(US-ASCII UTF-8).include? str.encoding.name
+        return if %w(US-ASCII UTF-8 ASCII-8BIT).include? str.encoding.name
         raise EncodingError.new(
           "Bad encoding: #{str.encoding.names.join(',')}. " +
           "Please convert your string to UTF-8."

data/lib/rouge/lexers/html.rb

@@ -33,8 +33,8 @@ module Rouge
           push :tag
         end
 
-        rule %r(<\s*[a-zA-Z0-9:]+), Name::Tag, :tag # opening tags
-        rule %r(<\s*/\s*[a-zA-Z0-9:]+\s*>), Name::Tag # closing tags
+        rule %r(<\s*[a-zA-Z0-9:-]+), Name::Tag, :tag # opening tags
+        rule %r(<\s*/\s*[a-zA-Z0-9:-]+\s*>), Name::Tag # closing tags
       end
 
       state :comment do

data/lib/rouge/lexers/java.rb

@@ -42,7 +42,7 @@ module Rouge
         rule /@#{id}/, Name::Decorator
         rule /(?:#{keywords.join('|')})\b/, Keyword
         rule /(?:#{declarations.join('|')})\b/, Keyword::Declaration
-        rule /(?:#{types.join('|')})/, Keyword::Type
+        rule /(?:#{types.join('|')})\b/, Keyword::Type
         rule /package\b/, Keyword::Namespace
         rule /(?:true|false|null)\b/, Keyword::Constant
         rule /(?:class|interface)\b/, Keyword::Declaration, :class

data/lib/rouge/lexers/ruby.rb

@@ -110,22 +110,21 @@ module Rouge
       )
 
       builtins_g = %w(
-        Array Float Integer Str __id__ __send__ abort ancestors
-        at_exit autoload binding callcc caller catch chomp chop
-        class_eval class_variables clone const_defined\? const_get
-        const_missing const_set constants display dup eval exec exit
-        extend fail fork format freeze getc gets global_variables gsub
-        hash id included_modules inspect instance_eval instance_method
-        instance_methods instance_variable_get instance_variable_set
-        instance_variables lambda load local_variables loop method
-        method_missing methods module_eval name object_id open p
-        print printf private_class_method private_instance_methods
-        private_methods proc protected_instance_methods protected_methods
-        public_class_method public_instance_methods public_methods putc
-        puts raise rand readline readlines require scan select self send
-        set_trace_func singleton_methods sleep split sprintf srand sub
-        syscall system taint test throw to_a to_s trace_var trap untaint
-        untrace_var warn
+        __id__ __send__ abort ancestors at_exit autoload binding callcc
+        caller catch chomp chop class_eval class_variables clone
+        const_defined\? const_get const_missing const_set constants
+        display dup eval exec exit extend fail fork format freeze
+        getc gets global_variables gsub hash id included_modules
+        inspect instance_eval instance_method instance_methods
+        instance_variable_get instance_variable_set instance_variables
+        lambda load local_variables loop method method_missing
+        methods module_eval name object_id open p print printf
+        private_class_method private_instance_methods private_methods proc
+        protected_instance_methods protected_methods public_class_method
+        public_instance_methods public_methods putc puts raise rand
+        readline readlines require scan select self send set_trace_func
+        singleton_methods sleep split sprintf srand sub syscall system
+        taint test throw to_a to_s trace_var trap untaint untrace_var warn
       )
 
       builtins_q = %w(

data/lib/rouge/lexers/swift.rb

@@ -11,44 +11,26 @@ module Rouge
       id_head = /_|(?!\p{Mc})\p{Alpha}|[^\u0000-\uFFFF]/
       id_rest = /[\p{Alnum}_]|[^\u0000-\uFFFF]/
       id = /#{id_head}#{id_rest}*/
+      
+      keywords = Set.new %w(
+        break case continue default do else fallthrough if in for return switch where while
 
-      def self.keywords
-        @keywords ||= Set.new %w(
-          break case continue default do else fallthrough if in for return switch where while
+        as dynamicType is new super self Self Type __COLUMN__ __FILE__ __FUNCTION__ __LINE__
 
-          as dynamicType is new super self Self Type __COLUMN__ __FILE__ __FUNCTION__ __LINE__
+        associativity didSet get infix inout left mutating none nonmutating operator override postfix precedence prefix right set unowned weak willSet
+      )
 
-          associativity didSet get infix inout left mutating none nonmutating operator override postfix precedence prefix right set unowned unowned(safe) unowned(unsafe) weak willSet
-        )
-      end
+      declarations = Set.new %w(
+        class deinit enum extension final func import init internal lazy let optional private protocol public required static struct subscript typealias var dynamic
+      )
 
-      def self.declarations
-        @declarations ||= Set.new %w(
-          class deinit enum extension final func import init internal lazy let optional private protocol public required static struct subscript typealias var dynamic
-        )
-      end
+      attributes = Set.new %w(
+        autoclosure IBAction IBDesignable IBInspectable IBOutlet noreturn NSCopying NSManaged objc UIApplicationMain NSApplicationMain
+      )
 
-      def self.at_keywords
-        @at_keywords ||= %w(
-          autoclosure IBAction IBDesignable IBInspectable IBOutlet noreturn NSCopying NSManaged objc UIApplicationMain
-        )
-      end
-
-      def self.types
-        @types ||= Set.new %w(
-          Int8 Int16 Int32 Int64 UInt8 UInt16 UInt32 UInt64 Int
-          Double Float
-          Bool
-          String Character
-          AnyObject Any
-        )
-      end
-
-      def self.constants
-        @constants ||= Set.new %w(
-          true false nil
-        )
-      end
+      constants = Set.new %w(
+        true false nil
+      )
 
       state :whitespace do
         rule /\s+/m, Text
@@ -70,67 +52,66 @@ module Rouge
         rule /0x[0-9A-Fa-f]+(?:_[0-9A-Fa-f]+)*/, Num::Hex
         rule /0b[01]+(?:_[01]+)*/, Num::Bin
         rule %r{[\d]+(?:_\d+)*}, Num::Integer
+                
+        rule /@availability[(][^)]+[)]/, Keyword::Declaration
 
-        rule /(?!\b(if|while|for|private|internal|@objc)\b)\b#{id}(?=\s*[(])/, Name::Function
-
-        rule /(#?#{id})(\s*)(:)/ do
-          groups Name::Variable, Text, Punctuation
-        end
-
-        rule /(let|var)\b(\s*)(#{id})/ do
-          groups Keyword, Text, Name::Variable
+        rule /(@objc[(])([^)]+)([)])/ do
+          groups Keyword::Declaration, Name::Class, Keyword::Declaration
         end
 
         rule /@(#{id})/ do |m|
-          if m[1] == 'objc'
-            token Keyword::Declaration
-            push :objc_setting
-          elsif self.class.at_keywords.include? m[1]
+          if attributes.include? m[1]
             token Keyword
           else
             token Error
           end
         end
 
-        rule id do |m|
-          if self.class.keywords.include? m[0]
-            token Keyword
-          elsif self.class.declarations.include? m[0]
+        rule /(private|internal)(\([ ]*)(\w+)([ ]*\))/ do |m|
+          if m[3] == 'set'
             token Keyword::Declaration
-            if %w(private internal).include? m[0]
-              push :access_control_setting
-            elsif %w(protocol class extension).include? m[0]
-              push :type_definition
-            end
-          elsif self.class.types.include? m[0]
-            token Keyword::Type
-          elsif self.class.constants.include? m[0]
-            token Keyword::Constant
           else
-            token Name
+            groups Keyword::Declaration, Keyword::Declaration, Error, Keyword::Declaration
           end
         end
-        rule id, Name
-      end
-      
-      state :access_control_setting do
-        rule /\( *(\w+) *\)/ do |m|
-          if m[1] == 'set'
+
+        rule /(unowned\([ ]*)(\w+)([ ]*\))/ do |m|
+          if m[2] == 'safe' || m[2] == 'unsafe'
             token Keyword::Declaration
           else
-            token Error
+            groups Keyword::Declaration, Error, Keyword::Declaration
           end
         end
-        rule //, Keyword::Declaration, :pop!
-      end
-      
-      state :objc_setting do
-        rule /(\( *)(\w+)( *\))/ do |m|
-          token Keyword::Declaration, m[1]
-          token Name::Class, m[2]
-          token Keyword::Declaration, m[3]
+        
+        rule /(let|var)\b(\s*)(#{id})/ do
+          groups Keyword, Text, Name::Variable
+        end
+        
+        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
+          end
+        end
+
+        rule /(#?(?!default)(?![[:upper:]])#{id})(\s*)(:)/ do
+          groups Name::Variable, Text, Punctuation
+        end
+
+        rule id do |m|
+          if keywords.include? m[0]
+            token Keyword
+          elsif declarations.include? m[0]
+            token Keyword::Declaration
+          elsif constants.include? m[0]
+            token Keyword::Constant
+          elsif m[0] =~ /^[[:upper:]]/
+            token Keyword::Type
+          else
+            token Name
+          end
         end
-        rule //, Keyword::Declaration, :pop!
       end
 
       state :dq do
@@ -152,17 +133,6 @@ module Rouge
         rule /[)]/, Punctuation, :pop!
         mixin :root
       end
-
-      state :type_definition do
-        mixin :whitespace
-        rule id, Name::Class, :pop!
-      end
-
-      state :namespace do
-        mixin :whitespace
-        rule /(?=[(])/, Text, :pop!
-        rule /(#{id}|[.])+/, Name::Namespace, :pop!
-      end
     end
   end
 end

data/lib/rouge/plugins/redcarpet.rb

@@ -17,16 +17,13 @@ module Rouge
           code.gsub! /^    /, "\t"
         end
 
-        formatter = rouge_formatter(
-          :css_class => "highlight #{lexer.tag}"
-        )
-
+        formatter = rouge_formatter(lexer)
         formatter.format(lexer.lex(code))
       end
 
-    protected
-      def rouge_formatter(opts={})
-        Formatters::HTML.new(opts)
+      # override this method for custom formatting behavior
+      def rouge_formatter(lexer)
+        Formatters::HTML.new(:css_class => "highlight #{lexer.tag}")
       end
     end
   end

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "1.6.2"
+    "1.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email: