fa_rails 0.1.30 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e861445b4047bffc1047326c7fc2b62a8ffffdbb8fba0e391cd47ec53750d9f
-  data.tar.gz: f619fb7fedceaa6db642149f22fde4b392c359df3ec0372370177f48abf1582a
+  metadata.gz: 82cc0408ffb769b073374d9993346efc041cee42538448ec69ad6875a769e952
+  data.tar.gz: 321bf680aab68c84c24b3f3ea9403ec701f4369f09f24c5da629177c57d677f4
 SHA512:
-  metadata.gz: 21c8c9a644c8ab06f5528af26f8926030d421834d4d4bc0470257ad0e4d3f2388f4e72bc6c04af54edf3d982e4fa608a89585adc7e85c4715b0bfc37f68bf37c
-  data.tar.gz: be852be38fd50e7685c993cc27b34d2c2b9ae257173b52b44dc9f2dced1595e507fde32899d44cb138ce2abba2f3a4e06a67167801578d37c146f673b2c1173e
+  metadata.gz: 4e222ee63e3d6fabf9c5c708cfb3ae42bcfe832544e56b85101566b536eb4464b5abcaa4431cf38f0dbebda7ed8dd54afdae19b2354caa9441314b774828a538
+  data.tar.gz: ba9a40a7674fb468d65b0e6b86e87aa80d0c2e21085b5679421032cc319a3b814a55d2d990f441717d351e2b594ca1fd5a7ba2e02317f32bf5652968fc29185f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fa_rails (0.1.30)
+    fa_rails (0.1.32)
 
 GEM
   remote: https://rubygems.org/

data/fa_rails.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'fa_rails'
-  s.version       = '0.1.30'
-  s.date          = '2023-03-28'
+  s.version       = '0.1.32'
+  s.date          = '2023-07-21'
   s.summary       = 'FontAwesome helper for Rails'
   s.description   = 'A helper module for using FontAwesome icons in Rails.'
   s.homepage      = 'http://rubygems.org/gems/fa_rails'

data/lib/fa/base.rb

@@ -54,8 +54,8 @@ module FA
       css = @classes.flatten.join(' ').sub(/\A\s+/, '')
       transforms = @transforms.join(' ')
 
-      "<i class='#{css}' style='#{@styles}' data-fa-transform='#{transforms}' " \
-      "title='#{options[:title]}'></i>"
+      "<i class='#{css}' id='#{options[:id]}' style='#{@styles}' " \
+      "data-fa-transform='#{transforms}' title='#{options[:title]}'></i>"
     end
 
     def parse_span(type, text, options = {})
@@ -70,7 +70,8 @@ module FA
       css = @classes.flatten.reject { |c| c.to_s.match?(/^fa.$/) }.join(' ')
       transforms = @transforms.join(' ')
 
-      "<span class='#{css}' style='#{@styles}' data-fa-transform='#{transforms}'>#{text}</span>"
+      "<span class='#{css}' id='#{options[:id]}' style='#{@styles}' " \
+      "data-fa-transform='#{transforms}'>#{text}</span>"
     end
 
     def fa_options(options)
@@ -146,13 +147,13 @@ module FA
     end
 
     def parse_style(options)
