fontawesome5-rails 5.0.8.0 → 5.0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9485a0987958ed95a778847a047f7f139167bb68105b7bdf7ec82fdc77db73a7
-  data.tar.gz: e1ca7235a593ad2f5733283192c08b0d45bb4839720fa9e5e2527588e470e35e
+  metadata.gz: 11543133a22d4f4c61b0a60f01377b788780f0a82a20fc4800c9a4cb76a0e8b3
+  data.tar.gz: 74be0d93baf9ae5c1903d4e286fa908c58077d72e760d310bca09bf1d6dcd780
 SHA512:
-  metadata.gz: 33fcd9a0f253d2819fa8001915ad2baee77aa491c4c890ac6298aa7c448996bf2c8096007fc677c910ee7ed606d43468fa7c43bf53275ce0a64480724152fd75
-  data.tar.gz: 669f2756ac31253885c6fe7d1ffa12432ed29750fedb4bb2ae6c855a0b62f93a1329ea93499f27a7676338c75c77d5ba4185da3e0feb6092dcc678c8ca3cc2a1
+  metadata.gz: 3dca465110fcdd8cbee079d17af755a64f1ee15ea164fd4fbda4269473783dc372213dca921ccf02e622145060f3fa29092db291fa1937fea54f278196f731ab
+  data.tar.gz: 225772906bcc88baa57186891021ac431e3132a7e6a48c5bfd04f419be13e5ad306ca834d7a7a221e85b39297e57aa7cc7c8f5990dccefc107ab47a2105bb5c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fontawesome5-rails (5.0.8.0)
+    fontawesome5-rails (5.0.8.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -5,6 +5,8 @@ In this version, Pro icons, light type, are prepared separately.
 
 This gem was built with Font Awesome 5 Free version to use easily as asset pipeline in Rails.
 
+[![Gem Version](https://badge.fury.io/rb/fontawesome5-rails.svg)](https://badge.fury.io/rb/fontawesome5-rails)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -23,7 +25,7 @@ Or install it yourself as:
 
 ## Usage
 
-In Font Awesome 5 Free version, there are 3 types of font:
+In Font Awesome 5 Free version, there are 3 icon styles:
 
   - Regular : `<i class="far fa-address-book"></i>`
   - Solid   : `<i class="fas fa-address-book"></i>`
@@ -43,24 +45,53 @@ The only one step to use Font Awesome 5 in Rails is needed. In app/assets/applic
 
 And, out of box, you can use some useful helper methods as follows:
 
-  - far_icon(shape, options = { text: '', size: '1x' })
+  - fa_icon(shape, options = {}) or far_icon(shape, options = {})
     ```erb
+    <%= fa_icon 'address-book' %>
+    <%= fa_icon 'address-book', text: 'Address Book' %>
+    <%= fa_icon 'address-book', text: 'Address Bookconfirm', size: '2x' %>
     <%= far_icon 'address-book' %>
     <%= far_icon 'address-book', text: 'Address Book' %>
     <%= far_icon 'address-book', text: 'Address Bookconfirm', size: '2x' %>
     ```
-  - fas_icon(shape, options = { text: '', size: '1x' })
+  - fas_icon(shape, options = {})
     ```erb
     <%= fas_icon 'address-book' %>
     <%= fas_icon 'address-book', text: 'Address Book' %>
     <%= fas_icon 'address-book', text: 'Address Book', size: '2x' %>
     ```
-  - fab_icon(shape, options = { text: '', size: '1x' })
+  - fab_icon(shape, options = {})
     ```erb
     <%= fab_icon 'apple' %>
     <%= fab_icon 'apple', text: 'Apple' %>
     <%= fab_icon 'apple', text: 'Apple', size: '2x' %>
     ```
+  - fa_icon_text(shape, text = '', options = {}) or far_icon_text(shape, text = '', options = {})
+    ```erb
+    <%= fa_icon_text 'address-book', 'Address Book' %>
+    <%= fa_icon_text 'address-book', 'Address Bookconfirm', size: '2x' %>
+    <%= far_icon_text 'address-book', 'Address Book' %>
+    <%= far_icon_text 'address-book', 'Address Bookconfirm', size: '2x' %>
+    ```
+  - fas_icon_text(shape, text = '', options = {})
+    ```erb
+    <%= fas_icon 'address-book', 'Address Book' %>
+    <%= fas_icon 'address-book', 'Address Book', size: '2x' %>
+    ```
+  - fab_icon_text(shape, text = '', options = {})
+    ```erb
+    <%= fab_icon 'apple', 'Apple' %>
+    <%= fab_icon 'apple', 'Apple', size: '2x' %>
+    ```
+    
+## Changelog
+
+  - v5.0.8.1
+    - added generic fa_icon() helper with 'regular' icon style by defult.
+    - added generic fa_icon_text() helper with `text` argument which is extracted from `opt` hash argument.
+
+  - v5.0.8.0
+    - released the first version on March 10, 2018.
 
 ## Development
 

data/lib/fontawesome5/rails/helper.rb

@@ -1,26 +1,48 @@
 module Fontawesome5
   module Rails
     module Helper
-      def far_icon(shape, options = { text: '', size: '1x' })
+      def fa_icon(icon_name, opt = {})
+        opt.reverse_merge!(style_prefix: 'far', text: '', icon_size: '1x', class: 'mr-0')
         capture do
-          concat(content_tag(:i, '', class: "far fa-#{shape} fa-#{options[:size]} mr-1"))
-          concat(options[:text])
+          concat(content_tag(:i, '', class: "#{opt[:style_prefix]} fa-#{icon_name} fa-#{opt[:icon_size]} #{opt[:class]}"))
+          concat(opt[:text])
         end
       end
 
-      def fas_icon(shape, options = { text: '', size: '1x' })
-        capture do 
-          concat(content_tag(:i, '', class: "fas fa-#{shape} fa-#{options[:size]} mr-1"))
-          concat(options[:text])
-        end
+      def far_icon(icon_name, opt = {})
+        opt.reverse_merge!(style_prefix: 'far', text: '', icon_size: '1x', class: 'mr-0')
+        fa_icon(icon_name, opt)
       end
 
-      def fab_icon(shape, options = { text: '', size: '1x' })
-        capture do 
-          concat(content_tag(:i, '', class: "fab fa-#{shape} fa-#{options[:size]} mr-1"))
-          concat(options[:text])
-        end
+      def fas_icon(icon_name, opt = {})
+        opt.reverse_merge!(style_prefix: 'fas', text: '', icon_size: '1x', class: 'mr-0')
+        fa_icon(icon_name, opt)
+      end
+
+      def fab_icon(icon_name, opt = {})
+        opt.reverse_merge!(style_prefix: 'fab', text: '', icon_size: '1x', class: 'mr-0')
+        fa_icon(icon_name, opt)
+      end
+
+      def fa_icon_text(icon_name, text = '', opt = {})
+        opt.reverse_merge!(style_prefix: 'far', text: text, icon_size: '1x', class: 'mr-1')
+        fa_icon(icon_name, opt)
+      end
+
+      def far_icon_text(icon_name, text = '', opt = {})
+        opt.reverse_merge!(style_prefix: 'far', text: text, icon_size: '1x', class: 'mr-1')
+        fa_icon(icon_name, opt)
+      end
+
+      def fas_icon_text(icon_name, text = '', opt = {})
+        opt.reverse_merge!(style_prefix: 'fas', text: text, icon_size: '1x', class: 'mr-1')
+        fa_icon(icon_name, opt)
+      end
+
+      def fab_icon_text(icon_name, text = '', opt = {})
+        opt.reverse_merge!(style_prefix: 'fab', text: text, icon_size: '1x', class: 'mr-1')
+        fa_icon(icon_name, opt)
       end
     end
   end
-end
+end

data/lib/fontawesome5/rails/version.rb

@@ -1,5 +1,5 @@
 module Fontawesome5
   module Rails
-    VERSION = "5.0.8.0"
+    VERSION = "5.0.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontawesome5-rails
 version: !ruby/object:Gem::Version
-  version: 5.0.8.0
+  version: 5.0.8.1
 platform: ruby
 authors:
 - Lucius Choi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler