jekyll-svg-plugin 1.0.0 → 1.1.0

data/History.rdoc

@@ -1,2 +1,7 @@
+=== 1.1.0 (2011-9-18)
+* Replace imagesize gem with maintained image_size ~> 1.0.3.
+* Support relative or site-absolute svg/png file paths.
+* Use <img/> empty tag for XHTML compatibility.
+
 === 1.0.0 (2010-8-14)
 * Initial release.

data/README.rdoc

@@ -18,9 +18,10 @@ Then you can include an SVG reference HTML object via liquid tag:
 
   {% svg svg/mygraph.svg %}
 
-Note that both an *.svg and *.png are expected at the specified
-location. The later is used as a fallback and also to obtain
-dimensions (via imagesize gem, pure ruby) from the png file.
+Where the referenced file is relative to the current page, or to the
+site source if absolute. Note that both an *.svg and *.png are
+expected at the specified location. The PNG file is used as a fallback
+and also to obtain dimensions (via imagesize gem, pure ruby).
 
 I typically use Graphviz dot to generate my SVG/PNG graphs, with a Rakefile like this:
 
@@ -43,7 +44,7 @@ I typically use Graphviz dot to generate my SVG/PNG graphs, with a Rakefile like
 
 == License
 
-Copyright (c) 2010 David Kellum
+Copyright (c) 2010-2011 David Kellum
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/Rakefile

@@ -4,14 +4,14 @@ $LOAD_PATH << './lib'
 require 'jekyll-svg-plugin/base'
 
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.2.2'
+gem     'rjack-tarpit', '~> 1.3.3'
 require 'rjack-tarpit'
 
 t = RJack::TarPit.new( 'jekyll-svg-plugin', JekyllSVGPlugin::VERSION )
 
 t.specify do |h|
   h.developer( 'David Kellum', 'dek-oss@gravitext.com' )
-  h.extra_deps << [ 'imagesize', '>= 0.1.1' ]
+  h.extra_deps << [ 'image_size', '~> 1.0.3' ]
 end
 
 task :check_history_version do

data/lib/jekyll-svg-plugin.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010 David Kellum
+# Copyright (c) 2010-2011 David Kellum
 # All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -30,6 +30,7 @@ mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
 mime_types.store 'svg', 'image/svg+xml'
 
 require 'image_size'
+
 module Jekyll
 
   class SvgTag < Liquid::Tag
@@ -40,13 +41,23 @@ module Jekyll
 
     def render(context)
       png = @svg.sub( /(\.svg)$/, '.png' )
-      w,h = open( png, 'rb' ) do |fpng|
-        ImageSize.new( fpng.read ).get_size
+      png_file = png
+
+      # png file is relative to this page, if relative
+      unless png_file =~ %r{^/}
+        png_file = File.join( File.dirname( context[ 'page' ][ 'url' ] ), png )
+      end
+
+      # And found in the site source
+      png_file = File.join( context.registers[ :site ].source, png_file )
+
+      w,h = open( png_file, 'rb' ) do |fpng|
+        ImageSize.new( fpng.read ).size
       end
       <<END
 <div class="svg-object">
   <object data="#{@svg}" type="image/svg+xml" width="#{w}" height="#{h}">
-    <img src="#{png}" width="#{w}" height="#{h}">
+    <img src="#{png}" width="#{w}" height="#{h}" />
   </object>
 </div>
 END

data/lib/jekyll-svg-plugin/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010 David Kellum
+# Copyright (c) 2010-2011 David Kellum
 # All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -23,5 +23,5 @@
 #++
 
 module JekyllSVGPlugin
-  VERSION='1.0.0'
+  VERSION='1.1.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll-svg-plugin
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - David Kellum
@@ -15,23 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 -07:00
-default_executable: 
+date: 2011-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: imagesize
+  name: image_size
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 17
         segments: 
-        - 0
-        - 1
         - 1
-        version: 0.1.1
+        - 0
+        - 3
+        version: 1.0.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 29
         segments: 
         - 1
-        - 2
-        - 2
-        version: 1.2.2
+        - 3
+        - 3
+        version: 1.3.3
   type: :development
   version_requirements: *id002
 description: |-
@@ -71,7 +70,6 @@ files:
 - Rakefile
 - lib/jekyll-svg-plugin/base.rb
 - lib/jekyll-svg-plugin.rb
-has_rdoc: true
 homepage: http://github.com/dekellum/jekyll-svg-plugin
 licenses: []
 
@@ -102,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jekyll-svg-plugin
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A plugin for adding an SVG liquid tag to Jekyll