fa_rails 0.1.29 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066ee0296fe9eddacfb54f58f2425661b2be548b0590ad04523089d6f61d0a25
-  data.tar.gz: 9730e00557d1ae282e262fd7067b99e9d667f2308b7aab2984d2390fa68d6f3c
+  metadata.gz: 5e75c0e9608f41e199502dd2feb1157b8f1fb2e83c6fef273d9655b267e7c0a1
+  data.tar.gz: 421e5312e5988e3fa5039c5269b37259f21a2e60b06bc28d1b3de910b4e1e0c6
 SHA512:
-  metadata.gz: e0081789f2c062f2aae50d568f58cf8d11e5cd4b17954ca47cf27c6a1608119a543fd562e6b616677b16d5c98b97066bbabe0555b4d1588afb12f34077ad6cb7
-  data.tar.gz: 04c3fa02408f7e88c98973e75765a28668b302afc1e69909a647c677f26d408c5c558d27a208d1a9f18b88fcf0cb69c08658c316c6826e73cabfcfad27bf0209
+  metadata.gz: b57d25bacf152ba1651c70d224c9cce0dd19ece29226572783c31a4ebab2bce3b97d7ff864a000fcd71f4d674dd601bf1578e3eee4ce77a5c75514e04d5fd8ee
+  data.tar.gz: fc339b05b167b9a35f73006495b4458dd8458a263e93d48d987a1fe59c2028581966794cf2e8cc89b90095b52ae6b060ee2106ef1a8193545092ac0f30fa219f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fa_rails (0.1.29)
+    fa_rails (0.1.31)
 
 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.29'
-  s.date          = '2023-03-13'
+  s.version       = '0.1.31'
+  s.date          = '2023-03-28'
   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

@@ -51,7 +51,7 @@ module FA
 
       @classes << "fa-#{name}"
       @classes << "fa-#{options[:size]}x"
-      css = @classes.flatten.join(' ')
+      css = @classes.flatten.join(' ').sub(/\A\s+/, '')
       transforms = @transforms.join(' ')
 
       "<i class='#{css}' style='#{@styles}' data-fa-transform='#{transforms}' " \
@@ -146,11 +146,13 @@ module FA
     end
 
     def parse_style(options)
-      return if options[:css].to_s.match?(/\bfa[#{STYLES.values.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

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe FA do
   describe 'link' do
-    it 'should generate the correct link tag' do
+    it 'generates the correct link tag' do
       tag = FA::Link.new(version: 'v0.1.2', integrity: 'sha384-abc', pro: true)
       expect(tag.safe).to eql(
         '<link rel="stylesheet" ' \
@@ -13,14 +13,14 @@ RSpec.describe FA do
       )
     end
 
-    it 'should generate the correct kit link tag' do
+    it 'generates the correct kit link tag' do
       tag = FA::Link.kit('abcdefg')
       expect(tag).to eql(
         "<script src=\"https://kit.fontawesome.com/abcdefg.js\"></script>"
       )
     end
 
-    it 'should raise an ArgumentError if not initialized correctly' do
+    it 'raises an ArgumentError if not initialized correctly' do
       expect { FA::Link.new(version: 'v0.0.0', pro: true) }.to raise_error(
         ArgumentError, 'Must specify version and integrity or kit.'
       )
@@ -28,56 +28,56 @@ RSpec.describe FA do
   end
 
   describe 'icon' do
-    it 'should generate the correct icon from a string name' 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>"
       )
     end
 
-    it 'should generate the correct icon from a symbol name' do
+    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>"
       )
     end
 
-    it 'should generate the correct icon from a configuration hash' do
+    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>"
       )
     end
 
-    it 'should correctly handle a string fa option' do
+    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>"
       )
     end
 
-    it 'should correctly handle an array fa option' do
+    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>"
       )
     end
 
-    it 'should correctly handle a string css option' do
+    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>"
       )
     end
 
-    it 'should correctly handle an array css option' do
+    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>"
       )
     end
 
-    it 'should correctly handle a nil css option' do
+    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>"
       )
     end
 
-    it 'should raise ArgumentError for other input types' do
+    it 'raises ArgumentError for other input types' do
       [nil, [], 0].each do |fa|
         expect { FA::Icon.p(fa) }.to raise_error(
           ArgumentError, 'Unexpected argument type.'
@@ -85,7 +85,13 @@ RSpec.describe FA do
       end
     end
 
-    it 'should generate the correct brand icon' 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>"
+      )
+    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>"
       )
@@ -97,7 +103,19 @@ RSpec.describe FA do
       )
     end
 
-    it 'should generate the correct icon with styles' do
+    it 'generates the correct sharp regular icon' do
+      expect(FA::Icon.p(:house, style: :regular, mode: :sharp)).to eql(
+        "<i class='fasr fa-house fa-1x' 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='fasl fa-house fa-1x' style='' data-fa-transform='' title=''></i>"
+      )
+    end
+
+    it 'generates the correct icon with styles' do
       expect(
         FA::Icon.p(
           'fire-alt', style: :duotone, fa_styles: {
@@ -112,7 +130,7 @@ RSpec.describe FA do
   end
 
   describe 'layer' do
-    it 'should generate the correct layer from string or symbol names' do
+    it 'generates the correct layer from string or symbol names' do
       icons = [
         { name: :square },
         { name: :circle, options: { grow: 1 } },
@@ -128,7 +146,7 @@ RSpec.describe FA do
       )
     end
 
-    it 'should generate the correct layer with a span' do
+    it 'generates the correct layer with a span' do
       icons = [
         { name: :square },
         { name: :counter, text: 17, options: { position: :tl } }
@@ -142,7 +160,7 @@ RSpec.describe FA do
       )
     end
 
-    it 'should apply layer titles to all icons' do
+    it 'applies layer titles to all icons' do
       icons = [
         { name: :square, title: 'wrong 1' },
         { name: :exclamation, title: 'wrong 2' }
@@ -158,7 +176,7 @@ RSpec.describe FA do
   end
 
   describe 'build' do
-    it 'should generate the correct layer' do
+    it 'generates the correct layer' do
       layer = FA::Build.p do |b|
         b.icon('circle')
         b.span('counter', 7)
@@ -174,13 +192,13 @@ RSpec.describe FA do
   end
 
   describe 'span' do
-    it 'should generate the correct span from a string or symbol type' 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>"
       )
     end
 
-    it 'should generate the correct span from a configuration hash' do
+    it 'generates the correct span from a configuration hash' 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' " \
@@ -188,7 +206,7 @@ RSpec.describe FA do
       )
     end
 
-    it 'should raise ArgumentError for other input types' do
+    it 'raises ArgumentError for other input types' do
       [nil, [], 0].each do |fa|
         expect { FA::Span.p(fa) }.to raise_error(
           ArgumentError, 'Unexpected argument type.'

metadata

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