exifr 0.10.9 → 1.0.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+EXIF Reader 1.0.0
+* bug fix; "ArgumentError: invalid byte sequence in UTF-8" when reading messy field using Ruby 1.9+
+* enhancement; "[GH#4] more informative inspect for EXIFR::TIFF::Orientation instance"
+* bug fix; "[GH#6] ERROR RuntimeError: can't add a new key into hash during iteration"; thanks to KISHIMOTO, Makoto
+
 EXIF Reader 0.10.9
 * bug fix; "[GH#1] user_comment returns nil for jpeg with UserComment"; thanks to Mark Lundquist
 * bug fix; "[GH#2] Nil pointer in tiff.rb"

data/README.rdoc

@@ -21,4 +21,4 @@ EXIF Reader is a module to read metadata from JPEG and TIFF images.
 R.W. van 't Veer
 
 == Copyright
-Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
+Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
 
 require 'rake/rdoctask'
 require 'rake/testtask'

data/lib/exifr.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
 
 require 'jpeg'
 require 'tiff'

data/lib/jpeg.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
 
 require 'stringio'
 

data/lib/tiff.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007, 2008, 2009 - R.W. van 't Veer
+# Copyright (c) 2007, 2008, 2009, 2010 - R.W. van 't Veer
 
 require 'rational'
 
@@ -255,6 +255,11 @@ module EXIFR
         @value
       end
 
+      # Debugging output.
+      def inspect
+        "\#<EXIFR::TIFF::Orientation:#{@type}(#{@value})>"
+      end
+
       # Rotate and/or flip for proper viewing.
       def transform_rmagick(img)
         case @type
@@ -405,16 +410,15 @@ module EXIFR
       def height; image_length; end
 
       def to_hash
-        @hash ||= begin
-          result = @fields.dup
-          result.delete_if { |key,value| value.nil? }
-          result.each do |key,value|
-            if IFD_TAGS.include? key
-              result.merge!(value.to_hash)
-              result.delete key
-            end
+        @hash ||= @fields.map do |key,value|
+          if value.nil?
+            {}
+          elsif IFD_TAGS.include?(key)
+            value.to_hash
+          else
+            {key => value}
           end
-        end
+        end.inject { |m,v| m.merge(v) } || {}
       end
 
       def inspect
@@ -459,7 +463,7 @@ module EXIFR
           # TODO handle signed bytes
           len, pack = count, proc { |d| d }
         when 2 # ascii
-          len, pack = count, proc { |d| d.strip }
+          len, pack = count, proc { |d| d.unpack("A*") }
         when 3, 8 # short, signed short
           # TODO handle signed
           len, pack = count * 2, proc { |d| d.unpack(data.short + '*') }
@@ -467,7 +471,7 @@ module EXIFR
           # TODO handle signed
           len, pack = count * 4, proc { |d| d.unpack(data.long + '*') }
         when 7 # undefined
-          # UserComment 
+          # UserComment
           if @tag == 0x9286
             len, pack = count, proc { |d| d.strip }
             len -= 8 # reduce to account for first 8 bytes

data/tests/jpeg_test.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
 
-require File.join(File.dirname(__FILE__), 'test_helper')
+require 'test_helper'
 
 class JPEGTest < Test::Unit::TestCase
   def test_initialize

data/tests/test_helper.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
 
 require 'test/unit'
 require 'stringio'

data/tests/tiff_test.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006, 2007, 2008, 2009 - R.W. van 't Veer
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 - R.W. van 't Veer
 
-require File.join(File.dirname(__FILE__), 'test_helper')
+require 'test_helper'
 
 class TIFFTest < Test::Unit::TestCase
   def setup
@@ -162,11 +162,11 @@ class TIFFTest < Test::Unit::TestCase
     TIFF.new(f('endless-loop.exif'))
     assert true
   end
-    
+
   def test_user_comment
     assert_equal "Manassas Battlefield", TIFF.new(f('user-comment.exif')).user_comment
   end
-  
+
   def test_handle_out_of_range_offset
     assert_nothing_raised do
       assert 'NIKON', TIFF.new(f('out-of-range.exif')).make

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.10.9
+  version: 1.0.0
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 +01:00
+date: 2010-04-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: EXIF Reader is a module to read EXIF from JPEG images.