image_size 1.3.1 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTU4YzA0NzUyYWUyZWYzMDgzY2JhYTk1NmMyZGM0NzY4YTcyZjZkYw==
+    MGIyMzZhMDAxMjI3NjllMTM1ODUyNzZjYWI5NmU3OGRiNjliMGRlMg==
   data.tar.gz: !binary |-
-    NmY0ZmEzNjg1MjdmNTg1ZGZjNTYwOTExNzAzMTJhNzNiNDdlZWU4NA==
-!binary "U0hBNTEy":
+    MjI1MTRkYzM2YWIyODA5OGFhZjQxMTA1YmEzYmEwYzBlZmUxZmNmYg==
+SHA512:
   metadata.gz: !binary |-
-    NjM1NjgxYzhiMTYwMTk4YWQ2NzUwZjVkZTE3NDFkN2I4NzZiM2RiYWQ3MjBi
-    OTExZjM1MTI0YmJiMzU3YTNkNWVhZmQ0M2ExMDE1ZGM4M2JkMTRkZTc3YTkw
-    ZWNmMWYxMWM4YWFjMGM4YTY0NjMyYTAwYTliMTc5ODIwMzZiOGU=
+    NWM2ZmNmOWQzZjI2ODVhYWNlNWQ0OTBmY2FhYjE4NWE2ZGMxZjljNmY3M2M5
+    ZWRkZGYwN2MzZTUwOWYzMTg0MWViYjQyNzc5NzBiYjY0YTFmYmVmYjk5MGRl
+    OTMxMzY2NjA3NDdiNzYxYmVjZTViZTZmYmNjZGViMzVhYTM0YWM=
   data.tar.gz: !binary |-
-    ZDE5NjZlNDc4OWYwOTYyYzM0YjQ4NTlhYzZjYzBkZmI5MjVjODZmYmUxZGU2
-    M2ZkNzk3YzI2Mjc4YzYwYmU1ODg5ZjIzYTAyZmYyNzk0YzFhMGRiYzlmYjZm
-    OGZiNDk4MDI4MGRkMzk3ZmEyZGU1NzY0ZWVlZjRkYzU4YTU2OTQ=
+    NzFlNjU2MWFiOTkwMjNhOGMyZjhiYWQxZmM0ZGY0YTczYTg5OTc4OTc5MzQw
+    Zjg4ZGY0MGFjYjlmNzdjMGZjOGFkYmIwMjA3Yzc2NDMwMzI5NGFiMzQ2ZDAy
+    MWRkMWFjNDY2MjA4YWIyMmM3ZjAyZjQ1MjAwMDBjYjEzNTkzYzY=

data/image_size.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '1.3.1'
+  s.version     = '1.4.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}"
@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
 
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/image_size.rb

@@ -111,6 +111,8 @@ private
       head =~ /<\?xml|<!--/ && ir[0, 4096][SVG_R]
                                             then :svg
     when head[0, 2] =~ /\n[\000-\005]/      then :pcx
+    when head[0, 4] == "\000\000\001\000"   then :ico
+    when head[0, 4] == "\000\000\002\000"   then :cur
     end
   end
 
@@ -261,4 +263,9 @@ private
       end
     end
   end
+
+  def size_of_ico(ir)
+    ir[6, 2].unpack('CC').map{ |v| v.zero? ? 256 : v }
+  end
+  alias_method :size_of_cur, :size_of_ico
 end

data/spec/image_size_spec.rb

@@ -20,6 +20,8 @@ describe ImageSize do
     ['test.xbm',  :xbm,  16,  32],
     ['test.xpm',  :xpm,  24,  32],
     ['test.svg',  :svg,  72, 100],
+    ['test.ico',  :ico, 256,  27],
+    ['test.cur',  :cur,  50, 256],
     ['image_size_spec.rb', nil, nil, nil],
   ].each do |name, format, width, height|
     path = File.join(File.dirname(__FILE__), name)
@@ -28,25 +30,25 @@ describe ImageSize do
     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
+        expect([is.format, is.width, is.height]).to eq([format, width, height])
+        expect(fh).not_to be_closed
         fh.rewind
-        fh.read.should == file_data
+        expect(fh.read).to eq(file_data)
       end
     end
 
     it "should get format and dimensions for #{name} given StringIO" do
       io = StringIO.new(file_data)
       is = ImageSize.new(io)
-      [is.format, is.width, is.height].should == [format, width, height]
-      io.should_not be_closed
+      expect([is.format, is.width, is.height]).to eq([format, width, height])
+      expect(io).not_to be_closed
       io.rewind
-      io.read.should == file_data
+      expect(io.read).to eq(file_data)
     end
 
     it "should get format and dimensions for #{name} given file data" do
       is = ImageSize.new(file_data)
-      [is.format, is.width, is.height].should == [format, width, height]
+      expect([is.format, is.width, is.height]).to eq([format, width, height])
     end
 
     it "should get format and dimensions for #{name} given Tempfile" do
@@ -55,32 +57,32 @@ describe ImageSize do
         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
+        expect([is.format, is.width, is.height]).to eq([format, width, height])
+        expect(tf).not_to be_closed
         tf.rewind
-        tf.read.should == file_data
+        expect(tf.read).to eq(file_data)
       end
     end
 
     it "should get format and dimensions for #{name} given IO when run twice" do
       File.open(path, 'rb') do |fh|
         is = ImageSize.new(fh)
-        [is.format, is.width, is.height].should == [format, width, height]
+        expect([is.format, is.width, is.height]).to eq([format, width, height])
         is = ImageSize.new(fh)
-        [is.format, is.width, is.height].should == [format, width, height]
+        expect([is.format, is.width, is.height]).to eq([format, width, height])
       end
     end
 
     it "should get format and dimensions for #{name} as path" do
       is = ImageSize.path(path)
-      [is.format, is.width, is.height].should == [format, width, height]
+      expect([is.format, is.width, is.height]).to eq([format, width, height])
     end
   end
 
   it "should raise ArgumentError if argument is not valid" do
-    lambda {
+    expect {
       ImageSize.new(Object)
-    }.should raise_error(ArgumentError)
+    }.to raise_error(ArgumentError)
   end
 
   {
@@ -88,9 +90,9 @@ describe ImageSize do
     :jpeg => "\377\330",
   }.each do |type, data|
     it "should raise FormatError if invalid #{type} given" do
-      lambda {
+      expect {
         ImageSize.new(data)
-      }.should raise_error(ImageSize::FormatError)
+      }.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.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: ! 'Measure following file dimensions: bmp, gif, jpeg, pbm, pcx, pgm,
   png, ppm, psd, swf, tiff, xbm, xpm'
 email: 
@@ -39,7 +39,9 @@ files:
 - image_size.gemspec
 - lib/image_size.rb
 - spec/image_size_spec.rb
+- spec/test.cur
 - spec/test.gif
+- spec/test.ico
 - spec/test.jpg
 - spec/test.pbm
 - spec/test.pcx
@@ -75,13 +77,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: image_size
-rubygems_version: 2.0.3
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Measure image size using pure Ruby
 test_files:
 - spec/image_size_spec.rb
+- spec/test.cur
 - spec/test.gif
+- spec/test.ico
 - spec/test.jpg
 - spec/test.pbm
 - spec/test.pcx