fa_rails 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69c12667e2d247c861e7c71c731f6b8f32af38d347df7a923263ffba1d3c2cef
-  data.tar.gz: a3b77f362a60c92ec5ef2184d1e8b46dbd9dd99dcd6c6cf7095bfc65bd3b3a14
+  metadata.gz: 2a0166501def630ab5880108fdd887614849f6a2b77a23c1e042c98a459a0130
+  data.tar.gz: 8dcd8b62b61b8f0dfe9a323378ccab27547e627dbfa3c5a97643da2720dbb0ab
 SHA512:
-  metadata.gz: d275d6951f206dedc9a22589825a16063af2f68ca93b85a9b6264182885a3e04356bf7fed1e6677800d7a6137c4bf8c5d95cda9d5280f8591ebd99c2915a4539
-  data.tar.gz: 20e364aa0cacf00c866c1a129bfb391407e55158564255ebc068bd558cc24d02ee1c7c7d3f3428c5a5016ed0719ef055da421d36408623a49109e0264a101e3e
+  metadata.gz: 5a17c51cd3277b386aea9211cd8e6b4744778f5546ca75936b9bdb917e39413096c6e672a9ec42191dfc8aa8e4472083b6a7324be5410aa1d4bf6a4e8ed54024
+  data.tar.gz: 5ec4b0d9261b7313305f306340a2d8bb0b060072161c4ba95f35ee5bd9abe18726b755cd630d1f63c2d2a6ef472d6247ce7fcbd78e8ccb53b58423d8cf984277

data/Gemfile.lock

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

data/fa_rails.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'fa_rails'
-  s.version       = '0.1.24'
-  s.date          = '2021-02-14'
+  s.version       = '0.1.25'
+  s.date          = '2021-04-03'
   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

@@ -106,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.split(' ') if classes.is_a?(String)
+      classes.map { |c| "#{prefix}#{c}" } if classes.is_a?(Array)
     end
 
     def merge_fa_styles(options)
@@ -135,7 +140,7 @@ module FA
     end
 
     def parse_style(options)
-      return if options[:css].to_s.match?(/fa[srldb]/)
+      return if options[:css].to_s.match?(/fa[srldbk]/)
       return 'fas' unless STYLES.keys.include?(options[:style])
 
       'fa' + STYLES[options[:style]]

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.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-14 00:00:00.000000000 Z
+date: 2021-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,7 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: FontAwesome helper for Rails