jekyll_prism 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f61e0eaf6f9058e2cca5576d1b0fb81d6643e6
-  data.tar.gz: 745239fb68984a4b4161f8140ee853e07b03a977
+  metadata.gz: a398817e4968243916001ca1528b3ef128cf1ec0
+  data.tar.gz: 173cb2f846cb487513110c4e209c63075276d3f7
 SHA512:
-  metadata.gz: d0672b1b02bf59e43077f03e600ecfafe88ba3791ee40097622075edfa1745a13be193ee3c1d923a5ec82a7b4958d104b57f5e9ab87848bac73db6951016d8dd
-  data.tar.gz: ef2be08da187abc96346b322c41e66d142f9c5b96f0ae4920f0f46cef842c320a69b8cb35054840148ad00a2c50de04f164b5083b99217d020b9df79b58538c4
+  metadata.gz: 2142b37f4d919e863ee38c672242c885fb58f85cc39bdd98755fa4052bc01f3279a2efa41030ee972ee736c2ee602b77e3745faf57a0e60d5991005d13c00106
+  data.tar.gz: 902af7f4ce3a0b87bb7b3de96211b29ec9167f2fe9f3388229e3eb4ae190a33ee4de8502c0c7ac5e6476ef8ef15b95d19d3a9e17906f908cda372b8ac21812df

data/jekyll_prism.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'jekyll_prism'
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = ''

data/lib/jekyll_prism.rb

@@ -1,5 +1,61 @@
 require 'liquid'
 
+##
+# Helpers for defining code HTML
+module PrismHelpers
+  def parse_args(args)
+    args.each_with_object({}) do |arg, hash|
+      value, key = arg.split('=').reverse
+      key ||= 'lang'
+      hash[key.to_sym] = value
+    end
+  end
+
+  def pre_attrs(opts)
+    s = ' class="'
+    s = add_line_numbers(s, opts)
+    s = add_lang(s, opts) if opts.include? :source
+    s << '"'
+    s = add_line_start(s, opts) unless [nil, 1].include? opts[:numbers]
+    s = add_source(s, opts) if opts.include? :source
+    s = add_highlights(s, opts) if opts.include? :highlights
+    s
+  end
+
+  def code_attrs(opts)
+    s = ' class="'
+    s = add_lang(s, opts) unless opts.include? :source
+    s << '"'
+  end
+
+  def add_line_numbers(s, opts)
+    s << 'line-numbers ' if opts.include? :numbers
+    s
+  end
+
+  def add_lang(s, opts)
+    s << "language-#{opts[:lang]}" if opts.include? :lang
+    s
+  end
+
+  def add_line_start(s, opts)
+    s << %Q( data-start="#{opts[:numbers]}")
+  end
+
+  def add_highlights(s, opts)
+    lines = if opts[:highlights] == 'all'
+              "1-#{opts[:linecount]}"
+            else
+              opts[:highlights]
+            end
+    s << %Q( data-line="#{lines}")
+  end
+
+  def add_source(s, opts)
+    s << %Q( data-src="#{opts[:source]}")
+  end
+end
+
 ##
 # Extend Jekyll to provide Prism helper blocks and tags
 module Jekyll
@@ -7,23 +63,19 @@ module Jekyll
   # Block object for Prism hilighting
   class CodeBlock < Liquid::Block
     include Liquid::StandardFilters
+    include PrismHelpers
 
     def initialize(a, args, b)
       super
-      options = args.split
-      @lang, @linenos = options.shift 2
-      true
+      @options = parse_args args.split
     end
 
     def render(_)
       code = h(super).strip
-
-      linenos = @linenos == 'all' ? "1-#{code.lines.count}" : @linenos
-      linestring = linenos.nil? ? '' : %Q( data-line="#{linenos}")
-      langstring = @lang.nil? ? '' : %Q( class="language-#{@lang}")
+      @options[:linecount] = code.lines.count
 
       <<-OUTPUT
-<pre#{linestring}><code#{langstring}>
+<pre#{pre_attrs @options}><code#{code_attrs @options}>
 #{code}
 </code></pre>
       OUTPUT
@@ -33,17 +85,17 @@ module Jekyll
   ##
   # Tag object for Prism hilighting
   class CodeTag < Liquid::Tag
+    include PrismHelpers
+
     def initialize(_, args, _)
       super
-      options = args.split
-      @file, @lang, @linenos = options.shift 3
+      args = args.split
+      args[0] = "source=#{args[0]}"
+      @options = parse_args args
     end
 
     def render(_)
-      linestring = @linenos.nil? ? '' : %Q( data-line="#{@linenos}")
-      langstring = @lang.nil? ? '' : %Q( class="language-#{@lang}")
-
-      %Q(<pre data-src="#{@file}"#{langstring}#{linestring}></pre>)
+      %Q(<pre#{pre_attrs @options}></pre>)
     end
   end
 end

data/spec/jekyll_prism_spec.rb

@@ -9,31 +9,28 @@ end
 describe Jekyll::CodeBlock do
   it 'renders code blocks' do
     code = '{% code %}foobar{% endcode %}'
-    result = "<pre><code>\nfoobar\n</code></pre>\n"
+    result = "<pre class=\"\"><code class=\"\">\nfoobar\n</code></pre>\n"
     test_template code, result
   end
 
   it 'accepts a language parameter' do
     code = '{% code ruby %}foobar{% endcode %}'
-    result = "<pre><code class=\"language-ruby\">\nfoobar\n</code></pre>\n"
+    result = "<pre class=\"\"><code class=\"language-ruby\">
+foobar\n</code></pre>\n"
     test_template code, result
   end
 
   describe 'accepts a linenos parameter' do
     it 'as line numbers' do
-      code = '{% code ruby 1,3-5,10 %}foobar{% endcode %}'
-      result = "<pre data-line=\"1,3-5,10\"><code class=\"language-ruby\">
-foobar
-</code></pre>\n"
+      code = '{% code ruby highlights=1,3-5,10 %}foobar{% endcode %}'
+      result = "<pre class=\"\" data-line=\"1,3-5,10\">" \
+        "<code class=\"language-ruby\">\nfoobar\n</code></pre>\n"
       test_template code, result
     end
     it 'as an "all" parameter' do
-      code = "{% code ruby all %}foo\nbar\nbaz{% endcode %}"
-      result = "<pre data-line=\"1-3\"><code class=\"language-ruby\">
-foo
-bar
-baz
-</code></pre>\n"
+      code = "{% code ruby highlights=all %}foo\nbar\nbaz{% endcode %}"
+      result = "<pre class=\"\" data-line=\"1-3\">"\
+        "<code class=\"language-ruby\">\nfoo\nbar\nbaz\n</code></pre>\n"
       test_template code, result
     end
   end
@@ -42,21 +39,21 @@ end
 describe Jekyll::CodeTag do
   it 'renders external code objects' do
     code = '{% ext_code sekrit.rb %}'
-    result = '<pre data-src="sekrit.rb"></pre>'
+    result = '<pre class="" data-src="sekrit.rb"></pre>'
     test_template code, result
   end
 
   it 'accepts a language parameter' do
     code = '{% ext_code sekrit.rb ruby %}'
-    result = '<pre data-src="sekrit.rb" class="language-ruby"></pre>'
+    result = '<pre class="language-ruby" data-src="sekrit.rb"></pre>'
     test_template code, result
   end
 
   describe 'accepts a linenos parameter' do
     it 'as line numbers' do
-      code = '{% ext_code sekrit.rb ruby 1,3-5,10 %}'
-      result = '<pre data-src="sekrit.rb" ' \
-        'class="language-ruby" data-line="1,3-5,10"></pre>'
+      code = '{% ext_code sekrit.rb ruby highlights=1,3-5,10 %}'
+      result = '<pre class="language-ruby" data-src="sekrit.rb" ' \
+        'data-line="1,3-5,10"></pre>'
       test_template code, result
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_prism
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid