xmp 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4275b1e67258b6a6b63a3b6c1a61bdaf9b5caf5fa6a6669008ecd6c43d58dd00
-  data.tar.gz: 7bff3b97c76db9f79ed337c84f18177680de92bb48edcd4400f25d8888bf5779
+  metadata.gz: '08b4db6fe980f2c71919cc1c18c5890aede35ae7314c63e3831da8acb297d631'
+  data.tar.gz: 1d98136da2cec12516e85fb8e7b0e70bd3fe95311c7a03c09b630e8cd7cc129a
 SHA512:
-  metadata.gz: 1056ea809c5e851a3c9b01778a4c6929d73a1f93df0ed592e75d0aca6bb98841156159b744aba7279b6ce4302d6af8d3486ddfae041558f29f4f2b27a3a85f41
-  data.tar.gz: e41d39d8e28bcd2a610257207d24be0c2fd58072e013c9b6c7a1ee4b0fd4fa8a0a29f3ce9bfb0ea4878e97c924716c4c20614545ed2b8f4822e965203c12e1f4
+  metadata.gz: d6f9598473a15eb47e65ce5659810576eafecafb8c399abcbecc07f8e1a6c3e64f0f386a4363830706ca4ddb2be1809406b1df4a245fefbf31076bf6c7b42b21
+  data.tar.gz: 3061122b945a464fe39d23ce115dfe2df0617f570f76ba8858d90a5bc12d0113de3d2a13fafaded4652eaf8f78eddcfb36644baca2505b416d1893128efee6cf

data/.gitignore

@@ -1,7 +1,11 @@
-*.swp
+.DS_Store
 *.gem
-.bundle
-Gemfile.lock
-pkg/*
+*.swp
+/.bundle
+/.idea
+/.ruby-version
+/Gemfile.lock
+/coverage
+/doc
+/pkg/*
 /xmp.xml
-.DS_Store

data/.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.3.5

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+  - 2.6.10
   - 2.7.8
   - 3.1.6
   - 3.2.5

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Changelog
+
+## [Unreleased]
+
+TBA
+
+## 2.0.0
+
+- `XMP.new` and `.parse` return an empty XMP::Document when a JPEG or TIFF image has no XMP metadata.
+  (In 0.2 and earlier, those methods returned `nil` in that case.
+  In 1.0 and 1.0.1 they intended to raise a custom exception, but raised `NoMethodError`.)
+- Add `XMP::Document#empty?`
+
+## 1.0.1
+
+- Reinstate support for Ruby 2.6 (the version included with current macOS, macOS 14, Sonoma)
+- Fix unintended exception, introduced in 1.0, in `XMP::Document#respond_to_missing?` and
+  `XMP::Namespace#respond_to_missing?`
+
+## 1.0
+
+- Support TIFF images
+- Support standalone properties with attributes, for example `Iptc4xmpCore.CreatorContactInfo`
+- Namespaces and attributes may be accessed with more Ruby-style underscore identifiers,
+  for example ExampleNamespace as example_namespace
+- `XMP.new` and `.parse` accept `Pathname` and `File` as well as a `String` path
+- Remove support for Ruby 2.6 and earlier

data/README.md

@@ -1,6 +1,6 @@
 # xmp - Extensible Metadata Platform (XMP) parser
 
-MP provides object oriented interface to [XMP data](http://en.wikipedia.org/wiki/Extensible_Metadata_Platform). XMP data can be found in PDF, JPEG, GIF, PNG, and many other formats.
+XMP provides an object oriented interface to [XMP data](http://en.wikipedia.org/wiki/Extensible_Metadata_Platform). XMP data can be found in PDF, JPEG, GIF, PNG, and many other formats.
 
 ## Supported Formats
 
@@ -59,9 +59,12 @@ gem 'exifr', '~> 1.3'
 ```
 
 ## Requirements
-* Ruby 2 or Ruby 3
-* Nokogiri (1.10 or newer, gem dependency - will be installed automatically)
-* EXIFR (1.3 or newer) - optional
+* Ruby 2 (supported on >= 2.6, though xmp may work on earlier versions) or Ruby 3
+* nokogiri (>= 1.10). The xmp gem depends on this gem. It will be installed automatically.
+  * On Ruby 2.6, nokogiri 1.13.10 will be installed; nokogiri >= 1.14 require Ruby 2.7.
+  * On Ruby 2.7, nokogiri 1.15.5 will be installed; nokogiri >= 1.16 require Ruby 3.
+  * See https://nokogiri.org/CHANGELOG.html for nokogiri support for older or newer Ruby versions.
+* exifr (>= 1.3). This gem is optional. If you need it, add it to your Gemfile.
 
 ## Development
 
@@ -73,6 +76,6 @@ $ rake spec      # run specs
 ```
 
 ## License
-Ruby's license.
+[Ruby's license.](https://www.ruby-lang.org/en/about/license.txt)
 
 Copyright (c) 2011 Wojciech Piekutowski, AmberBit (<http://amberbit.com>) and contributors.

data/lib/xmp/convenience.rb

@@ -10,7 +10,7 @@ module XMP::Convenience
   end
 
   def respond_to_missing?(method_name, include_private = false)
-    include?(key) or super
+    include?(method_name) or super
   end
 
   def to_h

data/lib/xmp/document.rb

@@ -4,14 +4,23 @@ class XMP::Document
   attr_reader :namespaces
   attr_reader :xml
 
-  def initialize(doc)
-    @xml        = doc.root
-    @namespaces = doc.collect_namespaces.map do |ns, url|
-      @xml.add_namespace_definition ns, url
-      ns[/^(?:xmlns:)?xmlns:(.+)/, 1]
+  def initialize(doc = nil)
+    if doc
+      @xml = doc.root
+      @namespaces = doc.collect_namespaces.map do |ns, url|
+        @xml.add_namespace_definition ns, url
+        ns[/^(?:xmlns:)?xmlns:(.+)/, 1]
+      end
+    else
+      @xml = nil
+      @namespaces = []
     end
   end
 
+  def empty?
+    @xml.nil?
+  end
+
   private
 
   def list

data/lib/xmp/error.rb

@@ -1,4 +1,3 @@
 module XMP
   Error = Class.new(RuntimeError)
-  NoXMP = Class.new(Error)
 end

data/lib/xmp/handler/exifr_jpeg.rb

@@ -0,0 +1,15 @@
+begin
+  require 'exifr/jpeg'
+rescue LoadError => exception
+  raise exception unless exception.path == 'exifr/jpeg'
+end
+
+module XMP::Handler
+  class ExifrJPEG
+    def call(object)
+      return unless defined?(EXIFR::JPEG) && object.is_a?(EXIFR::JPEG)
+      xmp_chunk = object.app1s.find { |a| a =~ %r|\Ahttp://ns.adobe.com/xap/1.0/| }
+      xmp_chunk ? xmp_chunk.split("\000")[1] : XMP::Document.new
+    end
+  end
+end

data/lib/xmp/handler/exifr_tiff.rb

@@ -0,0 +1,14 @@
+begin
+  require 'exifr/tiff'
+rescue LoadError => exception
+  raise exception unless exception.path == 'exifr/tiff'
+end
+
+module XMP::Handler
+  class ExifrTIFF
+    def call(object)
+      return unless defined?(EXIFR::TIFF) && object.is_a?(EXIFR::TIFF)
+      object.xmp || XMP::Document.new
+    end
+  end
+end

data/lib/xmp/namespace.rb

@@ -29,12 +29,12 @@ class XMP::Namespace
   end
 
   def get_embedded(name)  
-    return unless element = xml.at("//rdf:Description[@#{namespace}:#{name}]")
+    element = xml.at("//rdf:Description[@#{namespace}:#{name}]")
     element.attribute(name.to_s).text
   end
 
   def get_standalone(name)
-    return unless attribute = xml.xpath("//#{namespace}:#{name}").first
+    attribute = xml.xpath("//#{namespace}:#{name}").first
     if list = attribute.xpath("./rdf:Bag | ./rdf:Seq | ./rdf:Alt").first
       return list.xpath("./rdf:li").map(&:text)
     end

data/lib/xmp/version.rb

@@ -1,3 +1,3 @@
 module XMP
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

data/lib/xmp.rb

@@ -3,7 +3,8 @@ module XMP
   require 'xmp/document'
   require 'xmp/error'
   require 'xmp/handler'
-  require 'xmp/handler/exifr'
+  require 'xmp/handler/exifr_jpeg'
+  require 'xmp/handler/exifr_tiff'
   require 'xmp/handler/file'
   require 'xmp/handler/xml'
   require 'xmp/namespace'
@@ -14,7 +15,8 @@ module XMP
     Handler::File.new('.jpg', '.jpeg') { |file| EXIFR::JPEG.new(file) },
     Handler::File.new('.tif', '.tiff') { |file| EXIFR::TIFF.new(file) },
     Handler::File.new('.xmp', '.xml')  { |file| Nokogiri::XML(file) },
-    Handler::Exifr.new,
+    Handler::ExifrJPEG.new,
+    Handler::ExifrTIFF.new,
     Handler::XML.new
   ]
 end

data/spec/document_spec.rb

@@ -0,0 +1,18 @@
+describe XMP::Document do
+  describe '.new' do
+    it "should convert a Nokogiri::XML::Document to an XMP::Document with the expected XML and namespaces" do
+      xml_doc = Nokogiri::XML(File.open('spec/fixtures/xmp.xml'))
+      xmp_doc = XMP::Document.new(xml_doc)
+      xmp_doc.xml.should eq(xml_doc.root)
+      xmp_doc.namespaces.should =~ %w{rdf x tiff exif xap aux Iptc4xmpCore photoshop crs dc}
+      xmp_doc.should_not be_empty
+    end
+
+    it "should, given no args, create an empty XMP::Document" do
+      xmp_doc = XMP::Document.new
+      xmp_doc.xml.should be_nil
+      xmp_doc.namespaces.should be_empty
+      xmp_doc.should be_empty
+    end
+  end
+end

data/spec/exifr_jpeg_spec.rb

@@ -1,4 +1,3 @@
-require './spec/spec_helper.rb'
 require 'exifr/jpeg'
 
 describe "XMP with EXIFR::JPEG" do
@@ -20,4 +19,8 @@ describe "XMP with EXIFR::JPEG" do
     xmp.should be_instance_of(XMP::Document)
     xmp.namespaces.should =~ %w{dc iX pdf photoshop rdf tiff x xap xapRights}
   end
+
+  it "should return an empty XMP::Document for an image without XMP metadata" do
+    XMP.parse('spec/fixtures/no-xmp-metadata.jpg').should be_instance_of(XMP::Document)
+  end
 end

data/spec/exifr_tiff_spec.rb

@@ -1,4 +1,3 @@
-require './spec/spec_helper.rb'
 require 'exifr/tiff'
 
 describe "XMP with EXIFR::TIFF" do
@@ -14,4 +13,8 @@ describe "XMP with EXIFR::TIFF" do
     xmp.should be_instance_of(XMP::Document)
     xmp.namespaces.should =~ %w{dc iX pdf photoshop rdf tiff x xap xapRights}
   end
+
+  it "should return an empty XMP::Document for an image without XMP metadata" do
+    XMP.parse('spec/fixtures/no-xmp-metadata.tiff').should be_instance_of(XMP::Document)
+  end
 end

data/spec/fixtures/xmp-with-empty-attribute.xml

@@ -0,0 +1,240 @@
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2-c020 1.124078, Tue Sep 11 2007 23:21:40        ">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about=""
+    xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
+    xmlns:exif="http://ns.adobe.com/exif/1.0/"
+    xmlns:xap="http://ns.adobe.com/xap/1.0/"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:aux="http://ns.adobe.com/exif/1.0/aux/"
+    xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"
+    xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"
+    xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/"
+   tiff:Make="Canon"
+   tiff:Model="Canon EOS-1D Mark III"
+   tiff:ImageWidth="800"
+   tiff:ImageLength="533"
+   tiff:XResolution="72/1"
+   tiff:YResolution="72/1"
+   tiff:ResolutionUnit="2"
+   exif:ExifVersion="0221"
+   exif:ExposureTime="1/320"
+   exif:ShutterSpeedValue="8321928/1000000"
+   exif:FNumber="35/10"
+   exif:ApertureValue="361471/100000"
+   exif:ExposureProgram="1"
+   exif:DateTimeOriginal="2011-01-18T15:48:52.00+01:00"
+   exif:DateTimeDigitized="2011-01-18T15:48:52.00+01:00"
+   exif:ExposureBiasValue="0/1"
+   exif:MaxApertureValue="175/100"
+   exif:SubjectDistance="727/100"
+   exif:MeteringMode="5"
+   exif:FocalLength="85/1"
+   exif:CustomRendered="0"
+   exif:ExposureMode="1"
+   exif:WhiteBalance="0"
+   exif:SceneCaptureType="0"
+   exif:FocalPlaneXResolution="3888000/1107"
+   exif:FocalPlaneYResolution="2592000/736"
+   exif:FocalPlaneResolutionUnit="2"
+   exif:PixelXDimension="800"
+   exif:PixelYDimension="533"
+   xap:ModifyDate="2011-02-04T11:12:00+01:00"
+   xap:CreateDate="2011-01-18T15:48:52.00+01:00"
+   xap:CreatorTool="Adobe Photoshop Lightroom"
+   aux:SerialNumber="562133"
+   aux:LensInfo="85/1 85/1 0/0 0/0"
+   aux:Lens="EF85mm f/1.8 USM"
+   aux:LensID="155"
+   aux:ImageNumber="0"
+   aux:FlashCompensation="0/1"
+   aux:OwnerName="John Doe"
+   aux:Firmware="1.2.3"
+   Iptc4xmpCore:Location="Miejsce"
+   photoshop:Category="Kategoria"
+   photoshop:LegacyIPTCDigest="7220E75D669D5F417F2D6C9ADA130467"
+   crs:Version="6.1"
+   crs:ProcessVersion="5.7"
+   crs:WhiteBalance="As Shot"
+   crs:Temperature="4950"
+   crs:Tint="-6"
+   crs:Exposure="-0.75"
+   crs:Shadows="15"
+   crs:Brightness="+92"
+   crs:Contrast="+27"
+   crs:Saturation="+5"
+   crs:Sharpness="25"
+   crs:LuminanceSmoothing="0"
+   crs:ColorNoiseReduction="25"
+   crs:ChromaticAberrationR="0"
+   crs:ChromaticAberrationB="0"
+   crs:VignetteAmount="-61"
+   crs:VignetteMidpoint="50"
+   crs:ShadowTint="0"
+   crs:RedHue="+14"
+   crs:RedSaturation="+18"
+   crs:GreenHue="0"
+   crs:GreenSaturation="0"
+   crs:BlueHue="-7"
+   crs:BlueSaturation="-7"
+   crs:FillLight="31"
+   crs:Vibrance="0"
+   crs:HighlightRecovery="30"
+   crs:Clarity="+100"
+   crs:Defringe="0"
+   crs:HueAdjustmentRed="0"
+   crs:HueAdjustmentOrange="+33"
+   crs:HueAdjustmentYellow="0"
+   crs:HueAdjustmentGreen="0"
+   crs:HueAdjustmentAqua="0"
+   crs:HueAdjustmentBlue="0"
+   crs:HueAdjustmentPurple="0"
+   crs:HueAdjustmentMagenta="0"
+   crs:SaturationAdjustmentRed="-2"
+   crs:SaturationAdjustmentOrange="-30"
+   crs:SaturationAdjustmentYellow="0"
+   crs:SaturationAdjustmentGreen="0"
+   crs:SaturationAdjustmentAqua="0"
+   crs:SaturationAdjustmentBlue="0"
+   crs:SaturationAdjustmentPurple="0"
+   crs:SaturationAdjustmentMagenta="0"
+   crs:LuminanceAdjustmentRed="0"
+   crs:LuminanceAdjustmentOrange="0"
+   crs:LuminanceAdjustmentYellow="0"
+   crs:LuminanceAdjustmentGreen="0"
+   crs:LuminanceAdjustmentAqua="0"
+   crs:LuminanceAdjustmentBlue="0"
+   crs:LuminanceAdjustmentPurple="0"
+   crs:LuminanceAdjustmentMagenta="0"
+   crs:SplitToningShadowHue="0"
+   crs:SplitToningShadowSaturation="0"
+   crs:SplitToningHighlightHue="0"
+   crs:SplitToningHighlightSaturation="0"
+   crs:SplitToningBalance="+64"
+   crs:ParametricShadows="+60"
+   crs:ParametricDarks="-11"
+   crs:ParametricLights="+15"
+   crs:ParametricHighlights="+70"
+   crs:ParametricShadowSplit="25"
+   crs:ParametricMidtoneSplit="50"
+   crs:ParametricHighlightSplit="80"
+   crs:SharpenRadius="+1.0"
+   crs:SharpenDetail="25"
+   crs:SharpenEdgeMasking="0"
+   crs:PostCropVignetteAmount="0"
+   crs:GrainAmount="0"
+   crs:ColorNoiseReductionDetail="50"
+   crs:LensProfileEnable="0"
+   crs:LensManualDistortionAmount="0"
+   crs:PerspectiveVertical="0"
+   crs:PerspectiveHorizontal="0"
+   crs:PerspectiveRotate="0.0"
+   crs:PerspectiveScale="100"
+   crs:ConvertToGrayscale="False"
+   crs:ToneCurveName="Medium Contrast"
+   crs:CameraProfile="Adobe Standard"
+   crs:CameraProfileDigest="631F0C9CC003981496182C3DD10EF165"
+   crs:LensProfileSetup="LensDefaults"
+   crs:HasSettings="True"
+   crs:CropTop="0.024828"
+   crs:CropLeft="0.012414"
+   crs:CropBottom="1"
+   crs:CropRight="0.987586"
+   crs:CropAngle="0"
+   crs:CropConstrainToWarp="0"
+   crs:CropWidth="800"
+   crs:CropHeight="533"
+   crs:CropUnit="0"
+   crs:HasCrop="True"
+   crs:AlreadyApplied="True">
+   <exif:ISOSpeedRatings>
+    <rdf:Seq>
+     <rdf:li>100</rdf:li>
+    </rdf:Seq>
+   </exif:ISOSpeedRatings>
+   <dc:creator>
+    <rdf:Seq>
+     <rdf:li>John Doe</rdf:li>
+    </rdf:Seq>
+   </dc:creator>
+   <dc:title>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Tytuł zdjęcia</rdf:li>
+    </rdf:Alt>
+   </dc:title>
+   <dc:rights>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Autor</rdf:li>
+    </rdf:Alt>
+   </dc:rights>
+   <dc:subject>
+    <rdf:Bag>
+     <rdf:li>Słowa kluczowe i numery startowe.</rdf:li>
+    </rdf:Bag>
+   </dc:subject>
+   <dc:description>
+    <rdf:Alt>
+     <rdf:li xml:lang="x-default">Opis zdjęcia</rdf:li>
+    </rdf:Alt>
+   </dc:description>
+   <photoshop:SupplementalCategories>
+    <rdf:Bag>
+     <rdf:li>Nazwa imprezy</rdf:li>
+    </rdf:Bag>
+   </photoshop:SupplementalCategories>
+   <crs:ToneCurve>
+    <rdf:Seq>
+     <rdf:li>0, 0</rdf:li>
+     <rdf:li>32, 22</rdf:li>
+     <rdf:li>64, 56</rdf:li>
+     <rdf:li>128, 128</rdf:li>
+     <rdf:li>192, 196</rdf:li>
+     <rdf:li>255, 255</rdf:li>
+    </rdf:Seq>
+   </crs:ToneCurve>
+   <Iptc4xmpCore:CreatorContactInfo/>
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<?xpacket end="w"?>

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start { enable_coverage :branch }
+
 require 'bundler/setup'
 Bundler.require(:development)
 

data/spec/xmp_spec.rb

@@ -1,5 +1,4 @@
 # encoding: UTF-8
-require './spec/spec_helper.rb'
 
 describe XMP do
   describe "with xmp.xml" do
@@ -26,6 +25,14 @@ describe XMP do
       @xmp['photoshop']['SupplementalCategories'].should eq(['Nazwa imprezy'])
     end
 
+    it "should respond to standalone attributes" do
+      @xmp.should respond_to(:dc)
+      @xmp.dc.should respond_to(:title)
+      @xmp.should respond_to(:photoshop)
+      @xmp.photoshop.should respond_to(:SupplementalCategories)
+      @xmp.photoshop.should respond_to(:supplemental_categories)
+    end
+
     it "should return standalone attribute hash" do
       @xmp.Iptc4xmpCore.CreatorContactInfo.should eq({'CiAdrCtry' => 'Germany', 'CiAdrCity' => 'Berlin'})
     end
@@ -40,6 +47,13 @@ describe XMP do
       @xmp.photoshop['UnknownAttribute'].should eq(nil)
     end
 
+    it "should raise if an attribute is called with any argument" do
+      lambda { XMP.new('spec/fixtures/xmp.xml').dc('Comics') }.
+        should raise_error(ArgumentError, "wrong number of arguments (given 1, expected 0)")
+      lambda { XMP.new('spec/fixtures/xmp.xml').dc.title('Amazing Stories') }.
+        should raise_error(ArgumentError, "wrong number of arguments (given 1, expected 0)")
+    end
+
     describe "namespace 'tiff'" do
       before { @namespace = @xmp.tiff }
 
@@ -117,4 +131,24 @@ describe XMP do
       @xmp.to_h.keys.should =~ %w{Iptc4xmpExt aux crs dc exifEX mwg-rs photoshop rdf stArea stDim stEvt stRef x xmp xmpMM}
     end
   end
+
+  it "should read from an IO" do
+    xmp = XMP.new(File.open('spec/fixtures/xmp.xml'))
+    xmp.namespaces.should =~ %w{rdf x tiff exif xap aux Iptc4xmpCore photoshop crs dc}
+  end
+
+  it "should raise if the file doesn't exist" do
+    nonexistent_file = 'nonexistent.xml'
+    lambda { XMP.new(nonexistent_file) }.should raise_error(XMP::Error, "cannot read file #{nonexistent_file}")
+  end
+
+  it "should return nil for an unknown attribute" do
+    xmp = XMP.new('spec/fixtures/xmp-with-empty-attribute.xml')
+    lambda { xmp.Iptc4xmpCore.CreatorContactInfo }.
+      should raise_error(XMP::Error, "Don't know how to handle: \n<Iptc4xmpCore:CreatorContactInfo/>")
+  end
+
+  it "should raise for an unknown input type" do
+    lambda { XMP.new(0) }.should raise_error(XMP::Error, "cannot handle 0")
+  end
 end

data/xmp.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.email       = ["wojciech.piekutowski@amberbit.com"]
   s.homepage    = "https://github.com/amberbit/xmp"
   s.summary     = %q{Extensible Metadata Platform (XMP) parser for JPEG, TIFF and raw XML files}
-  s.description = %q{Extensible Metadata Platform (XMP) parser extracts metadata from JPED and TIFF image files. It also supports parsing raw XML files containing XMP.}
-  s.licenses    = ["MIT"]
+  s.description = %q{Extensible Metadata Platform (XMP) parser extracts metadata from JPEG and TIFF image files. It also supports parsing raw XML files containing XMP.}
+  s.licenses    = ["Ruby"]
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = %w(README.md)
 
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.add_dependency 'nokogiri', '~> 1.0'
 
@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'logger', '~> 1.0'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Wojciech Piekutowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -86,7 +86,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Extensible Metadata Platform (XMP) parser extracts metadata from JPED
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Extensible Metadata Platform (XMP) parser extracts metadata from JPEG
   and TIFF image files. It also supports parsing raw XML files containing XMP.
 email:
 - wojciech.piekutowski@amberbit.com
@@ -97,7 +111,9 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -106,16 +122,21 @@ files:
 - lib/xmp/document.rb
 - lib/xmp/error.rb
 - lib/xmp/handler.rb
-- lib/xmp/handler/exifr.rb
+- lib/xmp/handler/exifr_jpeg.rb
+- lib/xmp/handler/exifr_tiff.rb
 - lib/xmp/handler/file.rb
 - lib/xmp/handler/xml.rb
 - lib/xmp/namespace.rb
 - lib/xmp/version.rb
+- spec/document_spec.rb
 - spec/exifr_jpeg_spec.rb
 - spec/exifr_tiff_spec.rb
 - spec/fixtures/UPPERCASE.JPG
 - spec/fixtures/multiple-app1.jpg
 - spec/fixtures/multiple-app1.tiff
+- spec/fixtures/no-xmp-metadata.jpg
+- spec/fixtures/no-xmp-metadata.tiff
+- spec/fixtures/xmp-with-empty-attribute.xml
 - spec/fixtures/xmp.xml
 - spec/fixtures/xmp2.xml
 - spec/fixtures/xmp3.xml
@@ -126,7 +147,7 @@ files:
 - xmp.gemspec
 homepage: https://github.com/amberbit/xmp
 licenses:
-- MIT
+- Ruby
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -136,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -148,11 +169,15 @@ signing_key:
 specification_version: 4
 summary: Extensible Metadata Platform (XMP) parser for JPEG, TIFF and raw XML files
 test_files:
+- spec/document_spec.rb
 - spec/exifr_jpeg_spec.rb
 - spec/exifr_tiff_spec.rb
 - spec/fixtures/UPPERCASE.JPG
 - spec/fixtures/multiple-app1.jpg
 - spec/fixtures/multiple-app1.tiff
+- spec/fixtures/no-xmp-metadata.jpg
+- spec/fixtures/no-xmp-metadata.tiff
+- spec/fixtures/xmp-with-empty-attribute.xml
 - spec/fixtures/xmp.xml
 - spec/fixtures/xmp2.xml
 - spec/fixtures/xmp3.xml

data/lib/xmp/handler/exifr.rb

@@ -1,22 +0,0 @@
-begin
-  require 'exifr/jpeg'
-  require 'exifr/tiff'
-rescue LoadError => exception
-  raise exception unless exception.path == 'exifr/jpeg'
-end
-
-module XMP::Handler
-  class Exifr
-    def call(object)
-      return unless defined?(EXIFR::JPEG)
-      case object
-      when EXIFR::JPEG then format, xmp_data = 'jpeg', object.app1s.find { |a| a =~ %r|\Ahttp://ns.adobe.com/xap/1.0/| }&.split("\000")[1]
-      when EXIFR::TIFF then format, xmp_data = 'tiff', object.xmp
-      else return
-      end
-
-      raise XMP::NoXMP, "XMP section missing from #{format}" unless xmp_data
-      xmp_data
-    end
-  end
-end