image_size 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0873a78a9fb9f84f07d0389071379dda288330bd38ee7516b442ffde85a3af8
-  data.tar.gz: 0b9fffd2311efa1c24379686821289951a4cd2ec895c27325148a886a24ff57b
+  metadata.gz: f086d46fca698649fed0a23adca9dc67e1fa3317d9f3c209f1fe7f07fcd2cb6b
+  data.tar.gz: ff8f5243aadd37691eb7dabaa7e4b0d3b6fb212aba286a10d86165dc174eabff
 SHA512:
-  metadata.gz: f6dede99002af9b9fc32f9776e42019079abcd846370c06b2aeee812a73c9ec46dcb6c703d1ae454f807d532c1d6b740aabb999892a6ef610cd17311f6a9a7f0
-  data.tar.gz: 819d8a3b7797b1f12b59eb608ffdeda9338314a923ca54711143832685853ed36b9ae8d165fcfa242ce4e1d72aecd5a03bd11714aa7aee3b464722ea8bb4688f
+  metadata.gz: 6ff23aa12846de6eaeb9a8ae02cde4a152f891e863056cf901732ef1c6cd1a580befab1cb62037feed500906901018cf8cdb64b63dd6538c07f0b84c5e8ce80e
+  data.tar.gz: fe6d488afbac72d4a8c16e3d1457c9ae3acf82b87ac9bd6df34e4077f0a0166c47862eac796f71e34084bb7c1314e49f79963eba41ad73de935232b2f2c35bd1

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v3.2.0 (2022-11-03)
+
+* Support `EMF` images [#21](https://github.com/toy/image_size/pull/21) [@opoudjis](https://github.com/opoudjis)
+
 ## v3.1.0 (2022-09-17)
 
 * Document experimental fetching from http server [#18](https://github.com/toy/image_size/issues/18) [@toy](https://github.com/toy)

data/README.markdown

@@ -5,7 +5,7 @@
 # image_size
 
 Measure image size using pure Ruby.
-Formats: `apng`, `bmp`, `cur`, `gif`, `ico`, `j2c`, `jp2`, `jpeg`, `jpx`, `mng`, `pam`, `pbm`, `pcx`, `pgm`, `png`, `ppm`, `psd`, `svg`, `swf`, `tiff`, `webp`, `xbm`, `xpm`.
+Formats: `apng`, `bmp`, `cur`, `emf`, `gif`, `ico`, `j2c`, `jp2`, `jpeg`, `jpx`, `mng`, `pam`, `pbm`, `pcx`, `pgm`, `png`, `ppm`, `psd`, `svg`, `swf`, `tiff`, `webp`, `xbm`, `xpm`.
 
 ## Installation
 

data/image_size.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_size'
-  s.version     = '3.1.0'
+  s.version     = '3.2.0'
   s.summary     = %q{Measure image size using pure Ruby}
-  s.description = %q{Measure following file dimensions: apng, bmp, cur, gif, ico, j2c, jp2, jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf, tiff, webp, xbm, xpm}
+  s.description = %q{Measure following file dimensions: apng, bmp, cur, emf, gif, ico, j2c, jp2, jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf, tiff, webp, xbm, xpm}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Keisuke Minami', 'Ivan Kuchin']
   s.license     = 'Ruby'

data/lib/image_size.rb

@@ -95,6 +95,7 @@ private
     when head[0, 4] == "\0\0\2\0"                                 then :cur
     when head[0, 12] == "\0\0\0\fjP  \r\n\207\n"                  then detect_jpeg2000_type(ir)
     when head[0, 4] == "\377O\377Q"                               then :j2c
+    when head[0, 4] == "\1\0\0\0" && head[40, 4] == ' EMF'        then :emf
     end
   end
 
@@ -374,4 +375,20 @@ private
   def size_of_j2c(ir)
     ir.unpack(8, 8, 'NN')
   end
+
+  EMF_UMAX = 256**4
+  EMF_SMAX = EMF_UMAX / 2
+
+  def size_of_emf(ir)
+    left, top, right, bottom =
+      if RUBY_VERSION < '1.9'
+        ir.unpack(24, 16, 'V*').map{ |u| u < EMF_SMAX ? u : u - EMF_UMAX }
+      else
+        ir.unpack(24, 16, 'L<*')
+      end
+    dpi = self.class.dpi
+    [right - left + 1, bottom - top + 1].map do |n|
+      (n.to_f * dpi / 2540).round
+    end
+  end
 end

data/spec/image_size_spec.rb

@@ -19,6 +19,26 @@ describe ImageSize do
     @server.finish
   end
 
+  def supported_formats
+    ImageSize.private_instance_methods.map{ |name| name[/\Asize_of_(.*)\z/, 1] }.compact.sort
+  end
+
+  describe 'README' do
+    let(:readme){ File.read('README.markdown') }
+
+    it 'lists all supported formats' do
+      expect(readme[/^Formats: .*$/]).to eq("Formats: #{supported_formats.map{ |format| "`#{format}`" }.join(', ')}.")
+    end
+  end
+
+  describe 'gemspec' do
+    let(:gemspec){ Gem::Specification.load('image_size.gemspec') }
+
+    it 'lists all supported formats in description' do
+      expect(gemspec.description).to eq("Measure following file dimensions: #{supported_formats.join(', ')}")
+    end
+  end
+
   Dir['spec/**/*'].each do |path|
     next unless File.file?(path)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_size
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Keisuke Minami
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,8 +53,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 'Measure following file dimensions: apng, bmp, cur, gif, ico, j2c, jp2,
-  jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf, tiff, webp, xbm, xpm'
+description: 'Measure following file dimensions: apng, bmp, cur, emf, gif, ico, j2c,
+  jp2, jpeg, jpx, mng, pam, pbm, pcx, pgm, png, ppm, psd, svg, swf, tiff, webp, xbm,
+  xpm'
 email:
 executables: []
 extensions: []
@@ -86,6 +87,8 @@ files:
 - spec/images/bmp/v3-bottom2top.42x50.bmp
 - spec/images/bmp/v3-top2bottom.42x50.bmp
 - spec/images/cur/32x256.cur
+- spec/images/emf/74x77.emf
+- spec/images/emf/77x77.emf
 - spec/images/empty
 - spec/images/gif/668x481.gif
 - spec/images/ico/32x256.ico
@@ -127,7 +130,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_size/issues
   changelog_uri: https://github.com/toy/image_size/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_size/3.1.0
+  documentation_uri: https://www.rubydoc.info/gems/image_size/3.2.0
   source_code_uri: https://github.com/toy/image_size
 post_install_message:
 rdoc_options: []
@@ -157,6 +160,8 @@ test_files:
 - spec/images/bmp/v3-bottom2top.42x50.bmp
 - spec/images/bmp/v3-top2bottom.42x50.bmp
 - spec/images/cur/32x256.cur
+- spec/images/emf/74x77.emf
+- spec/images/emf/77x77.emf
 - spec/images/empty
 - spec/images/gif/668x481.gif
 - spec/images/ico/32x256.ico