octicons_v2 0.0.0.pre.02f9d7a → 0.0.0.pre.3ba887a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1aee7edd4eb9c2b6061fee731298abb940bb05dfd5ee1c0f291da2a1177f68f
-  data.tar.gz: ba6dd42e0154246c3d8b59e67532140ac265b44a07aa3aad35c59da0bae1da16
+  metadata.gz: 5ccaa6fe4043aadd722dd6d6f33578abad77f18ba1849e234e828ba48183bdf6
+  data.tar.gz: bb83495bb4336fbddad85fc4d0583d1262813900a7a135aefab13667a1d01cb4
 SHA512:
-  metadata.gz: f8e611d19c64419e4b1399dc9214d79a316206e77307fde5c2f86e11e6f05482a07ecf9e7d9dfe123eb3ff9cb2eb44c620976a6370d956dd7351977ca3bce01f
-  data.tar.gz: 7a6650c7d35896b034ec65abd16c471812075dc209f27ec11e94510459606f0acfbf6094c3120e6ece7cecee07833bf2fc3d0ecdf526c734ed5f3933114aeb7c
+  metadata.gz: 0b7cdc2d1c5ab5182dfc1430e4d096a3700504c803a2305a91dc10928b20eb2aac41625a5a6eb0ada27a6c63ef3c52899b5971eadcf68716de74910c849d763c
+  data.tar.gz: 4dde20a0c432224aeaaf8a341fa56d1e5ba00df555354ca9515cb6390d7b56c2c72f16c243e91329d23a005c1676de306f453edacee915dd4bf07b14689dbaf3

data/lib/octicons_v2/octicon_v2.rb

@@ -1,16 +1,15 @@
 module OcticonsV2
   class OcticonV2
-    DEFAULT_HEIGHT = 16
 
     attr_reader :path, :options, :width, :height, :symbol, :keywords
 
     def initialize(symbol, options = {})
       @symbol = symbol.to_s
       if octicon = get_octicon(@symbol, options)
-        @path = octicon["path"]
-        @width = octicon["width"]
-        @height = octicon["height"]
-        @keywords = octicon["keywords"]
+        @path = octicon[:path]
+        @width = octicon[:width]
+        @height = octicon[:height]
+        @keywords = octicon[:keywords]
         @options = options
         @options.merge!({
           class:   classes,
@@ -85,22 +84,21 @@ module OcticonsV2
 
     def get_octicon(symbol, options = {})
       if octicon = OcticonsV2::OCTICON_SYMBOLS[symbol]
-        # We're using width as an approximation for height if the height option is not passed in
-        height = options[:height] || options[:width] || DEFAULT_HEIGHT
-        natural_height = closest_natural_height(octicon["heights"].keys, height)
+        height = options[:height] || options[:width] || 16
+        octicon_height = closest_octicon_height(octicon["heights"].keys, height)
         return {
-          "name" => octicon["name"],
-          "keywords" => octicon["keywords"],
-          "width" => octicon["heights"][natural_height.to_s]["width"].to_i,
-          "height" => natural_height,
-          "path" => octicon["heights"][natural_height.to_s]["path"]
+          name: octicon["name"],
+          keywords: octicon["keywords"],
+          width: octicon["heights"][octicon_height.to_s]["width"].to_i,
+          height: octicon_height,
+          path: octicon["heights"][octicon_height.to_s]["path"]
         }
       end
     end
 
-    def closest_natural_height(natural_heights, height)
-      return natural_heights.reduce(natural_heights[0].to_i) do |acc, natural_height|
-        natural_height.to_i <= height.to_i ? natural_height.to_i : acc
+    def closest_octicon_height(octicon_heights, height)
+      return octicon_heights.reduce(octicon_heights[0].to_i) do |acc, octicon_height|
+        octicon_height.to_i <= height.to_i ? octicon_height.to_i : acc
       end
     end
   end

data/lib/octicons_v2/version.rb

@@ -1,3 +1,3 @@
 module OcticonsV2
-  VERSION = "0.0.0.pre.02f9d7a".freeze
+  VERSION = "0.0.0.pre.3ba887a".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octicons_v2
 version: !ruby/object:Gem::Version
-  version: 0.0.0.pre.02f9d7a
+  version: 0.0.0.pre.3ba887a
 platform: ruby
 authors:
 - GitHub Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri