image_size 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2ZmMGNhMjllMTRhOGVkMDc3MjA4OTM2NGFkZjQxN2MyN2QwNTUzNQ==
+    NjNlM2Y5M2U0NTk4M2NjNGQ2MWM2OWZjYjVmMWJkODcxZTVhYjI4Mg==
   data.tar.gz: !binary |-
-    NGIwMDQ0ZGY0ZjY5MmIxNmExYjJkNzU2OTZjMjJiNWI2MjEyOWZhOQ==
+    YjY0NTc4ZDRjNjkwNWFlZmM5NDk1NmIwYWFjYjI1YzkyOGU2N2Q5Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjQ1NDBhMzk0YjAzM2QwMzgyOWU3NTA2OGI5ZjNmZGQwZTllYzExN2E4MGFj
-    YmE5ZGM0ZDhkZmQ1MDA0Nzk2NjBlZDhhNTZlYWUzYWNlNzFkMWYxYTgzMjc5
-    ZDE1Njc1NmZmNWRmYmNlNzVkZjdiZmEyZDg3OTgxNTI0MTExNzE=
+    Y2MzNzhhOWNhOTY5ZjM2NDk0MDE5MTUzNzkwNWYyZjVkYjEwNGQ1MThkMGYw
+    OWY3MWRlMGY1ODgyMTk5MzRiNDExZDIyOWVkZjQzNjkxNGMyNGVlNzI3MGY0
+    ODhjMzA1OTljNWQyYmYxM2JlODVjY2ZmNGM3YmY1NjM5ZjNhYzE=
   data.tar.gz: !binary |-
-    NGM0ZTM1ZjRkYzlkMjcyMmM0MTU4NjkxZTA3MGMzM2E4ZmUzN2I5ODExYWE5
-    NTUwYWM4NzhlNmE4ZDNkMWEwMTYxNjIzOGFiMmM5NGJlNzM1NTNmYzYzNzE3
-    MzA3YjFmZmVlM2I1YWFhYzdhYWU4ZDI1MWZiMzQ1MWRhY2UzZDk=
+    YTY1NTEwZmZmYWQ2Njk5ZWUyZWU2OWEyODlmZDAwYWJhN2UzMWZmMTkyOTk2
+    M2Y5YTE4N2YwZmIzNjQ5NzZlMzBmZGFjNTE0MmQwNTdlYzgyN2ZjODllZDdj
+    NmQxYzYzZjBkYjAyOGI1MTAzMGVhM2UxMDk2YTYxMzRiMWFlZDQ=

data/.gitignore

@@ -6,6 +6,7 @@
 /.yardoc/
 /coverage/
 
+Gemfile.lock
 Makefile
 *.o
 *.bundle

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ree
+script: "bundle exec rspec"

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/README.markdown

@@ -3,6 +3,8 @@
 measure image size using pure Ruby
 formats: `bmp`, `gif`, `jpeg`, `pbm`, `pcx`, `pgm`, `png`, `ppm`, `psd`, `swf`, `tiff`, `xbm`, `xpm`
 
+[![Build Status](https://travis-ci.org/toy/image_size.png?branch=master)](https://travis-ci.org/toy/image_size)
+
 ## Download
 
 The latest version of image\_size can be found at http://github.com/toy/image_size

data/image_size.gemspec

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

@@ -25,8 +25,9 @@ class ImageSize
       @data = ''
     end
 
-    def rewind
+    def close
       @io.rewind
+      @io.close if IO === @io
     end
 
     CHUNK = 1024
@@ -55,7 +56,7 @@ class ImageSize
     if @format = detect_format(ir)
       @width, @height = self.send("size_of_#{@format}", ir)
     end
-    ir.rewind
+    ir.close
   end
 
   # Image format

data/spec/image_size_spec.rb

@@ -19,35 +19,42 @@ describe ImageSize do
     ['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)
 
     it "should get format and dimensions for #{name} given IO" do
       File.open(path, 'rb') do |fh|
         is = ImageSize.new(fh)
         [is.format, is.width, is.height].should == [format, width, height]
+        fh.should_not be_closed
+        fh.rewind
+        fh.read.should == file_data
       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
+      io = StringIO.new(file_data)
+      is = ImageSize.new(io)
+      [is.format, is.width, is.height].should == [format, width, height]
+      io.should_not be_closed
+      io.rewind
+      io.read.should == file_data
     end
 
     it "should get format and dimensions for #{name} given file data" do
-      File.open(path, 'rb') do |fh|
-        is = ImageSize.new(fh.read)
-        [is.format, is.width, is.height].should == [format, width, height]
-      end
+      is = ImageSize.new(file_data)
+      [is.format, is.width, is.height].should == [format, width, height]
     end
 
     it "should get format and dimensions for #{name} given Tempfile" do
-      file_data = File.open(path, 'rb') { |fh| fh.read }
       Tempfile.open(name) do |tf|
+        tf.binmode
         tf.write(file_data)
         tf.rewind
         is = ImageSize.new(tf)
         [is.format, is.width, is.height].should == [format, width, height]
+        tf.should_not be_closed
+        tf.rewind
+        tf.read.should == file_data
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -33,6 +33,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- Gemfile
 - README.markdown
 - image_size.gemspec
 - lib/image_size.rb