jekyll_icon_list 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66af09ff271544ab5afed2a9e28e05769d75337d43dafa32747fc546d1f91f5f
-  data.tar.gz: 26ebee9c1b1fa4589a3587c2fa9169a5cc18304948e032d639e15cec76e132e9
+  metadata.gz: 646c55e10cdc07ca2648f30a38f84283f54a0106ac50caebbfdb672202ae3a03
+  data.tar.gz: dbfb66532092ff44ba10afe9059683d953152989a84e13cddf1489cc0c6a0dce
 SHA512:
-  metadata.gz: 1b507c5492ac70c6cd0aedd02e56e7f2efdf264733ee280315c086b9d09b734c480700b10c85f5ddb6c8d0903051260e00edc5896de608a93bebad6bf7c6575a
-  data.tar.gz: 38507a86625e2ec9ab637359bdeaad9ed195b7ede1c22885e5878ec1ff90a6cefa8123f325722ef61567edfc57bd2f6ed7b5085f3a5a559c9e221befec2f5d07
+  metadata.gz: cc866f244d2846fcb9c0699591895b305da662a569079b22fdb031cd83756063d2859060b4b9b1bc77bb573eb70fc136c33c022f67e57ad1e815bab666d3c175
+  data.tar.gz: e2e450f350c7644ded463974b2fc0d99833c756626bd4d7f4722fa19245d9bd4092467264503fb4e9210ca8205eeb742341773c0de81e7a49bfbdb048c39687d

data/README.md

@@ -110,27 +110,34 @@ If you set a `url:`, it'll wrap the `<li>` contents in an anchor tag.
 
 ### Liquid Variables:
 
-It will parse liquid variables, as either a yaml array or a space-separated-list. Enclose them in
-double curly braces, like this: `{{ my_context.my_variable }}`. **If given multiword variables, it
-will attempt to build an item for each word.**
+It will parse liquid variables, as a space-separated-list. Enclose them in
+double curly braces, like this: `{{ my_context.my_variable }}`. **If given
+multiword variables, it will attempt to build an item for each word.**
 
 Example: 
 
 ```
 ---
-category_list: 
+categories: skydiving spelunking bouldering
+---
+
+
+{% icon_list {{ page.categories }} %}
+```
+
+If you use yaml arrays, you must join them into a space-separated
+string using `| join ' '`: 
+
+```
+---
+categories: 
   - skydiving
   - spelunking
   - bouldering
-
-category_string: skydiving spelunking bouldering
 ---
 
-{% icon_list {{ page.category_list }} %}
-
-{% icon_list {{ page.category_string }} %}
+{% icon_list {{ page.categories | join ' ' }} %}
 ```
-(Both icon_list tags will return the same output)
 
 ## Configuration
 

data/lib/jekyll_icon_list.rb

@@ -42,15 +42,18 @@ module JekyllIconList
       build_html(all_items_data)
     end
 
+    private
+
     def build_settings
       @attributes = @icon_list_settings['defaults'].dup || {}
       # {'ul' => 'class="awesome" (...)', (...)}
 
       # raw_input will look something like this:
       # 'item1 item2 item3 --ul attribute="value" --(...)'
-      raw_input_array = liquid_lookup(@raw_input).split('--').map do |i|
+      raw_input_array = liquid_parse(@raw_input).split('--').map do |i|
         i.strip.split(' ')
       end
+
       # [['item1', 'item2', 'item3'], ['ul', 'attr="value', 'value2"'],(...)]
 
       @item_shortnames = raw_input_array.shift
@@ -61,18 +64,8 @@ module JekyllIconList
       # {'ul' => 'attribute="value1 value2 value3"'}
     end
 
-    LIQUID_REGEX = /\{\{\s*([\w]+\.?[\w]*)\s*\}\}/i
-    def liquid_lookup(input)
-      # I mostly stole this method from SVG Inliner. There may be a better way,
-      # but this works well enough.
-      input.scan LIQUID_REGEX do |match|
-        value = lookup_variable(@context, match.first)
-        value = value.join(' ') if value.is_a? Array
-
-        input = input.sub(LIQUID_REGEX, value)
-      end
-
-      input
+    def liquid_parse(input)
+      Liquid::Template.parse(input).render(@context)
     end
 
     def build_html(all_items_data)
@@ -140,14 +133,10 @@ module JekyllIconList
     end
 
     def build_svg(icon_filename)
-      params = icon_filename
-      params << ' ' + @attributes['svg'] if @attributes['svg']
-      Jekyll::Tags::JekyllInlineSvg.send(
-        :new,
-        'svg',
-        params,
-        @tokens
-      ).render(@context)
+      tag = "{% svg #{icon_filename}"
+      tag << ' ' + @attributes['svg'] if @attributes['svg']
+      tag << ' %}'
+      liquid_parse(tag)
     end
 
     def build_img(icon_filename)

data/lib/jekyll_icon_list/version.rb

@@ -1,3 +1,3 @@
 module JekyllIconList
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_icon_list
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Robert Buchberger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler