image_size 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2YyMGZmNzllODAzMjlhMzRlYWNhZTBkOWQ3OWRlODViMmY4YTliNA==
+    YmNlNjk3NjQ1N2ZjYzFiOTc5MjU5N2ZhY2JlNjI4M2ZlNTUwNTA0Mg==
   data.tar.gz: !binary |-
-    ZTk0OGE4ZjczNmIwZjc2NTMwNzYxZjNjZDQxYjI0ZjU2YTJhOTk0Yw==
+    ODQ2MTBiYTg4ZjA1ZTZjZDVjM2ZiNzc1NWQ5ODYxZTgyNmUwNjM4OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGExOWMzZTU1NzM5NTUxMzIzNzc4ZmUxNGU2MGEzMmU5YzMzOTdjOGQyNWVl
-    ZTVjZGYzYTM4ZmM3ZmViYTU5NTE3MzE0ZjUwMDgwNjJmMmQzMTkyMmE0M2E0
-    MjA3MzBhY2QxMzAyNGQ2YmU5ZGY4YjlkNGY0YWMyOGJjZWYzYWY=
+    ZDA3NTQ4YzdkMTRjZmRiNGIxZTdkN2QxNTI5N2I3YzBkZWI5NjU3ODQ3ZmQz
+    Y2M4NDkxMTgxODQ1MGI4MzhlZWI0NjE0MmY2NTQyN2ZkNjgzMzUxNTIwYTYw
+    YWU1MThhYWYzZmUzMTMxZGMxOTFmY2FmMTQzNmQ0YTI3MzRmZjU=
   data.tar.gz: !binary |-
-    NGJkZWUxODAyMWYzODQ4NjJjNjczZGE4MGUxOTYzNjlkZmJhOWZkNTJiYWQ3
-    MzUyNjk0NzZlZjAwNDc2YmE3YmZlOTVjMWNiMjIwNjBiMzFiYTdjM2M5ODk3
-    NGNlNjUxNTk2MmI4ZTA4NzQwMzlmNmQyYzA1YjZkYTVlYjM4YWE=
+    MGViZWJmNTY3ZTA1ZWJkNjcyMjE5YjQ0ZTViMTkxNzA4NmY3ZmU2MjkyNzJj
+    MjM0YzUyNjkyODRhZWY1YmY1MTBjOWVmZWZmNDgzMGZlMjg4OTg0ZDY0NTUx
+    ZDM3MzZkMWFjMTE1N2YwMGFjMWNmNDY0ZGRjYWJiMDg2NDFkZTY=

data/image_size.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '1.2.0'
+  s.version     = '1.3.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

@@ -4,6 +4,8 @@ require 'stringio'
 require 'tempfile'
 
 class ImageSize
+  class FormatError < StandardError; end
+
   class Size < Array
     # join using 'x'
     def to_s
@@ -118,7 +120,7 @@ private
 
   def size_of_png(ir)
     unless ir[12, 4] == 'IHDR'
-      raise 'IHDR not in place for PNG'
+      raise FormatError, 'IHDR not in place for PNG'
     end
     ir[16, 8].unpack('NN')
   end
@@ -135,7 +137,7 @@ private
     loop do
       marker, code, length = ir[offset, 4].unpack('aan')
       offset += 4
-      raise 'JPEG marker not found' if marker != section_marker
+      raise FormatError, 'JPEG marker not found' if marker != section_marker
 
       if JpegCodeCheck.include?(code)
         return ir[offset + 1, 4].unpack('nn').reverse
@@ -179,7 +181,7 @@ private
     length = 1024
     until (data = ir[0, length]) =~ /"\s*(\d+)\s+(\d+)(\s+\d+\s+\d+){1,2}\s*"/m
       if data.length != length
-        raise 'XPM size not found'
+        raise FormatError, 'XPM size not found'
       end
       length += 1024
     end
@@ -203,7 +205,7 @@ private
     width = height = nil
     until width && height
       ifd = ir[offset, 12]
-      raise 'Reached end of directory entries in TIFF' if ifd.nil? || offset > num_dirent
+      raise FormatError, 'Reached end of directory entries in TIFF' if ifd.nil? || offset > num_dirent
       tag, type = ifd.unpack(endian2b * 2)
       offset += 12
 

data/spec/image_size_spec.rb

@@ -81,4 +81,15 @@ describe ImageSize do
       ImageSize.new(Object)
     }.should raise_error(ArgumentError)
   end
+
+  {
+    :png => "\211PNG\r\n\032\n",
+    :jpeg => "\377\330",
+  }.each do |type, data|
+    it "should raise FormatError if invalid #{type} given" do
+      lambda {
+        ImageSize.new(data)
+      }.should raise_error(ImageSize::FormatError)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec