livingstyleguide 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a074be5029c9a4e91b8bf8b23da0ff2d9656c433
-  data.tar.gz: 7c0e279055e9f77edc460df6959203f08c61471a
+  metadata.gz: 13d4d67aff5436433e7fbb5fc6f12d4e61e590e4
+  data.tar.gz: b48543efd1725a37b82a6cc0cd528d9dc5838c89
 SHA512:
-  metadata.gz: 39a2fb00a60f5307240f85cb25378b8c58c580fd2ba00158b31d229ce5b720859e590d09c121d54357b199c6761fa002ed0d72d9c2bb2034e0310dd6a1f0015c
-  data.tar.gz: b9eb472613d008aafd1e482f9a6e050f6c1c5e75029cb9c8053c2f0b3f9853a04e68c5aea994470f02ece4d281841eac57d6e248a3e99ce883fd347aef6f6880
+  metadata.gz: 36666790605e6a56db4453b4d83f652e472e036524025da2800fb79635468b57d3b0355c86cd6a5f3bae9f5865ab80eaf192fd356e13f79cdd5bef2b26e47db8
+  data.tar.gz: 455f1cdb1707f0be48322705d709add0009c5792d6bde3496b74bfb9abfbe3f88e55a5ea48ba8a9adeb3ee0f27911cbb5004d71f7c161249f23b8d63b5b3523c

data/CHANGELOG.md

@@ -13,3 +13,8 @@
 * Added support for Haml code in examples (`haml-example`,
   `haml-layout-example`)
 
+## 0.5.1
+
+* Fixed highlighting in Haml code examples
+* Use the Haml syntax highlighter
+

data/lib/livingstyleguide/markdown_extensions.rb

@@ -93,8 +93,9 @@ module LivingStyleGuide
           type = language[5..-1]
           require 'haml'
           Haml::Options.defaults[:attr_wrapper] = '"'
-          html = Haml::Engine.new(code).render.strip
-          %Q(<div class="livingstyleguide--#{type}">\n  #{html}\n</div>) + "\n" + block_code(code, 'html')
+          haml = code.gsub(/\*\*\*(.+?)\*\*\*/m, '\\1')
+          html = Haml::Engine.new(haml).render.strip
+          %Q(<div class="livingstyleguide--#{type}">\n  #{html}\n</div>) + "\n" + block_code(code, 'haml')
         rescue LoadError
           raise "Please make sure `gem 'haml'` is added to your Gemfile."
         end

data/lib/livingstyleguide/version.rb

@@ -1,3 +1,3 @@
 module LivingStyleGuide
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/fixtures/markdown/haml-example-with-highlight.md

@@ -0,0 +1,4 @@
+~~~ haml-example
+%button***.button*** Test
+~~~
+

data/test/integration/markdown_test.rb

@@ -38,7 +38,16 @@ class MarkdownTest < Test::Unit::TestCase
       <div class="livingstyleguide--example">
         <button class="button">Test</button>
       </div>
-      <pre class="livingstyleguide--code-block"><code class="livingstyleguide--code">%button.button Test</code></pre>
+      <pre class="livingstyleguide--code-block"><code class="livingstyleguide--code"><em>%button</em>.button Test</code></pre>
+    HTML
+  end
+
+  def test_haml_example_with_highlight
+    assert_markdown <<-HTML, 'haml-example-with-highlight.md'
+      <div class="livingstyleguide--example">
+        <button class="button">Test</button>
+      </div>
+      <pre class="livingstyleguide--code-block"><code class="livingstyleguide--code"><em>%button</em><strong class="livingstyleguide--code-highlight">.button</strong> Test</code></pre>
     HTML
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax
@@ -142,6 +142,7 @@ files:
 - test/fixtures/markdown/example-with-highlight.md
 - test/fixtures/markdown/example.md
 - test/fixtures/markdown/font-example.md
+- test/fixtures/markdown/haml-example-with-highlight.md
 - test/fixtures/markdown/haml-example.md
 - test/fixtures/markdown/javascript-example.md
 - test/fixtures/markdown/layout-example.md
@@ -184,6 +185,7 @@ test_files:
 - test/fixtures/markdown/example-with-highlight.md
 - test/fixtures/markdown/example.md
 - test/fixtures/markdown/font-example.md
+- test/fixtures/markdown/haml-example-with-highlight.md
 - test/fixtures/markdown/haml-example.md
 - test/fixtures/markdown/javascript-example.md
 - test/fixtures/markdown/layout-example.md