flag-icons-rails 1.1.2 → 2.5.0

data/lib/flag-icons-rails.rb

@@ -1,32 +1,33 @@
+# frozen_string_literal: true
+
 module FlagIconsRails
   class << self
     def load!
       if rails?
         register_rails_engine
+      else
+        configure_sass
       end
+    end
 
-      configure_sass
+    def root
+      @root ||= File.expand_path('..', File.dirname(__FILE__))
     end
 
-    # Paths
-    def gem_path
-      @gem_path ||= File.expand_path('..', File.dirname(__FILE__))
+    def rails?
+      defined?(::Rails)
     end
 
+    private
+
     def stylesheets_path
       File.join(assets_path, 'stylesheets')
     end
 
     def assets_path
-      @assets_path ||= File.join(gem_path, 'app', 'assets')
+      @assets_path ||= File.join(root, 'app', 'assets')
     end
 
-    def rails?
-      defined?(::Rails)
-    end
-
-    private
-
     def configure_sass
       require 'sass'
 

data/lib/flag-icons-rails/rails/engine.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module FlagIconsRails
   module Rails
     class Engine < ::Rails::Engine
       initializer 'flag-icons-rails.assets.precompile' do |app|
-        %w(stylesheets images).each do |sub|
+        %w[stylesheets images].each do |sub|
           app.config.assets.paths << root.join('app', 'assets', sub).to_s
         end
       end

data/lib/flag-icons-rails/rails/helpers.rb

@@ -1,16 +1,35 @@
+# frozen_string_literal: true
+
 module FlagIconsRails
   module Rails
     module ViewHelpers
-      def flag_icon(cca2, squared = false, html_options = {})
-        squared, html_options = false, squared if squared.is_a?(Hash)
-
-        content_class = "flag-icon flag-icon-#{cca2}"
-        content_class << " flag-icon-squared" if squared
-        content_class << " #{html_options[:class]}" if html_options.key?(:class)
-        html_options[:class] = content_class
+      # Helper to render flag icon
+      #
+      # @param [Symbol|String] country_code {https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 ISO 3166-1 alpha-2}
+      #   country code
+      # @param [true, false] :squared Optional. It is used to determine squared or rectangle version
+      #   of flag will be rendered, defaults to +false+
+      # @param [Hash] html_options Optional. HTML options applied to rendered span, defaults to +{}+
+      #
+      # @return [String] +span+ with requested HTML options to display country flag
+      def flag_icon(country_code, squared: false, **html_options)
+        html_options[:class] = flag_icon_content_class(country_code, squared, html_options[:class])
 
         content_tag(:span, nil, html_options)
       end
+
+      private
+
+      def flag_icon_content_class(country_code, squared, custom_css_class)
+        content_classes = [
+          'flag-icon',
+          "flag-icon-#{country_code}",
+          (squared == true ? 'flag-icon-squared' : ''),
+          custom_css_class
+        ]
+
+        content_classes.join(' ').strip
+      end
     end
   end
 end

data/lib/flag-icons-rails/rails/railtie.rb

@@ -1,11 +1,13 @@
-require "flag-icons-rails/rails/helpers"
+# frozen_string_literal: true
+
+require 'flag-icons-rails/rails/helpers'
 
 module FlagIconsRails
-    module Rails
-      class Railtie < ::Rails::Railtie
-        initializer 'flag-icons-rails.view_helpers' do
-          ActionView::Base.send :include, ViewHelpers
-        end
+  module Rails
+    class Railtie < ::Rails::Railtie
+      initializer 'flag-icons-rails.view_helpers' do
+        ActionView::Base.send :include, ViewHelpers
       end
     end
+  end
 end

data/lib/flag-icons-rails/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module FlagIconsRails
-  VERSION = '1.1.2'.freeze
-  FLAG_ICONS_CSS_VERSION = '1.1.0'.freeze
+  VERSION = '2.5.0'.freeze
+  FLAG_ICONS_CSS_VERSION = '2.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flag-icons-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.5.0
 platform: ruby
 authors:
-- Eugene Garlukovich
+- Evgeny Garlukovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -24,11 +24,128 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-description: |2
-      'flag-icons-rails' gem allows you to integrate sass version of
-      https://github.com/lipis/flag-icon-css into your Ruby/Rails project.
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-have_tag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-emoji
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Gem allows to use `flag-icon-css` - a collection of all country flags
+  in SVG - in your Rails projects
 email:
-- eugene.garlukovich@gmail.com
+- evgeny.garlukovich@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -113,6 +230,7 @@ files:
 - app/assets/images/flags/1x1/fr.svg
 - app/assets/images/flags/1x1/ga.svg
 - app/assets/images/flags/1x1/gb-eng.svg
+- app/assets/images/flags/1x1/gb-nir.svg
 - app/assets/images/flags/1x1/gb-sct.svg
 - app/assets/images/flags/1x1/gb-wls.svg
 - app/assets/images/flags/1x1/gb.svg
@@ -271,6 +389,7 @@ files:
 - app/assets/images/flags/1x1/ua.svg
 - app/assets/images/flags/1x1/ug.svg
 - app/assets/images/flags/1x1/um.svg
+- app/assets/images/flags/1x1/un.svg
 - app/assets/images/flags/1x1/us.svg
 - app/assets/images/flags/1x1/uy.svg
 - app/assets/images/flags/1x1/uz.svg
@@ -288,7 +407,6 @@ files:
 - app/assets/images/flags/1x1/za.svg
 - app/assets/images/flags/1x1/zm.svg
 - app/assets/images/flags/1x1/zw.svg
-- app/assets/images/flags/1x1/zz.svg
 - app/assets/images/flags/4x3/ad.svg
 - app/assets/images/flags/4x3/ae.svg
 - app/assets/images/flags/4x3/af.svg
@@ -367,6 +485,7 @@ files:
 - app/assets/images/flags/4x3/fr.svg
 - app/assets/images/flags/4x3/ga.svg
 - app/assets/images/flags/4x3/gb-eng.svg
+- app/assets/images/flags/4x3/gb-nir.svg
 - app/assets/images/flags/4x3/gb-sct.svg
 - app/assets/images/flags/4x3/gb-wls.svg
 - app/assets/images/flags/4x3/gb.svg
@@ -525,6 +644,7 @@ files:
 - app/assets/images/flags/4x3/ua.svg
 - app/assets/images/flags/4x3/ug.svg
 - app/assets/images/flags/4x3/um.svg
+- app/assets/images/flags/4x3/un.svg
 - app/assets/images/flags/4x3/us.svg
 - app/assets/images/flags/4x3/uy.svg
 - app/assets/images/flags/4x3/uz.svg
@@ -542,7 +662,6 @@ files:
 - app/assets/images/flags/4x3/za.svg
 - app/assets/images/flags/4x3/zm.svg
 - app/assets/images/flags/4x3/zw.svg
-- app/assets/images/flags/4x3/zz.svg
 - app/assets/stylesheets/flag-icon-sass/flag-icon-base.scss
 - app/assets/stylesheets/flag-icon-sass/flag-icon-list.scss
 - app/assets/stylesheets/flag-icon-sass/flag-icon-more.scss
@@ -553,7 +672,7 @@ files:
 - lib/flag-icons-rails/rails/helpers.rb
 - lib/flag-icons-rails/rails/railtie.rb
 - lib/flag-icons-rails/version.rb
-homepage: https://github.com/eugenegarl/flag-icons-rails
+homepage: https://github.com/evgenygarl/flag-icons-rails
 licenses:
 - MIT
 metadata: {}
@@ -565,7 +684,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -573,8 +692,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: flag-icon-css sass gem for use in Ruby/Rails projects
+summary: Gem to use `flag-icon-css` library in your Rails projects
 test_files: []

data/app/assets/images/flags/1x1/zz.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="512" width="512" version="1">
-  <path fill-rule="evenodd" d="M0 255h512v2H0zM0 510h512v2H0zM0 0h512v2H0z"/>
-  <path fill-rule="evenodd" d="M255 0h2v512h-2zM0 0h2v512H0zM510 0h2v512h-2z"/>
-</svg>

data/app/assets/images/flags/4x3/zz.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="480" width="640" version="1">
-  <path fill-rule="evenodd" d="M0 478h640v2H0zM0 159h640v2H0zM0 319h640v2H0z"/>
-  <path d="M0 0h2v480H0zM638 0h2v480h-2zM319 0h2v480h-2z"/>
-  <path fill-rule="evenodd" d="M0 0h640v2H0zM0 239h640v2H0z"/>
-</svg>