jekyll_icon_list 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 006f071d548e62aa2766ab95210f4f836f0a628c369cce00ca67a8b6671b49c5
-  data.tar.gz: 25325be68d4b402081270e21c13c777f9737627a4335ae02ca744c00eca29a76
+  metadata.gz: e8fa828ed8522d543437eef888c64b66b65f58720b7b81519c0673748e275caa
+  data.tar.gz: 6a65cf25a931a0d9e49120dafc7212da582b5e1bf54da962263327d000d2187b
 SHA512:
-  metadata.gz: 18185f5ca7028e06767dcb74719fb4176ebf18f09cd499e26b6ce2086a87f59fe44e1468bc30e122175776b5f12333c02c5d26575678636db8d462ff0740e5b8
-  data.tar.gz: 2cffc1859dc8f86afb47f0ab91c3d5450c73885aa4c849920065020ae2f96dfa40109efebe7ce079a513fa31a4a1e8a684305751f440dcc103ffc2061cd58785
+  metadata.gz: 8b0372e48dff779e32b871d396039e8f2c3db85ec1bbb0f3ce1ca0ef95905acb658a2d64d1be6c49cac6cced8136954fa076e22f666c1b260877cbde606bf1da
+  data.tar.gz: 21ff8a34efc37fe4082b20d357c4c935c8304d7775eabfc010dc6bac0cb12d52bba361138627fa2976aa4e74560cc930354e7d9083d5bb52f549de9fadb933b6

data/README.md

@@ -1,7 +1,7 @@
 # Jekyll Icon List
 
-**This plugin works, but I haven't had time to test it very thoroughly. Use with caution, and please
-report bugs if you find them.**
+**This plugin, though simple, is not thoroughly tested. Use with caution, and please report bugs if
+you find them.**
 
 ## What is it? 
 
@@ -19,11 +19,10 @@ Add some icons, configuration, and a little CSS, get something like this:
 
 I use it on [my portfolio](https://robert-buchberger.com/projects.html)
 ([ github ](https://github.com/rbuchberger/robert-buchberger.com)) if you want to see an example.
-(Actually, currently my master branch doesn't use the gem. Yet. Check the other branches.)
 
 You could use it to build category lists, or tag lists, or a bunch of other stuff.  You can pass
 element attributes in the tag itself, or set default attributes in the config. It only generates
-markup; the styling is up to you. 
+markup; the styling is up to you.
 
 It integrates with (and requires) [jekyll-svg-inliner](https://github.com/sdumetz/jekyll-inline-svg)
 to inline your SVGs for you. If you don't use inline SVGs (even though you should), it sets your file
@@ -178,16 +177,16 @@ ul.icon-list li {
 }
 ```
 
-### Using <use> To build an icon system
-[CSS tricks on SVG Icon Systems (old article warning)](https://css-tricks.com/svg-sprites-use-better-icon-fonts/)
+### Using \<use> to build an icon system
+[CSS tricks on SVG Icon Systems](https://css-tricks.com/svg-sprites-use-better-icon-fonts/). It's an
+older article sir, but it checks out. 
 
-[Slightly newer article on <use>](https://css-tricks.com/svg-use-with-external-reference-take-2/)
+[Slightly newer CSS tricks article on \<use>](https://css-tricks.com/svg-use-with-external-reference-take-2/)
 
 [MDN docs](https://developer.mozilla.org/en-US/docs/Web/SVG/Element/use)
 
-You can do it while using this plugin, but it's not remarkably efficient; build
-& inject the reference file on your own, and then write your SVG files like
-this:
+You can do it while using this plugin, but you have to do most of it yourself: build & inject the
+reference file on your own, and then write your SVG files like this:
 
 ```html
 <!-- example-name.svg -->

data/lib/jekyll_icon_list.rb

@@ -20,32 +20,10 @@ module JekyllIconList
       super
     end
 
-    def initialize_attributes
-      # We will be interpolating strings with these values several times, so
-      # initializing them with empty strings is convenient.
-
-      {
-        'ul' => '',
-        'li' => '',
-        'img' => '',
-        'svg' => '',
-        'a' => ''
-      }
-    end
-
-    def set_attribute_defaults
-      @attributes = initialize_attributes
-
-      @attributes.each_key do |k|
-        if @icon_list_settings['defaults'] && @icon_list_settings['defaults'][k]
-          @attributes[k] = @icon_list_settings['defaults'][k].dup
-        end
-      end
-    end
-
     def parse_input
       # raw_input will look something like this:
       # 'item1 item2 item3 --ul attribute="value" --(...)'
+      @attributes = @icon_list_settings['defaults'].dup || {}
 
       raw_input_array = @raw_input.split('--').map { |i| i.strip.split(' ') }
       # [['item1', 'item2', 'item3'], ['ul', 'attribute="value"'], (...) ]
@@ -53,27 +31,30 @@ module JekyllIconList
       @item_shortnames = raw_input_array.shift
 
       raw_input_array.each { |a| @attributes[a.shift] = a.join ' ' }
+      @attributes.each_value { |v| v.prepend(' ') }
+      @attributes.default = '' # Convenient for concatenation
     end
 
     def build_image_tag(icon_filename)
-      if icon_filename.split('.').pop.casecmp('svg')
+      if icon_filename.split('.').pop.casecmp('svg') == 0
         Jekyll::Tags::JekyllInlineSvg.send(
           :new,
           'svg',
-          "#{icon_filename} #{@attributes['svg']}",
+          icon_filename + @attributes['svg'],
           @tokens
         ).render(@context)
       else
-        "<img src=\"#{icon_filename}\" #{@attributes['img']}>"
+        "<img src=\"#{icon_filename}\"#{@attributes['img']}>"
       end
     end
 
     def search_path(path, item)
-      search_results = Dir.glob(Dir.pwd + path + item + '.*')
+      # We have to strip the leading slash for Dir to know it's relative:
+      search_results = Dir.glob( path[1..-1] + item + '.*')
       raise "No icon found at #{path + item} .*" unless search_results.any?
 
-      # Returns the first matching result. May improve in the future:
-      search_results.first
+      # And put it back so that pages outside of the root directory keep working
+      search_results.first.prepend '/'
     end
 
     def find_icon(item_shortname, this_item_data)
@@ -94,9 +75,9 @@ module JekyllIconList
     end
 
     def build_li(this_item_data, icon_location, label)
-      li = "  <li #{@attributes['li']}>"
+      li = "  <li#{@attributes['li']}>"
       if this_item_data && this_item_data['url']
-        li << "<a href=\"#{this_item_data['url']}\" #{@attributes['a']}>"
+        li << "<a href=\"#{this_item_data['url']}\"#{@attributes['a']}>"
       end
       li << build_image_tag(icon_location)
       li << label
@@ -105,7 +86,7 @@ module JekyllIconList
     end
 
     def build_html(all_items_data)
-      list = "<ul #{@attributes['ul']}>\n"
+      list = "<ul#{@attributes['ul']}>\n"
 
       @item_shortnames.each do |n|
         this_icon_data = all_items_data[n] || {}
@@ -130,8 +111,6 @@ module JekyllIconList
 
       all_items_data = site_settings.data['icon_list'] || {}
 
-      set_attribute_defaults
-
       parse_input
 
       build_html(all_items_data)

data/lib/jekyll_icon_list/version.rb

@@ -1,3 +1,3 @@
 module JekyllIconList
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_icon_list
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Robert Buchberger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Builds lists of Icons and labels