fa_rails 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157fd0642d7e283f63085edd82d1e83941440c53b62f1c7e547a448faa07d43f
-  data.tar.gz: 1fe81fae07ca36ee1451d435fb3355b4ad3c8fc9baa3b25f22f4823ce23f062d
+  metadata.gz: f664c27729b24055feaa406ad8847a1cd8e2c6bf176d513dff946c0cacfd088b
+  data.tar.gz: c2b3557385fe58d2c0cc87cc5f88b64b4a420cbf4ab521062e794253e2fc2672
 SHA512:
-  metadata.gz: 1ed38c30ff8f9aca74e873dc2308506434a424d6955ea982207d292500bd906755395536e93569647688a05f2cd479421a2f26fdc8cefb36cc33c60219877261
-  data.tar.gz: 1a630a476fb8b48a3c4800ac3907a2478e11bc99f6cdc656f50000e28581192375ad783648a3299252b040300c500cee14007d3d46e83418e88a21b9a7b4acf7
+  metadata.gz: 7f5b7a3d34e521837f5576c4a4da657c6e7d91fb30a131a32427f1750ffd183ab0281c1f11209c370ad96a11810f1e3a0b5381a947b6a126288aaa17e0652127
+  data.tar.gz: c6bfde33dce0ae1403553ca8ff1e36943e203ba6819010b9845b442e0ae46a242c16c63c424c121475af3fa6652f687dcec671150c4bff55613ac491cdeec7fc

data/Gemfile.lock

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

data/README.md

@@ -90,6 +90,7 @@ options #=> Hash
   size: Integer # Stepped scaling factor
 
   css: String # Arbitrary CSS classes, space-delimited
+  raw_css: Hash # Arbitrary raw CSS, as a hash of attributes and values
   fa: String # Arbitrary FA classes, space-delimited – each is automatically prefixed with `fa-`
   title: String #=> Tooltip text
   grow: Integer #=> Transform value – amount to grow by
@@ -114,6 +115,7 @@ options #=> Hash
   position: Symbol # Indicator of which corner to display on – one of [:tr, :tl, :br, :bl]
 
   css: String # Arbitrary CSS classes, space-delimited
+  raw_css: Hash # Arbitrary raw CSS, as a hash of attributes and values
   fa: String # Arbitrary FA classes, space-delimited – each is automatically prefixed with `fa-`
   title: String #=> Tooltip text
   grow: Integer #=> Transform value – amount to grow by
@@ -143,24 +145,28 @@ css #=> String – arbitrary CSS classes, space-delimited, applied to the layer
 ```ruby
 # Fixed-width lock icon
 FA::Icon.p('lock', fa: 'fw')
-#=> "<i class='fas fa-fw fa-lock fa-1x' data-fa-transform='' title=''></i>"
+#=> "<i class='fas fa-fw fa-lock 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>"
 
 # Counter span, with value 5
 FA::Span.p('counter', 5)
-#=> "<span class='fa-layers-counter ' data-fa-transform=''>5</span>"
+#=> "<span class='fa-layers-counter ' style='' data-fa-transform=''>5</span>"
 
 # Gray envelope icon with red exclamation mark overlayed, with tooltip 'Invalid email address'
 FA::Layer.p([{ name: 'envelope', options: { css: :gray } }, { name: 'exclamation', options: { css: :red } }], title: 'Invalid email address')
 #=> "<span class='icon fa-layers fa-stack fa-fw ' title='Invalid email address'>" \
-#   "<i class='fas fa-stack-1x gray fa-envelope fa-1x' data-fa-transform='grow-0' title='Invalid email address'></i>" \
-#   "<i class='fas fa-stack-1x red fa-exclamation fa-1x' data-fa-transform='grow-0' title='Invalid email address'></i>" \
+#   "<i class='fas fa-stack-1x gray fa-envelope fa-1x' style='' data-fa-transform='grow-0' title='Invalid email address'></i>" \
+#   "<i class='fas fa-stack-1x red fa-exclamation fa-1x' style='' data-fa-transform='grow-0' title='Invalid email address'></i>" \
 #   "</span>"
 
 # Blue envelope with red counter on the top left corner, with value 7
 FA::Layer.p([{ name: 'envelope', options: { css: :blue } }, { name: 'counter', text: 7, options: { css: :red, position: :tl } }])
 #=> "<span class='icon fa-layers fa-stack fa-fw ' title=''>" \
-#   "<i class='fas fa-stack-1x blue fa-envelope fa-1x' data-fa-transform='grow-0' title=''></i>" \
-#   "<span class='fa-stack-1x red fa-layers-counter fa-layers-top-left' data-fa-transform='grow-0'>7</span>" \
+#   "<i class='fas fa-stack-1x blue fa-envelope fa-1x' style='' data-fa-transform='grow-0' title=''></i>" \
+#   "<span class='fa-stack-1x red fa-layers-counter fa-layers-top-left' style='' data-fa-transform='grow-0'>7</span>" \
 #   "</span>"
 
 # The same stack, but using the FA::Build DSL (with various syntaxes).

data/fa_rails.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = 'fa_rails'
-  s.version       = '0.1.20'
-  s.date          = '2019-07-31'
+  s.version       = '0.1.21'
+  s.date          = '2019-08-09'
   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

@@ -43,7 +43,7 @@ module FA
       css = @classes.flatten.join(' ')
       transforms = @transforms.join(' ')
 
-      "<i class='#{css}' data-fa-transform='#{transforms}' " \
+      "<i class='#{css}' style='#{@styles}' data-fa-transform='#{transforms}' " \
       "title='#{options[:title]}'></i>"
     end
 
@@ -59,11 +59,11 @@ module FA
       css = @classes.flatten.reject { |c| c.to_s.match?(/^fa.$/) }.join(' ')
       transforms = @transforms.join(' ')
 
-      "<span class='#{css}' data-fa-transform='#{transforms}'>#{text}</span>"
+      "<span class='#{css}' style='#{@styles}' data-fa-transform='#{transforms}'>#{text}</span>"
     end
 
     def fa_options(options)
-      default = { style: :solid, css: '', fa: '', size: 1 }
+      default = { style: :solid, css: '', raw_css: {}, fa: '', size: 1 }
 
       default.merge(options.to_h)
     end
@@ -93,6 +93,7 @@ module FA
 
     def parse_options(options)
       parse_classes(options)
+      parse_styles(options)
       parse_transforms(options)
     end
 
@@ -103,6 +104,10 @@ module FA
       @classes << options[:css].to_s.split(' ')
     end
 
+    def parse_styles(options)
+      @styles = options[:raw_css].map { |k, v| "#{k}: #{v};" }.join(' ')
+    end
+
     def parse_transforms(options)
       @transforms = []
       %i[grow shrink rotate up down left right].each do |transform|

data/spec/lib/fa_spec.rb

@@ -30,18 +30,18 @@ RSpec.describe FA do
   describe 'icon' do
     it 'should generate the correct icon from a string or symbol name' do
       expect(FA::Icon.p('help')).to eql(
-        "<i class='fas fa-help fa-1x' data-fa-transform='' title=''></i>"
+        "<i class='fas fa-help fa-1x' style='' data-fa-transform='' title=''></i>"
       )
 
       expect(FA::Icon.p(:help)).to eql(
-        "<i class='fas fa-help fa-1x' data-fa-transform='' title=''></i>"
+        "<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
       fa = { name: 'help', options: { style: :light, size: 2 } }
       expect(FA::Icon.p(fa)).to eql(
-        "<i class='fal fa-help fa-2x' data-fa-transform='' title=''></i>"
+        "<i class='fal fa-help fa-2x' style='' data-fa-transform='' title=''></i>"
       )
     end
 
@@ -55,7 +55,7 @@ RSpec.describe FA do
 
     it 'should generate the correct brand icon' do
       expect(FA::Icon.p(:github, style: :brands)).to eql(
-        "<i class='fab fa-github fa-1x' data-fa-transform='' title=''></i>"
+        "<i class='fab fa-github fa-1x' style='' data-fa-transform='' title=''></i>"
       )
     end
   end
@@ -70,9 +70,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' data-fa-transform='grow-2' title=''></i>" \
-        "<i class='fas fa-stack-1x fa-circle fa-1x' data-fa-transform='grow-3' title=''></i>" \
-        "<i class='far fa-stack-1x fa-exclamation fa-1x' data-fa-transform='grow-2' title=''></i>" \
+        "<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>" \
         '</span>'
       )
     end
@@ -85,8 +85,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' data-fa-transform='grow-0' title=''></i>" \
-        "<span class='fa-stack-1x fa-layers-counter fa-layers-top-left' data-fa-transform='grow-0'>17</span>" \
+        "<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>" \
         '</span>'
       )
     end
@@ -99,8 +99,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' data-fa-transform='grow-0' title='right'></i>" \
-        "<i class='fas fa-stack-1x fa-exclamation fa-1x' data-fa-transform='grow-0' title='right'></i>" \
+        "<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>" \
         '</span>'
       )
     end
@@ -115,8 +115,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' data-fa-transform='grow-0' title=''></i>" \
-        "<span class='fa-stack-1x fa-layers-counter ' data-fa-transform='grow-0'>7</span>" \
+        "<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>" \
         '</span>'
       )
     end
@@ -125,7 +125,7 @@ RSpec.describe FA do
   describe 'span' do
     it 'should generate the correct span from a string or symbol type' do
       expect(FA::Span.p(:text, 'Hello')).to eql(
-        "<span class='fa-layers-text ' data-fa-transform=''>Hello</span>"
+        "<span class='fa-layers-text ' style='' data-fa-transform=''>Hello</span>"
       )
     end
 
@@ -133,7 +133,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' " \
-        "data-fa-transform=''>World</span>"
+        "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.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Julian Fiander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake