image_size 1.1.5 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQyNzA0NTJhM2ViNDFiOWM4ZjdhNDA4ZDVmMzgxZGEzOTg0ZWRmYw==
+    Y2YyMGZmNzllODAzMjlhMzRlYWNhZTBkOWQ3OWRlODViMmY4YTliNA==
   data.tar.gz: !binary |-
-    ZWE2YmQ3ODVlYjI1NDM1NTgyYTA3ODFiNDY3ODYxN2VkNmUzNGY4MQ==
+    ZTk0OGE4ZjczNmIwZjc2NTMwNzYxZjNjZDQxYjI0ZjU2YTJhOTk0Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTQ3MjBiNDQxMTIyZWRkOWY1NjBmMjRhODM0OTUxY2JmNjBmZjY4NWQxNjgy
-    ZjcwNjBlNjU2MWFhNTBmYTY1MzM4NWVmMTZjMzIxZDlmNmVmZTg1ODVlMzJh
-    ZjE5Njg2NWFlNGY1NjIxMjAwMjY3NTA4NDdkMDU0NjNkNmViNGY=
+    ZGExOWMzZTU1NzM5NTUxMzIzNzc4ZmUxNGU2MGEzMmU5YzMzOTdjOGQyNWVl
+    ZTVjZGYzYTM4ZmM3ZmViYTU5NTE3MzE0ZjUwMDgwNjJmMmQzMTkyMmE0M2E0
+    MjA3MzBhY2QxMzAyNGQ2YmU5ZGY4YjlkNGY0YWMyOGJjZWYzYWY=
   data.tar.gz: !binary |-
-    YzVlMGU4OTdjN2M2NjNiMTk3OTQ4Mjc2ZDAyZWE5MWE1Mzc1ODBhZjgxODRh
-    NWQ5NmEyNjg0MjQ2MmQ2Y2Y0NDlhMTkzYzM2MGNhOTk4ODBlMTNkZjk1NTUy
-    ZDZjN2U1N2U3YzZhM2IxYzY5ZDk3YWQzZGRkYmFkNDRlN2JmMDc=
+    NGJkZWUxODAyMWYzODQ4NjJjNjczZGE4MGUxOTYzNjlkZmJhOWZkNTJiYWQ3
+    MzUyNjk0NzZlZjAwNDc2YmE3YmZlOTVjMWNiMjIwNjBiMzFiYTdjM2M5ODk3
+    NGNlNjUxNTk2MmI4ZTA4NzQwMzlmNmQyYzA1YjZkYTVlYjM4YWE=

data/image_size.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '1.1.5'
+  s.version     = '1.2.0'
   s.summary     = %q{Measure image size using pure Ruby}
   s.description = %q{Measure following file dimensions: bmp, gif, jpeg, pbm, pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm}
   s.homepage    = "http://github.com/toy/#{s.name}"

data/lib/image_size.rb

@@ -12,6 +12,7 @@ class ImageSize
   end
 
   class ImageReader # :nodoc:
+    attr_reader :data
     def initialize(data_or_io)
       @io = case data_or_io
       when IO, StringIO, Tempfile
@@ -50,6 +51,16 @@ class ImageSize
     open(path, 'rb'){ |f| new(f) }
   end
 
+  # Used for svg
+  def self.dpi
+    @dpi || 72
+  end
+
+  # Used for svg
+  def self.dpi=(dpi)
+    @dpi = dpi.to_f
+  end
+
   # Given image as IO, StringIO, Tempfile or String finds its format and dimensions
   def initialize(data)
     ir = ImageReader.new(data)
@@ -79,6 +90,7 @@ class ImageSize
 
 private
 
+  SVG_R = /<svg\b([^>]*)>/
   def detect_format(ir)
     head = ir[0, 1024]
     case
@@ -93,7 +105,10 @@ private
     when head =~ /\/\* XPM \*\//            then :xpm
     when head[0, 4] == '8BPS'               then :psd
     when head =~ /^[FC]WS/                  then :swf
-    when head[0, 1] == "\n"                 then :pcx
+    when head[SVG_R] ||
+      head =~ /<\?xml|<!--/ && ir[0, 4096][SVG_R]
+                                            then :svg
+    when head[0, 2] =~ /\n[\000-\005]/      then :pcx
     end
   end
 
@@ -218,4 +233,27 @@ private
     x_min, x_max, y_min, y_max = values
     [(x_max - x_min) / 20, (y_max - y_min) / 20]
   end
+
+  DPI = 72
+  def size_of_svg(ir)
+    attributes = {}
+    ir.data[SVG_R, 1].scan(/(\S+)=(?:'([^']*)'|"([^"]*)"|([^'"\s]*))/) do |name, v0, v1, v2|
+      attributes[name] = v0 || v1 || v2
+    end
+    dpi = self.class.dpi
+    [attributes['width'], attributes['height']].map do |length|
+      if length
+        pixels = case length.downcase.strip[/(?:em|ex|px|in|cm|mm|pt|pc|%)\z/]
+        when 'em', 'ex', '%' then nil
+        when 'in' then length.to_f * dpi
+        when 'cm' then length.to_f * dpi / 2.54
+        when 'mm' then length.to_f * dpi / 25.4
+        when 'pt' then length.to_f * dpi / 72
+        when 'pc' then length.to_f * dpi / 6
+        else length.to_f
+        end
+        pixels.round if pixels
+      end
+    end
+  end
 end

data/spec/image_size_spec.rb

@@ -18,6 +18,7 @@ describe ImageSize do
     ['test.tif', :tiff,  48,  64],
     ['test.xbm',  :xbm,  16,  32],
     ['test.xpm',  :xpm,  24,  32],
+    ['test.svg',  :svg,  72, 100],
     ['image_size_spec.rb', nil, nil, nil],
   ].each do |name, format, width, height|
     path = File.join(File.dirname(__FILE__), name)

data/spec/test.svg

@@ -0,0 +1,3 @@
+<svg width="1in" height="100" xmlns="http://www.w3.org/2000/svg">
+	<circle cx="36" cy="50" r="30" stroke="black" stroke-width="10" fill="red" />
+</svg>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -46,6 +46,7 @@ files:
 - spec/test.pgm
 - spec/test.png
 - spec/test.psd
+- spec/test.svg
 - spec/test.swf
 - spec/test.tif
 - spec/test.xbm
@@ -86,6 +87,7 @@ test_files:
 - spec/test.pgm
 - spec/test.png
 - spec/test.psd
+- spec/test.svg
 - spec/test.swf
 - spec/test.tif
 - spec/test.xbm