multi_exiftool 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 770fbc9d8a918ec8e55c71edcc2f9d608a644f11
-  data.tar.gz: 744d23ddd5976dc1434a63410ea6a202a83fe507
+  metadata.gz: '08cd6e1d9c6c6ee77dcfc1a92dd00772419d0148'
+  data.tar.gz: 0e1252f4eebe67f630e7c4e6d79b8632a8bc8e08
 SHA512:
-  metadata.gz: f2d4d8875e05eede4367d5cde53581c2f09035495b80e7b495a3720c4be220ec5c244540cb71ebffe10e876e440b43fee6fc70af29902974bf1ee6a59a6731df
-  data.tar.gz: 5a221b09c6087da17049204d4079335b706e2941191d879c6c3515b88e01dd1a970fdd605552dd2be1aa0302895b0514f55383fd1b6289f54f5d454865827ed4
+  metadata.gz: a50fefa13b79f31013369a5441416f01ca0f521302ab47c5e1f9bbf3da2872aa716bc859e22fc5ed9c8c710781f34093fd4b6d31de7364b42d155c8fe7c20eaa
+  data.tar.gz: add6854570c75de94fcb73aa2bdcd309cb3fbc4b424ac040ad1d518ff10e4d772e1c86a4cefbf3e753e286606c5654fc900f5d7c4cc0b46cd0d01583ba253e54

data/Changelog

@@ -1,3 +1,8 @@
+0.5.0
+New methods Values#to_h and #to_hash.
+Values#tags gives now an array instead of a set.
+Tag names are not longer saved per Values instance.
+
 0.4.3
 Handle timestamps with additional DST string.
 Some improvements in documentation.

data/Rakefile

@@ -5,7 +5,7 @@ require 'regtest/task'
 
 Rim.setup do |p|
   p.name = 'multi_exiftool'
-  p.version = '0.4.3'
+  p.version = '0.5.0'
   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).'

data/lib/multi_exiftool/values.rb

@@ -9,28 +9,55 @@ module MultiExiftool
   # method_missing.
   class Values
 
-    attr_reader :tags
+    @tag_map = {}
 
     def initialize values
       @values = {}
-      @tags = Set.new
       values.map do |tag,val|
-        @tags << tag
+        unified_tag = Values.unify_tag(tag)
+        Values.tag_map[unified_tag] = tag
         val = val.kind_of?(Hash) ? Values.new(val) : val
-        @values[Values.unify_tag(tag)] = val
+        @values[unified_tag] = val
       end
     end
 
+    # Gets the (posible converted) value for a tag
+    # (tag will be unified, i.e. FNumber, fnumber or f_number
+    # can be used for FNumber)
     def [](tag)
       parse_value(@values[Values.unify_tag(tag)])
     end
 
-    def self.unify_tag tag
-      tag.gsub(/[-_]/, '').downcase
+    # Gets the original tag names of this instance
+    def tags
+      @values.keys.map {|tag| Values.tag_map[tag]}
+    end
+
+    # Generate a hash representation of this instance
+    # with original tag names es keys and converted
+    # values as values
+    def to_h
+      @values.inject(Hash.new) do |h,a|
+        k, v = a
+        h[Values.tag_map[k]] = parse_value(v)
+        h
+      end
     end
 
+    alias to_hash to_h
+
     private
 
+    class << self
+
+      attr_reader :tag_map
+
+      def unify_tag tag
+      tag.gsub(/[-_]/, '').downcase
+      end
+
+    end
+
     def method_missing tag, *args, &block
       res = self[Values.unify_tag(tag.to_s)]
       if res && block_given?

data/test/test_reader.rb

@@ -119,7 +119,7 @@ class TestReader < Test::Unit::TestCase
         @reader.tags = %w(fnumber)
         res =  @reader.read
         assert_equal [5.6, 6.7, 8], res.map {|e| e['FNumber']}
-        assert_equal Set.new(%w(SourceFile FNumber)), res.first.tags
+        assert_equal %w(SourceFile FNumber), res.first.tags
         assert_equal [], @reader.errors
       end
     end
@@ -130,7 +130,7 @@ class TestReader < Test::Unit::TestCase
         @reader.tags = :fnumber
         res =  @reader.read
         assert_equal [5.6, 6.7, 8], res.map {|e| e.fnumber}
-        assert_equal Set.new(%w(SourceFile FNumber)), res.first.tags
+        assert_equal %w(SourceFile FNumber), res.first.tags
         assert_equal [], @reader.errors
       end
     end

data/test/test_values.rb

@@ -86,12 +86,21 @@ class TestValues < Test::Unit::TestCase
 
   end
 
-  context 'tags' do
+  context 'tags and to_h' do
+
+    setup do
+      @hash = {'FNumber' => 8, 'Author' => 'janfri', 'E-MailAddress' => 'janfri26@gmail.com', 'DateTimeOriginal' => '2017:02:20 21:07:00'}
+      @values = MultiExiftool::Values.new(@hash)
+    end
 
     test 'tags preserves the original tag names' do
-      hash = {'FNumber' => 8, 'Author' => 'janfri', 'E-MailAddress' => 'janfri26@gmail.com'}
-      @values = MultiExiftool::Values.new(hash)
-      assert_equal hash.keys, @values.tags.to_a
+      assert_equal @hash.keys, @values.tags.to_a
+    end
+
+    test 'to_h preserves original tag names but uses converted values' do
+      dto = Time.new(2017, 2, 20, 21, 7, 0)
+      @hash['DateTimeOriginal'] = dto
+      assert_equal @hash, @values.to_h
     end
 
   end

data/test/test_writer.rb

@@ -121,7 +121,11 @@ class TestWriter < Test::Unit::TestCase
         @writer.values = {comment: 'foo', bar: 'x'}
         rc = @writer.write
         assert !rc
-        assert_equal ["Warning: Tag 'bar' does not exist", "Error: File not found - xxx"], @writer.errors
+        if MultiExiftool.exiftool_version >= 10.38
+          assert_equal ["Warning: Tag 'bar' is not defined", "Error: File not found - xxx"], @writer.errors
+        else
+          assert_equal ["Warning: Tag 'bar' is not supported", "Error: File not found - xxx"], @writer.errors
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_exiftool
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rim
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - exiftool, version 7.65 or higher
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.10
 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).