octopress-image-tag 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc25280430a21b10fd0e33bcd8adf6f9a68f30ef
-  data.tar.gz: bf9bc540e3cb1f8302736ed1498bee8f9c005960
+  metadata.gz: 7cac073cf84cbb03f15807142de0d18aec59add4
+  data.tar.gz: fb54c9e90176f04a821c565999620565209720a5
 SHA512:
-  metadata.gz: 04f08de32fedc6cdb8fb34ef80f422c92c2f905d15bc2b83899cc7617f4b82523a8e4c40a3b2a3b8e0fd4e416dbec8399570a529d794b4291a8b199dc3cfb04f
-  data.tar.gz: 1406408a6e9b049717c7a9a59adcee3638afd3b19623bb1ddc8f83a88052d4ad03233ab38134068a36c08d44c04c9bd15fdf8fe13f72a3e86c5a26e58041a475
+  metadata.gz: 50bd0c17760e7a50755ffb6efe275041f587eafcc3fe588aed03f9e5132e228493f2a9f46717ff562d7e89ba189f9d9d8f58657f2778658a11d2c4ef52040f8a
+  data.tar.gz: 1237ac401bc769ab34acfd189113b3044ded586df66fc54e9c16962dc590d7fea3a826678df401e08f897704013f1e2d6d73f3205d8856099350e6670fbe4670

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+### 1.1.0 (2015-01-07)
+- New: Liquid can be processed in tag.
+
+### 1.0.0 (2015-01-07)
+- Initial release

data/README.md

@@ -32,20 +32,21 @@ Then add the gem to your Jekyll configuration.
 ```
 
 Examples:
+
 ```
 {% img /images/ninja.png "Ninja Attack!" %}
 {% img left half http://site.com/images/ninja.png title:"Hidden Ninja" %}
-{% img http://site.com/images/ninja.png 150px 150px %}
+{% img {{ site.cdn }}/images/ninja.png 150px 150px %}
 ```
 
 Output:
+
 ```
 <img src="/images/ninja.png" alt="Ninja Attack!" >
 <img class="left half" src="http://site.com/images/ninja.png" alt="Hidden Ninja" title="Hidden Ninja" >
-<img src="http://site.com/images/ninja.png" width="150px" height="150px" alt="Ninja in the shadows" title="Hidden Ninja">
+<img src="http://some.cdn.io/images/ninja.png" width="150px" height="150px" alt="Ninja in the shadows" title="Hidden Ninja">
 ```
 
-
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/image-tag/fork )

data/lib/octopress-image-tag.rb

@@ -12,38 +12,52 @@ module Octopress
         @img = nil
 
         def initialize(tag_name, markup, tokens)
-          if markup =~ /title:['|"](.+?)['|"]/
-            @title = $1.strip
+          @markup = markup
+          super
+        end
+
+        def render(context)
+          begin
+            attributes = image(context).collect do |k,v|
+              "#{k}=\"#{v}\"" if v
+            end.join(" ")
+
+            "<img #{attributes}>"
+          rescue
+            raise "Error processing input, expected syntax: {% img [class name(s)] [http[s]:/]/path/to/image [width [height]] [title text | \"title text\" [\"alt text\"]] %}"
           end
+        end
 
-          markup = markup.gsub(/title:['|"].+?['|"]/, '').strip
+        def image(context)
+          @markup = process_liquid(context)
 
-          if markup =~ /(?<class>\S.*\s+)?(?<src>(?:https?:\/\/|\/|\S+\/)\S+)(?:\s+(?<width>\d\S+))?(?:\s+(?<height>\d\S+))?(?<alt>\s+.+)?/i
+          title = /title:['|"](.+?)['|"]/
+          @title = @markup.scan(title).flatten.compact.last
+          @markup.gsub!(title, '')
+
+          if @markup =~ /(?<class>\S.*\s+)?(?<src>(?:https?:\/\/|\/|\S+\/)\S+)(?:\s+(?<width>\d\S+))?(?:\s+(?<height>\d\S+))?(?<alt>\s+.+)?/i
             attributes = ['class', 'src', 'width', 'height', 'alt']
-            @img = attributes.reduce({}) { |img, attr| img[attr] ||= $~[attr].strip if $~[attr]; img }
-            text = @img['alt']
+            image = attributes.reduce({}) { |img, attr| img[attr] ||= $~[attr].strip if $~[attr]; img }
+            text = image['alt']
 
             # Allow parsing "title" "alt"
             if text =~ /(?:"|')(?<title>[^"']+)?(?:"|')\s+(?:"|')(?<alt>[^"']+)?(?:"|')/
-              @img['title']  = title
-              @img['alt']    = alt
+              image['title']  = title
+              image['alt']    = alt
             else
               # Set alt text and title from text
-              @img['alt'].gsub!(/"/, '') if @img['alt']
+              image['alt'].gsub!(/"/, '') if image['alt']
             end
           end
 
-          @img['title'] ||= @title
-          @img['alt'] ||= @title
-          super
+          image['title'] ||= @title
+          image['alt'] ||= @title
+
+          image
         end
 
-        def render(context)
-          if @img
-            "<img #{@img.collect {|k,v| "#{k}=\"#{v}\"" if v}.join(" ")}>"
-          else
-            "Error processing input, expected syntax: {% img [class name(s)] [http[s]:/]/path/to/image [width [height]] [title text | \"title text\" [\"alt text\"]] %}"
-          end
+        def process_liquid(context)
+          Liquid::Template.parse(@markup).render!(context.environments.first)
         end
       end
     end

data/lib/octopress-image-tag/version.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Tags
     module ImageTag
-      VERSION = "1.0.0"
+      VERSION = "1.1.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-image-tag
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - lib/octopress-image-tag.rb