font_awesome5_rails 1.3.0 → 1.4.0

data/lib/font_awesome5_rails/engine.rb

@@ -1,4 +1,4 @@
 module FontAwesome5Rails
   class Engine < ::Rails::Engine
   end
-end
+end

data/lib/font_awesome5_rails/parsers/fa_icon_parser.rb

@@ -1,55 +1,58 @@
 require_relative 'parse_methods'
 
-class FaIconParser
-  include ActionView::Helpers::TagHelper
-  include ParseMethods
-
-  attr_reader :icon, :options, :data, :style, :text, :title, :right, :attrs
-
-  def initialize(icon, options)
-    @icon = icon
-    @options = options
-    @data = options[:data]
-    @style = options[:style]
-    @text = options[:text]
-    @title = options[:title]
-    @right = options[:right] == true
-    @attrs = options.except(:text, :type, :class, :icon, :animation, :size, :right)
-  end
-
-  def classes
-    @classes ||= parse_classes
-  end
-
-  def sizes
-    @sizes ||= @options[:size].nil? ? "" : arr_with_fa(@options[:size]).uniq.join(" ").strip
-  end
-
-  def get_content_tag
-    if @text.nil?
-      icon_content_tag
-    else
-      @right ? (text_content_tag + icon_content_tag) : (icon_content_tag + text_content_tag)
+module FontAwesome5Rails
+  module Parsers
+    class FaIconParser
+      include ActionView::Helpers::TagHelper
+      include ParseMethods
+
+      attr_reader :icon, :options, :data, :style, :text, :title, :right, :attrs
+
+      def initialize(icon, options)
+        @icon = icon
+        @options = options
+        @data = options[:data]
+        @style = options[:style]
+        @text = options[:text]
+        @title = options[:title]
+        @right = options[:right] == true
+        @attrs = options.except(:text, :type, :class, :icon, :animation, :size, :right)
+      end
+
+      def classes
+        @classes ||= parse_classes
+      end
+
+      def sizes
+        @sizes ||= @options[:size].nil? ? '' : arr_with_fa(@options[:size]).uniq.join(' ').strip
+      end
+
+      def tag
+        return icon_content_tag if @text.nil?
+
+        @right ? (text_content_tag + icon_content_tag) : (icon_content_tag + text_content_tag)
+      end
+
+      private
+
+      def parse_classes
+        tmp = []
+        tmp << icon_type(@options[:type])
+        tmp += arr_with_fa(@icon)
+        tmp += @options[:class].split(' ') unless @options[:class].nil?
+        tmp += arr_with_fa(@options[:size]) unless @options[:size].nil?
+        tmp += arr_with_fa(@options[:animation]) unless @options[:animation].nil?
+        tmp.uniq.join(' ').strip
+      end
+
+      def icon_content_tag
+        content_tag(:i, nil, class: classes, **@attrs)
+      end
+
+      def text_content_tag
+        content_tag(:span, @text, class: "#{@right ? 'fa5-text-r' : 'fa5-text'}#{' ' unless sizes.blank?}#{sizes}",
+                                  style: @style)
+      end
     end
   end
-
-  private
-
-  def parse_classes
-    tmp = []
-    tmp << icon_type(@options[:type])
-    tmp += arr_with_fa(@icon)
-    tmp += @options[:class].split(" ") unless @options[:class].nil?
-    tmp += arr_with_fa(@options[:size]) unless @options[:size].nil?
-    tmp += arr_with_fa(@options[:animation]) unless @options[:animation].nil?
-    tmp.uniq.join(" ").strip
-  end
-
-  def icon_content_tag
-    content_tag(:i, nil, class: classes, **@attrs)
-  end
-
-  def text_content_tag
-    content_tag(:span, @text, class: "#{@right ? 'fa5-text-r' : 'fa5-text'}#{' ' unless sizes.blank?}#{sizes}", style: @style)
-  end
 end

data/lib/font_awesome5_rails/parsers/fa_layered_icon_parser.rb

@@ -1,29 +1,32 @@
-require_relative "parse_methods"
+require_relative 'parse_methods'
 
-class FaLayeredIconParser
-  include ParseMethods
+module FontAwesome5Rails
+  module Parsers
+    class FaLayeredIconParser
+      include ParseMethods
 
-  attr_reader :aligned, :style, :size, :title
+      attr_reader :aligned, :style, :size, :title
 
+      def initialize(options)
+        @aligned = options[:aligned].nil? ? true : options[:aligned]
+        @style = options[:style]
+        @size = options[:size]
+        @title = options[:title]
+        @options = options
+      end
 
-  def initialize(options)
-    @aligned = options[:aligned].nil? ? true : options[:aligned]
-    @style = options[:style]
-    @size = options[:size]
-    @title = options[:title]
-    @options = options
-  end
-
-  def classes
-    @classes ||= parse_classes
-  end
+      def classes
+        @classes ||= parse_classes
+      end
 
-  private
+      private
 
-  def parse_classes
-    tmp = ["fa-layers"]
-    tmp << "fa-fw" if @aligned
-    tmp += @options[:class].split(" ") unless @options[:class].nil?
-    tmp.uniq.join(" ").strip
+      def parse_classes
+        tmp = ['fa-layers']
+        tmp << 'fa-fw' if @aligned
+        tmp += @options[:class].split(' ') unless @options[:class].nil?
+        tmp.uniq.join(' ').strip
+      end
+    end
   end
-end
+end

data/lib/font_awesome5_rails/parsers/fa_stacked_icon_parser.rb

@@ -1,49 +1,53 @@
-require_relative "parse_methods"
-
-class FaStackedIconParser
-  include ParseMethods
-
-  attr_reader :reverse, :options, :span_classes, :first_icon_classes, :second_icon_classes, :text, :title
-
-  def initialize(icon, options)
-    @icon = icon
-    @text = options[:text]
-    @reverse = options[:reverse] == true
-    @title = options[:title]
-    @options = options
-  end
-
-  def span_classes
-    @span_classes ||= parse_span_classes
-  end
-
-  def first_icon_classes
-    @first_icon_classes ||= parse_icon_classes(@options[:base], true)
-  end
-
-  def second_icon_classes
-    @second_icon_classes ||= parse_icon_classes(@icon, false)
-  end
-
-  def more_options(key)
-    options[key] ? options[key].except(:class, :text) : {}
-  end
-
-  private
-
-  def parse_span_classes
-    tmp = ["fa-stack"]
-    tmp += @options[:class].split(" ") unless @options[:class].nil?
-    tmp.uniq.join(" ").strip
-  end
-
-  def parse_icon_classes(klass, first)
-    tmp = []
-    tmp << icon_type(first && @options[:base_type].present? ? @options[:base_type] : @options[:type])
-    tmp += arr_with_fa(klass)
-    tmp << (first ? "fa-stack-2x" : "fa-stack-1x")
-    key = first ? :base_options : :icon_options
-    tmp << options[key][:class] if options[key] && options[key][:class]
-    tmp.uniq.join(" ").strip
+require_relative 'parse_methods'
+
+module FontAwesome5Rails
+  module Parsers
+    class FaStackedIconParser
+      include ParseMethods
+
+      attr_reader :reverse, :options, :text, :title
+
+      def initialize(icon, options)
+        @icon = icon
+        @text = options[:text]
+        @reverse = options[:reverse] == true
+        @title = options[:title]
+        @options = options
+      end
+
+      def span_classes
+        @span_classes ||= parse_span_classes
+      end
+
+      def first_icon_classes
+        @first_icon_classes ||= parse_icon_classes(@options[:base], true)
+      end
+
+      def second_icon_classes
+        @second_icon_classes ||= parse_icon_classes(@icon, false)
+      end
+
+      def more_options(key)
+        options[key] ? options[key].except(:class, :text) : {}
+      end
+
+      private
+
+      def parse_span_classes
+        tmp = ['fa-stack']
+        tmp += @options[:class].split(' ') unless @options[:class].nil?
+        tmp.uniq.join(' ').strip
+      end
+
+      def parse_icon_classes(klass, first)
+        tmp = []
+        tmp << icon_type(first && @options[:base_type].present? ? @options[:base_type] : @options[:type])
+        tmp += arr_with_fa(klass)
+        tmp << (first ? 'fa-stack-2x' : 'fa-stack-1x')
+        key = first ? :base_options : :icon_options
+        tmp << options[key][:class] if options[key] && options[key][:class]
+        tmp.uniq.join(' ').strip
+      end
+    end
   end
-end
+end

data/lib/font_awesome5_rails/parsers/parse_methods.rb

@@ -1,40 +1,44 @@
-module ParseMethods
+module FontAwesome5Rails
+  module Parsers
+    module ParseMethods
+      def icon_type(type)
+        return 'fas' if type.nil?
 
-  def icon_type(type)
-    return "fas" if type.nil?
-    case type.to_sym
-      when :far, :regular
-        "far"
-      when :fal, :light
-        "fal"
-      when :fab, :brand
-        "fab"
-      when :fad, :duotone
-        "fad"
-      else
-        "fas"
-    end
-  end
+        case type.to_sym
+        when :far, :regular
+          'far'
+        when :fal, :light
+          'fal'
+        when :fab, :brand
+          'fab'
+        when :fad, :duotone
+          'fad'
+        else
+          'fas'
+        end
+      end
 
-  def prepend_fa(string)
-    "fa-#{string}"
-  end
+      def prepend_fa(string)
+        "fa-#{string}"
+      end
 
-  def arr_with_fa(array)
-    array = handle_input(array)
-    array.split(" ").map{ |s| prepend_fa(s) }
-  end
+      def arr_with_fa(array)
+        array = handle_input(array)
+        array.split(' ').map { |s| prepend_fa(s) }
+      end
 
-  private
+      private
 
-  def handle_input(input)
-    case input
-    when Symbol
-      input.to_s.dasherize
-    when Array
-      input.join(' ').dasherize
-    else
-      input.to_s
+      def handle_input(input)
+        case input
+        when Symbol
+          input.to_s.dasherize
+        when Array
+          input.join(' ').dasherize
+        else
+          input.to_s
+        end
+      end
     end
   end
 end

data/lib/font_awesome5_rails/version.rb

@@ -1,4 +1,4 @@
 module FontAwesome5Rails
-  FA_VERSION = '5.15.1'
-  VERSION = '1.3.0'
+  FA_VERSION = '5.15.3'
+  VERSION = '1.4.0'
 end

data/spec/dummy/config/environments/test.rb

@@ -15,7 +15,7 @@ Rails.application.configure do
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
+    'Cache-Control' => "public, max-age=3600"
   }
 
   # Show full error reports and disable caching.

data/spec/font_awesome5_rails_spec.rb

@@ -6,163 +6,166 @@ describe FontAwesome5Rails do
 
   describe 'files' do
     it 'should have correct dirs' do
-      expect(Dir.exists?('./app/assets/images')).to be_truthy
-      expect(Dir.exists?('./app/assets/images/fa5/brands')).to be_truthy
-      expect(Dir.exists?('./app/assets/images/fa5/regular')).to be_truthy
-      expect(Dir.exists?('./app/assets/images/fa5/solid')).to be_truthy
-      expect(Dir.exists?('./app/assets/javascripts')).to be_truthy
-      expect(Dir.exists?('./app/assets/stylesheets')).to be_truthy
-      expect(Dir.exists?('./app/helpers/font_awesome5/rails')).to be_truthy
+      expect(Dir.exist?('./app/assets/images')).to be_truthy
+      expect(Dir.exist?('./app/assets/images/fa5/brands')).to be_truthy
+      expect(Dir.exist?('./app/assets/images/fa5/regular')).to be_truthy
+      expect(Dir.exist?('./app/assets/images/fa5/solid')).to be_truthy
+      expect(Dir.exist?('./app/assets/javascripts')).to be_truthy
+      expect(Dir.exist?('./app/assets/stylesheets')).to be_truthy
+      expect(Dir.exist?('./app/helpers/font_awesome5/rails')).to be_truthy
     end
 
     it 'should have correct files' do
-      expect(File.exists?('./app/helpers/font_awesome5/rails/icon_helper.rb')).to be_truthy
-      expect(File.exists?('./app/assets/javascripts/font_awesome5.js')).to be_truthy
-      expect(File.exists?('./app/assets/javascripts/all.min.js')).to be_truthy
-      expect(File.exists?('./app/assets/stylesheets/svg-with-js.min.css')).to be_truthy
-      expect(File.exists?('./app/assets/stylesheets/font_awesome5.css')).to be_truthy
-      expect(File.exists?('./app/assets/stylesheets/all.scss')).to be_truthy
-      expect(File.exists?('./app/assets/stylesheets/font_awesome5_webfont.scss')).to be_truthy
-      expect(File.exists?('./lib/font_awesome5_rails/engine.rb')).to be_truthy
-      expect(File.exists?('./lib/font_awesome5_rails/version.rb')).to be_truthy
-      expect(File.exists?('./lib/font_awesome5_rails/parsers/fa_icon_parser.rb')).to be_truthy
-      expect(File.exists?('./lib/font_awesome5_rails/parsers/fa_layered_icon_parser.rb')).to be_truthy
-      expect(File.exists?('./lib/font_awesome5_rails/parsers/fa_stacked_icon_parser.rb')).to be_truthy
-      expect(File.exists?('./lib/font_awesome5_rails/parsers/parse_methods.rb')).to be_truthy
+      expect(File.exist?('./app/helpers/font_awesome5/rails/icon_helper.rb')).to be_truthy
+      expect(File.exist?('./app/assets/javascripts/font_awesome5.js')).to be_truthy
+      expect(File.exist?('./app/assets/javascripts/all.min.js')).to be_truthy
+      expect(File.exist?('./app/assets/stylesheets/svg-with-js.min.css')).to be_truthy
+      expect(File.exist?('./app/assets/stylesheets/font_awesome5.css')).to be_truthy
+      expect(File.exist?('./app/assets/stylesheets/all.scss')).to be_truthy
+      expect(File.exist?('./app/assets/stylesheets/font_awesome5_webfont.scss')).to be_truthy
+      expect(File.exist?('./lib/font_awesome5_rails/engine.rb')).to be_truthy
+      expect(File.exist?('./lib/font_awesome5_rails/version.rb')).to be_truthy
+      expect(File.exist?('./lib/font_awesome5_rails/parsers/fa_icon_parser.rb')).to be_truthy
+      expect(File.exist?('./lib/font_awesome5_rails/parsers/fa_layered_icon_parser.rb')).to be_truthy
+      expect(File.exist?('./lib/font_awesome5_rails/parsers/fa_stacked_icon_parser.rb')).to be_truthy
+      expect(File.exist?('./lib/font_awesome5_rails/parsers/parse_methods.rb')).to be_truthy
     end
   end
 
   %w(fa_icon fa5_icon).each do |method|
     describe "#{method} tags" do
+      subject { method }
       it 'should return correct type tags' do
-        expect(send method, 'camera-retro').to eq '<i class="fas fa-camera-retro"></i>'
-        expect(send method, 'camera-retro fw').to eq '<i class="fas fa-camera-retro fa-fw"></i>'
-        expect(send method, 'camera-retro', type: :fas).to eq '<i class="fas fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', type: :far).to eq '<i class="far fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', type: :fal).to eq '<i class="fal fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', type: :fab).to eq '<i class="fab fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', type: :fad).to eq '<i class="fad fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', type: :solid).to eq '<i class="fas fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', type: :regular).to eq '<i class="far fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', type: :light).to eq '<i class="fal fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', type: :brand).to eq '<i class="fab fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', type: :duotone).to eq '<i class="fad fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro')).to eq '<i class="fas fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro fw')).to eq '<i class="fas fa-camera-retro fa-fw"></i>'
+        expect(send(subject, 'camera-retro', type: :fas)).to eq '<i class="fas fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', type: :far)).to eq '<i class="far fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', type: :fal)).to eq '<i class="fal fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', type: :fab)).to eq '<i class="fab fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', type: :fad)).to eq '<i class="fad fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', type: :solid)).to eq '<i class="fas fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', type: :regular)).to eq '<i class="far fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', type: :light)).to eq '<i class="fal fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', type: :brand)).to eq '<i class="fab fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', type: :duotone)).to eq '<i class="fad fa-camera-retro"></i>'
       end
 
       it 'should return correct class tags' do
-        expect(send method, 'camera-retro').to eq '<i class="fas fa-camera-retro"></i>'
-        expect(send method, 'camera-retro', class: 'test').to eq '<i class="fas fa-camera-retro test"></i>'
-        expect(send method, 'camera-retro', class: 'fa-camera-retro').to eq '<i class="fas fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro')).to eq '<i class="fas fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', class: 'test')).to eq '<i class="fas fa-camera-retro test"></i>'
+        expect(send(subject, 'camera-retro', class: 'fa-camera-retro')).to eq '<i class="fas fa-camera-retro"></i>'
       end
 
       it 'should return correct size tags' do
-        expect(send method, 'camera-retro', size: '3x').to eq '<i class="fas fa-camera-retro fa-3x"></i>'
-        expect(send method, 'camera-retro', class: 'fa-3x', size: '3x').to eq '<i class="fas fa-camera-retro fa-3x"></i>'
-        expect(send method, 'camera-retro', size: '3x 2x').to eq '<i class="fas fa-camera-retro fa-3x fa-2x"></i>'
+        expect(send(subject, 'camera-retro', size: '3x')).to eq '<i class="fas fa-camera-retro fa-3x"></i>'
+        expect(send(subject, 'camera-retro', class: 'fa-3x', size: '3x')).to eq '<i class="fas fa-camera-retro fa-3x"></i>'
+        expect(send(subject, 'camera-retro', size: '3x 2x')).to eq '<i class="fas fa-camera-retro fa-3x fa-2x"></i>'
       end
 
       it 'should return correct animation tags' do
-        expect(send method, 'camera-retro', animation: 'spin').to eq '<i class="fas fa-camera-retro fa-spin"></i>'
-        expect(send method, 'camera-retro', class: 'fa-spin', animation: 'spin').to eq '<i class="fas fa-camera-retro fa-spin"></i>'
-        expect(send method, 'camera-retro', animation: 'spin cog').to eq '<i class="fas fa-camera-retro fa-spin fa-cog"></i>'
+        expect(send(subject, 'camera-retro', animation: 'spin')).to eq '<i class="fas fa-camera-retro fa-spin"></i>'
+        expect(send(subject, 'camera-retro', class: 'fa-spin', animation: 'spin')).to eq '<i class="fas fa-camera-retro fa-spin"></i>'
+        expect(send(subject, 'camera-retro', animation: 'spin cog')).to eq '<i class="fas fa-camera-retro fa-spin fa-cog"></i>'
       end
 
       it 'should return correct style tags' do
-        expect(send method, 'camera-retro', style: 'color: Tomato;').to eq '<i class="fas fa-camera-retro" style="color: Tomato;"></i>'
+        expect(send(subject, 'camera-retro', style: 'color: Tomato;')).to eq '<i class="fas fa-camera-retro" style="color: Tomato;"></i>'
       end
 
       it 'should return correct data tags' do
-        expect(send method, 'camera-retro', data: {'fa-transform': 'rotate-90'}).to eq '<i class="fas fa-camera-retro" data-fa-transform="rotate-90"></i>'
-        expect(send method, 'camera-retro', data: {fa_transform: 'rotate-90'}).to eq '<i class="fas fa-camera-retro" data-fa-transform="rotate-90"></i>'
+        expect(send(subject, 'camera-retro', data: {'fa-transform': 'rotate-90'})).to eq '<i class="fas fa-camera-retro" data-fa-transform="rotate-90"></i>'
+        expect(send(subject, 'camera-retro', data: {fa_transform: 'rotate-90'})).to eq '<i class="fas fa-camera-retro" data-fa-transform="rotate-90"></i>'
       end
 
       it 'should return correct text tags' do
-        expect(send method, 'camera-retro', text: 'Camera').to have_tag('i', with: { class: 'fas fa-camera-retro'})
-        expect(send method, 'camera-retro', text: 'Camera').to have_tag('span', text: 'Camera')
-        expect(send method, 'camera-retro', text: 'Camera', style: 'color: Tomato;').to have_tag('span', text: 'Camera', with: {style: 'color: Tomato;'})
-        expect(send method, 'camera-retro', text: 'Camera', size: '3x').to have_tag('span', text: 'Camera', with: {class: 'fa5-text fa-3x'})
+        expect(send(subject, 'camera-retro', text: 'Camera')).to have_tag('i', with: { class: 'fas fa-camera-retro'})
+        expect(send(subject, 'camera-retro', text: 'Camera')).to have_tag('span', text: 'Camera')
+        expect(send(subject, 'camera-retro', text: 'Camera', style: 'color: Tomato;')).to have_tag('span', text: 'Camera', with: {style: 'color: Tomato;'})
+        expect(send(subject, 'camera-retro', text: 'Camera', size: '3x')).to have_tag('span', text: 'Camera', with: {class: 'fa5-text fa-3x'})
       end
 
       it 'should return correct tags with symbols' do
-        expect(send method, :facebook, type: :brand).to eq '<i class="fab fa-facebook"></i>'
-        expect(send method, :camera_retro, type: :duotone).to eq '<i class="fad fa-camera-retro"></i>'
-        expect(send method, :camera_retro).to eq '<i class="fas fa-camera-retro"></i>'
-        expect(send method, [:camera_retro, :circle]).to eq '<i class="fas fa-camera-retro fa-circle"></i>'
+        expect(send(subject, :facebook, type: :brand)).to eq '<i class="fab fa-facebook"></i>'
+        expect(send(subject, :camera_retro, type: :duotone)).to eq '<i class="fad fa-camera-retro"></i>'
+        expect(send(subject, :camera_retro)).to eq '<i class="fas fa-camera-retro"></i>'
+        expect(send(subject, [:camera_retro, :circle])).to eq '<i class="fas fa-camera-retro fa-circle"></i>'
       end
 
       it 'should return correct title tags' do
-        expect(send method, 'camera-retro', title: 'camera-title').to eq '<i class="fas fa-camera-retro" title="camera-title"></i>'
-        expect(send method, 'camera-retro', text: 'Camera', title: 'camera-title').to eq '<i class="fas fa-camera-retro" title="camera-title"></i><span class="fa5-text">Camera</span>'
+        expect(send(subject, 'camera-retro', title: 'camera-title')).to eq '<i class="fas fa-camera-retro" title="camera-title"></i>'
+        expect(send(subject, 'camera-retro', text: 'Camera', title: 'camera-title')).to eq '<i class="fas fa-camera-retro" title="camera-title"></i><span class="fa5-text">Camera</span>'
       end
 
       it 'should return correct all tags' do
-        expect(send method, 'camera-retro', test: 'test').to eq '<i class="fas fa-camera-retro" test="test"></i>'
-        expect(send method, 'camera-retro', 'aria-hidden': true).to eq '<i class="fas fa-camera-retro" aria-hidden="true"></i>'
-        expect(send method, 'camera-retro', aria: {hidden: true}).to eq '<i class="fas fa-camera-retro" aria-hidden="true"></i>'
+        expect(send(subject, 'camera-retro', test: 'test')).to eq '<i class="fas fa-camera-retro" test="test"></i>'
+        expect(send(subject, 'camera-retro', 'aria-hidden': true)).to eq '<i class="fas fa-camera-retro" aria-hidden="true"></i>'
+        expect(send(subject, 'camera-retro', aria: {hidden: true})).to eq '<i class="fas fa-camera-retro" aria-hidden="true"></i>'
       end
 
       it 'should return tags with text on right side' do
-        expect(send method, 'camera-retro', text: 'Camera', right: true).to eq '<span class="fa5-text-r">Camera</span><i class="fas fa-camera-retro"></i>'
+        expect(send(subject, 'camera-retro', text: 'Camera', right: true)).to eq '<span class="fa5-text-r">Camera</span><i class="fas fa-camera-retro"></i>'
       end
     end
   end
 
   %w(fa_stacked_icon fa5_stacked_icon).each do |method|
     describe "#{method} tags" do
+      subject { method }
+
       it 'should return correct tags' do
-        expect(send method, 'camera', base: 'circle')
-            .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-stack-1x"></i></span>'
+        expect(send(subject, 'camera', base: 'circle'))
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-stack-1x"></i></span>'
 
-        expect(send method, 'camera inverse', base: 'circle')
-            .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
+        expect(send(subject, 'camera inverse', base: 'circle'))
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
 
-        expect(send method, 'camera inverse', base: 'circle inverse')
-            .to eq '<span class="fa-stack"><i class="fas fa-circle fa-inverse fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
+        expect(send(subject, 'camera inverse', base: 'circle inverse'))
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-inverse fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
 
-        expect(send method, 'camera', base: 'circle', type: :far, reverse: false)
-            .to eq '<span class="fa-stack"><i class="far fa-circle fa-stack-2x"></i><i class="far fa-camera fa-stack-1x"></i></span>'
+        expect(send(subject, 'camera', base: 'circle', type: :far, reverse: false))
+          .to eq '<span class="fa-stack"><i class="far fa-circle fa-stack-2x"></i><i class="far fa-camera fa-stack-1x"></i></span>'
 
-        expect(send method, 'camera', base: 'circle', reverse: true)
-            .to eq '<span class="fa-stack"><i class="fas fa-camera fa-stack-1x"></i><i class="fas fa-circle fa-stack-2x"></i></span>'
+        expect(send(subject, 'camera', base: 'circle', reverse: true))
+          .to eq '<span class="fa-stack"><i class="fas fa-camera fa-stack-1x"></i><i class="fas fa-circle fa-stack-2x"></i></span>'
 
-        expect(send method, 'camera', base: 'circle', text: 'Text!')
-            .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-stack-1x"></i></span>Text!'
+        expect(send(subject, 'camera', base: 'circle', text: 'Text!'))
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-stack-1x"></i></span>Text!'
 
-        expect(send method, 'camera', base: 'circle', type: :fas, base_type: :far, reverse: true)
-            .to eq '<span class="fa-stack"><i class="fas fa-camera fa-stack-1x"></i><i class="far fa-circle fa-stack-2x"></i></span>'
+        expect(send(subject, 'camera', base: 'circle', type: :fas, base_type: :far, reverse: true))
+          .to eq '<span class="fa-stack"><i class="fas fa-camera fa-stack-1x"></i><i class="far fa-circle fa-stack-2x"></i></span>'
 
-        expect(send method, 'camera', base: 'circle', type: :far, base_type: :fas, reverse: true)
-            .to eq '<span class="fa-stack"><i class="far fa-camera fa-stack-1x"></i><i class="fas fa-circle fa-stack-2x"></i></span>'
+        expect(send(subject, 'camera', base: 'circle', type: :far, base_type: :fas, reverse: true))
+          .to eq '<span class="fa-stack"><i class="far fa-camera fa-stack-1x"></i><i class="fas fa-circle fa-stack-2x"></i></span>'
       end
 
       it 'should return correct tags with symbols' do
-        expect(send method, [:camera, :inverse], base: :circle)
-            .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
-        expect(send method, :camera, base: :circle, type: :far, reverse: false)
-            .to eq '<span class="fa-stack"><i class="far fa-circle fa-stack-2x"></i><i class="far fa-camera fa-stack-1x"></i></span>'
+        expect(send(subject, [:camera, :inverse], base: :circle))
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
+        expect(send(subject, :camera, base: :circle, type: :far, reverse: false))
+          .to eq '<span class="fa-stack"><i class="far fa-circle fa-stack-2x"></i><i class="far fa-camera fa-stack-1x"></i></span>'
       end
 
       it 'should return correct tags with title' do
-        expect(send method, [:camera, :inverse], base: :circle, title: 'Camera')
-            .to eq '<span class="fa-stack" title="Camera"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
+        expect(send(subject, [:camera, :inverse], base: :circle, title: 'Camera'))
+          .to eq '<span class="fa-stack" title="Camera"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
       end
 
       it 'should return correct tags with base_options' do
-        expect(send method, 'camera', base: 'circle', base_options: { class: 'test' })
+        expect(send(subject, 'camera', base: 'circle', base_options: { class: 'test' }))
           .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x test"></i><i class="fas fa-camera fa-stack-1x"></i></span>'
 
-          expect(send method, 'camera', base: 'circle', base_options: { class: 'test', label: 'label' })
+        expect(send(subject, 'camera', base: 'circle', base_options: { class: 'test', label: 'label' }))
           .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x test" label="label"></i><i class="fas fa-camera fa-stack-1x"></i></span>'
       end
 
       it 'should return correct tags with icon_options' do
-        expect(send method, 'camera', base: 'circle', icon_options: { class: 'test', label: 'label' })
-        .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-stack-1x test" label="label"></i></span>'
+        expect(send(subject, 'camera', base: 'circle', icon_options: { class: 'test', label: 'label' }))
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-stack-1x test" label="label"></i></span>'
       end
 
       it 'should return correct tags with base_options and icon_options' do
-        expect(send method, 'camera', base: 'circle', icon_options: { class: 'icon', label: 'icon' }, base_options: { class: 'base', aria: 'base' })
-        .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x base" aria="base"></i><i class="fas fa-camera fa-stack-1x icon" label="icon"></i></span>'
+        expect(send(subject, 'camera', base: 'circle', icon_options: { class: 'icon', label: 'icon' }, base_options: { class: 'base', aria: 'base' }))
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x base" aria="base"></i><i class="fas fa-camera fa-stack-1x icon" label="icon"></i></span>'
       end
     end
   end
@@ -175,11 +178,10 @@ describe FontAwesome5Rails do
       expect(fa_layered_icon(class: 'test'){ fa_icon 'circle' }).to eq '<span class="fa-layers fa-fw test"><i class="fas fa-circle"></i></span>'
 
       expect(fa_layered_icon(size: '3x'){ fa_icon 'circle' })
-          .to eq '<div class="fa-3x"><span class="fa-layers fa-fw"><i class="fas fa-circle"></i></span></div>'
+        .to eq '<div class="fa-3x"><span class="fa-layers fa-fw"><i class="fas fa-circle"></i></span></div>'
 
       expect(fa_layered_icon(style: 'background: MistyRose'){ fa_icon 'circle' })
-          .to eq '<span class="fa-layers fa-fw" style="background: MistyRose"><i class="fas fa-circle"></i></span>'
-
+        .to eq '<span class="fa-layers fa-fw" style="background: MistyRose"><i class="fas fa-circle"></i></span>'
 
       expect(
         fa_layered_icon do
@@ -190,7 +192,7 @@ describe FontAwesome5Rails do
 
     it 'should return correct tags with title' do
       expect(fa_layered_icon(style: 'background: MistyRose', title: 'LayeredIcon'){ fa_icon 'circle' })
-          .to eq '<span class="fa-layers fa-fw" title="LayeredIcon" style="background: MistyRose"><i class="fas fa-circle"></i></span>'
+        .to eq '<span class="fa-layers fa-fw" title="LayeredIcon" style="background: MistyRose"><i class="fas fa-circle"></i></span>'
     end
   end