image_size 1.0.4 → 1.0.5

data/image_size.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '1.0.4'
+  s.version     = '1.0.5'
   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}"
@@ -15,4 +15,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
+
+  s.add_development_dependency 'rspec'
 end

data/lib/image_size.rb

@@ -14,9 +14,6 @@ class ImageSize
   # argument is image String, StringIO or IO
   def initialize(data)
     @data = data.dup
-    @width  = nil
-    @height = nil
-    @format = nil
 
     if @data.is_a?(IO)
       img_top = @data.read(1024)
@@ -83,8 +80,8 @@ private
     when img_top[0, 4] == "II\x2a\x00"              then :tiff
     when img_top =~ /\/\* XPM \*\//                 then :xpm
     when img_top[0, 4] == '8BPS'                    then :psd
-    when img_top[1, 2] == 'WS'                      then :swf
-    when img_top[0] == 10                           then :pcx
+    when img_top =~ /^[FC]WS/                       then :swf
+    when img_top[0, 1] == "\x0a"                    then :pcx
     end
   end
 
@@ -212,11 +209,7 @@ private
     sig2 = header[1, 1]
     sig3 = header[2, 1]
 
-    unless ((sig1 == 'F' || sig1 == 'C') && sig2 == 'W' && sig3 == 'S')
-      raise 'This file is not SWF.'
-    end
-
-    bit_length = Integer("0b#{header.unpack('@8B5')}")
+    bit_length = Integer("0b#{header.unpack('@8B5').first}")
     header << img_io.read_o(bit_length * 4 / 8 + 1)
     str = header.unpack("@8B#{5 + bit_length * 4}")[0]
     last = 5

data/spec/image_size_spec.rb

@@ -0,0 +1,37 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rspec'
+require 'image_size'
+
+describe ImageSize do
+  [
+    ['test.bmp',  :bmp,  50,  50],
+    ['test.gif',  :gif, 668, 481],
+    ['test.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,  20,  20],
+    ['test.swf',  :swf, 450, 200],
+    ['test.tif', :tiff,  64,  64],
+    ['test.xbm',  :xbm,  16,  16],
+    ['test.xpm',  :xpm,  32,  32],
+    ['image_size_spec.rb', nil, nil, nil],
+  ].each do |name, format, width, height|
+    path = File.join(File.dirname(__FILE__), name)
+
+    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]
+      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)
+        [is.format, is.width, is.height].should == [format, width, height]
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_size
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -16,9 +16,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 Z
-dependencies: []
-
+date: 2012-02-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: "Measure following file dimensions: PCX, PSD, XPM, TIFF, XBM, PGM, PBM, PPM, BMP, JPEG, PNG, GIF, SWF"
 email: 
 executables: []
@@ -32,20 +45,19 @@ files:
 - README.markdown
 - image_size.gemspec
 - lib/image_size.rb
-- test/2-4-7.png
-- test/4_1_2.gif
-- test/bmp.bmp
-- test/cursor.xbm
-- test/detect.swf
-- test/pbm.pbm
-- test/pcx.pcx
-- test/pgm.pgm
-- test/test.xpm
-- test/test_helper.rb
-- test/test_image_size.rb
-- test/tiff.tiff
-- test/tokyo_tower.jpg
-- test/tower_e.psd
+- spec/image_size_spec.rb
+- spec/test.bmp
+- spec/test.gif
+- spec/test.jpg
+- spec/test.pbm
+- spec/test.pcx
+- spec/test.pgm
+- spec/test.png
+- spec/test.psd
+- spec/test.swf
+- spec/test.tif
+- spec/test.xbm
+- spec/test.xpm
 homepage: http://github.com/toy/image_size
 licenses: 
 - MIT
@@ -75,23 +87,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: image_size
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Measure image size using pure Ruby
 test_files: 
-- test/2-4-7.png
-- test/4_1_2.gif
-- test/bmp.bmp
-- test/cursor.xbm
-- test/detect.swf
-- test/pbm.pbm
-- test/pcx.pcx
-- test/pgm.pgm
-- test/test.xpm
-- test/test_helper.rb
-- test/test_image_size.rb
-- test/tiff.tiff
-- test/tokyo_tower.jpg
-- test/tower_e.psd
+- spec/image_size_spec.rb
+- spec/test.bmp
+- spec/test.gif
+- spec/test.jpg
+- spec/test.pbm
+- spec/test.pcx
+- spec/test.pgm
+- spec/test.png
+- spec/test.psd
+- spec/test.swf
+- spec/test.tif
+- spec/test.xbm
+- spec/test.xpm
 has_rdoc: 

data/test/test_helper.rb

@@ -1,2 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/image_size'

data/test/test_image_size.rb

@@ -1,50 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestImageSize < Test::Unit::TestCase
-
-  def setup
-    @dir = File.dirname(__FILE__)
-    @data = [
-      ['4_1_2.gif',       :gif,  668, 481],
-      ['2-4-7.png',       :png,  640, 532],
-      ['tokyo_tower.jpg', :jpeg, 320, 240],
-      ['bmp.bmp',         :bmp,   50,  50],
-      ['pgm.pgm',         :pgm,   90,  55],
-      ['pbm.pbm',         :pbm,   85,  55],
-      ['cursor.xbm',      :xbm,   16,  16],
-      ['tiff.tiff',       :tiff,  64,  64],
-      ['test.xpm',        :xpm,   32,  32],
-      ['tower_e.psd',     :psd,   20,  20],
-      ['pcx.pcx',         :pcx,   70,  60],
-      ['detect.swf',      :swf,  450, 200],
-      ['test_helper.rb',  nil,   nil, nil],
-    ]
-  end
-
-  def teardown
-  end
-
-  def test_string
-    @data.each do |file_name, format, widht, height|
-      open(File.join(@dir, file_name), 'rb') do |fh|
-        img_data = fh.read
-
-        img = ImageSize.new(img_data)
-        assert_equal(format, img.format)
-        assert_equal(widht,  img.width)
-        assert_equal(height, img.height)
-      end
-    end
-  end
-
-  def test_io
-    @data.each do |file_name, format, widht, height|
-      open(File.join(@dir, file_name), 'rb') do |fh|
-        img = ImageSize.new(fh)
-        assert_equal(format, img.format)
-        assert_equal(widht,  img.width)
-        assert_equal(height, img.height)
-      end
-    end
-  end
-end