-      if options[:css].to_s =~ /\bfa[#{STYLES.values.uniq.join}][#{MODES.values.uniq.join}]?\b/
+      if options[:css].to_s =~ /\bfa[#{MODES.values.uniq.join}]?[#{STYLES.values.uniq.join}]\b/
         return # Don't overwrite a manual style [& mode] class
       end
 
       style = 'fa'
-      style += STYLES[options[:style]]
       style += MODES[options[:mode]]
+      style += STYLES[options[:style]]
     end
   end
 end

data/spec/lib/fa_spec.rb

@@ -30,50 +30,50 @@ RSpec.describe FA do
   describe 'icon' do
     it 'generates the correct icon from a string name' do
       expect(FA::Icon.p('help')).to eql(
-        "<i class='fas fa-help fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fas fa-help fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'generates the correct icon from a symbol name' do
       expect(FA::Icon.p(:help)).to eql(
-        "<i class='fas fa-help fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fas fa-help fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'generates the correct icon from a configuration hash' do
       fa = { name: 'help', options: { style: :light, size: 2 } }
       expect(FA::Icon.p(fa)).to eql(
-        "<i class='fal fa-help fa-2x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fal fa-help fa-2x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'handles a string fa option' do
       expect(FA::Icon.p(:help, fa: 'fw 2x')).to eql(
-        "<i class='fas fa-fw fa-2x fa-help fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fas fa-fw fa-2x fa-help fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'handles an array fa option' do
       expect(FA::Icon.p(:help, fa: %i[fw 2x])).to eql(
-        "<i class='fas fa-fw fa-2x fa-help fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fas fa-fw fa-2x fa-help fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'handles a string css option' do
       expect(FA::Icon.p(:help, css: 'green big')).to eql(
-        "<i class='fas green big fa-help fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fas green big fa-help fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'handles an array css option' do
       expect(FA::Icon.p(:help, css: %i[green big])).to eql(
-        "<i class='fas green big fa-help fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fas green big fa-help fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'handles a nil css option' do
       expect(FA::Icon.p(:help, css: nil)).to eql(
-        "<i class='fas fa-help fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fas fa-help fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
@@ -87,31 +87,31 @@ RSpec.describe FA do
 
     it 'generates the correct icon with a manual style class' do
       expect(FA::Icon.p(:help, style: :solid, css: 'fad')).to eql(
-        "<i class='fad fa-help fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fad fa-help fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'generates the correct brand icon' do
       expect(FA::Icon.p(:github, style: :brands)).to eql(
-        "<i class='fab fa-github fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fab fa-github fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'generates the correct sharp icon' do
       expect(FA::Icon.p(:house, mode: :sharp)).to eql(
-        "<i class='fass fa-house fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fass fa-house fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'generates the correct sharp regular icon' do
       expect(FA::Icon.p(:house, style: :regular, mode: :sharp)).to eql(
-        "<i class='fars fa-house fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fasr fa-house fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
     it 'generates the correct sharp light icon' do
       expect(FA::Icon.p(:house, style: :light, mode: :sharp)).to eql(
-        "<i class='fals fa-house fa-1x' style='' data-fa-transform='' title=''></i>"
+        "<i class='fasl fa-house fa-1x' id='' style='' data-fa-transform='' title=''></i>"
       )
     end
 
@@ -123,7 +123,7 @@ RSpec.describe FA do
           }
         )
       ).to eql(
-        "<i class='fad fa-fire-alt fa-1x' style='--fa-primary-opacity: 0.6; --fa-secondary-opacity: 0.4; " \
+        "<i class='fad fa-fire-alt fa-1x' id='' style='--fa-primary-opacity: 0.6; --fa-secondary-opacity: 0.4; " \
         "--fa-primary-color: green; --fa-secondary-color: #DD2200;' data-fa-transform='' title=''></i>"
       )
     end
@@ -139,9 +139,9 @@ RSpec.describe FA do
 
       expect(FA::Layer.p(icons, grow: 2)).to eql(
         "<span class='icon fa-layers fa-stack fa-fw ' title=''>" \
-        "<i class='fas fa-stack-1x fa-square fa-1x' style='' data-fa-transform='grow-2' title=''></i>" \
-        "<i class='fas fa-stack-1x fa-circle fa-1x' style='' data-fa-transform='grow-3' title=''></i>" \
-        "<i class='far fa-stack-1x fa-exclamation fa-1x' style='' data-fa-transform='grow-2' title=''></i>" \
+        "<i class='fas fa-stack-1x fa-square fa-1x' id='' style='' data-fa-transform='grow-2' title=''></i>" \
+        "<i class='fas fa-stack-1x fa-circle fa-1x' id='' style='' data-fa-transform='grow-3' title=''></i>" \
+        "<i class='far fa-stack-1x fa-exclamation fa-1x' id='' style='' data-fa-transform='grow-2' title=''></i>" \
         '</span>'
       )
     end
@@ -154,8 +154,8 @@ RSpec.describe FA do
 
       expect(FA::Layer.p(icons)).to eql(
         "<span class='icon fa-layers fa-stack fa-fw ' title=''>" \
-        "<i class='fas fa-stack-1x fa-square fa-1x' style='' data-fa-transform='grow-0' title=''></i>" \
-        "<span class='fa-stack-1x fa-layers-counter fa-layers-top-left' style='' data-fa-transform='grow-0'>17</span>" \
+        "<i class='fas fa-stack-1x fa-square fa-1x' id='' style='' data-fa-transform='grow-0' title=''></i>" \
+        "<span class='fa-stack-1x fa-layers-counter fa-layers-top-left' id='' style='' data-fa-transform='grow-0'>17</span>" \
         '</span>'
       )
     end
@@ -168,8 +168,8 @@ RSpec.describe FA do
 
       expect(FA::Layer.p(icons, title: 'right')).to eql(
         "<span class='icon fa-layers fa-stack fa-fw ' title='right'>" \
-        "<i class='fas fa-stack-1x fa-square fa-1x' style='' data-fa-transform='grow-0' title='right'></i>" \
-        "<i class='fas fa-stack-1x fa-exclamation fa-1x' style='' data-fa-transform='grow-0' title='right'></i>" \
+        "<i class='fas fa-stack-1x fa-square fa-1x' id='' style='' data-fa-transform='grow-0' title='right'></i>" \
+        "<i class='fas fa-stack-1x fa-exclamation fa-1x' id='' style='' data-fa-transform='grow-0' title='right'></i>" \
         '</span>'
       )
     end
@@ -184,8 +184,8 @@ RSpec.describe FA do
 
       expect(layer).to eql(
         "<span class='icon fa-layers fa-stack fa-fw ' title=''>" \
-        "<i class='fas fa-stack-1x fa-circle fa-1x' style='' data-fa-transform='grow-0' title=''></i>" \
-        "<span class='fa-stack-1x fa-layers-counter ' style='' data-fa-transform='grow-0'>7</span>" \
+        "<i class='fas fa-stack-1x fa-circle fa-1x' id='' style='' data-fa-transform='grow-0' title=''></i>" \
+        "<span class='fa-stack-1x fa-layers-counter ' id='' style='' data-fa-transform='grow-0'>7</span>" \
         '</span>'
       )
     end
@@ -194,7 +194,7 @@ RSpec.describe FA do
   describe 'span' do
     it 'generates the correct span from a string or symbol type' do
       expect(FA::Span.p(:text, 'Hello')).to eql(
-        "<span class='fa-layers-text ' style='' data-fa-transform=''>Hello</span>"
+        "<span class='fa-layers-text ' id='' style='' data-fa-transform=''>Hello</span>"
       )
     end
 
@@ -202,7 +202,7 @@ RSpec.describe FA do
       span = { type: :text, text: 'World', options: { position: :bl } }
       expect(FA::Span.p(span)).to eql(
         "<span class='fa-layers-text fa-layers-bottom-left' " \
-        "style='' data-fa-transform=''>World</span>"
+        "id='' style='' data-fa-transform=''>World</span>"
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fa_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.32
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake