fa_rails 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee37f3a2f313e0ad5099e14bf1d8fdbbbb80a85
-  data.tar.gz: 8a9f56c7fedebcb6e1d23fb46614508367d68e28
+  metadata.gz: c33ec94dc626c180aaa7587f6919e9359255b44a
+  data.tar.gz: 9f4c3f64315ad8558e14e00a3d51280e6b346374
 SHA512:
-  metadata.gz: 3bd3d12012947890a51f66c04a791039dba0678983ce27bc2cdc60322849afee34aeb2a9f54f710a48063c5c553e753ca69cc71c66c4d3e028b041575c2f6397
-  data.tar.gz: fd4de4291e86822b1d3a74a6677a97e64af65a6cc03eb3b05d1b82dc76b5da677bdb1a87ad70444d0097a612807692e4f5188b2dd2bbb5a9372f0c9ab334eae7
+  metadata.gz: d31c7603c4a274120b6e0e29713d909996f4836a10fdd020f723a3bd13532e86b46d9a2589ea7d0407d7502579b2cccd131993c5eab56b4b84d5e756538f8f02
+  data.tar.gz: 8361ed55763154d0cac06d3f724cd210fd8444d81fa79a995f08cceaa6ef4056da098aaa14076127845026bfa6b301c225704ccc635458abd81190eb05b6b2f2

data/Gemfile.lock

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

data/fa_rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'fa_rails'
-  s.version       = '0.1.11'
+  s.version       = '0.1.12'
   s.date          = '2018-07-30'
   s.summary       = 'FontAwesome helper for Rails'
   s.description   = 'A helper module for using FontAwesome icons in Rails.'

data/lib/fa/base.rb

@@ -94,7 +94,7 @@ module FA
 
     def parse_classes(options)
       @classes = []
-      @classes << parse_style(options[:style])
+      @classes << parse_style(options)
       @classes << options[:fa].to_s.split(' ').map { |c| "fa-#{c}" }
       @classes << options[:css].to_s.split(' ')
     end
@@ -108,10 +108,11 @@ module FA
       end
     end
 
-    def parse_style(style)
-      return 'fas' unless %i[solid regular light brands].include?(style)
+    def parse_style(options)
+      return if options[:css].to_s.match?(/fa[srlb]/)
+      return 'fas' unless %i[solid regular light brands].include?(options[:style])
 
-      'fa' + { solid: 's', regular: 'r', light: 'l', brands: 'b' }[style]
+      'fa' + { solid: 's', regular: 'r', light: 'l', brands: 'b' }[options[:style]]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fa_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Julian Fiander