esvg 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc49e968dc9968f8fe72bae00d4efcbb8e1e4e52
-  data.tar.gz: 428208a9c3c9426a199361c225e7e6625234ac40
+  metadata.gz: 22b09f33bb221a8e3e0ca935a7e1ee2b958d4503
+  data.tar.gz: d0415a87014d73b3363fc29f5879bbb06e81bf55
 SHA512:
-  metadata.gz: 9f59e82c496aeed8819c3e2a8e953d17b682d5f99ae578a9dd576fbc3c875ab76d0db3a0f7988c9a9112759a282f1c8912c3745769285332328a7fa7802e61e2
-  data.tar.gz: 26ba8e38c78eb82e7861a847bc31a5f0601dcf231ea7fb99cee4befc99062887e8d65167b5365eb1776b5fef45a43c10dfefc113cbe11f220c3ad07ddd45696b
+  metadata.gz: bc4b112d6b50c3189dfdad7c16493b4c79fddb4dd3671b2b8422d8bc208abd431141736d70ade7a50613de0df1c96d4da6e0a4c5c757228867191027774c01e6
+  data.tar.gz: f3a7e00e22411e3dd4ab823be0077fd0509aae1ce9df3eefae7a2014a74828bb33d30f49c5e6d3d26465bbe365218080047e214d5a21d2f7f54925d34ea62442

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.1.2 (2015-06-30)
+
+- Fix: Measuring modified time works better now.
+- Fix: SVGs keep their dimensions when embedded.
+
 ### 1.1.1 (2015-06-29)
 
 - Fix: Moved methods from Esvg module to SVG class. Oops.

data/lib/esvg/svg.rb

@@ -1,6 +1,5 @@
 module Esvg
   class SVG
-
     attr_accessor :files
 
     CONFIG = {
@@ -21,20 +20,23 @@ module Esvg
 
     def initialize(options={})
       config(options)
-
-      @mtime = File.mtime(config[:path])
       read_icons
     end
 
     def modified?
-      @mtime != File.mtime(config[:path])
+      mtime = File.mtime(find_files.last)
+      @mtime != mtime
     end
 
     def read_icons
       @files = {}
+      @mtime = {}
       @svgs  = {}
 
-      find_files.each do |f|
+      found = find_files
+      @mtime = File.mtime(found.last)
+
+      found.each do |f|
         svg = File.read(f)
         @files[File.basename(f, ".*")] = SvgOptimizer.optimize(svg)
       end
@@ -114,9 +116,9 @@ module Esvg
       end
     end
 
-    def svg_icon(name, options={})
-      name = icon_name(name)
-      %Q{<svg class="#{config[:base_class]} #{name} #{options[:class] || ""}"><use xlink:href="##{name}"/>#{title(options)}#{desc(options)}</svg>}.html_safe
+    def svg_icon(file, options={})
+      name = icon_name(file)
+      %Q{<svg class="#{config[:base_class]} #{name} #{options[:class] || ""}" #{dimensions(@files[file])}><use xlink:href="##{name}"/>#{title(options)}#{desc(options)}</svg>}.html_safe
     end
 
     def title(options)
@@ -160,7 +162,7 @@ module Esvg
 
     def dimensions(input)
       dimensions = [] 
-      %w(viewBox).map do |dimension|
+      %w(viewBox height width).map do |dimension|
           dimensions << input.scan(/<svg.+(#{dimension}=["'].+?["'])/).flatten.first
       end
       dimensions.compact.join(' ')
@@ -186,7 +188,7 @@ module Esvg
     def find_files
       path = File.join(config[:path], '*.svg')
 
-      Dir[path].uniq
+      Dir[path].uniq.sort_by{ |f| File.mtime(f) }
     end
 
   end

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: svg_optimizer