font_awesome5_rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc58a58950f15df45b6f0fe9f3f12b12b353af6bc4fe88e35a54a79f5f5c50cc
-  data.tar.gz: e9982fa1a84e1eebff97deeb5baa15e3eb24de6c1795d57998667bc24c46ed16
+  metadata.gz: 99d08e6a633a47779690afed02b22d8865588e75a5cbbb50e797d75fcdd3f0d0
+  data.tar.gz: 05bade9ea906385cb1d7ffc05376203f1be69c5a854eedb0aee361bbf90e8ba4
 SHA512:
-  metadata.gz: 7b9dfec777ff6afc943e7bc31f68fb38d4c9da6ab7228d205ea0afc0dee358c4757a9f40438dbbba85a9c146aad643bc29ccb79d5b07549300c6bb0f876ec886
-  data.tar.gz: d23e231f852dc7db99551cb3e34136e409b6054056791748f456ea868b94ae71485e1255414b2b0660127125cf941fc10a09241c50f14f65a242c3ae8efb1637
+  metadata.gz: 197ca98e6d4e80b59b6f0228da1f2d03fb019bdef74280c269b9da9e9384b160f8dd6c4b121fabb0fa184507dc921c2e351219278768a34e9af4777a3aa6e142
+  data.tar.gz: 4fa1373007e09fad93942bc7fd7a48d488ece24bba69ee5df4cd7e7d3305f5ef624d2d21bad3fdc54d16e505f6d79271d165fa9226421f0feddfdc5864d2b164

data/README.md

@@ -1,4 +1,7 @@
 # FontAwesome5Rails
+[![Build Status](https://travis-ci.org/tomkra/font_awesome5_rails.svg?branch=master)](https://travis-ci.org/tomkra/font_awesome5_rails)
+[![HitCount](http://hits.dwyl.io/tomkra/tomkra/font_awesome5_rails.svg)](http://hits.dwyl.io/tomkra/tomkra/font_awesome5_rails)
+
 font_awesome5_rails provides the [Font-Awesome5](https://fontawesome.com/) web fonts, stylesheets and javascripts as a Rails engine for use with the asset pipeline and with backwards compatibility with [font-awesome-rails](https://github.com/bokmann/font-awesome-rails) gem.
 
 This gem provides only Free icons from Font-Awesome.
@@ -44,24 +47,27 @@ fa_icon('camera-retro', class: 'my-class', text: 'Camera', size: '3x')
 In Font Awesome 5 there are several different types of icons. In font_awesome5_rails gem default icon type is ```solid```.
 If you want to use different icon style you can do this through ```type``` attribute.
 
-| Style         | type: |
-| ------------- |-------|
-| Solid         | :fas  |
-| Regular       | :far  |
-| Light         | :fal  |
-| Brand         | :fab  |
+| Style         | type: | type:  |
+| ------------- |-------|--------|
+| Solid         | :fas  |:solid  |
+| Regular       | :far  |:regular|
+| Light         | :fal  |:light  |
+| Brand         | :fab  |:brand  | 
 
 
 ```ruby
-fa_icon('camera-retro', type: :fas)
+fa_icon('camera-retro', type: :solid) #Default
 # => <i class="fas fa-camera-retro"></i>
  
-fa_icon('camera-retro', type: :far)
+fa_icon('camera-retro', type: :regular)
 # => <i class="far fa-camera-retro"></i>
   
-fa_icon('camera-retro', type: :fal)
+fa_icon('camera-retro', type: :light)
 # => <i class="fal fa-camera-retro"></i>
  
+fa_icon('camera-retro', type: :brand)
+# => <i class="fab fa-camera-retro"></i>
+     
 fa_icon('camera-retro', type: :fab)
 # => <i class="fab fa-camera-retro"></i>
      

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

@@ -1,21 +1,18 @@
+require 'font_awesome5_rails/fa_icon_parser'
+
 module FontAwesome
   module Rails
     module IconHelper
 
       def fa_icon(icon, options = {})
-        classes = [options[:type].nil? ? "fas" : options[:type].to_s]
-        classes << "fa-#{icon}"
-        classes += options[:class].split(" ") unless options[:class].nil?
-        classes += options[:size].split(" ").map{|s| "fa-#{s}"} unless options[:size].nil?
-        classes += options[:animation].split(" ").map{|s| "fa-#{s}"} unless options[:animation].nil?
-        classes = classes.uniq.join(" ")
+        parser = FaIconParser.new(icon, options)
         tags = []
-        if options[:text].nil?
-          tags << content_tag(:i, nil, class: classes, style: options[:style], data: options[:data])
+        if parser.text.nil?
+          tags << content_tag(:i, nil, class: parser.classes, style: parser.style, data: parser.data)
         else
           content_tag :span do
-            tags << content_tag(:i, nil, class: classes, style: options[:style], data: options[:data])
-            tags << content_tag(:span, options[:text], style: "padding-left: 5px;#{options[:style]}")
+            tags << content_tag(:i, nil, class: parser.classes, style: parser.style, data: parser.data)
+            tags << content_tag(:span, parser.text, style: "padding-left: 5px;#{parser.style}")
           end
         end
         tags.join.html_safe

data/lib/font_awesome5_rails/fa_icon_parser.rb

@@ -0,0 +1,49 @@
+class FaIconParser
+  attr_reader :icon, :options, :data, :style, :text
+
+  def initialize(icon, options)
+    @icon = icon
+    @options = options
+    @data = options[:data]
+    @style = options[:style]
+    @text = options[:text]
+  end
+
+  def classes
+    @classes ||= get_all_classes
+  end
+
+  def icon_type(type)
+    return "fas" if type.nil?
+    case type.to_s
+      when "far", "regular"
+        "far"
+      when "fal", "light"
+        "fal"
+      when "fab", "brand"
+        "fab"
+      else
+        "fas"
+    end
+  end
+
+  def prepend_fa(string)
+    "fa-#{string}"
+  end
+
+  def arr_with_fa(array)
+    array.split(" ").map{ |s| prepend_fa(s) }
+  end
+
+  private
+
+  def get_all_classes
+    tmp = []
+    tmp << icon_type(@options[:type])
+    tmp << prepend_fa(@icon)
+    tmp += @options[:class].split(" ") unless @options[:class].nil?
+    tmp += arr_with_fa(@options[:size]) unless @options[:size].nil?
+    tmp += arr_with_fa(@options[:animation]) unless @options[:animation].nil?
+    tmp.uniq.join(" ")
+  end
+end

data/lib/font_awesome5_rails/version.rb

@@ -1,4 +1,4 @@
 module FontAwesome5Rails
   FA_VERSION = '5.0.7'
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/font_awesome5_rails_spec.rb

@@ -4,6 +4,29 @@ describe FontAwesome5Rails do
   include RSpecHtmlMatchers
   include ActionView::Context
 
+  describe 'files' do
+    it 'should have correct dirs' do
+      expect(Dir.exists?('./app/assets/images')).to be_truthy
+      expect(Dir.exists?('./app/assets/javascripts')).to be_truthy
+      expect(Dir.exists?('./app/assets/stylesheets')).to be_truthy
+      expect(Dir.exists?('./app/helpers/font_awesome/rails')).to be_truthy
+    end
+
+    it 'should have correct files' do
+      expect(File.exists?('./app/helpers/font_awesome/rails/icon_helper.rb')).to be_truthy
+      expect(File.exists?('./app/assets/images/fa-brands.svg')).to be_truthy
+      expect(File.exists?('./app/assets/images/fa-regular.svg')).to be_truthy
+      expect(File.exists?('./app/assets/images/fa-solid.svg')).to be_truthy
+      expect(File.exists?('./app/assets/javascripts/font_awesome5.js')).to be_truthy
+      expect(File.exists?('./app/assets/javascripts/fontawesome-all.min.js')).to be_truthy
+      expect(File.exists?('./app/assets/stylesheets/fa-svg-with-js.css')).to be_truthy
+      expect(File.exists?('./app/assets/stylesheets/font_awesome5.css')).to be_truthy
+      expect(File.exists?('./lib/font_awesome5_rails/engine.rb')).to be_truthy
+      expect(File.exists?('./lib/font_awesome5_rails/version.rb')).to be_truthy
+      expect(File.exists?('./lib/font_awesome5_rails/fa_icon_parser.rb')).to be_truthy
+    end
+  end
+
   describe 'tags' do
     it 'should return correct type tags' do
       expect(fa_icon 'camera-retro').to eq '<i class="fas fa-camera-retro"></i>'
@@ -11,6 +34,10 @@ describe FontAwesome5Rails do
       expect(fa_icon 'camera-retro', type: :far).to eq '<i class="far fa-camera-retro"></i>'
       expect(fa_icon 'camera-retro', type: :fal).to eq '<i class="fal fa-camera-retro"></i>'
       expect(fa_icon 'camera-retro', type: :fab).to eq '<i class="fab fa-camera-retro"></i>'
+      expect(fa_icon 'camera-retro', type: :solid).to eq '<i class="fas fa-camera-retro"></i>'
+      expect(fa_icon 'camera-retro', type: :regular).to eq '<i class="far fa-camera-retro"></i>'
+      expect(fa_icon 'camera-retro', type: :light).to eq '<i class="fal fa-camera-retro"></i>'
+      expect(fa_icon 'camera-retro', type: :brand).to eq '<i class="fab fa-camera-retro"></i>'
     end
 
     it 'should return correct class tags' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: font_awesome5_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - tomkra
@@ -79,6 +79,7 @@ files:
 - bin/test
 - lib/font_awesome5_rails.rb
 - lib/font_awesome5_rails/engine.rb
+- lib/font_awesome5_rails/fa_icon_parser.rb
 - lib/font_awesome5_rails/version.rb
 - lib/tasks/font_awesome5_rails_tasks.rake
 - spec/dummy/Rakefile
@@ -132,7 +133,6 @@ files:
 - spec/dummy/public/apple-touch-icon-precomposed.png
 - spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/favicon.ico
-- spec/examples.txt
 - spec/font_awesome5_rails_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/tomkra/font_awesome5_rails

data/spec/examples.txt

@@ -1,3 +0,0 @@
-example_id                      | status | run_time        |
-------------------------------- | ------ | --------------- |
-./spec/icon_helper_spec.rb[1:1] | failed | 0.00014 seconds |