image_size 1.0.5 → 1.0.6

data/.tmignore

@@ -0,0 +1 @@
+/spec/test.*

data/image_size.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '1.0.5'
+  s.version     = '1.0.6'
   s.summary     = %q{Measure image size using pure Ruby}
   s.description = %q{Measure following file dimensions: PCX, PSD, XPM, TIFF, XBM, PGM, PBM, PPM, BMP, JPEG, PNG, GIF, SWF}
   s.homepage    = "http://github.com/toy/#{s.name}"

data/lib/image_size.rb

@@ -1,39 +1,30 @@
 require 'stringio'
 
 class ImageSize
-  JpegCodeCheck = [
-    "\xc0", "\xc1", "\xc2", "\xc3",
-    "\xc5", "\xc6", "\xc7",
-    "\xc9", "\xca", "\xcb",
-    "\xcd", "\xce", "\xcf",
-  ]
-
   attr_reader :format, :width, :height
 
   # receive image & make size
   # argument is image String, StringIO or IO
   def initialize(data)
-    @data = data.dup
-
-    if @data.is_a?(IO)
-      img_top = @data.read(1024)
-      img_io = def_read_o(@data)
-    elsif @data.is_a?(StringIO)
-      img_top = @data.read(1024)
-      img_io = def_read_o(@data)
-    elsif @data.is_a?(String)
-      img_top = @data[0, 1024]
-      img_io = StringIO.open(@data)
+    data = data.dup
+
+    case data
+    when IO, StringIO
+      img_top = data.read(1024)
+      img_io = def_read_o(data)
+    when String
+      img_top = data[0, 1024]
+      img_io = StringIO.open(data)
       img_io = def_read_o(img_io)
     else
-      raise "argument class error!! #{data.class}"
+      raise ArgumentError.new("expected instance of IO, StringIO or String, got #{data.class}")
     end
 
     if @format = check_format(img_top)
       @width, @height = self.send("measure_#{@format}", img_io)
     end
 
-    if @data.is_a?(String)
+    if data.is_a?(String)
       img_io.close
     end
   end
@@ -96,6 +87,12 @@ private
     img_io.read_o(8).unpack('NN')
   end
 
+  JpegCodeCheck = [
+    "\xc0", "\xc1", "\xc2", "\xc3",
+    "\xc5", "\xc6", "\xc7",
+    "\xc9", "\xca", "\xcb",
+    "\xcd", "\xce", "\xcf",
+  ]
   def measure_jpeg(img_io)
     c_marker = "\xFF"   # Section marker.
     img_io.read_o(2)

data/spec/image_size_spec.rb

@@ -27,6 +27,13 @@ describe ImageSize do
       end
     end
 
+    it "should get format and dimensions for #{name} given StringIO" do
+      File.open(path, 'rb') do |fh|
+        is = ImageSize.new(StringIO.new(fh.read))
+        [is.format, is.width, is.height].should == [format, width, height]
+      end
+    end
+
     it "should get format and dimensions for #{name} given file data" do
       File.open(path, 'rb') do |fh|
         is = ImageSize.new(fh.read)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_size
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-04 00:00:00 Z
+date: 2012-02-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -42,6 +42,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .tmignore
 - README.markdown
 - image_size.gemspec
 - lib/image_size.rb