exiv2 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700d9adb55ce3e0eb64fa2f2f8749c607e22ebd896e82b92142c4a901f8c2f99
-  data.tar.gz: f74dc692a5e857177623ff7d62c88bd7f3dfb6e7e717fd47c9a05dbc6b921f2b
+  metadata.gz: 2d7b70abda815a7d5ee2a37dbda954d65f61a277cd41c73517d02c1659ac2ed6
+  data.tar.gz: 9f6aba355b6e181965205674a81a577bd4adc7ac085886021138d2ba925e3489
 SHA512:
-  metadata.gz: '025834b98bb969965ce0a4a0b87df41f5bb4c193cf16297753f4bfc8ca45ab94c6048f81e6429e53f1dcb90e73bfdada4a39da8b1a816c594bf1767ae8ca7b82'
-  data.tar.gz: 7b3f1468e28087b2f7b369a6b7b660656f31aef57b93ac048ad1f8333256f61c629a30d95834f2f50001b9720ebf2075110ab3b9b275923a5a9fa5be0fe5013f
+  metadata.gz: a0431aa73b62228bf2bbbfd618747ce18d3b453306f4ae452e9a4e8843c274ae1fb5ca65f09657f1d7ff568f4689fde1156320d4c1a8e1b4b86a844748a358d6
+  data.tar.gz: 5c67ecf3dee17f011d274610bff7d5e1d245ce0754f0f1d5c2095785759da78780c5a307ff48c2380e79b4e308171944f5430142b1563593789074ce8f2f5793

data/README.md

@@ -1,6 +1,9 @@
 # Exiv2
 
-[![Build Status](https://travis-ci.org/envato/exiv2.svg)](https://travis-ci.org/envato/exiv2)
+[![License MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/envato/exiv2/blob/master/LICENSE)
+[![Gem Version](https://img.shields.io/gem/v/exiv2.svg?maxAge=2592000)](https://rubygems.org/gems/exiv2)
+[![Gem Downloads](https://img.shields.io/gem/dt/exiv2.svg?maxAge=2592000)](https://rubygems.org/gems/exiv2)
+[![Build Status](https://github.com/envato/exiv2/workflows/tests/badge.svg?branch=master)](https://github.com/envato/exiv2/actions?query=branch%3Amaster+workflow%3Atests)
 
 A simple wrapper around the C++ Exiv2 libary for reading and writing image metadata.
 

data/ext/exiv2/exiv2.cpp

@@ -75,6 +75,7 @@ extern "C" void Init_exiv2() {
   basic_error_class = rb_define_class_under(exiv2_module, "BasicError", rb_eRuntimeError);
 
   image_class = rb_define_class_under(exiv2_module, "Image", rb_cObject);
+  rb_undef_alloc_func(image_class);
   rb_define_method(image_class, "read_metadata", (Method)image_read_metadata, 0);
   rb_define_method(image_class, "write_metadata", (Method)image_write_metadata, 0);
   rb_define_method(image_class, "iptc_data", (Method)image_iptc_data, 0);
@@ -85,18 +86,21 @@ extern "C" void Init_exiv2() {
   rb_define_singleton_method(image_factory_class, "open", (Method)image_factory_open, 1);
 
   exif_data_class = rb_define_class_under(exiv2_module, "ExifData", rb_cObject);
+  rb_undef_alloc_func(exif_data_class);
   rb_include_module(exif_data_class, enumerable_module);
   rb_define_method(exif_data_class, "each", (Method)exif_data_each, 0);
   rb_define_method(exif_data_class, "add", (Method)exif_data_add, 2);
   rb_define_method(exif_data_class, "delete", (Method)exif_data_delete, 1);
 
   iptc_data_class = rb_define_class_under(exiv2_module, "IptcData", rb_cObject);
+  rb_undef_alloc_func(iptc_data_class);
   rb_include_module(iptc_data_class, enumerable_module);
   rb_define_method(iptc_data_class, "each", (Method)iptc_data_each, 0);
   rb_define_method(iptc_data_class, "add", (Method)iptc_data_add, 2);
   rb_define_method(iptc_data_class, "delete", (Method)iptc_data_delete, 1);
   
   xmp_data_class = rb_define_class_under(exiv2_module, "XmpData", rb_cObject);
+  rb_undef_alloc_func(xmp_data_class);
   rb_include_module(xmp_data_class, enumerable_module);
   rb_define_method(xmp_data_class, "each", (Method)xmp_data_each, 0);
   rb_define_method(xmp_data_class, "add", (Method)xmp_data_add, 2);

data/ext/exiv2/extconf.rb

@@ -5,6 +5,8 @@ RbConfig::MAKEFILE_CONFIG['CCFLAGS'] = ENV['CCFLAGS'] if ENV['CCFLAGS']
 RbConfig::MAKEFILE_CONFIG['CXX'] = ENV['CXX'] if ENV['CXX']
 RbConfig::MAKEFILE_CONFIG['CXXFLAGS'] = ENV['CXXFLAGS'] if ENV['CXXFLAGS']
 
-dir_config("exiv2")
+if dir_config("exiv2") == [nil, nil]
+  pkg_config("exiv2")
+end
 have_library("exiv2")
 create_makefile("exiv2/exiv2")

data/lib/exiv2/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module Exiv2
-  VERSION = "0.0.9"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exiv2
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
 platform: ruby
 authors:
 - Pete Yandell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -46,15 +46,8 @@ extensions:
 - ext/exiv2/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
-- exiv2.gemspec
 - ext/exiv2/exiv2.cpp
 - ext/exiv2/extconf.rb
 - lib/exiv2.rb
@@ -63,13 +56,15 @@ files:
 - lib/exiv2/shared_methods.rb
 - lib/exiv2/version.rb
 - lib/exiv2/xmp_data.rb
-- spec/exiv2_spec.rb
-- spec/files/photo_with_utf8_description.jpg
-- spec/files/test.jpg
 homepage: https://github.com/envato/exiv2
 licenses: []
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/envato/exiv2/issues
+  changelog_uri: https://github.com/envato/exiv2/releases
+  documentation_uri: https://www.rubydoc.info/gems/exiv2/0.1.1
+  homepage_uri: https://github.com/envato/exiv2
+  source_code_uri: https://github.com/envato/exiv2/tree/v0.1.1
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,12 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: exiv2
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: A simple wrapper around Exiv2
-test_files:
-- spec/exiv2_spec.rb
-- spec/files/photo_with_utf8_description.jpg
-- spec/files/test.jpg
+test_files: []

data/.gitignore

@@ -1,14 +0,0 @@
-Makefile
-mkmf.log
-.DS_Store
-*.gem
-*.bundle
-*.rbc
-*.a
-*.o
-*.so
-*.dSYM
-pkg
-tmp
-bin
-/vendor

data/.rspec

@@ -1 +0,0 @@
---colour

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-before_script:
-  - sudo apt-get install libexiv2-dev
-script:
-  - bundle exec rake spec

data/Gemfile

@@ -1,3 +0,0 @@
-source "http://rubygems.org"
-
-gemspec

data/Gemfile.lock

@@ -1,36 +0,0 @@
-PATH
-  remote: .
-  specs:
-    exiv2 (0.0.9)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    rake (10.4.2)
-    rake-compiler (0.9.5)
-      rake
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  exiv2!
-  rake-compiler
-  rspec
-
-BUNDLED WITH
-   1.10.6

data/Rakefile

@@ -1,16 +0,0 @@
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
-
-require 'rake/extensiontask'
-Rake::ExtensionTask.new('exiv2') do |ext|
-  ext.lib_dir = "lib/exiv2"
-  if ENV['EXIV2_DIR']
-    ext.config_options << "--with-exiv2-dir=#{ENV['EXIV2_DIR']}"
-  end
-end
-Rake::Task[:spec].prerequisites << :compile
-
-require 'bundler'
-Bundler::GemHelper.install_tasks
-

data/exiv2.gemspec

@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "exiv2/version"
-
-Gem::Specification.new do |s|
-  s.name        = "exiv2"
-  s.version     = Exiv2::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Pete Yandell"]
-  s.email       = ["pete@envato.com"]
-  s.homepage    = "https://github.com/envato/exiv2"
-  s.summary     = %q{A simple wrapper around Exiv2}
-  s.description = %q{A simple wrapper around the C++ Exiv2 libary for reading image metadata}
-
-  s.rubyforge_project = "exiv2"
-
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rake-compiler"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib", "ext"]
-  s.extensions    = ["ext/exiv2/extconf.rb"]
-end

data/spec/exiv2_spec.rb

@@ -1,227 +0,0 @@
-# coding: utf-8
-require 'bundler/setup'
-require 'exiv2'
-require 'fileutils'
-
-describe Exiv2 do
-
-  it "should handle a Pathname being passed to open" do
-    image = Exiv2::ImageFactory.open(Pathname.new("spec/files/test.jpg").to_s)
-    image.read_metadata
-    expect(image.iptc_data.to_hash).not_to be_empty
-  end
-
-  it "should raise an error when trying to open a non-existant file" do
-    expect {
-      Exiv2::ImageFactory.open("tmp/no-such-file.jpg")
-    }.to raise_error(Exiv2::BasicError)
-  end
-
-  it "should write metadata" do
-    FileUtils.cp("spec/files/test.jpg", "spec/files/test_tmp.jpg")
-    image = Exiv2::ImageFactory.open("spec/files/test_tmp.jpg")
-    image.read_metadata
-    image.iptc_data["Iptc.Application2.Caption"] = "A New Caption"
-    image.write_metadata
-    image = nil
-    
-    image2 = Exiv2::ImageFactory.open("spec/files/test_tmp.jpg")
-    image2.read_metadata
-    expect(image2.iptc_data["Iptc.Application2.Caption"]).to eq("A New Caption")
-    FileUtils.rm("spec/files/test_tmp.jpg")
-  end
-
-  it 'reads UTF-8 data' do
-    image = Exiv2::ImageFactory.open(Pathname.new("spec/files/photo_with_utf8_description.jpg").to_s)
-    image.read_metadata
-    description = image.exif_data["Exif.Image.ImageDescription"]
-    if description.respond_to? :encoding # Only in Ruby 1.9+
-      expect(description.encoding).to eq(Encoding::UTF_8)
-    end
-    expect(description).to eq('UTF-8 description. ☃ł㌎')
-  end
-
-  it 'reads UTF-8 data in each' do
-    if String.new.respond_to? :encoding # Only in Ruby 1.9+
-      image = Exiv2::ImageFactory.open(Pathname.new("spec/files/photo_with_utf8_description.jpg").to_s)
-      image.read_metadata
-      image.exif_data.each do |key,value|
-        expect(key.encoding).to   eq(Encoding::UTF_8)
-        expect(value.encoding).to eq(Encoding::UTF_8)
-      end
-    end
-  end
-  
-  let(:image) do
-    image = Exiv2::ImageFactory.open("spec/files/test.jpg")
-    image.read_metadata
-    image
-  end
-
-  context "IPTC data" do
-    before do
-      @iptc_data = image.iptc_data
-    end
-
-    it "should read IPTC data" do
-      expect(@iptc_data).to be_a(Exiv2::IptcData)
-      expect(@iptc_data.inspect).to eq('#<Exiv2::IptcData: {"Iptc.Application2.Caption"=>"Rhubarb rhubarb rhubard", "Iptc.Application2.Keywords"=>["fish", "custard"]}>')
-      expect(@iptc_data.to_a).to eq([
-        ["Iptc.Application2.Caption", "Rhubarb rhubarb rhubard"],
-        ["Iptc.Application2.Keywords", "fish"],
-        ["Iptc.Application2.Keywords", "custard"]
-      ])
-    end
-
-    it "should convert iptc data into a hash" do
-      iptc_hash = @iptc_data.to_hash
-      expect(iptc_hash).to be_a(Hash)
-      expect(iptc_hash).to eq({
-        "Iptc.Application2.Caption"  => "Rhubarb rhubarb rhubard",
-        "Iptc.Application2.Keywords" => ["fish", "custard"]
-      })
-    end
-    
-    it "should write IPTC data" do
-      @iptc_data.add("Iptc.Application2.Keywords", "fishy")
-      expect(@iptc_data.to_a).to eq([
-        ["Iptc.Application2.Caption", "Rhubarb rhubarb rhubard"],
-        ["Iptc.Application2.Keywords", "fish"],
-        ["Iptc.Application2.Keywords", "custard"],
-        ["Iptc.Application2.Keywords", "fishy"]
-      ])
-    end
-    
-    it "should set IPTC data" do
-      @iptc_data["Iptc.Application2.Caption"] = "A New Caption"
-      expect(@iptc_data.to_hash["Iptc.Application2.Caption"]).to eq("A New Caption")
-    end
-    
-    it "should set multiply IPTC data values" do
-      @iptc_data["Iptc.Application2.Keywords"] = ["abc", "cde"]
-      expect(@iptc_data.to_hash["Iptc.Application2.Keywords"]).to eq(["abc", "cde"])
-    end
-    
-    it "should delete one value of IPTC data" do
-      @iptc_data.delete("Iptc.Application2.Keywords")
-      expect(@iptc_data.to_hash["Iptc.Application2.Keywords"]).to eq("custard")
-    end
-    
-    it "should delete all values of IPTC data" do
-      @iptc_data.delete_all("Iptc.Application2.Keywords")
-      expect(@iptc_data.to_hash["Iptc.Application2.Keywords"]).to eq(nil)
-    end
-  end
-
-  context "XMP data" do
-    before do
-      @xmp_data = image.xmp_data
-    end
-
-    it "should read XMP data" do
-      expect(@xmp_data).to be_a(Exiv2::XmpData)
-      expect(@xmp_data.inspect).to eq('#<Exiv2::XmpData: {"Xmp.dc.description"=>"lang=\"x-default\" This is a description", "Xmp.dc.title"=>"lang=\"x-default\" Pickled"}>')
-      expect(@xmp_data.to_a).to eq([
-        ["Xmp.dc.title", "lang=\"x-default\" Pickled"],
-        ["Xmp.dc.description", "lang=\"x-default\" This is a description"]
-      ])
-    end
-
-    it "should convert xmp data into a hash" do
-      xmp_hash = @xmp_data.to_hash
-      expect(xmp_hash).to be_a(Hash)
-      expect(xmp_hash).to eq({
-        "Xmp.dc.title"       => "lang=\"x-default\" Pickled",
-        "Xmp.dc.description" => "lang=\"x-default\" This is a description"
-      })
-    end
-
-    it "should write XMP data" do
-      @xmp_data["Xmp.dc.title"] = "lang=\"x-default\" Changed!"
-      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq("lang=\"x-default\" Changed!")
-    end
-    
-    it "should set XMP data" do
-      @xmp_data["Xmp.dc.title"] = "A New Title"
-      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq("lang=\"x-default\" A New Title")
-    end
-    
-    it "should set multiply XMP data values" do
-      @xmp_data["Xmp.dc.title"] = ["abc", "cde"]
-      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq(["lang=\"x-default\" abc", "lang=\"x-default\" cde"])
-    end
-    
-    it "should delete one value of XMP data" do
-      @xmp_data["Xmp.dc.title"] = ["abc", "cde"]
-      @xmp_data.delete("Xmp.dc.title")
-      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq("lang=\"x-default\" cde")
-    end
-    
-    it "should delete all values of XMP data" do
-      @xmp_data.delete_all("Xmp.dc.title")
-      expect(@xmp_data.to_hash["Xmp.dc.title"]).to eq(nil)
-    end
-  end
-
-  context "EXIF data" do
-    before do
-      @exif_data = image.exif_data
-    end
-
-    it "should read Exif data" do
-      expect(@exif_data).to be_a(Exiv2::ExifData)
-      expect(@exif_data.inspect).to eq('#<Exiv2::ExifData: {"Exif.Image.ExifTag"=>"52", "Exif.Image.Software"=>"plasq skitch", "Exif.Photo.ExifVersion"=>"48 50 49 48", "Exif.Photo.PixelXDimension"=>"32", "Exif.Photo.PixelYDimension"=>"32"}>')
-      expect(@exif_data.to_a).to eq([
-        ["Exif.Image.Software",         "plasq skitch"],
-        ["Exif.Image.ExifTag",          "52"],
-        ["Exif.Photo.ExifVersion",      "48 50 49 48"],
-        ["Exif.Photo.PixelXDimension",  "32"],
-        ["Exif.Photo.PixelYDimension",  "32"]
-      ])
-    end
-
-    it "should convert xmp data into a hash" do
-      exif_hash = @exif_data.to_hash
-      expect(exif_hash).to be_a(Hash)
-      expect(exif_hash).to eq({
-        "Exif.Photo.PixelXDimension" => "32",
-        "Exif.Photo.ExifVersion"     => "48 50 49 48",
-        "Exif.Image.Software"        => "plasq skitch",
-        "Exif.Photo.PixelYDimension" => "32",
-        "Exif.Image.ExifTag"         => "52"
-      })
-    end
-
-    it "should write Exif data" do
-      @exif_data.add("Exif.Image.Software", "ruby-exiv2")
-      expect(@exif_data.to_hash).to eq({
-        "Exif.Photo.PixelXDimension" => "32",
-        "Exif.Photo.ExifVersion"     => "48 50 49 48",
-        "Exif.Image.Software"        => ["plasq skitch", "ruby-exiv2"],
-        "Exif.Photo.PixelYDimension" => "32",
-        "Exif.Image.ExifTag"         => "52"
-      })
-    end
-    
-    it "should set Exif data" do
-      @exif_data["Exif.Image.Software"] = "ruby-exiv2"
-      expect(@exif_data.to_hash["Exif.Image.Software"]).to eq("ruby-exiv2")
-    end
-    
-    it "should set multiply Exif data values" do
-      @exif_data["Exif.Image.Software"] = ["ruby-exiv2", "plasq skitch"]
-      expect(@exif_data.to_hash["Exif.Image.Software"]).to eq(["ruby-exiv2", "plasq skitch"])
-    end
-    
-    it "should delete one value of Exif data" do
-      @exif_data["Exif.Image.Software"] = ["ruby-exiv2", "plasq skitch"]
-      @exif_data.delete("Exif.Image.Software")
-      expect(@exif_data.to_hash["Exif.Image.Software"]).to eq("plasq skitch")
-    end
-    
-    it "should delete all values of Exif data" do
-      @exif_data.delete_all("Exif.Image.Software")
-      expect(@exif_data.to_hash["Exif.Image.Software"]).to eq(nil)
-    end
-  end
-end