basicons 1.0.2 → 1.0.3

data/lib/basicons/basicon.rb

@@ -1,74 +1,51 @@
 module Basicons
   class Basicon
     DEFAULT_HEIGHT = 16
-
-    attr_reader :data, :symbol
-    attr_reader :width, :height, :options
+    attr_reader :data, :symbol, :options
 
     def initialize(symbol, options = {})
       @symbol = symbol.to_s
-
-      if basicon = find_basicon(@symbol, options)
+      @options = options.dup
+
+      if @data = Basicons::SVG_DATA[@symbol]
+        @options.merge!({
+          class: classes,
+          width: svg_size,
+          height: svg_size,
+          viewBox: '0 0 24 24',
+          stroke: 'currentColor',
+          fill: 'none'
+        })
+
+        @options['stroke-width'] = 2
+        @options['stroke-linecap'] = 'round'
+        @options['stroke-linejoin'] = 'round'
+        @options['xmlns'] = 'http://www.w3.org/2000/svg'
       else
-        raise "Couldn't find basicon symbol for #{@symbol.inspect}"
+        raise "<#{@symbol}> not found"
       end
-
-      #         @path = octicon["path"]
-      #         @width = octicon["width"]
-      #         @height = octicon["height"]
-      #         @options = options.dup
-      #         @options.merge!({
-      #           class:   classes,
-      #           viewBox: viewbox,
-      #           version: "1.1"
-      #         })
-      #         @options.merge!(size)
-      #         @options.merge!(a11y)
-
     end
 
     def to_svg
-      "<svg #{html_attributes}>#{@path}</svg>"
+      "<svg #{html_attributes}>#{@data}</svg>"
     end
 
     private
 
-    def html_attributes
-
-      #       attrs = ""
-      #       @options.each { |attr, value| attrs += "#{attr}=\"#{value}\" " }
-      #       attrs.strip
+    def html_attributes(result = '')
+      @options.each { |key, value| result += "#{key}=\"#{value}\" " }
+      result.strip
+    end
 
+    def svg_size
+      return @size unless @size.nil?
+      @size = @options[:size].to_i
+      @size = 24 if @size.zero?
+      @size
     end
 
     def classes
       "basicon basicon-#{@symbol} #{@options[:class]}".strip
     end
-
-    def viewbox
-      "0 0 #{@width} #{@height}"
-    end
-
-    def find_basicon(symbol, options = {})
-      basicon = Basicons::SVG_DATA[symbol]
-      return if basicon.nil?
-
-      {}
-
-      #         return {
-      #           "name" => octicon["name"],
-      #           "width" => octicon["heights"][natural_height.to_s]["width"].to_i,
-      #           "height" => natural_height,
-      #           "path" => octicon["heights"][natural_height.to_s]["path"]
-      #         }
-    end
   end
 end
-
-#     def size
-#       size = {
-#         width:  @width,
-#         height: @height
-#       }
-#       size
-#     end

data/lib/basicons/version.rb

@@ -1,3 +1,3 @@
 module Basicons
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basicons
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - basicons's authors