octicons 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d27467c7641ffa5bb3f966ae01fdaf0ad2e92a1
-  data.tar.gz: f8f51072c94e860d41b600d54f1666f815ced9e1
+  metadata.gz: aa3eeb410a24dcd75482f20b6bd0781c925de34c
+  data.tar.gz: eb273834778e0a64abb7c0872668124990de4d3c
 SHA512:
-  metadata.gz: f0f9f2bd64d282134e40c6523c8f1e972fdd174c7ae65d3e125a03d1a5c4d89253148fcd8b6fbfe38ef6707c5800059224aa747d57ce9cc6c7b415deffab1e77
-  data.tar.gz: 4e5c1755bab5fccec3b35f3df2a08944615479537b0959f143e74e0fe8c963450fe6810799a7f06c27a89dfe58f59c50fd88001ee6b79878cebf4cb6018e66f6
+  metadata.gz: 1462667e821dae27c878c54062e593b8a703d6e600ce4d1bc05d18a22ceec916b6ffb28b6d45525441b33624c417048eecaefc1d5523423f60065b5bae2dea5f
+  data.tar.gz: bae7f385ef8fe074dfcf0d4176e21a0e4968d340bf2081bde6b02e708619e66e2c1ee3b21c9bc5a0212a39726be6732535a8235509b4be856058e067e99ccaf2

data/README.md

@@ -31,7 +31,7 @@ The `Octicon` class takes a hash of arguments to construct the icon you want
 #### Options
 
 * `:symbol` _(required)_ - This is the name of the octicon you want to use. For example `alert`. [Full list of icons][octicons-docs]
-* `:size` - This will help output 16 or 32 sized icons. You can also pass an Integer to this, for other sizes
+* `:size` - This will help output 16 or 32 sized icons. if you pass "large" the icon will be double the size. You can also pass an number and the icon will be scaled properly.
 * `:width`, `:height` - width and height are exact sizes, if you have an odd shape like the gist logo, pass in exact dimensions
 
 Everything else passed in through the options hash will be treated as html attributes and added to the svg tag.

data/lib/octicons/octicon.rb

@@ -7,66 +7,87 @@ module Octicons
         @path = symbol[:path]
         @width = symbol[:width]
         @height = symbol[:height]
-        @html_options = @options.reject { |d| [:symbol, :tag, :size].include? d }
 
-        css_class
-        compute_size
-        accessible
+        # create html_options from options, except for a few
+        @html_options = @options.reject { |d| [:symbol, :size].include? d }
+        @html_options.merge!({
+          :class   => classes,
+          :viewBox => viewbox,
+          :version => "1.1"
+        })
+        @html_options.merge!(size)
+        @html_options.merge!(a11y)
       else
         raise "Couldn't find octicon symbol for #{options[:symbol].inspect}"
       end
     end
 
     def to_svg
-      "<svg #{html_attrs}>#{@path}</svg>"
+      "<svg #{html_attributes}>#{@path}</svg>"
     end
 
     private
 
-    def html_attrs
+    def html_attributes
       attrs = ""
       @html_options.each { |attr, value| attrs += "#{attr}=\"#{value}\" " }
       attrs.strip
     end
 
     # add some accessibility features to svg
-    def accessible
-      @html_options[:version] = "1.1"
+    def a11y
+      accessible = {}
 
-      if @html_options[:'aria-label'].nil?
-        @html_options[:'aria-hidden'] = "true"
+      if @options[:'aria-label'].nil?
+        accessible[:'aria-hidden'] = "true"
       else
-        @html_options[:role] = "img"
+        accessible[:role] = "img"
       end
+
+      accessible
     end
 
     # prepare the octicon class
-    def css_class
-      @html_options[:class] = "octicon octicon-#{@options[:symbol]} #{@options[:class]} ".strip
+    def classes
+      "octicon octicon-#{@options[:symbol]} #{@options[:class]} ".strip
+    end
+
+    def viewbox
+      "0 0 #{@width} #{@height}"
     end
 
     # determine the height and width of the octicon based on :size option
-    def compute_size
+    def size
+      size = {
+        :width => @width,
+        :height => @height
+      }
 
-      @html_options[:viewBox] = "0 0 #{@width} #{@height}"
+      # When size is "large"
+      if @options[:size] == "large"
+        size[:width] = 2 * @width
+        size[:height] = 2 * @height
 
-      if !@options[:width].nil? && !@options[:height].nil?
-        @html_options[:width] = @options[:width]
-        @html_options[:height] = @options[:height]
+      # When size is an integer
+      elsif @options[:size].is_a?(Integer) || !!(@options[:size] =~ /\A[0-9]+\z/)
+        size[:width]  = calculate_width(@options[:size])
+        size[:height] = @options[:size]
 
-      elsif @options[:size] == "large"
-        @html_options[:width] = 2 * @width
-        @html_options[:height] = 2 * @height
+        # Specific size
+      elsif !@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]
+      end
 
-      elsif @options[:size].is_a? Integer
-        @html_options[:width] = (@options[:size] * @width) / @height
-        @html_options[:height] = @options[:size]
+      size
+    end
 
-      else
-        @html_options[:width] = @width
-        @html_options[:height] = @height
+    def calculate_width(height)
+      (height.to_i * @width) / @height
+    end
 
-      end
+    def calculate_height(width)
+      (width.to_i * @height) / @width
     end
   end
 end

data/lib/octicons/version.rb

@@ -1,3 +1,3 @@
 module Octicons
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/svg/grabber.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16" viewBox="0 0 8 16"><path d="M8 4v1H0V4h8zM0 8h8V7H0v1zm0 3h8v-1H0v1z"/></svg>

data/lib/svg/plug.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path d="M14 7V6h-4V4H8v1H6c-1.03 0-1.77.81-2 2L3 8c-1.66 0-3 1.34-3 3v2h1v-2c0-1.11.89-2 2-2l1 1c.25 1.16.98 2 2 2h2v1h2v-2h4v-1h-4V7h4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path d="M14 6V5h-4V3H8v1H6c-1.03 0-1.77.81-2 2L3 7c-1.66 0-3 1.34-3 3v2h1v-2c0-1.11.89-2 2-2l1 1c.25 1.16.98 2 2 2h2v1h2v-2h4V9h-4V6h4z"/></svg>

data/lib/svg/plus-small.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="7" height="16" viewBox="0 0 7 16"><path d="M4 7V4H3v3H0v1h3v3h1V8h3V7H4z"/></svg>

data/lib/svg/reply.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16"><path d="M6 3.5c3.92.44 8 3.125 8 10-2.312-5.062-4.75-6-8-6V11L.5 5.5 6 0v3.5z"/></svg>

data/lib/svg/smiley.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M8 0C3.58 0 0 3.58 0 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zm4.81 12.81a6.72 6.72 0 0 1-2.17 1.45c-.83.36-1.72.53-2.64.53-.92 0-1.81-.17-2.64-.53-.81-.34-1.55-.83-2.17-1.45a6.773 6.773 0 0 1-1.45-2.17A6.59 6.59 0 0 1 1.21 8c0-.92.17-1.81.53-2.64.34-.81.83-1.55 1.45-2.17.62-.62 1.36-1.11 2.17-1.45A6.59 6.59 0 0 1 8 1.21c.92 0 1.81.17 2.64.53.81.34 1.55.83 2.17 1.45.62.62 1.11 1.36 1.45 2.17.36.83.53 1.72.53 2.64 0 .92-.17 1.81-.53 2.64-.34.81-.83 1.55-1.45 2.17zM4 5.8v-.59c0-.66.53-1.19 1.2-1.19h.59c.66 0 1.19.53 1.19 1.19v.59c0 .67-.53 1.2-1.19 1.2H5.2C4.53 7 4 6.47 4 5.8zm5 0v-.59c0-.66.53-1.19 1.2-1.19h.59c.66 0 1.19.53 1.19 1.19v.59c0 .67-.53 1.2-1.19 1.2h-.59C9.53 7 9 6.47 9 5.8zm4 4.2c-.72 1.88-2.91 3-5 3s-4.28-1.13-5-3c-.14-.39.23-1 .66-1h8.59c.41 0 .89.61.75 1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M8 0C3.58 0 0 3.58 0 8s3.58 8 8 8 8-3.58 8-8-3.58-8-8-8zm4.81 12.81a6.72 6.72 0 0 1-2.17 1.45c-.83.36-1.72.53-2.64.53-.92 0-1.81-.17-2.64-.53-.81-.34-1.55-.83-2.17-1.45a6.773 6.773 0 0 1-1.45-2.17A6.59 6.59 0 0 1 1.21 8c0-.92.17-1.81.53-2.64.34-.81.83-1.55 1.45-2.17.62-.62 1.36-1.11 2.17-1.45A6.59 6.59 0 0 1 8 1.21c.92 0 1.81.17 2.64.53.81.34 1.55.83 2.17 1.45.62.62 1.11 1.36 1.45 2.17.36.83.53 1.72.53 2.64 0 .92-.17 1.81-.53 2.64-.34.81-.83 1.55-1.45 2.17zM4 6.8v-.59c0-.66.53-1.19 1.2-1.19h.59c.66 0 1.19.53 1.19 1.19v.59c0 .67-.53 1.2-1.19 1.2H5.2C4.53 8 4 7.47 4 6.8zm5 0v-.59c0-.66.53-1.19 1.2-1.19h.59c.66 0 1.19.53 1.19 1.19v.59c0 .67-.53 1.2-1.19 1.2h-.59C9.53 8 9 7.47 9 6.8zm4 3.2c-.72 1.88-2.91 3-5 3s-4.28-1.13-5-3c-.14-.39.23-1 .66-1h8.59c.41 0 .89.61.75 1z"/></svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octicons
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - GitHub Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -109,6 +109,7 @@ files:
 - lib/svg/git-merge.svg
 - lib/svg/git-pull-request.svg
 - lib/svg/globe.svg
+- lib/svg/grabber.svg
 - lib/svg/graph.svg
 - lib/svg/heart.svg
 - lib/svg/history.svg
@@ -154,6 +155,7 @@ files:
 - lib/svg/person.svg
 - lib/svg/pin.svg
 - lib/svg/plug.svg
+- lib/svg/plus-small.svg
 - lib/svg/plus.svg
 - lib/svg/primitive-dot.svg
 - lib/svg/primitive-square.svg
@@ -161,6 +163,7 @@ files:
 - lib/svg/question.svg
 - lib/svg/quote.svg
 - lib/svg/radio-tower.svg
+- lib/svg/reply.svg
 - lib/svg/repo-clone.svg
 - lib/svg/repo-force-push.svg
 - lib/svg/repo-forked.svg