pizzazz 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e02cd57798e3c118c87002a9752f03997178b32
-  data.tar.gz: 50b693e72a290357a01276a67b35963d84b9c8d9
+  metadata.gz: 78ba9b2f27bf01cd6e8ca21e219c36ee83779c89
+  data.tar.gz: 28b1c4445d13227011d80a91ab0be3d5829ad5b8
 SHA512:
-  metadata.gz: c8dc4e76f1867e50470ba4574932b21757fc980f33524e95073e4db140290c4981d7f580c33ed073b7e5fd1df7290617c4d95c9de52c5b8c3ea696779d11b56b
-  data.tar.gz: 990143e7286b36a6498ad5890af316d002476aed00bb796eff640aec3ed4f1349b0399f5f517f30470be606147ef2d50b83e3a9b85b5d31274174208fe18d3fd
+  metadata.gz: 0aa2ff88e3a96caee02b7050a1db9410bbf9d6ab9a585531716de9163a9e5d0e4335e24287e301b72d169026b9ee1220676ef68169a5c5b49df4f5905ec541a7
+  data.tar.gz: 89b52e03781a8a4e436da67c40b582238f8b1a892d3e0679e04040cc3ada346de5fc00d36a27f1b929cdd8ae16200dd6e45c1ff55ef66fa79712bc2e13801692

data/Rakefile

@@ -6,4 +6,4 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
 end
-task :default => :test
+task default: :test

data/Readme.markdown

@@ -31,7 +31,13 @@ Pizzazzifing an object is simple:
 ``` ruby
 object = { name: 'Sam Soffes', website: 'http://soff.es' }
 Pizzazz.ify(object)
-#=> "{\n  <span class=\"string key\">\"name\"</span>: <span class=\"string\">\"Sam Soffes\"</span>,\n  <span class=\"string key\">\"website\"</span>: <span class=\"string\">\"http://soff.es\"</span>\n}"
+```
+
+``` html
+<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-name"><span class="string key"><span class="control quote opening">"</span><span class="text">name</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">Sam Soffes</span><span class="control quote closing">"</span></span></span><span class="control comma">,</span>
+<span class="control tab">  </span><span class="key-website"><span class="string key"><span class="control quote opening">"</span><span class="text">website</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string link"><a href="http://soff.es" rel="external"><span class="control quote opening">"</span><span class="text">http://soff.es</span><span class="control quote closing">"</span></a></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>
 ```
 
 You can optionally limit arrays or values as well:
@@ -46,11 +52,10 @@ This will add an ellipses after the first element and truncate values longer tha
 Pizzazz.ify(all_of_the_things, array_limit: 'etc', value_omission: '... (continued)')
 ```
 
-You can also supply `omit_root_container` and `prefix`, a string that's added to the beginning of each line of the output, is really nice for doing custom things. Both options can be used independently as well.
+You can also supply `prefix` to add a string to the beginning of each line of the output. You can also supply `class_name_prefix` to prefix the classes that are generated.
 
 By defauly, hash keys are sorted alphabetically. You can disable this with `sort_keys: false`.
 
-
 ### HTML
 
 Spans are added around various elements. Here's the classes:

data/lib/pizzazz/colorer.rb

@@ -4,6 +4,7 @@ require 'erb'
 require 'uri'
 
 module Pizzazz
+  # A class for turning JSON into HTML.
   class Colorer
     def initialize(object, options = nil)
       options ||= {}
@@ -15,133 +16,180 @@ module Pizzazz
       @value_omission = options[:value_omission] || '…'
       @tab = options[:tab] || '  '
       @prefix = options[:prefix]
-      @omit_root_container = options[:omit_root_container] || false
-      @detect_links = options[:detect_links] == nil ? true : options[:detect_links]
-      @sort_keys = options[:sort_keys] == nil ? true : options[:sort_keys]
+      @detect_links = options[:detect_links].nil? ? true : options[:detect_links]
+      @sort_keys = options[:sort_keys].nil? ? true : options[:sort_keys]
+      @class_name_prefix = options[:class_name_prefix] || ''
     end
 
     def ify
       return '' unless @object
 
       # Parse
-      output = node(@object, true)
+      output = node(@object)
       return output unless @prefix
 
       # Add prefix
-      prefix = %Q{<span class="prefix">#{@prefix}</span>}
+      prefix = span(@prefix, 'prefix')
       lines = output.split("\n")
       prefix + lines.join("\n#{prefix}")
     end
 
-  private
+    private
 
-    URL_PATTERN = /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,})([\/\w \.-]*)*\/?$/i
+    URL_PATTERN = %r{^(https?://)?([\da-z\.-]+)\.([a-z\.]{2,})([/\w \.-]*)*/?$}i
 
     def tab
-      %Q{<span class="control tab">#{@tab * @indent}</span>}
+      span @tab * @indent, 'control tab'
     end
 
     def truncate(string)
       return string if @value_limit < 1
       text = string.dup
       stop = @value_limit - @value_omission.length
-      (text.length > @value_limit ? text[0...stop] + @value_omission : text).to_s
+      (text.length > @value_limit ? text[0...stop] + span(@value_omission, 'omission') : text).to_s
     end
 
-    def node(object, root = false)
-      omit_container = root && @omit_root_container
-
+    def node(object)
       case object
       when String
-        if @detect_links && is_link?(object)
-          %Q{<span class="string link"><a href="#{object}" rel="external"><span class="quote opening">"</span><span class="text">#{truncate(::ERB::Util.h(object.gsub("\n", '\n')))}</span><span class="quote closing">"</span></a></span>}
-        else
-          %Q{<span class="string"><span class="quote opening">"</span>#{truncate(::ERB::Util.h(object.gsub("\n", '\n')))}<span class="quote closing">"</span></span>}
-        end
-
+        @detect_links && link?(object) ? link(object) : string(object)
       when Time
-        %Q{<span class="string">#{object.to_json}</span>}
-
+        span object.to_json, 'string time'
       when TrueClass
-        %Q{<span class="constant">true</span>}
-
+        span 'true', 'boolean true'
       when FalseClass
-        %Q{<span class="constant">false</span>}
-
+        span 'false', 'boolean false'
       when NilClass
-        %Q{<span class="null">null</span>}
-
+        span 'null', 'null'
       when Numeric
-        %Q{<span class="number">#{object}</span>}
-
+        span object, 'number'
       when Hash
-        return omit_container ? '' : '<span class="control curly-bracket opening">{</span><span class="control curly-bracket closing">}</span>' if object.length == 0
+        hash object
+      when Array
+        array object
+      end
+    end
+
+    def link?(string)
+      scheme = URI.parse(string).scheme
+      scheme == 'http' || scheme == 'https'
+    rescue
+      false
+    end
+
+    def span(content, class_names = nil)
+      class_names = class_names.split(' ') if class_names.is_a?(String)
+      class_names = if class_names.empty?
+        ''
+      else
+        %( class="#{class_names.map { |name| @class_name_prefix + name }.join(' ')}")
+      end
+
+      %(<span#{class_names}>#{content}</span>)
+    end
+
+    def array_omission
+      span @array_omission, 'omission array'
+    end
 
-        string = if omit_container
-          ''
-        else
-          @indent += 1
-          %Q[<span class="control curly-bracket opening">{</span>\n]
-        end
+    def text(object, should_truncate = false)
+      object = object.gsub("\n", '\n')
+      object = ::ERB::Util.h(object)
+      object = truncate(object) if should_truncate
+      opening_quote + span(object, 'text') + closing_quote
+    end
 
-        rows = []
-        keys = object.keys.collect(&:to_s)
+    def string(object)
+      span text(object, true), 'string'
+    end
 
-        keys.sort! if @sort_keys
+    def link(object)
+      a = %(<a href="#{object}" rel="external">#{text(object)}</a>)
+      span a, 'string link'
+    end
 
-        keys.each do |key|
-          value = (object[key] != nil ? object[key] : object[key.to_sym])
-          row = %Q{<span class="string key"><span class="control quote opening">"</span>#{key}<span class="control quote closing">"</span></span><span class="control colon">:</span> #{node(value)}}
+    def hash(object)
+      return span(opening_curly + closing_curly, 'dictionary') if object.empty?
 
-          # Hopefully most keys will be sane since there are probably JSON
-          row = %Q{<span class="key-#{key}">#{row}</span>}
+      @indent += 1
+      string = opening_curly + "\n"
 
-          rows << tab + row
-        end
-        string << rows.join(%Q{<span class="control comma">,</span>\n})
+      rows = []
+      keys = object.keys.collect(&:to_s)
 
-        unless omit_container
-          @indent -= 1
-          string << %Q[\n#{tab}<span class="control curley-bracket closing">}</span>]
-        end
+      keys.sort! if @sort_keys
 
-        string
+      keys.each do |key|
+        value = (!object[key].nil? ? object[key] : object[key.to_sym])
+        row = %(#{span(text(key), 'string key') + colon} #{node(value)})
 
-      when Array
-        return omit_container ? '' : '<span class="control square-bracket opening">[</span><span class="control square-bracket closing">]</span>' if object.length == 0
-        string = if omit_container
-          ''
-        else
-          @indent += 1
-          %Q{<span class="control square-bracket opening">[</span>\n}
-        end
-
-        rows = []
-        array = @array_limit > 0 ? object[0...@array_limit] : object
-        array.each do |value|
-          rows << tab + node(value)
-        end
-
-        if @array_limit > 0 and object.length > @array_limit
-          rows << tab + (object[0].is_a?(Hash) ? %Q[<span class="control curley-bracket opening">{</span> <span class="array-omission">#{@array_omission}</span> <span class="control curley-bracket closing">}</span>] : %Q{<span class="array-omission">#{@array_omission}</span>})
-        end
-
-        string << rows.join(%Q{<span class="control comma">,</span>\n})
-
-        unless omit_container
-          @indent -= 1
-          string << %Q{\n#{tab}<span class="control square-bracket closing">]</span>}
-        end
-
-        string
+        # Wrap row in with class for key.
+        # Hopefully most keys will be sane since it's probably JSON.
+        row = tab + span(row, "key-#{key}")
+        rows << row
+      end
+      string << rows.join(comma + "\n")
+
+      @indent -= 1
+      string << "\n" + tab + closing_curly
+
+      span string, 'dictionary'
+    end
+
+    def array(object)
+      return span(opening_square + closing_square, 'array') if object.empty?
+
+      @indent += 1
+      string = opening_square + "\n"
+
+      rows = []
+      array = @array_limit > 0 ? object[0...@array_limit] : object
+      array.each do |value|
+        rows << tab + node(value)
+      end
+
+      if @array_limit > 0 && object.length > @array_limit
+        rows << tab + (object[0].is_a?(Hash) ? %(#{opening_curly} #{array_omission} #{closing_curly}) : array_omission)
       end
+
+      string << rows.join(comma + "\n")
+
+      @indent -= 1
+      string << "\n" + tab + closing_square
+
+      span string, 'array'
     end
 
-    def is_link?(string)
-      scheme = URI.parse(string).scheme
-      scheme == 'http' || scheme == 'https'
-    rescue
-      false
+    def opening_quote
+      span '"', 'control quote opening'
+    end
+
+    def closing_quote
+      span '"', 'control quote closing'
+    end
+
+    def opening_curly
+      span '{', 'control bracket curly opening'
+    end
+
+    def closing_curly
+      span '}', 'control bracket curly closing'
+    end
+
+    def opening_square
+      span '[', 'control bracket square opening'
+    end
+
+    def closing_square
+      span ']', 'control bracket square closing'
+    end
+
+    def comma
+      span ',', 'control comma'
+    end
+
+    def colon
+      span ':', 'control colon'
     end
   end
 end

data/lib/pizzazz/html.rb

@@ -1,7 +1,13 @@
 module Pizzazz
   def self.ify_html(object, options = nil)
     p = Colorer.new(object, options)
-    html = %Q{<pre class="pizzazz">#{p.ify}</pre>}
+
+    class_name = 'pizzazz'
+    if class_name_prefix = options[:class_name_prefix]
+      class_name = class_name_prefix + class_name
+    end
+
+    html = %(<pre class="#{class_name}">#{p.ify}</pre>)
     html = html.html_safe if Pizzazz::RAILS_AVAILABLE
     html
   end

data/lib/pizzazz/version.rb

@@ -1,3 +1,3 @@
 module Pizzazz
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/pizzazz.gemspec

@@ -5,13 +5,13 @@ require File.expand_path('../lib/pizzazz/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ['Sam Soffes']
   gem.email         = ['sam@soff.es']
-  gem.description   = %q{Add some pizzazz to your documentation}
-  gem.summary       = %q{A simple gem to code color documentation}
+  gem.description   = 'Add some pizzazz to your documentation'
+  gem.summary       = 'A simple gem to code color documentation'
   gem.homepage      = 'http://github.com/soffes/pizzazz'
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'pizzazz'
   gem.require_paths = ['lib']

data/test/units/colorer_test.rb

@@ -4,96 +4,90 @@ require 'test_helper'
 
 class TestColorer < Pizzazz::TestCase
   def test_that_it_colors_hashes
-    colored = Pizzazz.ify({:foo => 'bar'})
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-foo"><span class="string key"><span class="control quote opening">"</span>foo<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>bar<span class="quote closing">"</span></span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+    colored = Pizzazz.ify({})
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span><span class="control bracket curly closing">}</span></span>'
+
+    colored = Pizzazz.ify({hello: 'World'})
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-hello"><span class="string key"><span class="control quote opening">"</span><span class="text">hello</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">World</span><span class="control quote closing">"</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
   end
 
   def test_new_lines
-    colored = Pizzazz.ify({:message => "hello\nworld"})
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-message"><span class="string key"><span class="control quote opening">"</span>message<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>hello\nworld<span class="quote closing">"</span></span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+    colored = Pizzazz.ify({message: "Hello\nWorld"})
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-message"><span class="string key"><span class="control quote opening">"</span><span class="text">message</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">Hello\nWorld</span><span class="control quote closing">"</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
   end
 
   def test_tabs
-    colored = Pizzazz.ify({:foo => 'bar'}, tab: '||||')
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">||||</span><span class="key-foo"><span class="string key"><span class="control quote opening">"</span>foo<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>bar<span class="quote closing">"</span></span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+    colored = Pizzazz.ify({message: "Hello"}, tab: '||||')
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">||||</span><span class="key-message"><span class="string key"><span class="control quote opening">"</span><span class="text">message</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">Hello</span><span class="control quote closing">"</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
   end
 
   def test_prefix
-    colored = Pizzazz.ify({:foo => 'bar'}, prefix: '**')
-    assert_equal colored, %q{<span class="prefix">**</span><span class="control curly-bracket opening">{</span>
-<span class="prefix">**</span><span class="control tab">  </span><span class="key-foo"><span class="string key"><span class="control quote opening">"</span>foo<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>bar<span class="quote closing">"</span></span></span>
-<span class="prefix">**</span><span class="control tab"></span><span class="control curley-bracket closing">}</span>}
-  end
-
-  def test_omit_root_container
-    colored = Pizzazz.ify({:foo => 'bar'}, omit_root_container: true)
-    assert_equal colored, %q{<span class="control tab"></span><span class="key-foo"><span class="string key"><span class="control quote opening">"</span>foo<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>bar<span class="quote closing">"</span></span></span>}
-
-    colored = Pizzazz.ify([1, 2], omit_root_container: true)
-    assert_equal colored, %q{<span class="control tab"></span><span class="number">1</span><span class="control comma">,</span>
-<span class="control tab"></span><span class="number">2</span>}
+    colored = Pizzazz.ify({message: "Hello"}, prefix: '*')
+    assert_equal colored, '<span class="prefix">*</span><span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="prefix">*</span><span class="control tab">  </span><span class="key-message"><span class="string key"><span class="control quote opening">"</span><span class="text">message</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">Hello</span><span class="control quote closing">"</span></span></span>
+<span class="prefix">*</span><span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
   end
 
   def test_that_it_truncates_arrays
     colored = Pizzazz.ify({:numbers => [1, 2, 3]}, :array_limit => 2)
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-numbers"><span class="string key"><span class="control quote opening">"</span>numbers<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="control square-bracket opening">[</span>
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-numbers"><span class="string key"><span class="control quote opening">"</span><span class="text">numbers</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="array"><span class="control bracket square opening">[</span>
 <span class="control tab">    </span><span class="number">1</span><span class="control comma">,</span>
 <span class="control tab">    </span><span class="number">2</span><span class="control comma">,</span>
-<span class="control tab">    </span><span class="array-omission">…</span>
-<span class="control tab">  </span><span class="control square-bracket closing">]</span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+<span class="control tab">    </span><span class="omission array">…</span>
+<span class="control tab">  </span><span class="control bracket square closing">]</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
 
     colored = Pizzazz.ify({:numbers => [1, 2, 3]}, :array_limit => 1, :array_omission => 'hello')
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-numbers"><span class="string key"><span class="control quote opening">"</span>numbers<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="control square-bracket opening">[</span>
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-numbers"><span class="string key"><span class="control quote opening">"</span><span class="text">numbers</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="array"><span class="control bracket square opening">[</span>
 <span class="control tab">    </span><span class="number">1</span><span class="control comma">,</span>
-<span class="control tab">    </span><span class="array-omission">hello</span>
-<span class="control tab">  </span><span class="control square-bracket closing">]</span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+<span class="control tab">    </span><span class="omission array">hello</span>
+<span class="control tab">  </span><span class="control bracket square closing">]</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
   end
 
   def test_that_it_truncates_values
     colored = Pizzazz.ify({:wooden => 'baseball bat'}, :value_limit => 5)
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-wooden"><span class="string key"><span class="control quote opening">"</span>wooden<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>base…<span class="quote closing">"</span></span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-wooden"><span class="string key"><span class="control quote opening">"</span><span class="text">wooden</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">base<span class="omission">…</span></span><span class="control quote closing">"</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
 
     colored = Pizzazz.ify({:wooden => 'baseball bat'}, :value_limit => 9, :value_omission => '!')
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-wooden"><span class="string key"><span class="control quote opening">"</span>wooden<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>baseball!<span class="quote closing">"</span></span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-wooden"><span class="string key"><span class="control quote opening">"</span><span class="text">wooden</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">baseball<span class="omission">!</span></span><span class="control quote closing">"</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
   end
 
   def test_link
     colored = Pizzazz.ify({:website => 'http://soff.es'})
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-website"><span class="string key"><span class="control quote opening">"</span>website<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string link"><a href="http://soff.es" rel="external"><span class="quote opening">"</span><span class="text">http://soff.es</span><span class="quote closing">"</span></a></span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-website"><span class="string key"><span class="control quote opening">"</span><span class="text">website</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string link"><a href="http://soff.es" rel="external"><span class="control quote opening">"</span><span class="text">http://soff.es</span><span class="control quote closing">"</span></a></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
 
     colored = Pizzazz.ify({:website => 'http://soff.es'}, :detect_links => false)
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-website"><span class="string key"><span class="control quote opening">"</span>website<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>http://soff.es<span class="quote closing">"</span></span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-website"><span class="string key"><span class="control quote opening">"</span><span class="text">website</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">http://soff.es</span><span class="control quote closing">"</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
   end
 
   def test_sort_keys
     colored = Pizzazz.ify({:b => 'foo', :a => 'bar'})
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-a"><span class="string key"><span class="control quote opening">"</span>a<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>bar<span class="quote closing">"</span></span></span><span class="control comma">,</span>
-<span class="control tab">  </span><span class="key-b"><span class="string key"><span class="control quote opening">"</span>b<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>foo<span class="quote closing">"</span></span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-a"><span class="string key"><span class="control quote opening">"</span><span class="text">a</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">bar</span><span class="control quote closing">"</span></span></span><span class="control comma">,</span>
+<span class="control tab">  </span><span class="key-b"><span class="string key"><span class="control quote opening">"</span><span class="text">b</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">foo</span><span class="control quote closing">"</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
 
     colored = Pizzazz.ify({:b => 'foo', :a => 'bar'}, :sort_keys => false)
-    assert_equal colored, %q{<span class="control curly-bracket opening">{</span>
-<span class="control tab">  </span><span class="key-b"><span class="string key"><span class="control quote opening">"</span>b<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>foo<span class="quote closing">"</span></span></span><span class="control comma">,</span>
-<span class="control tab">  </span><span class="key-a"><span class="string key"><span class="control quote opening">"</span>a<span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="quote opening">"</span>bar<span class="quote closing">"</span></span></span>
-<span class="control tab"></span><span class="control curley-bracket closing">}</span>}
+    assert_equal colored, '<span class="dictionary"><span class="control bracket curly opening">{</span>
+<span class="control tab">  </span><span class="key-b"><span class="string key"><span class="control quote opening">"</span><span class="text">b</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">foo</span><span class="control quote closing">"</span></span></span><span class="control comma">,</span>
+<span class="control tab">  </span><span class="key-a"><span class="string key"><span class="control quote opening">"</span><span class="text">a</span><span class="control quote closing">"</span></span><span class="control colon">:</span> <span class="string"><span class="control quote opening">"</span><span class="text">bar</span><span class="control quote closing">"</span></span></span>
+<span class="control tab"></span><span class="control bracket curly closing">}</span></span>'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pizzazz
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sam Soffes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies: []
 description: Add some pizzazz to your documentation
 email: