image_size 1.5.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTIzODU3ZDBhYTI5M2MyOGZjOGFhY2FjNzAxYWVhOWUwM2Q4YWQyYw==
-  data.tar.gz: !binary |-
-    N2VmMzkwMWFmNzY5NmM5YTY0NTJmOWU5ZDlkMDBiYTlmYTA0NDY3Yg==
+SHA256:
+  metadata.gz: 82a7fbf13124c2d0472d5da0f7d210ef83519dcde8927ec9db13954cf3f3d44c
+  data.tar.gz: 5b77e47649b9632ec16b882397d367343d61750884ab9642170150ec43f9895c
 SHA512:
-  metadata.gz: !binary |-
-    OTllZGE4NjkyNTdiMzkyZjYzNjhlNjBlOGIwNjA3ZGU2NGRjZDYzOWJiZTNi
-    MjNiNjRhZDVlY2FkMDk0Mzk2YjlkZmIwMGM0ZjM4NzUyNjhkOThiYmM2M2Ji
-    NzNhZDNlMjVkZjcxYWM2NjgyYjdhNDNhNGVmNzZhOGVlYTdjMDE=
-  data.tar.gz: !binary |-
-    ZTM0NDI5YmFkOTM3YjAzNWY2OWQ3Y2U0ODBlMDhhYzBiYzYzYWVjMzE0Njg1
-    NWI0ZDA4MmZhZDY2ODc1YTExYjIzYWYzZTM2OTFiOTNmNDNhYmJkZjU1ZGRl
-    MmZiNDY0NTIyODE1YzZlZGQwODM2MTZlMTA3MThlNGQ4N2I3ODE=
+  metadata.gz: f1e666a5911f31b8b3d44cf94ab3223621561026f6701e43e8db39e3d36761641a6f8122cdcd9bff18740a50679ebec593de7b73dd5ea36309d4688f7926f29e
+  data.tar.gz: 6322a3aa7488e76f2cd26ef0eb83492269165ba4948a2f888bf935d48ccba86d20f0fb306252ed0dc1af5e5adce11442edb70586331b40070fec866d46ae36e1

data/.rubocop.yml

@@ -0,0 +1,61 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - '*.gemspec'
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+  EnforcedStyleForEmptyBraces: no_space
+
+Lint/PercentStringArray: # broken in rubocop 0.55.0
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Enabled: false
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/EmptyCaseCondition:
+  Enabled: false
+
+Style/Encoding:
+  Enabled: false
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma

data/.rubocop_todo.yml

@@ -0,0 +1,25 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-04-23 23:58:18 +0200 using RuboCop version 0.55.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 6
+Metrics/AbcSize:
+  Max: 41
+
+# Offense count: 3
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 20
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+  Exclude:
+    - 'lib/image_size.rb'

data/.travis.yml

@@ -3,13 +3,22 @@ language: ruby
 before_install:
   - gem update bundler
 rvm:
-  - '1.8'
-  - '1.9'
-  - '2.0'
-  - '2.1'
-  - '2.2'
-  - '2.3.0'
-  - jruby-18mode
-  - jruby-19mode
-  - ree
+  - '1.8.7-p371'
+  - '1.9.3-p551'
+  - '2.0.0-p648'
+  - '2.1.10'
+  - '2.2.10'
+  - '2.3.7'
+  - '2.4.4'
+  - '2.5.1'
+  - 'jruby-9.0.5.0'
+  - 'jruby-9.1.9.0'
 script: bundle exec rspec
+matrix:
+  include:
+    - env: RUBOCOP=✓
+      rvm: '2.4.4'
+      script: bundle exec rubocop
+    - env: CHECK_RUBIES=✓
+      rvm: '2.4.4'
+      script: bundle exec travis_check_rubies

data/CHANGELOG.markdown

@@ -0,0 +1,104 @@
+# ChangeLog
+
+## unreleased
+
+## v2.0.0 (2018-05-01)
+
+* Allow any class responding to `read` and `eof?` to be passed to `ImageSize` [@toy](https://github.com/toy)
+* Introduce `rubocop` [@toy](https://github.com/toy)
+* Use `File.open` instead of `Kernel#open` [@toy](https://github.com/toy)
+* Don’t rewind `IO` before or after usage [@toy](https://github.com/toy)
+* Enhance readme [@toy](https://github.com/toy)
+
+## v1.5.0 (2016-11-20)
+
+* Support `WEBP` images [@toy](https://github.com/toy)
+* Cleanup `GIF`, `PPM` and `SWF` magic number matching [@toy](https://github.com/toy)
+* Fix `GIF` magic number (matched `GIF8,a`) [@toy](https://github.com/toy)
+* Detect `APNG` images by `acTL` chunk [@toy](https://github.com/toy)
+* Support `MNG` images [@toy](https://github.com/toy)
+
+## v1.4.2 (2016-02-18)
+
+* Fixed license in gemspec to be Ruby [#10](https://github.com/toy/image_size/issues/10) [@toy](https://github.com/toy)
+
+## v1.4.1 (2014-11-19)
+
+* Missed `ICO` and `CUR` in description [@toy](https://github.com/toy)
+
+## v1.4.0 (2014-11-19)
+
+* Detecting `ICO` and `CUR` images [@toy](https://github.com/toy)
+
+## v1.3.1 (2014-06-24)
+
+* Fix reading `JPEGs` with extraneous bytes [@toy](https://github.com/toy)
+
+## v1.3.0 (2014-04-06)
+
+* Raise `FormatError` instead of `RuntimeError` [@toy](https://github.com/toy)
+
+## v1.2.0 (2014-02-01)
+
+* Basic handling of `SVG` (only width and height attributes) [@toy](https://github.com/toy)
+* Enhance matching `PCX` [@toy](https://github.com/toy)
+
+## v1.1.5 (2013-12-23)
+
+* Fix reading dimensions of `BMP v2` and `BMP v3` [@toy](https://github.com/toy)
+* Fix swapped `PSD` width (columns) and height (rows) [#9](https://github.com/toy/image_size/issues/9) [@toy](https://github.com/toy)
+* Replace square test images with rectangle ones [@toy](https://github.com/toy)
+
+## v1.1.4 (2013-11-05)
+
+* Close instead of only rewinding `IO` instances [@toy](https://github.com/toy)
+* Add `.travis.yml` and supporting files [#8](https://github.com/toy/image_size/pull/8) [@petergoldstein](https://github.com/petergoldstein)
+
+## v1.1.3 (2013-07-24)
+
+* Enforce binary encoding of data returned by `ImageReader#[]` [#6](https://github.com/toy/image_size/issues/6) [@toy](https://github.com/toy)
+
+## v1.1.2 (2013-02-24)
+
+* Explicitly set encoding to `ASCII-8BIT` as for `ruby2.0.0-p0` it will be `UTF-8` by default [#5](https://github.com/toy/image_size/pull/5) [@walf443](https://github.com/walf443)
+
+## v1.1.1 (2012-06-19)
+
+* Fix exception in message for exception [#3](https://github.com/toy/image_size/pull/3) [@yachi](https://github.com/yachi)
+
+## v1.1.0 (2012-02-25)
+
+* Rework most code [@toy](https://github.com/toy)
+* `Size` class instead of dynamically adding `to_s` method to size array [@toy](https://github.com/toy)
+* `ImageSize.path`, more examples [@toy](https://github.com/toy)
+* Added support for `Tempfile`, as well as fixed bug when running `ImageSize` on the same `IO` stream twice [#2](https://github.com/toy/image_size/pull/2) [@kanevski](https://github.com/kanevski)
+
+## v1.0.6 (2012-02-08)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v1.0.5 (2012-02-04)
+
+* Fix getting `SWF` dimensions for ruby 1.9 [@toy](https://github.com/toy)
+* Fix determining `PCX` for ruby1.9 [@toy](https://github.com/toy)
+* Enhance `SWF` checking [@toy](https://github.com/toy)
+
+## v1.0.4 (2011-12-16)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v1.0.3 (2011-02-21)
+
+* Fix permissions on `lib/image_size.rb` from `700` to `644` [#1](https://github.com/toy/image_size/issues/1) [@toy](https://github.com/toy)
+
+## v1.0.2 (2010-12-15)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v1.0.1 (2010-12-15)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v1.0.0 (2010-11-01)
+
+* Initial commit [@toy](https://github.com/toy)

data/Gemfile

@@ -1,3 +1,7 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
+
+if RUBY_VERSION >= '2.0'
+  gem 'travis_check_rubies', '~> 0.2'
+end

data/README.markdown

@@ -1,50 +1,87 @@
+[![Gem Version](https://img.shields.io/gem/v/image_size.svg?style=flat)](https://rubygems.org/gems/image_size)
+[![Build Status](https://img.shields.io/travis/toy/image_size/master.svg?style=flat)](https://travis-ci.org/toy/image_size)
+
 # image_size
 
 measure image size using pure Ruby
 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)
+## Installation
 
-## Download
+```sh
+gem install image_size
+```
 
-The latest version of image\_size can be found at http://github.com/toy/image_size
+### Bundler
 
-## Installation
+Add to your `Gemfile`:
 
-    gem install image_size
+```ruby
+gem 'image_size', '~> 2.0'
+```
 
 ## 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]
+```ruby
+image_size = ImageSize.path('spec/test.jpg')
+
+image_size.format       #=> :jpec
+image_size.width        #=> 320
+image_size.height       #=> 240
+image_size.w            #=> 320
+image_size.h            #=> 240
+image_size.size         #=> [320, 240]
+```
+
+Or using `IO` object:
+
+```ruby
+image_size = File.open('spec/test.jpg', 'rb'){ |fh| ImageSize.new(fh) }
+```
+
+Any object responding to `read` and `eof?`:
+
+```ruby
+require 'image_size'
+
+image_size = ImageSize.new(ARGF)
+```
+
+Works with `open-uri` if needed:
 
-`width` and `height` have aliases `w` and `h`.
+```ruby
+require 'image_size'
+require 'open-uri'
 
-## Examples
+image_size = URI.parse('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg').open('rb') do |fh|
+  ImageSize.new(fh)
+end
 
-    require 'image_size'
+image_size = open('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg', 'rb') do |fh|
+  ImageSize.new(fh)
+end
+```
 
-    ImageSize.path('spec/test.jpg')
+Note that starting with version `2.0.0` the object given to `ImageSize` will not be rewound before or after use.
+So rewind if needed before passing to `ImageSize` and/or rewind after passing to `ImageSize` before reading data.
 
-    open('spec/test.jpg', 'rb') do |fh|
-      ImageSize.new(fh)
-    end
+```ruby
+require 'image_size'
 
+File.open('spec/test.jpg', 'rb') do |fh|
+  image_size = ImageSize.new(fh)
 
-    require 'image_size'
-    require 'open-uri'
+  fh.rewind
+  data = fh.read
+end
 
-    open('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg', 'rb') do |fh|
-      ImageSize.new(fh)
-    end
+File.open('spec/test.jpg', 'rb') do |fh|
+  data = fh.read
+  fh.rewind
 
-    open('http://www.rubycgi.org/image/ruby_gtk_book_title.jpg', 'rb') do |fh|
-      data = fh.read
-      ImageSize.new(data)
-    end
+  image_size = ImageSize.new(fh)
+end
+```
 
 ## Licence
 
@@ -53,3 +90,4 @@ This code is free to use under the terms of the Ruby's licence.
 ## Contact
 
 Original author: "Keisuke Minami": mailto:keisuke@rccn.com
+Further development by Ivan Kuchin https://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.5.0'
+  s.version     = '2.0.0'
   s.summary     = %q{Measure image size using pure Ruby}
   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}"
@@ -17,4 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_development_dependency 'rspec', '~> 3.0'
+  if RUBY_VERSION >= '2.1'
+    s.add_development_dependency 'rubocop', '~> 0.55'
+  end
 end

data/lib/image_size.rb

@@ -1,11 +1,12 @@
-# -- coding: ASCII-8BIT --
-#
+# encoding: BINARY
+
 require 'stringio'
-require 'tempfile'
 
+# Determine image format and size
 class ImageSize
   class FormatError < StandardError; end
 
+  # Array joining with 'x'
   class Size < Array
     # join using 'x'
     def to_s
@@ -16,33 +17,23 @@ class ImageSize
   class ImageReader # :nodoc:
     attr_reader :data
     def initialize(data_or_io)
-      @io = case data_or_io
-      when IO, StringIO, Tempfile
-        data_or_io.dup.tap(&:rewind)
-      when String
+      @io = if data_or_io.is_a?(String)
         StringIO.new(data_or_io)
+      elsif data_or_io.respond_to?(:read) && data_or_io.respond_to?(:eof?)
+        data_or_io
       else
-        raise ArgumentError.new("expected instance of IO, StringIO, Tempfile or String, got #{data_or_io.class}")
+        raise ArgumentError, "expected data as String or an object responding to read and eof?, got #{data_or_io.class}"
       end
-      @read = 0
       @data = ''
     end
 
-    def close
-      @io.rewind
-      @io.close if IO === @io
-    end
-
     CHUNK = 1024
     def [](offset, length)
-      while offset + length > @read
-        @read += CHUNK
-        if data = @io.read(CHUNK)
-          if data.respond_to?(:encoding)
-            data.force_encoding(@data.encoding)
-          end
-          @data << data
-        end
+      while !@io.eof? && @data.length < offset + length
+        data = @io.read(CHUNK)
+        break unless data
+        data.force_encoding(@data.encoding) if data.respond_to?(:encoding)
+        @data << data
       end
       @data[offset, length]
     end
@@ -50,7 +41,7 @@ class ImageSize
 
   # Given path to image finds its format, width and height
   def self.path(path)
-    open(path, 'rb'){ |f| new(f) }
+    File.open(path, 'rb'){ |f| new(f) }
   end
 
   # Used for svg
@@ -63,13 +54,12 @@ class ImageSize
     @dpi = dpi.to_f
   end
 
-  # Given image as IO, StringIO, Tempfile or String finds its format and dimensions
+  # Given image as any class responding to read and eof? or data as String, finds its format and dimensions
   def initialize(data)
     ir = ImageReader.new(data)
-    if @format = detect_format(ir)
-      @width, @height = self.send("size_of_#{@format}", ir)
-    end
-    ir.close
+    @format = detect_format(ir)
+    return unless @format
+    @width, @height = send("size_of_#{@format}", ir)
   end
 
   # Image format
@@ -77,11 +67,11 @@ class ImageSize
 
   # Image width
   attr_reader :width
-  alias :w :width
+  alias_method :w, :width
 
   # Image height
   attr_reader :height
-  alias :h :height
+  alias_method :h, :height
 
   # get image width and height as an array which to_s method returns "#{width}x#{height}"
   def size
@@ -103,7 +93,7 @@ private
     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 =~ %r{/\* XPM \*/}            then :xpm
     when head[0, 4] == '8BPS'               then :psd
     when head[0, 3] =~ /[FC]WS/             then :swf
     when head[SVG_R] ||
@@ -148,12 +138,12 @@ private
   end
   alias_method :size_of_apng, :size_of_png
 
-  JpegCodeCheck = [
-    "\xc0", "\xc1", "\xc2", "\xc3",
-    "\xc5", "\xc6", "\xc7",
-    "\xc9", "\xca", "\xcb",
-    "\xcd", "\xce", "\xcf",
-  ] # :nodoc:
+  JPEG_CODE_CHECK = %W[
+    \xC0 \xC1 \xC2 \xC3
+    \xC5 \xC6 \xC7
+    \xC9 \xCA \xCB
+    \xCD \xCE \xCF
+  ].freeze
   def size_of_jpeg(ir)
     section_marker = "\xFF"
     offset = 2
@@ -162,10 +152,10 @@ private
       offset += 1 until section_marker != ir[offset + 1, 1]
       raise FormatError, 'EOF in JPEG' if ir[offset, 1].nil?
 
-      marker, code, length = ir[offset, 4].unpack('aan')
+      _marker, code, length = ir[offset, 4].unpack('aan')
       offset += 4
 
-      if JpegCodeCheck.include?(code)
+      if JPEG_CODE_CHECK.include?(code)
         return ir[offset + 1, 4].unpack('nn').reverse
       end
       offset += length - 2
@@ -192,8 +182,8 @@ private
     header.gsub!(/^\#[^\n\r]*/m, '')
     header =~ /^(P[1-6])\s+?(\d+)\s+?(\d+)/m
     case $1
-      when 'P1', 'P4' then @format = :pbm
-      when 'P2', 'P5' then @format = :pgm
+    when 'P1', 'P4' then @format = :pbm
+    when 'P2', 'P5' then @format = :pgm
     end
     [$2.to_i, $3.to_i]
   end
@@ -219,7 +209,7 @@ private
   end
 
   def size_of_tiff(ir)
-    endian2b = (ir[0, 4] == "II*\000") ? 'v' : 'n'
+    endian2b = ir[0, 4] == "II*\000" ? 'v' : 'n'
     endian4b = endian2b.upcase
     packspec = [nil, 'C', nil, endian2b, endian4b, nil, 'c', nil, endian2b, endian4b]
 
@@ -235,14 +225,13 @@ private
       tag, type = ifd.unpack(endian2b * 2)
       offset += 12
 
-      unless packspec[type].nil?
-        value = ifd[8, 4].unpack(packspec[type])[0]
-        case tag
-        when 0x0100
-          width = value
-        when 0x0101
-          height = value
-        end
+      next if packspec[type].nil?
+      value = ifd[8, 4].unpack(packspec[type])[0]
+      case tag
+      when 0x0100
+        width = value
+      when 0x0101
+        height = value
       end
     end
     [width, height]
@@ -269,18 +258,17 @@ private
     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
+      next unless 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
 

data/spec/image_size_spec.rb

@@ -1,69 +1,89 @@
 require 'rspec'
 require 'image_size'
+require 'tempfile'
 
 describe ImageSize do
   (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 "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(data)
+    describe "for #{path}" do
+      let(:name){ File.basename(path) }
+      let(:attributes) do
+        match = /(\d+)x(\d+)\.([^.]+)$/.match(name)
+        width, height, format = match[1].to_i, match[2].to_i, match[3].to_sym if match
+        size = format && [width, height]
+        {
+          :format => format,
+          :width => width,
+          :height => height,
+          :w => width,
+          :h => height,
+          :size => size,
+        }
       end
-    end
+      let(:file_data){ File.open(path, 'rb', &:read) }
 
-    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(data)
-    end
+      context 'given as data' do
+        it 'gets format and dimensions' do
+          data = file_data.dup
+          image_size = ImageSize.new(data)
+          expect(image_size).to have_attributes(attributes)
+          expect(data).to eq(file_data)
+        end
+      end
 
-    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
+      context 'given as IO' do
+        it 'gets format and dimensions' do
+          File.open(path, 'rb') do |io|
+            image_size = ImageSize.new(io)
+            expect(image_size).to have_attributes(attributes)
+            expect(io).not_to be_closed
+            expect(io.pos).to_not be_zero
+            io.rewind
+            expect(io.read).to eq(file_data)
+          end
+        end
+      end
 
-    it "gets format and dimensions of #{name} given as Tempfile" do
-      Tempfile.open(name) do |tf|
-        tf.binmode
-        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(data)
+      context 'given as StringIO' do
+        it 'gets format and dimensions' do
+          io = StringIO.new(file_data)
+          image_size = ImageSize.new(io)
+          expect(image_size).to have_attributes(attributes)
+          expect(io).not_to be_closed
+          expect(io.pos).to_not be_zero
+          io.rewind
+          expect(io.read).to eq(file_data)
+        end
       end
-    end
 
-    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])
-        is = ImageSize.new(fh)
-        expect([is.format, is.width, is.height]).to eq([format, width, height])
+      context 'given as Tempfile' do
+        it 'gets format and dimensions' do
+          Tempfile.open(name) do |io|
+            io.binmode
+            io.write(file_data)
+            io.rewind
+            image_size = ImageSize.new(io)
+            expect(image_size).to have_attributes(attributes)
+            expect(io).not_to be_closed
+            expect(io.pos).to_not be_zero
+            io.rewind
+            expect(io.read).to eq(file_data)
+          end
+        end
       end
-    end
 
-    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])
+      context 'using path method' do
+        it 'gets format and dimensions' do
+          image_size = ImageSize.path(path)
+          expect(image_size).to have_attributes(attributes)
+        end
+      end
     end
   end
 
-  it "raises ArgumentError if argument is not valid" do
-    expect {
+  it 'raises ArgumentError if argument is not valid' do
+    expect do
       ImageSize.new(Object)
-    }.to raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 
   {
@@ -71,9 +91,9 @@ describe ImageSize do
     :jpeg => "\377\330",
   }.each do |type, data|
     it "raises FormatError if invalid #{type} given" do
-      expect {
+      expect do
         ImageSize.new(data)
-      }.to raise_error(ImageSize::FormatError)
+      end.to 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.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,31 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-20 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: ! 'Measure following file dimensions: apng, bmp, cur, gif, jpeg, ico,
-  mng, pbm, pcx, pgm, png, ppm, psd, swf, tiff, xbm, xpm, webp'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.55'
+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: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
+- CHANGELOG.markdown
 - Gemfile
 - README.markdown
 - image_size.gemspec
@@ -72,17 +89,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: image_size
-rubygems_version: 2.6.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Measure image size using pure Ruby
@@ -111,4 +128,3 @@ test_files:
 - spec/images/webp/lossy.16x32.webp
 - spec/images/xbm/16x32.xbm
 - spec/images/xpm/24x32.xpm
-has_rdoc: