jekyll-octicons 1.1.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODg3ZjVlMjI0YWFjZDBjZGY2NTE4YTE0MjczOTVlOWU2YTU3ODkyMA==
+    YWE3NGQzMjMzZmZkOTI4MTdkYzk1ZjMxMTljNGRkZDE1OTgzZTdiNw==
   data.tar.gz: !binary |-
-    ZDhjNDI1OTMwYTU5YThmNjgzMWY0MjY5NWFlZWYwZjM5Zjc0ZDBkNA==
+    ZDhhMTVkM2JhNzdkNThhODYwYmJlZDNlZTA5NjYxMzM5NDNhYmRjYw==
 SHA512:
   metadata.gz: !binary |-
-    NGE2YmYzYWZmNjliMzExMTkzYTYzYWFkZmM4NTFkYzY3MzYxNjEyMWQxZmJh
-    Nzc4Njc4MTRmMGExNjgzYjU3ODM0OGQxN2Y5YjZhODMxYzA3MDA0Y2E2NzYx
-    NTBlMjQyMDJiZDJkYzA0NmVkNTMzYzQxYzkzODI2YTRiMzI0ZDc=
+    MTU1ODIyMTNhMjFlY2VjZGJmMmI4NDFiYzczODFkNTZiNTcyMTE4NjNmODc0
+    OWFjZTFmNzM1MTE1ZGM0ZTllNGYyYjQwODgwNDI1YzA3ZTE1ZGEwNGJjMmI4
+    MjBhZGU1YmUwNzhmNzY0Y2IzNjViY2Q0NGU1NTllNTk5ZTA3OWI=
   data.tar.gz: !binary |-
-    NDA2NzEyMGQxY2I0MjZiZDNmNjg5YzZkNjIxMmVlNDRhZWNmY2E3NGQwNDcw
-    ZGQ3ZDQ4ZDcyOTc1ZGIzOWRkYTYyMjk1M2I1ZDI4ZmFiNmQ4NDg5NDc1ZGQx
-    ZTk1NzQ3ODZkNzJjODVlOGZjOWQ1ZDE3NWEzZDk2MDQ1MDIwNTg=
+    MzliYWZmOWU3NDg3NmM5Y2JkNmFkNmE3MGI3ODZjNzI2ZWRjNWJjNWNkYjNi
+    YzFmOTc2YmQ2ZmQ4ZTVjNGNkMDBkMTc3OGRiNDg1OWYwNDE5OGNjN2Q1ZTFh
+    OGI2NTY3MWY4NWZmODAwODM1ZGVlODhjOWE0N2Q0YzA1ZjY2NzE=

data/README.md

@@ -25,7 +25,7 @@ This jekyll liquid tag, is a plugin that will let you easily include svg [octico
 3. Use this tag in your jekyll templates
 
     ```
-    {% octicon alert size:large class:"right left" aria-label:hi %}
+    {% octicon alert height:32 class:"right left" aria-label:hi %}
     ```
 
 The minimum CSS you'll need in your jekyll site is in the [octicons][octicons] repository. You can also npm install that package and include `build/octicons.css` in your styles.

data/lib/jekyll-octicons.rb

@@ -22,26 +22,42 @@ module Jekyll
     def initialize(tag_name, markup, options)
       super
       @markup = markup
-      @options = string_to_hash(markup)
+      # If there's interpoaltion going on, we need to do this in render
+      prepare(markup) unless match = markup.match(Variable)
     end
 
     def render(context)
-      @markup.scan Variable do |variable|
-        @options = string_to_hash(@markup.gsub(Variable, lookup_variable(context, variable.first)))
-      end
-      return nil if @options[:symbol].nil?
-      ::Octicons::Octicon.new(@options).to_svg
+      prepare(interpolate(@markup, context)) if match = @markup.match(Variable)
+
+      return nil if @symbol.nil?
+      ::Octicons::Octicon.new(@symbol, @options).to_svg
     end
 
     private
 
+    def interpolate(markup, context)
+      markup.scan Variable do |variable|
+        markup = markup.gsub(Variable, lookup_variable(context, variable.first))
+      end
+      markup
+    end
+
+    def prepare(markup)
+      @symbol = symbol(markup)
+      @options = string_to_hash(markup)
+    end
+
+    def symbol(markup)
+      if match = markup.match(Syntax)
+        match[1]
+      end
+    end
+
     # Create a ruby hash from a string passed by the jekyll tag
     def string_to_hash(markup)
       options = {}
 
       if match = markup.match(Syntax)
-        options[:symbol] = match[1]
-
         markup.scan(TagAttributes) do |key, value|
           options[key.to_sym] = value.gsub(/\A"|"\z/, '')
         end

data/lib/jekyll-octicons/version.rb

@@ -3,6 +3,6 @@ module Liquid; class Tag; end; end
 
 module Jekyll
   class Octicons < Liquid::Tag
-    VERSION = '1.1.0'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-octicons
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - GitHub Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: A jekyll liquid plugin that makes including svg Octicons simple.
 email:
 - support@github.com