image_size 1.4.2 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWEzNGYyODYwNmFkZTE1ZGEzOTA0YmVlZmNiZWE1MmE0NjExZjYzOQ==
+    MTIzODU3ZDBhYTI5M2MyOGZjOGFhY2FjNzAxYWVhOWUwM2Q4YWQyYw==
   data.tar.gz: !binary |-
-    YTAzMDA3MTIzYzJjYzgxNDIyNjRjZTlhMmNlZDFlNTY3MzU3MmQyOA==
+    N2VmMzkwMWFmNzY5NmM5YTY0NTJmOWU5ZDlkMDBiYTlmYTA0NDY3Yg==
 SHA512:
   metadata.gz: !binary |-
-    NWQ2YTNiNjFiNmY0ZGJiNWZkYjBiODQzMmE5Y2I5NjhkMGVmMzdhMGIyZmEz
-    MjI1NjRiNDFkMTE1ZGE3YzZmYjgwYTcyYmE2NDg5ZWY2YWM2NWVkZGEwNDVj
-    OWIyM2M0NjIwMmE5Y2Y1YzY5OWM4NTdlMjA4ZjQxMGMxYzNjMmI=
+    OTllZGE4NjkyNTdiMzkyZjYzNjhlNjBlOGIwNjA3ZGU2NGRjZDYzOWJiZTNi
+    MjNiNjRhZDVlY2FkMDk0Mzk2YjlkZmIwMGM0ZjM4NzUyNjhkOThiYmM2M2Ji
+    NzNhZDNlMjVkZjcxYWM2NjgyYjdhNDNhNGVmNzZhOGVlYTdjMDE=
   data.tar.gz: !binary |-
-    MTI2YTEwM2IzNTAwYmExNGE5MTE1NGUyNGQyNTFlNTFiMTA2NzEyYzNlZDYw
-    MzMzYzFmMTQ4NjY0ZWI2YmUxNGNkYWJlYWVlMjZiMzZmNDczOTU0NDJlZTM2
-    ODUzZGUxYWJkYTEyOGIwNDdlYTQzNjdmOWQyMmUzNWEzYzIyMDE=
+    ZTM0NDI5YmFkOTM3YjAzNWY2OWQ3Y2U0ODBlMDhhYzBiYzYzYWVjMzE0Njg1
+    NWI0ZDA4MmZhZDY2ODc1YTExYjIzYWYzZTM2OTFiOTNmNDNhYmJkZjU1ZGRl
+    MmZiNDY0NTIyODE1YzZlZGQwODM2MTZlMTA3MThlNGQ4N2I3ODE=

data/.travis.yml

@@ -1,10 +1,15 @@
+sudo: false
 language: ruby
+before_install:
+  - gem update bundler
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
+  - '1.8'
+  - '1.9'
+  - '2.0'
+  - '2.1'
+  - '2.2'
+  - '2.3.0'
   - jruby-18mode
   - jruby-19mode
   - ree
-script: "bundle exec rspec"
+script: bundle exec rspec

data/README.markdown

@@ -1,7 +1,7 @@
 # image_size
 
 measure image size using pure Ruby
