octicons_v2 0.0.0.pre.9fd88ac → 0.0.0.pre.16b4984

data/lib/build/svg/x-24.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M5.71967 5.71967C6.01256 5.42678 6.48744 5.42678 6.78033 5.71967L12 10.9393L17.2197 5.71967C17.5126 5.42678 17.9874 5.42678 18.2803 5.71967C18.5732 6.01256 18.5732 6.48744 18.2803 6.78033L13.0607 12L18.2803 17.2197C18.5732 17.5126 18.5732 17.9874 18.2803 18.2803C17.9874 18.5732 17.5126 18.5732 17.2197 18.2803L12 13.0607L6.78033 18.2803C6.48744 18.5732 6.01256 18.5732 5.71967 18.2803C5.42678 17.9874 5.42678 17.5126 5.71967 17.2197L10.9393 12L5.71967 6.78033C5.42678 6.48744 5.42678 6.01256 5.71967 5.71967Z"/>
+</svg>

data/lib/build/svg/x-circle-24.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path d="M9.03649 7.97577C8.7436 7.68288 8.26873 7.68288 7.97583 7.97577C7.68294 8.26867 7.68294 8.74354 7.97583 9.03643L10.9393 11.9999L7.97583 14.9633C7.68294 15.2562 7.68294 15.731 7.97583 16.0239C8.26873 16.3168 8.7436 16.3168 9.03649 16.0239L11.9999 13.0605L14.9633 16.0239C15.2562 16.3168 15.7311 16.3168 16.024 16.0239C16.3169 15.731 16.3169 15.2562 16.024 14.9633L13.0606 11.9999L16.024 9.03643C16.3169 8.74354 16.3169 8.26867 16.024 7.97577C15.7311 7.68288 15.2562 7.68288 14.9633 7.97577L11.9999 10.9392L9.03649 7.97577Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1ZM2.5 12C2.5 6.75329 6.75329 2.5 12 2.5C17.2467 2.5 21.5 6.75329 21.5 12C21.5 17.2467 17.2467 21.5 12 21.5C6.75329 21.5 2.5 17.2467 2.5 12Z"/>
+</svg>

data/lib/build/svg/x-circle-fill-24.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12ZM9.03649 7.97577C8.7436 7.68288 8.26873 7.68288 7.97583 7.97577C7.68294 8.26867 7.68294 8.74354 7.97583 9.03643L10.9393 11.9999L7.97583 14.9633C7.68294 15.2562 7.68294 15.731 7.97583 16.0239C8.26873 16.3168 8.7436 16.3168 9.03649 16.0239L11.9999 13.0605L14.9633 16.0239C15.2562 16.3168 15.7311 16.3168 16.024 16.0239C16.3169 15.731 16.3169 15.2562 16.024 14.9633L13.0606 11.9999L16.024 9.03643C16.3169 8.74354 16.3169 8.26867 16.024 7.97577C15.7311 7.68288 15.2562 7.68288 14.9633 7.97577L11.9999 10.9392L9.03649 7.97577Z"/>
+</svg>

data/lib/{octicons/octicon.rb → octicons_v2/octicon_v2.rb}

@@ -1,18 +1,16 @@
-module Octicons
-  class Octicon
+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 = Octicons::OCTICON_SYMBOLS[@symbol]
-
+      if octicon = get_octicon(@symbol, options)
         @path = octicon["path"]
-        @width = octicon["width"].to_i
-        @height = octicon["height"].to_i
-
+        @width = octicon["width"]
+        @height = octicon["height"]
         @keywords = octicon["keywords"]
-
         @options = options
         @options.merge!({
           class:   classes,
@@ -84,5 +82,26 @@ module Octicons
     def calculate_height(width)
       (width.to_i * @height) / @width
     end
+
+    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)
+        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"]
+        }
+      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
+      end
+    end
   end
 end

data/lib/octicons_v2/version.rb

@@ -0,0 +1,3 @@
+module OcticonsV2
+  VERSION = "0.0.0.pre.16b4984".freeze
+end

data/lib/{octicons.rb → octicons_v2.rb}

@@ -1,8 +1,8 @@
-require "octicons/version"
-require "octicons/octicon"
+require "octicons_v2/version"
+require "octicons_v2/octicon_v2"
 require "json"
 
-module Octicons
+module OcticonsV2
   file_data = File.read(File.join(File.dirname(__FILE__), "./build/data.json"))
   OCTICON_SYMBOLS = JSON.parse(file_data).freeze
 end