jekyll_icon_list 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8fa828ed8522d543437eef888c64b66b65f58720b7b81519c0673748e275caa
-  data.tar.gz: 6a65cf25a931a0d9e49120dafc7212da582b5e1bf54da962263327d000d2187b
+  metadata.gz: c183bc2a0fb36c49830c7d5cd6a1e48c5d52a9f7228b749523281af82dceae8d
+  data.tar.gz: 19895ddfae466f1ae9ca7bca3b9ac2c6ab0be47f01b20ed7120d97948ecde58a
 SHA512:
-  metadata.gz: 8b0372e48dff779e32b871d396039e8f2c3db85ec1bbb0f3ce1ca0ef95905acb658a2d64d1be6c49cac6cced8136954fa076e22f666c1b260877cbde606bf1da
-  data.tar.gz: 21ff8a34efc37fe4082b20d357c4c935c8304d7775eabfc010dc6bac0cb12d52bba361138627fa2976aa4e74560cc930354e7d9083d5bb52f549de9fadb933b6
+  metadata.gz: b48fcc1b173c63e00459f66664bf7ef99c1e9605aade8d1550683e866ee03c5ce95f24effb41d24aafd2d025448fc2ff0f88600123b159a4b1b46533e25216da
+  data.tar.gz: bb425489af5383a626431e3ed48d2ea5b0db0a2550856050abc6b021c9ac00004cc269fbbd72aa8adec390d967d7e2425888c2a4ce1cbdcf23c6662b98f71389

data/jekyll_icon_list.gemspec

@@ -12,13 +12,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/rbuchberger/jekyll_icon_list'
   spec.license       = 'MIT'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the
-  # 'allowed_push_host' to allow pushing to a single host or delete this section
-  # to allow pushing to any host.  if spec.respond_to?(:metadata)
-  # spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  # else raise 'RubyGems 2.0 or newer is required to protect against ' \ 'public
-  # gem pushes.' end
-
   # Specify which files should be added to the gem when it is released.  The
   # `git ls-files -z` loads the files in the RubyGem that have been added into
   # git.
@@ -36,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
 
   spec.add_dependency 'jekyll-inline-svg'
+  spec.add_dependency 'objective_elements', '~>0.2.0'
 end

data/lib/jekyll_icon_list.rb

@@ -1,6 +1,7 @@
 require 'jekyll_icon_list/version'
 require 'jekyll'
 require 'jekyll-inline-svg'
+require 'objective_elements'
 # Title: Jekyll Icon List
 # Author: Robert Buchberger : robert@robert-buchberger.com
 # Description: Generates lists of icons + labels, useful for things like tag
@@ -20,41 +21,52 @@ module JekyllIconList
       super
     end
 
+    def render(context)
+      @context = context
+
+      site_settings = @context.registers[:site]
+      raise 'could not load website configuration data' unless site_settings
+
+      @icon_list_settings = site_settings.config['icon_list'] || {}
+
+      all_items_data = site_settings.data['icon_list'] || {}
+
+      parse_input
+
+      build_html(all_items_data)
+    end
+
     def parse_input
       # raw_input will look something like this:
       # 'item1 item2 item3 --ul attribute="value" --(...)'
+
       @attributes = @icon_list_settings['defaults'].dup || {}
+      # {'ul' => 'class="awesome" (...)', (...)}
 
       raw_input_array = @raw_input.split('--').map { |i| i.strip.split(' ') }
-      # [['item1', 'item2', 'item3'], ['ul', 'attribute="value"'], (...) ]
+      # [['item1', 'item2', 'item3'], ['ul', 'attr="value', 'value2"'],(...)]
 
       @item_shortnames = raw_input_array.shift
+      # ['ul, 'attribute="value1 value2"', (...)]
 
       raw_input_array.each { |a| @attributes[a.shift] = a.join ' ' }
-      @attributes.each_value { |v| v.prepend(' ') }
-      @attributes.default = '' # Convenient for concatenation
+      # {'ul' => 'attribute="value1 value2 value3"'}
     end
 
-    def build_image_tag(icon_filename)
-      if icon_filename.split('.').pop.casecmp('svg') == 0
-        Jekyll::Tags::JekyllInlineSvg.send(
-          :new,
-          'svg',
-          icon_filename + @attributes['svg'],
-          @tokens
-        ).render(@context)
-      else
-        "<img src=\"#{icon_filename}\"#{@attributes['img']}>"
-      end
-    end
+    def build_html(all_items_data)
+      list = DoubleTag.new 'ul', attributes: @attributes['ul']
 
-    def search_path(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?
+      @item_shortnames.each do |n|
+        this_item_data = all_items_data[n] || {}
 
-      # And put it back so that pages outside of the root directory keep working
-      search_results.first.prepend '/'
+        icon_location = find_icon n, this_item_data
+
+        label = build_label(n, this_item_data)
+
+        list.add_content build_li(this_item_data, icon_location, label)
+      end
+
+      list.to_s
     end
 
     def find_icon(item_shortname, this_item_data)
@@ -69,51 +81,64 @@ module JekyllIconList
       end
     end
 
+    def search_path(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?
+
+      # And put it back so that pages outside of the root directory keep working
+      search_results.first.prepend '/'
+    end
+
     def build_label(shortname, this_item_data)
       this_item_data['label'] ||
         shortname.split(/[-_]/).map(&:capitalize).join(' ')
     end
 
     def build_li(this_item_data, icon_location, label)
-      li = "  <li#{@attributes['li']}>"
-      if this_item_data && this_item_data['url']
-        li << "<a href=\"#{this_item_data['url']}\"#{@attributes['a']}>"
-      end
-      li << build_image_tag(icon_location)
-      li << label
-      li << '</a>' if this_item_data['url']
-      li << "</li>\n"
+      li = DoubleTag.new(
+        'li',
+        attributes: @attributes['li'],
+        content: [build_image_tag(icon_location), label],
+        oneline: true
+      )
+      return li unless this_item_data['url']
+
+      li.reset_content build_anchor(this_item_data['url'], li.content)
     end
 
-    def build_html(all_items_data)
-      list = "<ul#{@attributes['ul']}>\n"
-
-      @item_shortnames.each do |n|
-        this_icon_data = all_items_data[n] || {}
-
-        icon_location = find_icon n, this_icon_data
-
-        label = build_label(n, this_icon_data)
-
-        list << build_li(this_icon_data, icon_location, label)
+    def build_image_tag(icon_filename)
+      if icon_filename.split('.').pop.casecmp('svg').zero?
+        build_svg(icon_filename)
+      else
+        build_img(icon_filename)
       end
-
-      list << "</ul>\n"
     end
 
-    def render(context)
-      @context = context
-
-      site_settings = @context.registers[:site]
-      raise 'could not load website configuration data' unless site_settings
-
-      @icon_list_settings = site_settings.config['icon_list'] || {}
-
-      all_items_data = site_settings.data['icon_list'] || {}
+    def build_svg(icon_filename)
+      params = icon_filename
+      params << ' ' + @attributes['svg'] if @attributes['svg']
+      Jekyll::Tags::JekyllInlineSvg.send(
+        :new,
+        'svg',
+        params,
+        @tokens
+      ).render(@context)
+    end
 
-      parse_input
+    def build_img(icon_filename)
+      img = SingleTag.new 'img', attributes: { src: icon_filename }
+      img.add_attributes @attributes['img'] if @attributes['img']
+    end
 
-      build_html(all_items_data)
+    def build_anchor(url, content)
+      a = DoubleTag.new(
+        'a',
+        attributes: { href: url },
+        oneline: true,
+        content: content
+      )
+      a.add_attributes @attributes['a'] if @attributes['a']
     end
   end
 end

data/lib/jekyll_icon_list/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_icon_list
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Buchberger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: objective_elements
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: 
 email:
 - robert@robert-buchberger.com
@@ -103,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Builds lists of Icons and labels