exiv2 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    exiv2 (0.0.7)
+    exiv2 (0.0.8)
 
 GEM
   remote: http://rubygems.org/

data/ext/exiv2/exiv2.cpp

@@ -3,7 +3,14 @@
 
 // Create a Ruby string from a C++ std::string.
 static VALUE to_ruby_string(const std::string& string) {
-  return rb_str_new(string.data(), string.length());
+  VALUE str = rb_str_new(string.data(), string.length());
+
+  // force UTF-8 encoding in Ruby 1.9+
+  ID forceEncodingId = rb_intern("force_encoding");
+  if(rb_respond_to(str, forceEncodingId)) {
+      rb_funcall(str, forceEncodingId, 1, rb_str_new("UTF-8", 5));
+  }
+  return str;
 }
 
 // Create a C++ std::string from a Ruby string.

data/lib/exiv2/shared_methods.rb

@@ -4,8 +4,6 @@ module SharedMethods
     result = {}
 
     self.each do |key, value|
-      key.force_encoding('utf-8')
-      value.force_encoding('utf-8')
       if result[key]
         if result[key].is_a? Array
           result[key] << value

data/lib/exiv2/version.rb

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

data/spec/exiv2_spec.rb

@@ -35,9 +35,22 @@ describe Exiv2 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"]
-    description.encoding.should == Encoding::UTF_8
+    if description.respond_to? :encoding # Only in Ruby 1.9+
+      description.encoding.should == Encoding::UTF_8
+    end
     description.should == '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|
+        key.encoding.should   == Encoding::UTF_8
+        value.encoding.should == Encoding::UTF_8
+      end
+    end
+  end
   
   let(:image) do
     image = Exiv2::ImageFactory.open("spec/files/test.jpg")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiv2
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-02-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70104251986840 !ruby/object:Gem::Requirement
+  requirement: &2157752580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70104251986840
+  version_requirements: *2157752580
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70104251986260 !ruby/object:Gem::Requirement
+  requirement: &2157751940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70104251986260
+  version_requirements: *2157751940
 description: A simple wrapper around the C++ Exiv2 libary for reading image metadata
 email:
 - pete@envato.com
@@ -42,7 +42,6 @@ extensions:
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rbenv-version
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -74,15 +73,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1767711018481939965
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1767711018481939965
 requirements: []
 rubyforge_project: exiv2
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A simple wrapper around Exiv2

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p125