minisyntax 0.1.1 → 0.1.2

data/lib/minisyntax/highlighter/css.rb

@@ -2,7 +2,7 @@ module MiniSyntax
   module Highlighter
     module CSS
       def self.highlight(code)
-        code.gsub! %r(( *)((\$[a-z\-_]+):(.+?);|([_\*]?[a-z\-]+:)(("|[^&])+?);|@import (.+?);|(([\.\#]?[a-z0-9\-_&:]+([,\s]\s*[\.\#]?[a-z0-9\-_&:]+)*))(\s*)\{(.*?\n\1)\})|@media (.+?)\{|@(include|extend) (.+?);)im do
+        code.gsub! %r(( *)((\$[a-z\-_]+):(.+?);|([_\*]?[a-z\-]+:)(("|[^&])+?);|@import (.+?);|(([\.\#]?[a-z0-9\-_&:]+([,\s]\s*[\.\#]?[a-z0-9\-_&:]+)*))(\s*)\{(.*?\n\1)\})|@media (.+?)\{|@include (.+?);|@extend (.+?);)im do
           intendation = $1
           if $3
             %Q(#{intendation}<var>#{$3}</var>:#{highlight_value($4)};)
@@ -27,11 +27,14 @@ module MiniSyntax
           elsif $14
             %Q(#{intendation}@<em>media</em> #{$14.gsub('and', '<em>and</em>')}{)
           elsif $15
-            keyword = $15
-            call = $16
-            rule = call.gsub(/^([\.#]?[a-z\-_]+).*$/, '<b>\\1</b>')
+            call = $15
+            mixin = call.gsub(/^([a-z\-_]+).*$/, '<b>\\1</b>')
             parameter = call.gsub(/^.*?\((.+?)\)/) { "(#{highlight_value($1)})" }
-            %Q(#{intendation}@<em>#{keyword}</em> #{rule}#{parameter};)
+            %Q(#{intendation}@<em>include</em> #{mixin}#{parameter};)
+          elsif $16
+            call = $16
+            rule = call.gsub(/^([\.#%]?[a-z\-_]+).*$/, '<b>\\1</b>')
+            %Q(#{intendation}@<em>extend</em> #{rule};)
           end
         end
         code.gsub! %r((<i>)?(//.*?$|/\*.*?\*/)) do

data/lib/minisyntax.rb

@@ -2,7 +2,7 @@ module MiniSyntax
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/minisyntax.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "minisyntax"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nico Hagenburger"]
-  s.date = "2012-12-06"
+  s.date = "2013-01-08"
   s.description = "A simple powerful syntax highlighter with minimal HTML output"
   s.email = "nico@hagenburger.net"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minisyntax
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000Z
+date: 2013-01-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70137403490000 !ruby/object:Gem::Requirement
+  requirement: &70219057981500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70137403490000
+  version_requirements: *70219057981500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70137403489520 !ruby/object:Gem::Requirement
+  requirement: &70219057980520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70137403489520
+  version_requirements: *70219057980520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70137403489040 !ruby/object:Gem::Requirement
+  requirement: &70219057978940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70137403489040
+  version_requirements: *70219057978940
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70137403488520 !ruby/object:Gem::Requirement
+  requirement: &70219057977660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137403488520
+  version_requirements: *70219057977660
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70137403488040 !ruby/object:Gem::Requirement
+  requirement: &70219057976200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70137403488040
+  version_requirements: *70219057976200
 description: A simple powerful syntax highlighter with minimal HTML output
 email: nico@hagenburger.net
 executables: []
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1766550032169555269
+      hash: 506257264124259129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: