bootstrap-icons 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db7363124b9e26ee4b4bbbd9374476656a9fa4b2e4c3310a4a9e7c0f24b1b7f3
-  data.tar.gz: a0d9326b0bff91d2e02a509fa7df63d0c4a86a49e7c795e70d97ff104533cb10
+  metadata.gz: 43602983de499c1a51f734370c8293c04033df383424de6c63c7e064541e567b
+  data.tar.gz: 44ea996ed14e47a1aa0f886cd7842d33eb6fa2686f1ea176b08b652fee392679
 SHA512:
-  metadata.gz: 307e30cd3ec30e24d8f1ebdec17b653d43ba0b822d2432100dfeaef91e8b98444327c81d06da5aecf2ca9a37da0e618795d294c6d80a876942fbbf405645b707
-  data.tar.gz: d6478224c30bf440dc9572f4f3e31db701dfde557fc31ecfe5c8e8f1d09035f6bc6436125928a39a7e4aa92d3763b015593ed23827a443573af6ef039bb5e1db
+  metadata.gz: b0d94a34ddf968608f94116b6b3eeda9e8dda81161e650d2e09bf4222092279abdeb7992344bfa9a41e85a0fddd81a77fb7ad46791d2b1c30eeecd153718c767
+  data.tar.gz: a84e9fa58edfa28dd36208d78f490289c65c8e398afd55b773bf0f0da7257ab4434d0cb03e761fbabef42debace38d018e806046976d632712dac007c953b57a

data/CHANGELOG.md

@@ -8,4 +8,9 @@
 
 ## 0.0.3
 
-- Add support to fill icon.
+- Add support to fill icon.
+
+## 0.0.4
+
+- Expose fill and viewBox.
+- Internal refactorings.

data/lib/bootstrap_icons/bootstrap_icon.rb

@@ -1,50 +1,62 @@
 module BootstrapIcons
   class BootstrapIcon
-    attr_reader :path, :options, :width, :height, :symbol
+    attr_reader :path, :options, :width, :height, :fill, :viewBox, :symbol
 
     def initialize(symbol, options = {})
       @symbol = symbol.to_s
-      if bootstrap_icon = BootstrapIcons::BOOTSTRAP_ICONS_SYMBOLS[@symbol]
-        
-        @path = bootstrap_icon["path"]
-        @width = bootstrap_icon["width"].to_i
-        @height = bootstrap_icon["height"].to_i
-        @fill = bootstrap_icon["fill"]
-        
-        @options = options
-        @options.merge!({
-          class: classes,
-          viewBox: bootstrap_icon["viewBox"],
-          fill: fill_with,
-          version: "1.1"
-        })
-        @options.merge!(size)
-        @options.merge!(a11y)
-
-
-      else
-        raise "Couldn't find bootstrap icon symbol for #{@symbol.inspect}"
-      end
+      @options = options
+      @bootstrap_icon = find_bootstrap_icon        
+      @path = bootstrap_icon["path"]
+      @width = bootstrap_icon["width"].to_i
+      @height = bootstrap_icon["height"].to_i
+      @fill = bootstrap_icon["fill"]
+      @viewBox = bootstrap_icon["viewBox"]
+      
+      prepare_icon_options
     end
 
     # Returns an string representing a <svg> tag
     def to_svg
-      "<svg #{html_attributes}>#{@path}</svg>"
+      "<svg #{html_attributes}>#{path}</svg>"
     end
 
     private
 
+    attr_reader :bootstrap_icon
+
     def html_attributes
       attrs = ""
-      @options.each { |attr, value| attrs += "#{attr}=\"#{value}\" " }
+      options.each { |attr, value| attrs += "#{attr}=\"#{value}\" " }
       attrs.strip
     end
 
+    def find_bootstrap_icon
+      icon = BootstrapIcons::BOOTSTRAP_ICONS_SYMBOLS[symbol]
+      raise_icon_not_found if icon.nil?
+
+      icon
+    end
+
+    def raise_icon_not_found
+      raise "Couldn't find bootstrap icon symbol for #{symbol.inspect}"
+    end
+
+    def prepare_icon_options
+      options.merge!({
+        class: classes,
+        viewBox: viewBox,
+        fill: fill_with,
+        version: "1.1"
+      })
+      options.merge!(size)
+      options.merge!(a11y)
+    end
+
     # add some accessibility features to svg
     def a11y
       accessible = {}
 
-      if @options[:"aria-label"].nil? && @options["aria-label"].nil?
+      if options[:"aria-label"].nil? && options["aria-label"].nil?
         accessible[:"aria-hidden"] = "true"
       else
         accessible[:role] = "img"
@@ -55,25 +67,25 @@ module BootstrapIcons
 
     # prepare the bootstrap_icon class
     def classes
-      "bi bi-#{@symbol} #{@options[:class]} ".strip
+      "bi bi-#{symbol} #{options[:class]} ".strip
     end
 
     def fill_with
-      fill_option = @options[:fill]
-      fill_option.nil? ? @fill : fill_option
+      fill_option = options[:fill]
+      fill_option.nil? ? fill : fill_option
     end
 
     # determine the height and width of the bootstrap_icon based on :size option
     def size
       size = {
-        width:  @width,
-        height: @height
+        width:  width,
+        height: height
       }
 
       # Specific size
-      unless @options[:width].nil? && @options[:height].nil?
-        size[:width]  = @options[:width].nil?  ? calculate_width(@options[:height]) : @options[:width]
-        size[:height] = @options[:height].nil? ? calculate_height(@options[:width]) : @options[:height]
+      if custom_size_option_provided?
+        size[:width]  = options.has_key?(:width) ? options[:width] : calculate_width(options[:height])
+        size[:height] = options.has_key?(:height) ? options[:height] : calculate_height(options[:width])
       end
 
       size[:width] = size[:width].to_s + "em"
@@ -81,12 +93,16 @@ module BootstrapIcons
       size
     end
 
-    def calculate_width(height)
-      (height.to_i * @width) / @height
+    def custom_size_option_provided?
+      options.has_key?(:width) || options.has_key?(:height)
+    end
+
+    def calculate_width(custom_height)
+      (custom_height.to_i * width) / height
     end
 
-    def calculate_height(width)
-      (width.to_i * @height) / @width
+    def calculate_height(custom_width)
+      (custom_width.to_i * height) / width
     end
   end
 end

data/lib/bootstrap_icons/version.rb

@@ -1,3 +1,3 @@
 module BootstrapIcons
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-icons
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Marcelo Lauxen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri