shoes-highlighter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06db840874b7b465b090576dc13bba0274542c67
-  data.tar.gz: 0252050fbd61257f89648d4076fd41338b399e12
+  metadata.gz: 17121d48a9b7cd4917902d1a31c8dcaeece4bbd1
+  data.tar.gz: 66910b8f22dbf4f7265a97ac561980960d775e8a
 SHA512:
-  metadata.gz: ee92054f48c6b63d9618c38e3246c6e814fbdcbb6d90466c7b29ae272c1efe966db378299d3011b37060683d33697b67f3048f05d1ac71127adc5afbd8fa52c2
-  data.tar.gz: 7b4a67cded1f6f77106419e48e5b46e3ad4fa428a4123f95ed56ad0f194c79143cd9b46e96500fb5ecb37c4a7359da856d6492ba037da1539c6e577a8c7480e7
+  metadata.gz: 4b8959e9c7ecf530852855b7b899e5852239213d006426a074964c1dfb55c251537864806718c6f9af4b767a17b392d3dc3b3a9432ec6e200e3a993b9f9787ea
+  data.tar.gz: 29ec2c6c1f00ae89a5ad45a7186d04ffde0cb142971465ba7874ca355608718d7b5609e1a61b0d0c0a2b7710029a8c2e6658724734827b688f9eac61ea33b204

data/lib/shoes/highlighter/markup.rb

@@ -5,25 +5,25 @@ class Shoes
     module Markup
       TOKENIZER = Shoes::Highlighter::Syntax.load "ruby"
       COLORS = {
-        comment: { stroke: "#887" },
-        keyword: { stroke: "#111" },
-        method: { stroke: "#C09", weight: "bold" },
-        # :class => {:stroke => "#0c4", :weight => "bold"},
-        # :module => {:stroke => "#050"},
-        # :punct => {:stroke => "#668", :weight => "bold"},
-        symbol: { stroke: "#C30" },
-        string: { stroke: "#C90" },
-        number: { stroke: "#396" },
-        regex: { stroke: "#000", fill: "#FFC" },
-        # :char => {:stroke => "#f07"},
-        attribute: { stroke: "#369" },
-        # :global => {:stroke => "#7FB" },
-        expr: { stroke: "#722" },
-        # :escape => {:stroke => "#277" }
-        ident: { stroke: "#994c99" },
-        constant: { stroke: "#630", weight: "bold" },
-        class: { stroke: "#630", weight: "bold" },
-        matching: { stroke: "#ff0", weight: "bold" },
+          comment: { stroke: "#887" },
+          keyword: { stroke: "#111" },
+          method: { stroke: "#C09", weight: "bold" },
+          # :class => {:stroke => "#0c4", :weight => "bold"},
+          # :module => {:stroke => "#050"},
+          # :punct => {:stroke => "#668", :weight => "bold"},
+          symbol: { stroke: "#C30" },
+          string: { stroke: "#C90" },
+          number: { stroke: "#396" },
+          regex: { stroke: "#000", fill: "#FFC" },
+          # :char => {:stroke => "#f07"},
+          attribute: { stroke: "#369" },
+          # :global => {:stroke => "#7FB" },
+          expr: { stroke: "#722" },
+          # :escape => {:stroke => "#277" }
+          ident: { stroke: "#994c99" },
+          constant: { stroke: "#630", weight: "bold" },
+          class: { stroke: "#630", weight: "bold" },
+          matching: { stroke: "#ff0", weight: "bold" },
       }
 
       def highlight(str, pos = nil, colors = COLORS)
@@ -43,13 +43,9 @@ class Shoes
         tokens.each do |token|
           res <<
             if colors[token.group]
-              # span(token, colors[token.group])
-              tmp = fg(token, colors[token.group][:stroke])
-              colors[token.group][:fill] ? bg(tmp, colors[token.group][:fill]) : tmp
+              span(token, colors[token.group])
             elsif colors[:any]
-              # span(token, colors[:any])
-              tmp = fg(token, colors[:any][:stroke])
-              colors[:any][:fill] ? bg(tmp, colors[:any][:fill]) : tmp
+              span(token, colors[:any])
             else
               token
             end
@@ -62,13 +58,9 @@ class Shoes
         token_index, matching_index = matching_token(tokens, pos)
 
         if token_index
-          # res[token_index] = span(tokens[token_index], colors[:matching])
-          tmp = fg(tokens[token_index], colors[:matching][:stroke])
-          res[token_index] = colors[:matching][:fill] ? bg(tmp, colors[:matching][:fill]) : tmp
+          res[token_index] = span(tokens[token_index], colors[:matching])
           if matching_index
-            # res[matching_index] = span(tokens[matching_index], colors[:matching])
-            tmp = fg(tokens[matching_index], colors[:matching][:stroke])
-            res[matching_index] = colors[:matching][:fill] ? bg(tmp, colors[:matching][:fill]) : tmp
+            res[matching_index] = span(tokens[matching_index], colors[:matching])
           end
         end
 
@@ -182,9 +174,9 @@ class Shoes
       end
 
       OPEN_BRACKETS = {
-        '{' => '}',
-        '(' => ')',
-        '[' => ']',
+          '{' => '}',
+          '(' => ')',
+          '[' => ']',
       }
 
       # close_bracket = {}
@@ -192,9 +184,9 @@ class Shoes
       # CLOSE_BRACKETS = opens_bracket
       # the following is more readable :)
       CLOSE_BRACKETS = {
-        '}' => '{',
-        ')' => '(',
-        ']' => '[',
+          '}' => '{',
+          ')' => '(',
+          ']' => '[',
       }
 
       BRACKETS = CLOSE_BRACKETS.keys + OPEN_BRACKETS.keys

data/lib/shoes/highlighter/version.rb

@@ -1,5 +1,5 @@
 class Shoes
   module Highlighter
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoes-highlighter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Team Shoes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A syntax highlighting library used by Shoes