font_awesome5_rails 0.3.1 → 0.3.2

data/app/assets/stylesheets/fontawesome-all.css.scss

@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Free 5.0.9 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.0.10 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  */
 .fa,
@@ -64,8 +64,8 @@
   list-style-type: none;
   margin-left: 2.5em;
   padding-left: 0; }
-.fa-ul > li {
-  position: relative; }
+  .fa-ul > li {
+    position: relative; }
 
 .fa-li {
   left: -2em;
@@ -101,57 +101,57 @@
 
 .fa-spin {
   -webkit-animation: fa-spin 2s infinite linear;
-  animation: fa-spin 2s infinite linear; }
+          animation: fa-spin 2s infinite linear; }
 
 .fa-pulse {
   -webkit-animation: fa-spin 1s infinite steps(8);
-  animation: fa-spin 1s infinite steps(8); }
+          animation: fa-spin 1s infinite steps(8); }
 
 @-webkit-keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);
-    transform: rotate(0deg); }
+            transform: rotate(0deg); }
   100% {
     -webkit-transform: rotate(360deg);
-    transform: rotate(360deg); } }
+            transform: rotate(360deg); } }
 
 @keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);
-    transform: rotate(0deg); }
+            transform: rotate(0deg); }
   100% {
     -webkit-transform: rotate(360deg);
-    transform: rotate(360deg); } }
+            transform: rotate(360deg); } }
 
 .fa-rotate-90 {
   -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
   -webkit-transform: rotate(90deg);
-  transform: rotate(90deg); }
+          transform: rotate(90deg); }
 
 .fa-rotate-180 {
   -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
   -webkit-transform: rotate(180deg);
-  transform: rotate(180deg); }
+          transform: rotate(180deg); }
 
 .fa-rotate-270 {
   -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
   -webkit-transform: rotate(270deg);
-  transform: rotate(270deg); }
+          transform: rotate(270deg); }
 
 .fa-flip-horizontal {
   -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
   -webkit-transform: scale(-1, 1);
-  transform: scale(-1, 1); }
+          transform: scale(-1, 1); }
 
 .fa-flip-vertical {
   -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
   -webkit-transform: scale(1, -1);
-  transform: scale(1, -1); }
+          transform: scale(1, -1); }
 
 .fa-flip-horizontal.fa-flip-vertical {
   -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
   -webkit-transform: scale(-1, -1);
-  transform: scale(-1, -1); }
+          transform: scale(-1, -1); }
 
 :root .fa-rotate-90,
 :root .fa-rotate-180,
@@ -159,7 +159,7 @@
 :root .fa-flip-horizontal,
 :root .fa-flip-vertical {
   -webkit-filter: none;
-  filter: none; }
+          filter: none; }
 
 .fa-stack {
   display: inline-block;
@@ -1492,6 +1492,9 @@ readers do not read off random characters that represent icons */
 .fa-itunes-note:before {
   content: "\f3b5"; }
 
+.fa-java:before {
+  content: "\f4e4"; }
+
 .fa-jenkins:before {
   content: "\f3b6"; }
 
@@ -1900,6 +1903,9 @@ readers do not read off random characters that represent icons */
 .fa-pied-piper-alt:before {
   content: "\f1a8"; }
 
+.fa-pied-piper-hat:before {
+  content: "\f4e5"; }
+
 .fa-pied-piper-pp:before {
   content: "\f1a7"; }
 
@@ -2852,4 +2858,4 @@ readers do not read off random characters that represent icons */
 .fa,
 .fas {
   font-family: 'Font Awesome 5 Free';
-  font-weight: 900; }
+  font-weight: 900; }

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

@@ -9,10 +9,10 @@ module FontAwesome5
       def fa_icon(icon, options = {})
         parser = FaIconParser.new(icon, options)
         if parser.text.nil?
-          content_tag(:i, nil, class: parser.classes, style: parser.style, data: parser.data)
+          content_tag(:i, nil, class: parser.classes, style: parser.style, title: parser.title, data: parser.data)
         else
-          content_tag(:i, nil, class: parser.classes, style: parser.style, data: parser.data) +
-          content_tag(:span, parser.text, class: "fa5-text #{parser.sizes}", style: parser.style)
+          content_tag(:i, nil, class: parser.classes, style: parser.style, title: parser.title, data: parser.data) +
+          content_tag(:span, parser.text, class: "fa5-text#{' ' unless parser.sizes.blank?}#{parser.sizes}", style: parser.style)
         end
       end
 
@@ -20,7 +20,7 @@ module FontAwesome5
       def fa_stacked_icon(icon, options = {})
         parser = FaStackedIconParser.new(icon, options)
 
-        tags = content_tag :span, class: parser.span_classes do
+        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) )
         end
@@ -31,10 +31,10 @@ module FontAwesome5
       def fa_layered_icon(options = {}, &block)
         parser = FaLayeredIconParser.new(options)
         if parser.size.nil?
-          content_tag(:span, class: parser.classes, style: parser.style, &block)
+          content_tag(:span, class: parser.classes, title: parser.title, style: parser.style, &block)
         else
           content_tag :div, class: "fa-#{parser.size}" do
-            content_tag(:span, class: parser.classes, style: parser.style, &block)
+            content_tag(:span, class: parser.classes, title: parser.title, style: parser.style, &block)
           end
         end
       end

data/lib/font_awesome5_rails/parsers/fa_icon_parser.rb

@@ -3,7 +3,7 @@ require_relative 'parse_methods'
 class FaIconParser
   include ParseMethods
 
-  attr_reader :icon, :options, :data, :style, :text
+  attr_reader :icon, :options, :data, :style, :text, :title
 
   def initialize(icon, options)
     @icon = icon
@@ -11,6 +11,7 @@ class FaIconParser
     @data = options[:data]
     @style = options[:style]
     @text = options[:text]
+    @title = options[:title]
   end
 
   def classes

data/lib/font_awesome5_rails/parsers/fa_layered_icon_parser.rb

@@ -3,13 +3,14 @@ require_relative "parse_methods"
 class FaLayeredIconParser
   include ParseMethods
 
-  attr_reader :aligned, :style, :size
+  attr_reader :aligned, :style, :size, :title
 
 
   def initialize(options)
     @aligned = options[:aligned].nil? ? true : options[:aligned]
     @style = options[:style]
     @size = options[:size]
+    @title = options[:title]
     @options = options
   end
 

data/lib/font_awesome5_rails/parsers/fa_stacked_icon_parser.rb

@@ -1,7 +1,7 @@
 require_relative "parse_methods"
 
 class FaStackedIconParser
-  attr_reader :reverse, :options, :span_classes, :first_icon_classes, :second_icon_classes, :text
+  attr_reader :reverse, :options, :span_classes, :first_icon_classes, :second_icon_classes, :text, :title
 
   include ParseMethods
 
@@ -9,6 +9,7 @@ class FaStackedIconParser
     @icon = icon
     @text = options[:text]
     @reverse = options[:reverse].nil? ? false : options[:reverse]
+    @title = options[:title]
     @options = options
   end
 

data/lib/font_awesome5_rails/parsers/parse_methods.rb

@@ -19,6 +19,20 @@ module ParseMethods
   end
 
   def arr_with_fa(array)
+    array = handle_input(array)
     array.split(" ").map{ |s| prepend_fa(s) }
   end
+
+  private
+
+  def handle_input(input)
+    case input
+    when Symbol
+      input.to_s.gsub('_', '-')
+    when Array
+      input.collect{ |i| i.to_s.gsub('_', '-') }.join(' ')
+    else
+      input.to_s
+    end
+  end
 end

data/lib/font_awesome5_rails/version.rb

@@ -1,4 +1,4 @@
 module FontAwesome5Rails
-  FA_VERSION = '5.0.9'
-  VERSION = '0.3.1'
+  FA_VERSION = '5.0.10'
+  VERSION = '0.3.2'
 end

data/spec/font_awesome5_rails_spec.rb

@@ -79,6 +79,18 @@ describe FontAwesome5Rails do
       expect(fa_icon 'camera-retro', text: 'Camera', style: 'color: Tomato;').to have_tag('span', text: 'Camera', with: {style: 'color: Tomato;'})
       expect(fa_icon 'camera-retro', text: 'Camera', size: '3x').to have_tag('span', text: 'Camera', with: {class: 'fa5-text fa-3x'})
     end
+
+    it 'should return correct tags with symbols' do
+      expect(fa_icon :facebook, type: :brand).to eq '<i class="fab fa-facebook"></i>'
+      expect(fa_icon :camera_retro).to eq '<i class="fas fa-camera-retro"></i>'
+      expect(fa_icon [:camera_retro, :circle]).to eq '<i class="fas fa-camera-retro fa-circle"></i>'
+    end
+
+    it 'should return correct title tags' do
+      expect(fa_icon 'camera-retro', title: 'camera-title').to eq '<i class="fas fa-camera-retro" title="camera-title"></i>'
+      expect(fa_icon 'camera-retro', text: 'Camera', title: 'camera-title').to eq '<i class="fas fa-camera-retro" title="camera-title"></i><span class="fa5-text">Camera</span>'
+
+    end
   end
 
   describe 'fa_stacked_icon tags' do
@@ -107,6 +119,18 @@ describe FontAwesome5Rails do
       expect(fa_stacked_icon 'camera', base: 'circle', type: :far, base_type: :fas, reverse: true)
           .to eq '<span class="fa-stack"><i class="far fa-camera fa-stack-1x"></i><i class="fas fa-circle fa-stack-2x"></i></span>'
     end
+
+    it 'should return correct tags with symbols' do
+      expect(fa_stacked_icon [:camera, :inverse], base: :circle)
+          .to eq '<span class="fa-stack"><i class="fas fa-circle fa-stack-2x"></i><i class="fas fa-camera fa-inverse fa-stack-1x"></i></span>'
+      expect(fa_stacked_icon :camera, base: :circle, type: :far, reverse: false)
+          .to eq '<span class="fa-stack"><i class="far fa-circle fa-stack-2x"></i><i class="far fa-camera fa-stack-1x"></i></span>'
+    end
+
+    it 'should return correct tags with title' do
+      expect(fa_stacked_icon [: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
   end
 
   describe 'fa_layered_icon tags' do
@@ -129,6 +153,11 @@ describe FontAwesome5Rails do
         end
       ).to eq '<span class="fa-layers fa-fw"><i class="fas fa-circle"></i><i class="fas fa-times"></i></span>'
     end
+
+    it 'should return correct tags with title' do
+      expect(fa_layered_icon(style: 'background: MistyRose', title: 'LayeredIcon'){ fa_icon 'circle' })
+          .to eq '<span class="fa-layers fa-fw" title="LayeredIcon" style="background: MistyRose"><i class="fas fa-circle"></i></span>'
+    end
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: font_awesome5_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - tomkra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -240,6 +240,7 @@ files:
 - app/assets/images/fa5/brands/ioxhost.svg
 - app/assets/images/fa5/brands/itunes-note.svg
 - app/assets/images/fa5/brands/itunes.svg
+- app/assets/images/fa5/brands/java.svg
 - app/assets/images/fa5/brands/jenkins.svg
 - app/assets/images/fa5/brands/joget.svg
 - app/assets/images/fa5/brands/joomla.svg
@@ -298,6 +299,7 @@ files:
 - app/assets/images/fa5/brands/phoenix-framework.svg
 - app/assets/images/fa5/brands/php.svg
 - app/assets/images/fa5/brands/pied-piper-alt.svg
+- app/assets/images/fa5/brands/pied-piper-hat.svg
 - app/assets/images/fa5/brands/pied-piper-pp.svg
 - app/assets/images/fa5/brands/pied-piper.svg
 - app/assets/images/fa5/brands/pinterest-p.svg
@@ -1077,6 +1079,7 @@ files:
 - app/assets/stylesheets/fa-svg-with-js.css
 - app/assets/stylesheets/font_awesome5.css
 - app/assets/stylesheets/font_awesome5_webfont.css
+- app/assets/stylesheets/fontawesome-all-old.css.scss
 - app/assets/stylesheets/fontawesome-all.css.scss
 - app/helpers/font_awesome5/rails/icon_helper.rb
 - bin/test