mini_exiftool 2.10.2 → 2.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51cea5ba80431798479c6bef0c1554fd9af1f228ebcfc7944215b4bff2206087
-  data.tar.gz: ca0f34cc3e579a6a3fb06f60f10275e57f700c0ef48e8c6ea687bc6ce3256705
+  metadata.gz: d02a99b3bb57a80fdd788fee4d19730b444733abba15521b3f82182c1616e2a2
+  data.tar.gz: c0123ea7ed1a3f61b4a0a26efaba5b25633b8219d9c4899ad76da4d295199d38
 SHA512:
-  metadata.gz: 54713433ddd51360894ed0ca8e0cda2cd91c45c7f9c14db0cffab40296b2bf7d359abf1d41fa8b646a932eb9169795133367da38d0be226c10720d7e91e068eb
-  data.tar.gz: 4e1906897d09383272d8cbb69abe50e4e477e6d340cf1a13a4fc29f7d5cd53c454360af44ab45f7998383437fbe1ed3fbd7543debeab8fef8172773f1267ee95
+  metadata.gz: af633fd3e440b6d264fe8b0b94a8c5e9ce06270cef77eed380474eff9541f63cee8f8b0521ad9637d46d4aff7b06de681e0d9fee28ea1af8babf5d3ad5269fac
+  data.tar.gz: a96a9ea4a784ba41b57383e72f922c06f525ec7440896bca8d5dfc33ae6fef55f66dd48d3e46429dbf4b34a281485a2fc6afe96812903f82cfac0e5c13b898e6

data/.aspell.pws

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 120 
+personal_ws-1.1 en 121 
 Barushev
 Bugfix
 CaptionAbstract
@@ -56,6 +56,7 @@ Wil
 acki
 aiff
 atomar
+backport
 backticks
 bundler
 ccoenen

data/Changelog

@@ -1,3 +1,9 @@
+2.10.4
+- Maintenance release.
+
+2.10.3
+- Use YAML.unsafe_load and backport it if necessary.
+
 2.10.2
 - Escape backticks and use escaped values in option coord_format.
 

data/README.md

@@ -1,4 +1,4 @@
-# MiniExiftool [![Build Status](https://travis-ci.org/janfri/mini_exiftool.svg?branch=master)](https://travis-ci.org/janfri/mini_exiftool)
+# MiniExiftool ![Test Status](https://github.com/janfri/mini_exiftool/actions/workflows/main.yml/badge.svg)
 
 This library is a wrapper for the ExifTool command-line application
 (https://exiftool.org) written by Phil Harvey.

data/lib/mini_exiftool.rb

@@ -22,11 +22,12 @@ require 'rbconfig'
 require 'set'
 require 'tempfile'
 require 'time'
+require 'yaml'
 
 # Simple OO access to the ExifTool command-line application.
 class MiniExiftool
 
-  VERSION = '2.10.2'
+  VERSION = '2.10.4'
 
   # Name of the ExifTool command-line application
   @@cmd = 'exiftool'
@@ -304,7 +305,7 @@ class MiniExiftool
   # Create a MiniExiftool instance from YAML data created with
   # MiniExiftool#to_yaml
   def self.from_yaml yaml, opts={}
-    MiniExiftool.from_hash YAML.load(yaml), opts
+    MiniExiftool.from_hash YAML.unsafe_load(yaml), opts
   end
 
   # Returns the command name of the called ExifTool application.
@@ -553,6 +554,16 @@ class MiniExiftool
     params
   end
 
+  # Backport YAML.unsafe_load
+  unless defined? YAML.unsafe_load
+    module BackportYAML
+      def unsafe_load *args
+        load *args
+      end
+    end
+    YAML.extend BackportYAML
+  end
+
   # Hash with indifferent access:
   # DateTimeOriginal == datetimeoriginal == date_time_original
   class TagHash < Hash # :nodoc:

data/mini_exiftool.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: mini_exiftool 2.10.2 ruby lib
+# stub: mini_exiftool 2.10.4 ruby lib
 #
 # This file is automatically generated by rim.
 # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,34 +7,25 @@
 
 Gem::Specification.new do |s|
   s.name = "mini_exiftool"
-  s.version = "2.10.2"
+  s.version = "2.10.4"
 
   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 = "2021-06-29"
+  s.date = "2023-10-06"
   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| 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.2.15"
+  s.rubygems_version = "3.5.0.dev"
   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
-  end
+  s.specification_version = 4
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_development_dependency(%q<rake>, [">= 0"])
-    s.add_development_dependency(%q<rim>, ["~> 2.17"])
-    s.add_development_dependency(%q<test-unit>, [">= 0"])
-    s.add_development_dependency(%q<regtest>, ["~> 2"])
-  else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rim>, ["~> 2.17"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<regtest>, ["~> 2"])
-  end
+  s.add_development_dependency(%q<rake>, [">= 0"])
+  s.add_development_dependency(%q<rim>, ["~> 2.17"])
+  s.add_development_dependency(%q<test-unit>, [">= 0"])
+  s.add_development_dependency(%q<regtest>, ["~> 2"])
 end

data/regtest/read_all.yml

@@ -1,8 +1,8 @@
 ---
 sample: read Bad_PreviewIFD.jpg
 result:
-  ExifToolVersion: 11.7
-  FileSize: 8.4 kB
+  ExifToolVersion: 12.26
+  FileSize: 8.4 KiB
   FileType: JPEG
   FileTypeExtension: jpg
   MIMEType: image/jpeg
@@ -46,7 +46,7 @@ result:
   ImageBoundary: 0 0 3872 2592
   CropHiSpeed: Off (3904x2616 cropped to 3904x2616 at pixel 0,0)
   SerialNumber: 3365614
-  VRInfoVersion: 100
+  VRInfoVersion: '0100'
   VibrationReduction: 'On'
   VRMode: Normal
   ActiveD-Lighting: 'Off'
@@ -70,7 +70,7 @@ result:
   HueAdjustment: 0
   NoiseReduction: 'Off'
   WB_RGGBLevels: 56833 1 1 7
-  LensDataVersion: 202
+  LensDataVersion: '0202'
   ExitPupilPosition: 70.6 mm
   AFAperture: 4.1
   FocusPosition: '0x22'
@@ -91,23 +91,23 @@ result:
   ImageOptimization: ''
   Saturation: Auto
   VariProgram: Auto
-  MultiExposureVersion: 100
+  MultiExposureVersion: '0100'
   MultiExposureMode: 'Off'
   MultiExposureShots: 0
   MultiExposureAutoGain: 'Off'
   HighISONoiseReduction: 'Off'
   PowerUpTime: 2008-12-12 11:11:24.000000000 +01:00
-  FileInfoVersion: 100
+  FileInfoVersion: '0100'
   MemoryCardNumber: 0
   DirectoryNumber: 100
   FileNumber: '0081'
-  RetouchInfoVersion: 100
+  RetouchInfoVersion: '0100'
   NEFBitDepth: Unknown (0 0 16723 17225)
   UserComment: ''
-  SubSecTime: 0
-  SubSecTimeOriginal: 0
-  SubSecTimeDigitized: 0
-  FlashpixVersion: 100
+  SubSecTime: '00'
+  SubSecTimeOriginal: '00'
+  SubSecTimeDigitized: '00'
+  FlashpixVersion: '0100'
   ColorSpace: sRGB
   ExifImageWidth: 1
   ExifImageHeight: 1
@@ -187,8 +187,8 @@ result:
 ---
 sample: read Canon.jpg
 result:
-  ExifToolVersion: 11.7
-  FileSize: 2.6 kB
+  ExifToolVersion: 12.26
+  FileSize: 2.6 KiB
   FileType: JPEG
   FileTypeExtension: jpg
   MIMEType: image/jpeg
@@ -272,7 +272,7 @@ result:
   BracketShotNumber: 0
   CanonImageType: CRW:EOS DIGITAL REBEL CMOS RAW
   CanonFirmwareVersion: Firmware Version 1.1.1
-  SerialNumber: 560018150
+  SerialNumber: '0560018150'
   SerialNumberFormat: Format 1
   FileNumber: 118-1861
   OwnerName: Phil Harvey
@@ -303,12 +303,12 @@ result:
   AFPointsInFocus: "(none)"
   ThumbnailImageValidArea: 0 159 7 112
   UserComment: ''
-  FlashpixVersion: 100
+  FlashpixVersion: '0100'
   ColorSpace: sRGB
   ExifImageWidth: 160
   ExifImageHeight: 120
   InteropIndex: THM - DCF thumbnail file
-  InteropVersion: 100
+  InteropVersion: '0100'
   RelatedImageWidth: 3072
   RelatedImageHeight: 2048
   FocalPlaneXResolution: 3443.946188
@@ -347,8 +347,8 @@ result:
 ---
 sample: read test.jpg
 result:
-  ExifToolVersion: 11.7
-  FileSize: 46 kB
+  ExifToolVersion: 12.26
+  FileSize: 46 KiB
   FileType: JPEG
   FileTypeExtension: jpg
   MIMEType: image/jpeg
@@ -409,7 +409,7 @@ result:
   ColorTemperature: 0
   LensType: Minolta AF 28-135mm F4-4.5 or Other Lens
   UserComment: ''
-  FlashpixVersion: 100
+  FlashpixVersion: '0100'
   ColorSpace: sRGB
   ExifImageWidth: 3008
   ExifImageHeight: 2000
@@ -422,7 +422,7 @@ result:
   Contrast: Normal
   Saturation: Normal
   Sharpness: Normal
-  PrintIMVersion: 300
+  PrintIMVersion: '0300'
   Compression: JPEG (old-style)
   ThumbnailOffset: 39274
   ThumbnailLength: 1820
@@ -457,8 +457,8 @@ result:
 ---
 sample: read test_coordinates.jpg
 result:
-  ExifToolVersion: 11.7
-  FileSize: 251 kB
+  ExifToolVersion: 12.26
+  FileSize: 251 KiB
   FileType: JPEG
   FileTypeExtension: jpg
   MIMEType: image/jpeg
@@ -487,7 +487,7 @@ result:
   FocalLength: 4.1 mm
   SubjectArea: 519 403 239 180
   UserComment: clip
-  FlashpixVersion: 100
+  FlashpixVersion: '0100'
   ColorSpace: sRGB
   ExifImageWidth: 1280
   ExifImageHeight: 720
@@ -529,7 +529,7 @@ result:
 ---
 sample: read test_encodings.jpg
 result:
-  ExifToolVersion: 11.7
+  ExifToolVersion: 12.26
   FileSize: 660 bytes
   FileType: JPEG
   FileTypeExtension: jpg
@@ -548,8 +548,8 @@ result:
 ---
 sample: read test_special_dates.jpg
 result:
-  ExifToolVersion: 11.7
-  FileSize: 3.7 kB
+  ExifToolVersion: 12.26
+  FileSize: 3.7 KiB
   FileType: JPEG
   FileTypeExtension: jpg
   MIMEType: image/jpeg
@@ -559,10 +559,10 @@ result:
   ResolutionUnit: inches
   ModifyDate: false
   YCbCrPositioning: Centered
-  ExifVersion: 220
+  ExifVersion: '0220'
   DateTimeOriginal: 1961-08-13 12:08:25.000000000 +01:00
   ComponentsConfiguration: Y, Cb, Cr, -
-  FlashpixVersion: 100
+  FlashpixVersion: '0100'
   ColorSpace: Uncalibrated
   PreviewDateTime: 1961-08-13 12:08:25.000000000 +01:00
   ImageWidth: 300

data/test/test_dumping.rb

@@ -48,7 +48,7 @@ class TestDumping < TestCase
   def test_to_yaml
     hash = @mini_exiftool.to_hash
     yaml = @mini_exiftool.to_yaml
-    assert_equal hash, YAML.load(yaml)
+    assert_equal hash, YAML.unsafe_load(yaml)
   end
 
   def test_from_yaml

data/test/test_pstore.rb

@@ -31,7 +31,7 @@ class TestPstore < TestCase
       puts YAML.dump res
     END
     cmd = %Q(#{RUBY_ENGINE} -EUTF-8 -I lib -r mini_exiftool -r yaml -e "#{script}")
-    YAML.load(`#{cmd}`)
+    YAML.unsafe_load(`#{cmd}`)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_exiftool
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.10.4
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: This library is a wrapper for the ExifTool command-line application (https://exiftool.org).