lib/bunto-avatar.rb in bunto-avatar-4.0.0 vs lib/bunto-avatar.rb in bunto-avatar-5.0.0

@@ -1,9 +1,12 @@
-require 'zlib'
+# frozen_string_literal: true
+require "zlib"
 
 module Bunto
   class Avatar < Liquid::Tag
+    include Bunto::LiquidExtensions
+
     SERVERS      = 4
     DEFAULT_SIZE = 40
     API_VERSION  = 3
 
     def initialize(_tag_name, text, _tokens)
@@ -12,39 +15,39 @@
     end
 
     def render(context)
       @context = context
       @text    = Liquid::Template.parse(@text).render(@context)
-      attrs    = attributes.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')
+      attrs    = attributes.map { |k, v| "#{k}=\"#{v}\"" }.join(" ")
       "<img #{attrs} />"
     end
 
     private
 
     def attributes
       {
-        :class                 => classes,
-        :src                   => url,
-        :alt                   => username,
-        :srcset                => srcset,
-        :width                 => size,
-        :height                => size,
-        :'data-proofer-ignore' => true
+        :class                => classes,
+        :src                  => url,
+        :alt                  => username,
+        :srcset               => srcset,
+        :width                => size,
+        :height               => size,
+        "data-proofer-ignore" => true
       }
     end
 
     def username
-      matches = @text.match(/\buser=(\w+)\b/)
-      if matches && @context.has_key?(matches[1])
-        @context[matches[1]]
+      matches = @text.match(%r!\buser=([\w\.]+)\b!)
+      if matches
+        lookup_variable(@context, matches[1])
       else
-        @text.split(' ').first.sub('@', '')
+        @text.split(" ").first.sub("@", "")
       end
     end
 
     def size
-      matches = @text.match(/\bsize=(\d+)\b/i)
+      matches = @text.match(%r!\bsize=(\d+)\b!i)
       matches ? matches[1].to_i : DEFAULT_SIZE
     end
 
     def path(scale = 1)
       "#{username}?v=#{API_VERSION}&s=#{size * scale}"
@@ -61,16 +64,16 @@
     def url(scale = 1)
       "https://#{host}/#{path(scale)}"
     end
 
     def srcset
-      (1..4).map { |scale| "#{url(scale)} #{scale}x" }.join(', ')
+      (1..4).map { |scale| "#{url(scale)} #{scale}x" }.join(", ")
     end
 
     # See http://primercss.io/avatars/#small-avatars
     def classes
-      size < 48 ? 'avatar avatar-small' : 'avatar'
+      size < 48 ? "avatar avatar-small" : "avatar"
     end
   end
 end
 
-Liquid::Template.register_tag('avatar', Bunto::Avatar)
+Liquid::Template.register_tag("avatar", Bunto::Avatar)