fa_rails 0.1.22 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 626bd595bc9a79f241571cc01ea6c2b17f926f4a98b37678f2ab0f78046de28d
-  data.tar.gz: 9b2374e43b36b5f304496de28e2a876014875e5d1615e20a1d853fe8fe271e8b
+  metadata.gz: 79592033f8cde3a69b9c151928289df8ea5564c6657c3c32aba9464ea5a80014
+  data.tar.gz: 5e30a6766b53e7563dd1759656ab04e50720fb270e72509196fbdb1045bf9813
 SHA512:
-  metadata.gz: 9a20e551e982f87d8e3c81df3a4dbd5d15e3933ecebcef9b62978a0174879a389379189f93ed4a985672de8ebbab15fbb124f4c074a914dcb1da9ac1cab30d1f
-  data.tar.gz: 685fb1c6945497270fd48526f8d481bad0b48cf1f408164fabe2a3f23b51827448fb68be0dca9c496a440bbe6cdbe8b108f45f40b4f1fa08cc53b39d9b9a2e16
+  metadata.gz: a43c475dd94f739d326a2f855f69bd525d47935113eb77a193787eded0879bee3985548da66fa99a1628b9fc9afe04ceba9ee63e450cc2b94d03b3f855a42b8d
+  data.tar.gz: 45338d64be37baddb0ef1802a0b13a8338d304104305e262ec2f201dbb5009bea8f2c3f5afdfbf3ccd9f561a66c182cd8923a3b768e5e16a00103d4039f396c6

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    fa_rails (0.1.22)
+    fa_rails (0.1.27)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
     docile (1.3.1)
-    json (2.1.0)
-    rake (12.3.1)
+    json (2.3.1)
+    rake (12.3.3)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)

data/README.md

@@ -29,29 +29,41 @@ corresponding locations in your app, and ensure you correctly include all files.
 
 ### FontAwesome CDN
 
-Go to the FontAwesome
-[How to Use](https://fontawesome.com/how-to-use/on-the-web/setup/getting-started?using=web-fonts-with-css)
-page and copy the appropriate CDN link tag.
+You can also link into the FontAwesome CDN, in either of two ways:
 
-You can also `include FA`, then use the built-in helper method in your layout:
+#### Version-Specific Link
+
+You can use this helper method in your layout:
 
 ```ruby
 FA::Link.new(version: 'v5.3.1', integrity: 'sha384-some-key-here').safe
 ```
 
-#### Free
+Or, go to the FontAwesome
+[How to Use](https://fontawesome.com/how-to-use/on-the-web/setup/getting-started?using=web-fonts-with-css)
+page and copy the appropriate CDN link tag.
+
+**Be sure to also register each domain that will use this CDN link.**
+
+##### Free
 
 ```html
 <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-some-key-here" crossorigin="anonymous">
 ```
 
-#### Pro
+##### Pro
 
 ```html
 <link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-some-key-here" crossorigin="anonymous">
 ```
 
-**Be sure to also register each domain that will use this CDN link.**
+#### Kit Link
+
+Use this helper method in your layout:
+
+```ruby
+FA::Link.kit('kit-id')
+```
 
 ## Usage
 
@@ -147,6 +159,10 @@ css #=> String – arbitrary CSS classes, space-delimited, applied to the layer
 FA::Icon.p('lock', fa: 'fw')
 #=> "<i class='fas fa-fw fa-lock fa-1x' style='' data-fa-transform='' title=''></i>"
 
+# Duotone fire-alt icon with swapped opacity
+FA::Icon.p('fire-alt', fa: 'swap-opacity')
+#=> "<i class='fas fa-swap-opacity fa-fire-alt fa-1x' style='' data-fa-transform='' title=''></i>"
+
 # Duotone fire-alt icon with specified opacities
 FA::Icon.p('fire-alt', style: :duotone, raw_css: { '--fa-primary-opacity' => '0.6', '--fa-secondary-opacity' => '0.4' })
 #=> "<i class='fad fa-fire-alt fa-1x' style='--fa-primary-opacity: 0.4; --fa-secondary-opacity: 0.6;' data-fa-transform='' title=''></i>"

data/fa_rails.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'fa_rails'
-  s.version       = '0.1.22'
-  s.date          = '2019-08-09'
+  s.version       = '0.1.27'
+  s.date          = '2021-05-26'
   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

@@ -3,6 +3,11 @@
 module FA
   # FontAwesome 5 (Pro) Helper core class for inheritance
   class Base
+    STYLES = {
+      solid: 's', regular: 'r', light: 'l', thin: 't',
+      duotone: 'd', brands: 'b', kit_upload: 'k'
+    }.freeze
+
     # Outputs the formatted string directly.
     def raw
       #
@@ -101,8 +106,13 @@ module FA
     def parse_classes(options)
       @classes = []
       @classes << parse_style(options)
-      @classes << options[:fa].to_s.split(' ').map { |c| "fa-#{c}" }
-      @classes << options[:css].to_s.split(' ')
+      @classes << format_classes(options[:fa], prefix: 'fa-')
+      @classes << format_classes(options[:css])
+    end
+
+    def format_classes(classes, prefix: nil)
+      classes = classes.to_s.split(' ') unless classes.is_a?(Array)
+      classes.map { |c| "#{prefix}#{c}" }
     end
 
     def merge_fa_styles(options)
@@ -130,10 +140,10 @@ module FA
     end
 
     def parse_style(options)
-      return if options[:css].to_s.match?(/fa[srldb]/)
-      return 'fas' unless %i[solid regular light duotone brands].include?(options[:style])
+      return if options[:css].to_s.match?(/\bfa[#{STYLES.values.join}]\b/)
+      return 'fas' unless STYLES.keys.include?(options[:style])
 
-      'fa' + { solid: 's', regular: 'r', light: 'l', duotone: 'd', brands: 'b' }[options[:style]]
+      'fa' + STYLES[options[:style]]
     end
   end
 end

data/spec/lib/fa_spec.rb

@@ -47,6 +47,36 @@ RSpec.describe FA do
       )
     end
 
+    it 'should correctly handle 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
+      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
+      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
+      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
+      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
       [nil, [], 0].each do |fa|
         expect { FA::Icon.p(fa) }.to raise_error(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fa_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.27
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -77,6 +77,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock