mini_exiftool 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29f066192f7a6aa306be4a975177eb121f1f36ae54657bce8fba3eb03d3b6b4b
-  data.tar.gz: 19c32968ea26a447921d9c964e365a38c8d46bee90b85aadcd1886b7ffae9364
+  metadata.gz: 7904a6f99bcb35d5b5d0c98cb23dfe671a8cda1d2dd61e57140fdb1c8fb17012
+  data.tar.gz: '074899234f52fc1a42c854d5f20e373cf2970cbe186854b1bf4d51133224bddb'
 SHA512:
-  metadata.gz: 878d604908cc91deec045336c011520e4647e4c66f5d85ed1089b2daae8d1a04cdbc9c6c3e60bdbc0906f8878680fe5d18c81a73ce350ba05087ba1cdf3b9ce2
-  data.tar.gz: b3461aaececc3c7a4e5dd57160300eee2fa6a027d6fd976bc9328ef4bcf3673e5e7615fa2d556caa1e37474c9de8a920054927eaedb61a5a785b511e2b2e44a6
+  metadata.gz: 7409a45bf6b8bbf40eb79a288532c8019c5e14d6114e6adc1fdd2226270d9480cef568393c245595fcb1babb0f46ef840e81829813ffe16a5089c3158e2ffec6
+  data.tar.gz: 4b2aa1e104d586d102a2ca2602621ad9418373308824598d5b01ce98c286988809a13cc758538c2bafacdde0fd4c2aec2c23c3b8b09f493172deccb538590464

data/.aspell.pws

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 118 
+personal_ws-1.1 en 119 
 Barushev
 Bugfix
 CaptionAbstract
@@ -81,6 +81,7 @@ io
 iptc
 jpg
 json
+jvradelis
 md
 metadata
 mfo

data/Changelog

@@ -1,3 +1,9 @@
+2.10.1
+- Make access via PStore thread-safe.
+- Fix conversion of values with leading zeros.
+  Thanks to jvradelis for reporting this bug (github issue #40) and the hint
+  to the incorrect regular expression.
+
 2.10.0
 - Implement the method MiniExiftool#respond_to_missing? for completeness and
   the possibility to use MiniExiftool with Forwardable.

data/README.md

@@ -1,7 +1,7 @@
 # MiniExiftool [![Build Status](https://travis-ci.org/janfri/mini_exiftool.svg?branch=master)](https://travis-ci.org/janfri/mini_exiftool)
 
 This library is a wrapper for the ExifTool command-line application
-(http://www.sno.phy.queensu.ca/~phil/exiftool) written by Phil Harvey.
+(https://exiftool.org) written by Phil Harvey.
 It provides the full power of ExifTool to Ruby: reading and writing of
 EXIF-data, IPTC-data and XMP-data.
 
@@ -12,7 +12,7 @@ command-line application at least version 7.65.
 If you run on Ruby 1.8 or with a prior exiftool version
 install mini_exiftool version 1.x.x.
 Instructions for installation you can find under
-http://www.sno.phy.queensu.ca/~phil/exiftool/install.html .
+https://exiftool.org/install.html .
 
 Alternatively Wil Gieseler has bundled a meta-gem that eliminates the
 need for a separate ExifTool installation. Have a look at
@@ -131,7 +131,7 @@ tag.
 
 Please read the section about the character sets of the ExifTool command
 line application carefully to understand what's going on
-(http://www.sno.phy.queensu.ca/~phil/exiftool/faq.html#Q10)!
+(https://exiftool.org/faq.html#Q10)!
 
 ```ruby
 # Using UTF-8 as internal encoding for IPTC tags and MacRoman

data/Rakefile

@@ -10,10 +10,10 @@ Rim.setup do |p|
   p.version = MiniExiftool::VERSION
   p.authors = 'Jan Friedrich'
   p.email = 'janfri26@gmail.com'
-  p.summary = 'This library is a wrapper for the ExifTool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).'
+  p.summary = 'This library is a wrapper for the ExifTool command-line application (https://exiftool.org).'
   p.description <<-END
 This library is a wrapper for the ExifTool command-line application
-(http://www.sno.phy.queensu.ca/~phil/exiftool) written by Phil Harvey.
+(https://exiftool.org) written by Phil Harvey.
 It provides the full power of ExifTool to Ruby: reading and writing of
 EXIF-data, IPTC-data and XMP-data.
   END
@@ -26,7 +26,7 @@ EXIF-data, IPTC-data and XMP-data.
 | Please ensure you have installed exiftool at least version 7.65       |
 | and it's found in your PATH (Try "exiftool -ver" on your commandline).|
 | For more details see                                                  |
-| http://www.sno.phy.queensu.ca/~phil/exiftool/install.html             |
+| https://exiftool.org/install.html             |
 | You need also Ruby 1.9 or higher.                                     |
 | If you need support for Ruby 1.8 or exiftool prior 7.65 install       |
 | mini_exiftool version < 2.0.0.                                        |

data/Tutorial.md

@@ -4,7 +4,7 @@
 ## Installation
 
 * Installing the ExifTool command-line application from Phil Harvey
-  (see http://www.sno.phy.queensu.ca/~phil/exiftool/install.html)
+  (see https://exiftool.org/install.html)
 * Installing the Ruby library (`gem install mini_exiftool`)
 
 

data/lib/mini_exiftool.rb

@@ -3,7 +3,7 @@
 # MiniExiftool
 #
 # This library is wrapper for the ExifTool command-line
-# application (http://www.sno.phy.queensu.ca/~phil/exiftool/)
+# application (https://exiftool.org/)
 # written by Phil Harvey.
 # Read and write access is done in a clean OO manner.
 #
@@ -26,7 +26,7 @@ require 'time'
 # Simple OO access to the ExifTool command-line application.
 class MiniExiftool
 
-  VERSION = '2.10.0'
+  VERSION = '2.10.1'
 
   # Name of the ExifTool command-line application
   @@cmd = 'exiftool'
@@ -461,8 +461,8 @@ class MiniExiftool
       end
     when /^\+\d+\.\d+$/
       value = value.to_f
-    when /^0+[1-9]+$/
-      # nothing => String
+    when /^0\d+$/
+      # no conversion => String
     when /^-?\d+$/
       value = value.to_i
     when %r(^(\d+)/(\d+)$)
@@ -508,7 +508,7 @@ class MiniExiftool
   def self.load_or_create_pstore
     FileUtils.mkdir_p(pstore_dir)
     pstore_filename = File.join(pstore_dir, 'exiftool_tags_' << exiftool_version.gsub('.', '_') << '.pstore')
-    @@pstore = PStore.new pstore_filename
+    @@pstore = PStore.new(pstore_filename, _threadsafe = true)
     if !File.exist?(pstore_filename) || File.size(pstore_filename) == 0
       $stderr.puts 'Generating cache file for ExifTool tag names. This takes a few seconds but is only needed once...'
       @@pstore.transaction do |ps|

data/mini_exiftool.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: mini_exiftool 2.10.0 ruby lib
+# stub: mini_exiftool 2.10.1 ruby lib
 #
 # This file is automatically generated by rim.
 # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,20 +7,20 @@
 
 Gem::Specification.new do |s|
   s.name = "mini_exiftool"
-  s.version = "2.10.0"
+  s.version = "2.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jan Friedrich"]
-  s.date = "2020-01-01"
-  s.description = "This library is a wrapper for the ExifTool command-line application\n(http://www.sno.phy.queensu.ca/~phil/exiftool) written by Phil Harvey.\nIt provides the full power of ExifTool to Ruby: reading and writing of\nEXIF-data, IPTC-data and XMP-data.\n"
+  s.date = "2021-05-15"
+  s.description = "This library is a wrapper for the ExifTool command-line application\n(https://exiftool.org) written by Phil Harvey.\nIt provides the full power of ExifTool to Ruby: reading and writing of\nEXIF-data, IPTC-data and XMP-data.\n"
   s.email = "janfri26@gmail.com"
   s.files = ["./.aspell.pws", "COPYING", "Changelog", "Gemfile", "README.md", "Rakefile", "Tutorial.md", "examples/copy_icc_profile.rb", "examples/external_photo.rb", "examples/print_portraits.rb", "examples/shift_time.rb", "examples/show_speedup_with_fast_option.rb", "lib/mini_exiftool.rb", "mini_exiftool.gemspec", "regtest/read_all.rb", "regtest/read_all.yml", "test/data", "test/data/Bad_PreviewIFD.jpg", "test/data/Canon.jpg", "test/data/INFORMATION", "test/data/invalid_byte_sequence_in_utf8.json", "test/data/invalid_rational.json", "test/data/test.jpg", "test/data/test.jpg.json", "test/data/test_coordinates.jpg", "test/data/test_encodings.jpg", "test/data/test_special_dates.jpg", "test/helpers_for_test.rb", "test/test_bad_preview_ifd.rb", "test/test_class_methods.rb", "test/test_composite.rb", "test/test_copy_tags_from.rb", "test/test_dumping.rb", "test/test_encodings.rb", "test/test_filename_access.rb", "test/test_from_hash.rb", "test/test_instance_methods.rb", "test/test_invalid_byte_sequence_in_utf8.rb", "test/test_invalid_rational.rb", "test/test_io.rb", "test/test_pstore.rb", "test/test_read.rb", "test/test_read_coordinates.rb", "test/test_read_numerical.rb", "test/test_save.rb", "test/test_special.rb", "test/test_special_dates.rb", "test/test_write.rb"]
   s.homepage = "https://github.com/janfri/mini_exiftool"
   s.licenses = ["LGPL-2.1"]
-  s.post_install_message = "+-----------------------------------------------------------------------+\n| Please ensure you have installed exiftool at least version 7.65       |\n| and it's found in your PATH (Try \"exiftool -ver\" on your commandline).|\n| For more details see                                                  |\n| http://www.sno.phy.queensu.ca/~phil/exiftool/install.html             |\n| You need also Ruby 1.9 or higher.                                     |\n| If you need support for Ruby 1.8 or exiftool prior 7.65 install       |\n| mini_exiftool version < 2.0.0.                                        |\n+-----------------------------------------------------------------------+\n"
+  s.post_install_message = "+-----------------------------------------------------------------------+\n| Please ensure you have installed exiftool at least version 7.65       |\n| and it's found in your PATH (Try \"exiftool -ver\" on your commandline).|\n| For more details see                                                  |\n| https://exiftool.org/install.html             |\n| You need also Ruby 1.9 or higher.                                     |\n| If you need support for Ruby 1.8 or exiftool prior 7.65 install       |\n| mini_exiftool version < 2.0.0.                                        |\n+-----------------------------------------------------------------------+\n"
   s.rubygems_version = "3.1.2"
-  s.summary = "This library is a wrapper for the ExifTool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool)."
+  s.summary = "This library is a wrapper for the ExifTool command-line application (https://exiftool.org)."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/regtest/read_all.yml

@@ -1,7 +1,7 @@
 ---
 sample: read Bad_PreviewIFD.jpg
 result:
-  ExifToolVersion: 10.55
+  ExifToolVersion: 11.7
   FileSize: 8.4 kB
   FileType: JPEG
   FileTypeExtension: jpg
@@ -41,7 +41,7 @@ result:
   WB_RBLevels: 56833 21761 1 1
   ProgramShift: 0
   ExposureDifference: 0
-  Warning: Bad PreviewIFD directory
+  Warning: "[minor] Bad PreviewIFD directory"
   ISOSetting: 110
   ImageBoundary: 0 0 3872 2592
   CropHiSpeed: Off (3904x2616 cropped to 3904x2616 at pixel 0,0)
@@ -84,6 +84,7 @@ result:
   MCUVersion: 146
   EffectiveMaxAperture: 4.0
   SensorPixelSize: 6.05 x 6.05 um
+  DateStampMode: 'Off'
   RetouchHistory: None
   ImageDataSize: 4725881
   ShutterCount: 290
@@ -122,7 +123,7 @@ result:
   RatingPercent: 0
   Rating: 0
   Title: ''
-  ProfileCMMType: Lino
+  ProfileCMMType: Linotronic
   ProfileVersion: 2.1.0
   ProfileClass: Display Device Profile
   ColorSpaceData: 'RGB '
@@ -131,12 +132,12 @@ result:
   ProfileFileSignature: acsp
   PrimaryPlatform: Microsoft Corporation
   CMMFlags: Not Embedded, Independent
-  DeviceManufacturer: 'IEC '
+  DeviceManufacturer: Hewlett-Packard
   DeviceModel: sRGB
   DeviceAttributes: Reflective, Glossy, Positive, Color
   RenderingIntent: Perceptual
   ConnectionSpaceIlluminant: 0.9642 1 0.82491
-  ProfileCreator: 'HP  '
+  ProfileCreator: Hewlett-Packard
   ProfileID: 0
   ProfileCopyright: Copyright (c) 1998 Hewlett-Packard Company
   ProfileDescription: sRGB IEC61966-2.1
@@ -170,8 +171,6 @@ result:
   Aperture: 5.6
   BlueBalance: 7
   ImageSize: 1x1
-  LensID: AF-S DX VR Zoom-Nikkor 55-200mm f/4-5.6G IF-ED
-  LensSpec: 55-200mm f/4-5.6 G VR
   Megapixels: 1.0e-06
   RedBalance: 56833
   ShutterSpeed: !ruby/object:Rational
@@ -181,12 +180,14 @@ result:
   SubSecDateTimeOriginal: 2008-12-12 11:12:30.000000000 +01:00
   SubSecModifyDate: 2012-05-31 21:33:12.000000000 +02:00
   ThumbnailImage: "(Binary data 631 bytes, use -b option to extract)"
+  LensID: AF-S DX VR Zoom-Nikkor 55-200mm f/4-5.6G IF-ED
+  LensSpec: 55-200mm f/4-5.6 G VR
   FocalLength35efl: 55.0 mm
   LightValue: 11.8
 ---
 sample: read Canon.jpg
 result:
-  ExifToolVersion: 10.55
+  ExifToolVersion: 11.7
   FileSize: 2.6 kB
   FileType: JPEG
   FileTypeExtension: jpg
@@ -324,29 +325,29 @@ result:
   BitsPerSample: 8
   ColorComponents: 3
   YCbCrSubSampling: YCbCr4:2:0 (2 2)
-  Aperture: 14.0
   DriveMode: Continuous Shooting
-  ImageSize: 8x8
   Lens: 18.0 - 55.0 mm
+  ShootingMode: Bulb
+  WB_RGGBLevels: 1719 832 831 990
+  Aperture: 14.0
+  BlueBalance: 1.190619
+  ImageSize: 8x8
   LensID: Unknown 18-55mm
   Megapixels: 6.4e-05
+  RedBalance: 2.067348
   ScaleFactor35efl: 1.6
-  ShootingMode: Bulb
   ShutterSpeed: 4
-  WB_RGGBLevels: 1719 832 831 990
-  BlueBalance: 1.190619
+  Lens35efl: '18.0 - 55.0 mm (35 mm equivalent: 28.6 - 87.4 mm)'
   CircleOfConfusion: 0.019 mm
   DOF: inf (4.31 m - inf)
   FOV: 36.9 deg
   FocalLength35efl: '34.0 mm (35 mm equivalent: 54.0 mm)'
   HyperfocalDistance: 4.37 m
-  Lens35efl: '18.0 - 55.0 mm (35 mm equivalent: 28.6 - 87.4 mm)'
   LightValue: 5.6
-  RedBalance: 2.067348
 ---
 sample: read test.jpg
 result:
-  ExifToolVersion: 10.55
+  ExifToolVersion: 11.7
   FileSize: 46 kB
   FileType: JPEG
   FileTypeExtension: jpg
@@ -406,7 +407,7 @@ result:
   ImageStabilization: 'On'
   ZoneMatching: ISO Setting Used
   ColorTemperature: 0
-  LensType: Minolta AF 28-135mm F4-4.5 or Sigma Lens
+  LensType: Minolta AF 28-135mm F4-4.5 or Other Lens
   UserComment: ''
   FlashpixVersion: 100
   ColorSpace: sRGB
@@ -441,7 +442,7 @@ result:
   YCbCrSubSampling: YCbCr4:2:0 (2 2)
   Aperture: 9.5
   ImageSize: 300x199
-  LensID: Minolta AF 28-135mm F4-4.5
+  LensID: Tokina AT-X 242 AF 24-200mm F3.5-5.6
   Megapixels: 0.06
   ScaleFactor35efl: 1.5
   ShutterSpeed: !ruby/object:Rational
@@ -456,7 +457,7 @@ result:
 ---
 sample: read test_coordinates.jpg
 result:
-  ExifToolVersion: 10.55
+  ExifToolVersion: 11.7
   FileSize: 251 kB
   FileType: JPEG
   FileTypeExtension: jpg
@@ -510,9 +511,6 @@ result:
   ColorComponents: 3
   YCbCrSubSampling: YCbCr4:2:0 (2 2)
   Aperture: 2.4
-  GPSLatitude: 43 deg 39' 11.40" N
-  GPSLongitude: 79 deg 22' 23.40" W
-  GPSPosition: 43 deg 39' 11.40" N, 79 deg 22' 23.40" W
   ImageSize: 1280x720
   Megapixels: 0.922
   ScaleFactor35efl: 8.5
@@ -520,15 +518,18 @@ result:
     denominator: 30
     numerator: 1
   ThumbnailImage: "(Binary data 3831 bytes, use -b option to extract)"
+  GPSLatitude: 43 deg 39' 11.40" N
+  GPSLongitude: 79 deg 22' 23.40" W
   CircleOfConfusion: 0.004 mm
   FOV: 54.4 deg
   FocalLength35efl: '4.1 mm (35 mm equivalent: 35.0 mm)'
+  GPSPosition: 43 deg 39' 11.40" N, 79 deg 22' 23.40" W
   HyperfocalDistance: 2.00 m
   LightValue: 5.4
 ---
 sample: read test_encodings.jpg
 result:
-  ExifToolVersion: 10.55
+  ExifToolVersion: 11.7
   FileSize: 660 bytes
   FileType: JPEG
   FileTypeExtension: jpg
@@ -547,7 +548,7 @@ result:
 ---
 sample: read test_special_dates.jpg
 result:
-  ExifToolVersion: 10.55
+  ExifToolVersion: 11.7
   FileSize: 3.7 kB
   FileType: JPEG
   FileTypeExtension: jpg

data/test/test_read_numerical.rb

@@ -30,4 +30,11 @@ class TestReadNumerical < TestCase
     assert_kind_of String, @mini_exiftool_num['SupplementalCategories']
   end
 
+  # Catching github issue [#40]
+  # Values with leading zeros can have further zeros in it
+  # Thanks to jvradelis
+  def test_digits_starting_with_zero_and_has_further_zeros
+    assert_equal '0300', @mini_exiftool_num['PrintIMVersion']
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_exiftool
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Jan Friedrich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-01 00:00:00.000000000 Z
+date: 2021-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,7 +68,7 @@ dependencies:
         version: '2'
 description: |
   This library is a wrapper for the ExifTool command-line application
-  (http://www.sno.phy.queensu.ca/~phil/exiftool) written by Phil Harvey.
+  (https://exiftool.org) written by Phil Harvey.
   It provides the full power of ExifTool to Ruby: reading and writing of
   EXIF-data, IPTC-data and XMP-data.
 email: janfri26@gmail.com
@@ -132,7 +132,7 @@ post_install_message: |
   | Please ensure you have installed exiftool at least version 7.65       |
   | and it's found in your PATH (Try "exiftool -ver" on your commandline).|
   | For more details see                                                  |
-  | http://www.sno.phy.queensu.ca/~phil/exiftool/install.html             |
+  | https://exiftool.org/install.html             |
   | You need also Ruby 1.9 or higher.                                     |
   | If you need support for Ruby 1.8 or exiftool prior 7.65 install       |
   | mini_exiftool version < 2.0.0.                                        |
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
-summary: This library is a wrapper for the ExifTool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).
+summary: This library is a wrapper for the ExifTool command-line application (https://exiftool.org).
 test_files: []