font_awesome5_rails 1.1.1 → 1.2.0

data/app/assets/stylesheets/svg-with-js.min.css

@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.13.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.14.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 .svg-inline--fa,svg:not(:root).svg-inline--fa{overflow:visible}.svg-inline--fa{display:inline-block;font-size:inherit;height:1em;vertical-align:-.125em}.svg-inline--fa.fa-lg{vertical-align:-.225em}.svg-inline--fa.fa-w-1{width:.0625em}.svg-inline--fa.fa-w-2{width:.125em}.svg-inline--fa.fa-w-3{width:.1875em}.svg-inline--fa.fa-w-4{width:.25em}.svg-inline--fa.fa-w-5{width:.3125em}.svg-inline--fa.fa-w-6{width:.375em}.svg-inline--fa.fa-w-7{width:.4375em}.svg-inline--fa.fa-w-8{width:.5em}.svg-inline--fa.fa-w-9{width:.5625em}.svg-inline--fa.fa-w-10{width:.625em}.svg-inline--fa.fa-w-11{width:.6875em}.svg-inline--fa.fa-w-12{width:.75em}.svg-inline--fa.fa-w-13{width:.8125em}.svg-inline--fa.fa-w-14{width:.875em}.svg-inline--fa.fa-w-15{width:.9375em}.svg-inline--fa.fa-w-16{width:1em}.svg-inline--fa.fa-w-17{width:1.0625em}.svg-inline--fa.fa-w-18{width:1.125em}.svg-inline--fa.fa-w-19{width:1.1875em}.svg-inline--fa.fa-w-20{width:1.25em}.svg-inline--fa.fa-pull-left{margin-right:.3em;width:auto}.svg-inline--fa.fa-pull-right{margin-left:.3em;width:auto}.svg-inline--fa.fa-border{height:1.5em}.svg-inline--fa.fa-li{width:2em}.svg-inline--fa.fa-fw{width:1.25em}.fa-layers svg.svg-inline--fa{bottom:0;left:0;margin:auto;position:absolute;right:0;top:0}.fa-layers{display:inline-block;height:1em;position:relative;text-align:center;vertical-align:-.125em;width:1em}.fa-layers svg.svg-inline--fa{-webkit-transform-origin:center center;transform-origin:center center}.fa-layers-counter,.fa-layers-text{display:inline-block;position:absolute;text-align:center}.fa-layers-text{left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);-webkit-transform-origin:center center;transform-origin:center center}.fa-layers-counter{background-color:#ff253a;border-radius:1em;-webkit-box-sizing:border-box;box-sizing:border-box;color:#fff;height:1.5em;line-height:1;max-width:5em;min-width:1.5em;overflow:hidden;padding:.25em;right:0;text-overflow:ellipsis;top:0;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:top right;transform-origin:top right}.fa-layers-bottom-right{bottom:0;right:0;top:auto;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:bottom right;transform-origin:bottom right}.fa-layers-bottom-left{bottom:0;left:0;right:auto;top:auto;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:bottom left;transform-origin:bottom left}.fa-layers-top-right{right:0;top:0;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:top right;transform-origin:top right}.fa-layers-top-left{left:0;right:auto;top:0;-webkit-transform:scale(.25);transform:scale(.25);-webkit-transform-origin:top left;transform-origin:top left}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s linear infinite;animation:fa-spin 2s linear infinite}.fa-pulse{-webkit-animation:fa-spin 1s steps(8) infinite;animation:fa-spin 1s steps(8) infinite}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scaleX(-1);transform:scaleX(-1)}.fa-flip-vertical{-webkit-transform:scaleY(-1);transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-webkit-transform:scale(-1);transform:scale(-1)}:root .fa-flip-both,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;position:relative;width:2.5em}.fa-stack-1x,.fa-stack-2x{bottom:0;left:0;margin:auto;position:absolute;right:0;top:0}.svg-inline--fa.fa-stack-1x{height:1em;width:1.25em}.svg-inline--fa.fa-stack-2x{height:2em;width:2.5em}.fa-inverse{color:#fff}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.svg-inline--fa .fa-primary{fill:var(--fa-primary-color,currentColor);opacity:1;opacity:var(--fa-primary-opacity,1)}.svg-inline--fa .fa-secondary{fill:var(--fa-secondary-color,currentColor)}.svg-inline--fa .fa-secondary,.svg-inline--fa.fa-swap-opacity .fa-primary{opacity:.4;opacity:var(--fa-secondary-opacity,.4)}.svg-inline--fa.fa-swap-opacity .fa-secondary{opacity:1;opacity:var(--fa-primary-opacity,1)}.svg-inline--fa mask .fa-primary,.svg-inline--fa mask .fa-secondary{fill:#000}.fad.fa-inverse{color:#fff}

data/app/helpers/font_awesome5/rails/icon_helper.rb

@@ -16,8 +16,8 @@ module FontAwesome5
         parser = FaStackedIconParser.new(icon, options)
 
         tags = content_tag :span, class: parser.span_classes, title: parser.title do
-          content_tag(:i, nil, class: (parser.reverse ? parser.second_icon_classes : parser.first_icon_classes) ) +
-          content_tag(:i, nil, class: (parser.reverse ? parser.first_icon_classes : parser.second_icon_classes) )
+          content_tag(:i, nil, class: (parser.reverse ? parser.second_icon_classes : parser.first_icon_classes), **parser.more_options(:base_options) ) +
+          content_tag(:i, nil, class: (parser.reverse ? parser.first_icon_classes : parser.second_icon_classes), **parser.more_options(:icon_options) )
         end
         tags += parser.text unless parser.text.nil?
         tags

data/lib/font_awesome5_rails/parsers/fa_icon_parser.rb

@@ -13,12 +13,12 @@ class FaIconParser
     @style = options[:style]
     @text = options[:text]
     @title = options[:title]
-    @right = options[:right] || false
+    @right = options[:right] == true
     @attrs = options.except(:text, :type, :class, :icon, :animation, :size, :right)
   end
 
   def classes
-    @classes ||= get_all_classes
+    @classes ||= parse_classes
   end
 
   def sizes
@@ -35,7 +35,7 @@ class FaIconParser
 
   private
 
-  def get_all_classes
+  def parse_classes
     tmp = []
     tmp << icon_type(@options[:type])
     tmp += arr_with_fa(@icon)

data/lib/font_awesome5_rails/parsers/fa_layered_icon_parser.rb

@@ -15,12 +15,12 @@ class FaLayeredIconParser
   end
 
   def classes
-    @classes ||= get_all_classes
+    @classes ||= parse_classes
   end
 
   private
 
-  def get_all_classes
+  def parse_classes
     tmp = ["fa-layers"]
     tmp << "fa-fw" if @aligned
     tmp += @options[:class].split(" ") unless @options[:class].nil?

data/lib/font_awesome5_rails/parsers/fa_stacked_icon_parser.rb

@@ -8,7 +8,7 @@ class FaStackedIconParser
   def initialize(icon, options)
     @icon = icon
     @text = options[:text]
-    @reverse = options[:reverse].nil? ? false : options[:reverse]
+    @reverse = options[:reverse] == true
     @title = options[:title]
     @options = options
   end
@@ -25,6 +25,10 @@ class FaStackedIconParser
     @second_icon_classes ||= parse_icon_classes(@icon, false)
   end
 
+  def more_options(key)
+    options[key] ? options[key].except(:class, :text) : {}
+  end
+
   private
 
   def parse_span_classes
@@ -38,7 +42,8 @@ class FaStackedIconParser
     tmp << icon_type(first && @options[:base_type].present? ? @options[:base_type] : @options[:type])
     tmp += arr_with_fa(klass)
     tmp << (first ? "fa-stack-2x" : "fa-stack-1x")
+    key = first ? :base_options : :icon_options
+    tmp << options[key][:class] if options[key] && options[key][:class]
     tmp.uniq.join(" ").strip
   end
-
 end

data/lib/font_awesome5_rails/parsers/parse_methods.rb

@@ -2,15 +2,15 @@ module ParseMethods
 
   def icon_type(type)
     return "fas" if type.nil?
-    case type.to_s
-      when "far", "regular"
+    case type.to_sym
+      when :far, :regular
         "far"
-      when "fal", "light"
+      when :fal, :light
         "fal"
-      when "fab", "brand"
+      when :fab, :brand
         "fab"
-      when "fad", "duotone"
-        "fad"      
+      when :fad, :duotone
+        "fad"
       else
         "fas"
     end
@@ -30,9 +30,9 @@ module ParseMethods
   def handle_input(input)
     case input
     when Symbol
-      input.to_s.gsub('_', '-')
+      input.to_s.dasherize
     when Array
-      input.collect{ |i| i.to_s.gsub('_', '-') }.join(' ')
+      input.join(' ').dasherize
     else
       input.to_s
     end

data/lib/font_awesome5_rails/version.rb

@@ -1,4 +1,4 @@
 module FontAwesome5Rails
-  FA_VERSION = '5.13.0'
-  VERSION = '1.1.1'
+  FA_VERSION = '5.14.0'
+  VERSION = '1.2.0'
 end

data/spec/font_awesome5_rails_spec.rb

@@ -146,6 +146,24 @@ describe FontAwesome5Rails do
         expect(send method, [:camera, :inverse], base: :circle, title: 'Camera')
             .to eq '<span class="fa-stack" title="Camera"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
       end
+
+      it 'should return correct tags with base_options' do
+        expect(send method, 'camera', base: 'circle', base_options: { class: 'test' })
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x test"></i><i class="fas fa-camera fa-stack-1x"></i></span>'
+
+          expect(send method, 'camera', base: 'circle', base_options: { class: 'test', label: 'label' })
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x test" label="label"></i><i class="fas fa-camera fa-stack-1x"></i></span>'
+      end
+
+      it 'should return correct tags with icon_options' do
+        expect(send method, 'camera', base: 'circle', icon_options: { class: 'test', label: 'label' })
+        .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-stack-1x test" label="label"></i></span>'
+      end
+
+      it 'should return correct tags with base_options and icon_options' do
+        expect(send method, 'camera', base: 'circle', icon_options: { class: 'icon', label: 'icon' }, base_options: { class: 'base', aria: 'base' })
+        .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x base" aria="base"></i><i class="fas fa-camera fa-stack-1x icon" label="icon"></i></span>'
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: font_awesome5_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - tomkra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -175,6 +175,7 @@ files:
 - app/assets/images/fa5/brands/d-and-d.svg
 - app/assets/images/fa5/brands/dailymotion.svg
 - app/assets/images/fa5/brands/dashcube.svg
+- app/assets/images/fa5/brands/deezer.svg
 - app/assets/images/fa5/brands/delicious.svg
 - app/assets/images/fa5/brands/deploydog.svg
 - app/assets/images/fa5/brands/deskpro.svg
@@ -196,6 +197,7 @@ files:
 - app/assets/images/fa5/brands/dyalog.svg
 - app/assets/images/fa5/brands/earlybirds.svg
 - app/assets/images/fa5/brands/ebay.svg
+- app/assets/images/fa5/brands/edge-legacy.svg
 - app/assets/images/fa5/brands/edge.svg
 - app/assets/images/fa5/brands/elementor.svg
 - app/assets/images/fa5/brands/ello.svg
@@ -256,6 +258,7 @@ files:
 - app/assets/images/fa5/brands/goodreads-g.svg
 - app/assets/images/fa5/brands/goodreads.svg
 - app/assets/images/fa5/brands/google-drive.svg
+- app/assets/images/fa5/brands/google-pay.svg
 - app/assets/images/fa5/brands/google-play.svg
 - app/assets/images/fa5/brands/google-plus-g.svg
 - app/assets/images/fa5/brands/google-plus-square.svg
@@ -401,6 +404,7 @@ files:
 - app/assets/images/fa5/brands/rev.svg
 - app/assets/images/fa5/brands/rocketchat.svg
 - app/assets/images/fa5/brands/rockrms.svg
+- app/assets/images/fa5/brands/rust.svg
 - app/assets/images/fa5/brands/safari.svg
 - app/assets/images/fa5/brands/salesforce.svg
 - app/assets/images/fa5/brands/sass.svg
@@ -458,6 +462,7 @@ files:
 - app/assets/images/fa5/brands/themeco.svg
 - app/assets/images/fa5/brands/themeisle.svg
 - app/assets/images/fa5/brands/think-peaks.svg
+- app/assets/images/fa5/brands/tiktok.svg
 - app/assets/images/fa5/brands/trade-federation.svg
 - app/assets/images/fa5/brands/trello.svg
 - app/assets/images/fa5/brands/tripadvisor.svg
@@ -473,6 +478,7 @@ files:
 - app/assets/images/fa5/brands/umbraco.svg
 - app/assets/images/fa5/brands/uniregistry.svg
 - app/assets/images/fa5/brands/unity.svg
+- app/assets/images/fa5/brands/unsplash.svg
 - app/assets/images/fa5/brands/untappd.svg
 - app/assets/images/fa5/brands/ups.svg
 - app/assets/images/fa5/brands/usb.svg
@@ -727,6 +733,8 @@ files:
 - app/assets/images/fa5/solid/backspace.svg
 - app/assets/images/fa5/solid/backward.svg
 - app/assets/images/fa5/solid/bacon.svg
+- app/assets/images/fa5/solid/bacteria.svg
+- app/assets/images/fa5/solid/bacterium.svg
 - app/assets/images/fa5/solid/bahai.svg
 - app/assets/images/fa5/solid/balance-scale-left.svg
 - app/assets/images/fa5/solid/balance-scale-right.svg
@@ -1435,6 +1443,7 @@ files:
 - app/assets/images/fa5/solid/signal.svg
 - app/assets/images/fa5/solid/signature.svg
 - app/assets/images/fa5/solid/sim-card.svg
+- app/assets/images/fa5/solid/sink.svg
 - app/assets/images/fa5/solid/sitemap.svg
 - app/assets/images/fa5/solid/skating.svg
 - app/assets/images/fa5/solid/skiing-nordic.svg
@@ -1626,6 +1635,7 @@ files:
 - app/assets/images/fa5/solid/user-times.svg
 - app/assets/images/fa5/solid/user.svg
 - app/assets/images/fa5/solid/users-cog.svg
+- app/assets/images/fa5/solid/users-slash.svg
 - app/assets/images/fa5/solid/users.svg
 - app/assets/images/fa5/solid/utensil-spoon.svg
 - app/assets/images/fa5/solid/utensils.svg
@@ -1759,7 +1769,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: an asset gemification of the font-awesome 5 icon font library