rails_heroicon 2.0.0 → 2.1.0

data/lib/rails_heroicon/helper.rb

@@ -2,6 +2,7 @@ require "action_view"
 
 module RailsHeroicon
   module Helper
+    include ActionView::Helpers::TagHelper
     # To add a heroicon, call <tt><%= heroicon "icon_name" %></tt> on your erb template.
     # Head over to https://heroicons.com to view all the icons.
     #
@@ -9,7 +10,7 @@ module RailsHeroicon
     # The helper method accepts mutiple arguments such as:
     #
     # === Variant
-    # There are two types of variants: 'outline' and 'solid', the default being the 'outline'.
+    # There are three types of variants: 'outline', 'solid' and 'mini', the default being the 'outline'.
     # To specify the solid variant, call <tt><%= heroicon "icon_name", variant: "solid" %></tt>
     #
     # === HTML attributes
@@ -25,9 +26,9 @@ module RailsHeroicon
     #
     # This will set the <tt>height</tt> and <tt>width</tt> attribute on the svg.
     #
-    # If the variant is set as <tt>outline</tt>, size automatically defaults to 24, and if the variant is set as
-    # <tt>solid</tt>, size automatically defaults to 20. However, this can be over-written with the <tt>size</tt>
-    # attribute.
+    # If the variant is set as <tt>outline</tt> or <tt>solid</tt>, size automatically defaults to 24,
+    # and if the variant is set as <tt>mini</tt>, size automatically defaults to 20.
+    # However, this can be over-written with the <tt>size</tt> attribute.
     #
     # == Accessibility
     # The helper method automatically sets <tt>aria-hidden=true</tt> if <tt>aria-label</tt> is not set, and

data/lib/rails_heroicon/rails_heroicon.rb

@@ -11,11 +11,9 @@ module RailsHeroicon
 
       @icon = icon.to_s
       @variant = variant.to_s
-      @options = options
+      @options = options.dup
       @size = icon_size_with(size)
-
-      @options.merge!(a11y)
-      @options.merge!(misc)
+      @options.merge!(svg_properties)
     end
 
     # Finds the svg icon with respect to variant.
@@ -28,30 +26,24 @@ module RailsHeroicon
 
     private
 
-    def a11y
-      accessible = {}
+    def svg_properties
+      properties = {}
+
+      properties[:viewBox] = mini? ? "0 0 20 20" : "0 0 24 24"
+      properties[:height] = @size
+      properties[:width] = @size
+      properties[:version] = "1.1"
+      properties[:fill] = outline? ? "none" : "currentColor"
+      properties[:stroke] = outline? ? "currentColor" : "none"
+      properties[:"stroke-width"] = "1.5" if outline?
 
-      if @options[:"aria-label"].nil? && @options["aria-label"].nil? && @options.dig(:aria, :label).nil?
-        accessible[:"aria-hidden"] = "true"
+      if options[:"aria-label"].nil? && options["aria-label"].nil? && options.dig(:aria, :label).nil?
+        properties[:"aria-hidden"] = "true"
       else
-        accessible[:role] = "img"
+        properties[:role] = "img"
       end
 
-      accessible
-    end
-
-    def misc
-      hash = {}
-
-      hash[:viewBox] = mini? ? "0 0 20 20" : "0 0 24 24"
-      hash[:height] = @size
-      hash[:width] = @size
-      hash[:version] = "1.1"
-      hash[:fill] = outline? ? "none" : "currentColor"
-      hash[:stroke] = outline? ? "currentColor" : "none"
-      hash[:"stroke-width"] = "1.5" if outline?
-
-      hash
+      properties
     end
 
     # If the user has explicitly stated the size attribute, then use that. If size attribute is not passed

data/lib/rails_heroicon/railtie.rb

@@ -3,7 +3,7 @@ require_relative "helper"
 module RailsHeroicon
   class Railtie < Rails::Railtie
     initializer "rails_heroicon.helper" do
-      ActionView::Base.send :include, Helper # rubocop:disable Lint/SendWithMixinArgument
+      ActionView::Base.send :include, Helper
     end
   end
 end

data/lib/rails_heroicon/version.rb

@@ -1,3 +1,3 @@
 module RailsHeroicon
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_heroicon
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - abeidahmed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -70,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.6
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="