-formats: `bmp`, `cur`, `gif`, `jpeg`, `ico`, `pbm`, `pcx`, `pgm`, `png`, `ppm`, `psd`, `swf`, `tiff`, `xbm`, `xpm`
+formats: `apng`, `bmp`, `cur`, `gif`, `jpeg`, `ico`, `mng`, `pbm`, `pcx`, `pgm`, `png`, `ppm`, `psd`, `swf`, `tiff`, `xbm`, `xpm`, `webp`
 
 [![Build Status](https://travis-ci.org/toy/image_size.png?branch=master)](https://travis-ci.org/toy/image_size)
 
@@ -13,14 +13,24 @@ The latest version of image\_size can be found at http://github.com/toy/image_si
 
     gem install image_size
 
+## Usage
+
+    image_size = ImageSize.path('spec/images/jpeg/320x240.jpeg')
+    image_size.format       #=> :jpec
+    image_size.width        #=> 320
+    image_size.height       #=> 240
+    image_size.size         #=> [320, 240]
+
+`width` and `height` have aliases `w` and `h`.
+
 ## Examples
 
     require 'image_size'
 
-    p ImageSize.path('spec/test.jpg').size
+    ImageSize.path('spec/test.jpg')
 
     open('spec/test.jpg', 'rb') do |fh|
-      p ImageSize.new(fh).size
+      ImageSize.new(fh)
     end
 
 
@@ -28,12 +38,12 @@ The latest version of image\_size can be found at http://github.com/toy/image_si
     require 'open-uri'
 
     open('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg', 'rb') do |fh|
-      p ImageSize.new(fh).size
+      ImageSize.new(fh)
     end
 
     open('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg', 'rb') do |fh|
       data = fh.read
-      p ImageSize.new(data).size
+      ImageSize.new(data)
     end
 
 ## Licence

data/image_size.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '1.4.2'
+  s.version     = '1.5.0'
   s.summary     = %q{Measure image size using pure Ruby}
-  s.description = %q{Measure following file dimensions: bmp, cur, gif, jpeg, ico, pbm, pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm}
+  s.description = %q{Measure following file dimensions: apng, bmp, cur, gif, jpeg, ico, mng, pbm, pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm, webp}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Keisuke Minami', 'Ivan Kuchin']
   s.license     = 'Ruby'

data/lib/image_size.rb

@@ -85,9 +85,7 @@ class ImageSize
 
   # get image width and height as an array which to_s method returns "#{width}x#{height}"
   def size
-    if format
-      Size.new([width, height])
-    end
+    Size.new([width, height]) if format
   end
 
 private
@@ -96,36 +94,59 @@ private
   def detect_format(ir)
     head = ir[0, 1024]
     case
-    when head =~ /^GIF8[7,9]a/              then :gif
-    when head[0, 8] == "\211PNG\r\n\032\n"  then :png
+    when head[0, 6] =~ /GIF8[79]a/          then :gif
+    when head[0, 8] == "\211PNG\r\n\032\n"  then detect_png_type(ir)
+    when head[0, 8] == "\212MNG\r\n\032\n"  then :mng
     when head[0, 2] == "\377\330"           then :jpeg
     when head[0, 2] == 'BM'                 then :bmp
-    when head =~ /^P[1-7]/                  then :ppm
+    when head[0, 2] =~ /P[1-7]/             then :ppm
     when head =~ /\#define\s+\S+\s+\d+/     then :xbm
     when head[0, 4] == "II*\000"            then :tiff
     when head[0, 4] == "MM\000*"            then :tiff
     when head =~ /\/\* XPM \*\//            then :xpm
     when head[0, 4] == '8BPS'               then :psd
-    when head =~ /^[FC]WS/                  then :swf
+    when head[0, 3] =~ /[FC]WS/             then :swf
     when head[SVG_R] ||
       head =~ /<\?xml|<!--/ && ir[0, 4096][SVG_R]
                                             then :svg
     when head[0, 2] =~ /\n[\000-\005]/      then :pcx
+    when head[0, 12] =~ /RIFF(?m:....)WEBP/ then :webp
     when head[0, 4] == "\000\000\001\000"   then :ico
     when head[0, 4] == "\000\000\002\000"   then :cur
     end
   end
 
+  def detect_png_type(ir)
+    offset = 8
+    loop do
+      type = ir[offset + 4, 4]
+      break if ['IDAT', 'IEND', nil].include?(type)
+      return :apng if type == 'acTL'
+
+      length = ir[offset, 4].unpack('N')[0]
+      offset += 8 + length + 4
+    end
+    :png
+  end
+
   def size_of_gif(ir)
     ir[6, 4].unpack('vv')
   end
 
+  def size_of_mng(ir)
+    unless ir[12, 4] == 'MHDR'
+      raise FormatError, 'MHDR not in place for MNG'
+    end
+    ir[16, 8].unpack('NN')
+  end
+
   def size_of_png(ir)
     unless ir[12, 4] == 'IHDR'
       raise FormatError, 'IHDR not in place for PNG'
     end
     ir[16, 8].unpack('NN')
   end
+  alias_method :size_of_apng, :size_of_png
 
   JpegCodeCheck = [
     "\xc0", "\xc1", "\xc2", "\xc3",
@@ -241,7 +262,6 @@ private
     [(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|
@@ -268,4 +288,17 @@ private
     ir[6, 2].unpack('CC').map{ |v| v.zero? ? 256 : v }
   end
   alias_method :size_of_cur, :size_of_ico
+
+  def size_of_webp(ir)
+    case ir[12, 4]
+    when 'VP8 '
+      ir[26, 4].unpack('vv').map{ |v| v & 0x3fff }
+    when 'VP8L'
+      n = ir[21, 4].unpack('V')[0]
+      [(n & 0x3fff) + 1, (n >> 14 & 0x3fff) + 1]
+    when 'VP8X'
+      w16, w8, h16, h8 = ir[24, 6].unpack('vCvC')
+      [(w16 | w8 << 16) + 1, (h16 | h8 << 16) + 1]
+    end
+  end
 end

data/spec/image_size_spec.rb

@@ -1,70 +1,51 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rspec'
 require 'image_size'
 
 describe ImageSize do
-  [
-    ['test2.bmp', :bmp,  42,  50],
-    ['test3b.bmp',:bmp,  42,  50],
-    ['test3t.bmp',:bmp,  42,  50],
-    ['test.gif',  :gif, 668, 481],
-    ['test.jpg', :jpeg, 320, 240],
-    ['test2.jpg',:jpeg, 320, 240],
-    ['test.pbm',  :pbm,  85,  55],
-    ['test.pcx',  :pcx,  70,  60],
-    ['test.pgm',  :pgm,  90,  55],
-    ['test.png',  :png, 640, 532],
-    ['test.psd',  :psd,  16,  20],
-    ['test.swf',  :swf, 450, 200],
-    ['test.tif', :tiff,  48,  64],
-    ['test.xbm',  :xbm,  16,  32],
-    ['test.xpm',  :xpm,  24,  32],
-    ['test.svg',  :svg,  72, 100],
-    ['test.ico',  :ico, 256,  27],
-    ['test.cur',  :cur,  50, 256],
-    ['image_size_spec.rb', nil, nil, nil],
-  ].each do |name, format, width, height|
-    path = File.join(File.dirname(__FILE__), name)
-    file_data = File.open(path, 'rb', &:read)
+  (Dir['spec/images/*/*.*'] + [__FILE__]).each do |path|
+    name = File.basename(path)
+    match = /(\d+)x(\d+)\.([^.]+)$/.match(name)
+    width, height, format = match[1].to_i, match[2].to_i, match[3].to_sym if match
+    data = File.open(path, 'rb', &:read)
 
-    it "should get format and dimensions for #{name} given IO" do
+    it "gets format and dimensions of #{name} given as IO" do
       File.open(path, 'rb') do |fh|
         is = ImageSize.new(fh)
         expect([is.format, is.width, is.height]).to eq([format, width, height])
         expect(fh).not_to be_closed
         fh.rewind
-        expect(fh.read).to eq(file_data)
+        expect(fh.read).to eq(data)
       end
     end
 
-    it "should get format and dimensions for #{name} given StringIO" do
-      io = StringIO.new(file_data)
+    it "gets format and dimensions of #{name} given as StringIO" do
+      io = StringIO.new(data)
       is = ImageSize.new(io)
       expect([is.format, is.width, is.height]).to eq([format, width, height])
       expect(io).not_to be_closed
       io.rewind
-      expect(io.read).to eq(file_data)
+      expect(io.read).to eq(data)
     end
 
-    it "should get format and dimensions for #{name} given file data" do
-      is = ImageSize.new(file_data)
+    it "gets format and dimensions of #{name} given as data" do
+      is = ImageSize.new(data)
       expect([is.format, is.width, is.height]).to eq([format, width, height])
     end
 
-    it "should get format and dimensions for #{name} given Tempfile" do
+    it "gets format and dimensions of #{name} given as Tempfile" do
       Tempfile.open(name) do |tf|
         tf.binmode
-        tf.write(file_data)
+        tf.write(data)
         tf.rewind
         is = ImageSize.new(tf)
         expect([is.format, is.width, is.height]).to eq([format, width, height])
         expect(tf).not_to be_closed
         tf.rewind
-        expect(tf.read).to eq(file_data)
+        expect(tf.read).to eq(data)
       end
     end
 
-    it "should get format and dimensions for #{name} given IO when run twice" do
+    it "gets format and dimensions of #{name} given as IO when run twice" do
       File.open(path, 'rb') do |fh|
         is = ImageSize.new(fh)
         expect([is.format, is.width, is.height]).to eq([format, width, height])
@@ -73,13 +54,13 @@ describe ImageSize do
       end
     end
 
-    it "should get format and dimensions for #{name} as path" do
+    it "gets format and dimensions of #{name} as path" do
       is = ImageSize.path(path)
       expect([is.format, is.width, is.height]).to eq([format, width, height])
     end
   end
 
-  it "should raise ArgumentError if argument is not valid" do
+  it "raises ArgumentError if argument is not valid" do
     expect {
       ImageSize.new(Object)
     }.to raise_error(ArgumentError)
@@ -89,7 +70,7 @@ describe ImageSize do
     :png => "\211PNG\r\n\032\n",
     :jpeg => "\377\330",
   }.each do |type, data|
-    it "should raise FormatError if invalid #{type} given" do
+    it "raises FormatError if invalid #{type} given" do
       expect {
         ImageSize.new(data)
       }.to raise_error(ImageSize::FormatError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -25,8 +25,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-description: ! 'Measure following file dimensions: bmp, cur, gif, jpeg, ico, pbm,
-  pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm'
+description: ! 'Measure following file dimensions: apng, bmp, cur, gif, jpeg, ico,
+  mng, pbm, pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm, webp'
 email: 
 executables: []
 extensions: []
@@ -39,24 +39,29 @@ files:
 - image_size.gemspec
 - lib/image_size.rb
 - spec/image_size_spec.rb
-- spec/test.cur
-- spec/test.gif
-- spec/test.ico
-- spec/test.jpg
-- spec/test.pbm
-- spec/test.pcx
-- spec/test.pgm
-- spec/test.png
-- spec/test.psd
-- spec/test.svg
-- spec/test.swf
-- spec/test.tif
-- spec/test.xbm
-- spec/test.xpm
-- spec/test2.bmp
-- spec/test2.jpg
-- spec/test3b.bmp
-- spec/test3t.bmp
+- spec/images/apng/192x110.apng
+- spec/images/bmp/v2.42x50.bmp
+- spec/images/bmp/v3-bottom2top.42x50.bmp
+- spec/images/bmp/v3-top2bottom.42x50.bmp
+- spec/images/cur/50x256.cur
+- spec/images/gif/668x481.gif
+- spec/images/ico/256x27.ico
+- spec/images/jpeg/320x240.jpeg
+- spec/images/jpeg/extraneous-bytes.320x240.jpeg
+- spec/images/mng/612x132.mng
+- spec/images/pbm/85x55.pbm
+- spec/images/pcx/70x60.pcx
+- spec/images/pgm/90x55.pgm
+- spec/images/png/640x532.png
+- spec/images/psd/16x20.psd
+- spec/images/svg/72x100.svg
+- spec/images/swf/450x200.swf
+- spec/images/tiff/48x64.tiff
+- spec/images/webp/extended.16x32.webp
+- spec/images/webp/lossless.16x32.webp
+- spec/images/webp/lossy.16x32.webp
+- spec/images/xbm/16x32.xbm
+- spec/images/xpm/24x32.xpm
 homepage: http://github.com/toy/image_size
 licenses:
 - Ruby
@@ -77,28 +82,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: image_size
-rubygems_version: 2.4.7
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Measure image size using pure Ruby
 test_files:
 - spec/image_size_spec.rb
-- spec/test.cur
-- spec/test.gif
-- spec/test.ico
-- spec/test.jpg
-- spec/test.pbm
-- spec/test.pcx
-- spec/test.pgm
-- spec/test.png
-- spec/test.psd
-- spec/test.svg
-- spec/test.swf
-- spec/test.tif
-- spec/test.xbm
-- spec/test.xpm
-- spec/test2.bmp
-- spec/test2.jpg
-- spec/test3b.bmp
-- spec/test3t.bmp
+- spec/images/apng/192x110.apng
+- spec/images/bmp/v2.42x50.bmp
+- spec/images/bmp/v3-bottom2top.42x50.bmp
+- spec/images/bmp/v3-top2bottom.42x50.bmp
+- spec/images/cur/50x256.cur
+- spec/images/gif/668x481.gif
+- spec/images/ico/256x27.ico
+- spec/images/jpeg/320x240.jpeg
+- spec/images/jpeg/extraneous-bytes.320x240.jpeg
+- spec/images/mng/612x132.mng
+- spec/images/pbm/85x55.pbm
+- spec/images/pcx/70x60.pcx
+- spec/images/pgm/90x55.pgm
+- spec/images/png/640x532.png
+- spec/images/psd/16x20.psd
+- spec/images/svg/72x100.svg
+- spec/images/swf/450x200.swf
+- spec/images/tiff/48x64.tiff
+- spec/images/webp/extended.16x32.webp
+- spec/images/webp/lossless.16x32.webp
+- spec/images/webp/lossy.16x32.webp
+- spec/images/xbm/16x32.xbm
+- spec/images/xpm/24x32.xpm
 has_rdoc: