exiv2 0.0.4 → 0.0.5

data/Gemfile.lock

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

data/lib/exiv2.rb

@@ -1,3 +1,5 @@
 require 'exiv2/exiv2'
+require 'exiv2/shared_methods'
+require 'exiv2/exif_data'
 require 'exiv2/iptc_data'
 require 'exiv2/xmp_data'

data/lib/exiv2/exif_data.rb

@@ -0,0 +1,3 @@
+class Exiv2::ExifData
+  include SharedMethods
+end

data/lib/exiv2/iptc_data.rb

@@ -1,22 +1,3 @@
 class Exiv2::IptcData
-  def to_hash
-    result = {}
-
-    self.each do |key, value|
-      if result[key]
-        if result[key].is_a? Array
-          result[key] << value
-        else
-          result[key] = [result[key], value]
-        end
-      else
-        result[key] = value
-      end
-    end
-    result
-  end
-
-  def inspect
-    "#<Exiv2::IptcData: #{self.to_hash.inspect}>"
-  end
+  include SharedMethods
 end

data/lib/exiv2/shared_methods.rb

@@ -0,0 +1,22 @@
+module SharedMethods
+  def to_hash
+    result = {}
+
+    self.each do |key, value|
+      if result[key]
+        if result[key].is_a? Array
+          result[key] << value
+        else
+          result[key] = [result[key], value]
+        end
+      else
+        result[key] = value
+      end
+    end
+    result
+  end
+
+  def inspect
+    "#<#{self.class.name}: #{self.to_hash.inspect}>"
+  end
+end

data/lib/exiv2/version.rb

@@ -1,3 +1,3 @@
 module Exiv2
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/exiv2/xmp_data.rb

@@ -1,22 +1,3 @@
 class Exiv2::XmpData
-  def to_hash
-    result = {}
-
-    self.each do |key, value|
-      if result[key]
-        if result[key].is_a? Array
-          result[key] << value
-        else
-          result[key] = [result[key], value]
-        end
-      else
-        result[key] = value
-      end
-    end
-    result
-  end
-
-  def inspect
-    "#<Exiv2::XmpData: #{self.to_hash.inspect}>"
-  end
+  include SharedMethods
 end

data/spec/exiv2_spec.rb

@@ -2,30 +2,6 @@ require 'exiv2'
 
 describe Exiv2 do
 
-  it "should read IPTC data" do
-    image = Exiv2::ImageFactory.open("spec/files/test.jpg")
-    image.read_metadata
-    iptc_data = image.iptc_data
-    iptc_data.should be_a(Exiv2::IptcData)
-    iptc_data.inspect.should == '#<Exiv2::IptcData: {"Iptc.Application2.Caption"=>"Rhubarb rhubarb rhubard", "Iptc.Application2.Keywords"=>["fish", "custard"]}>'
-    iptc_data.to_a.should == [
-      ["Iptc.Application2.Caption", "Rhubarb rhubarb rhubard"],
-      ["Iptc.Application2.Keywords", "fish"],
-      ["Iptc.Application2.Keywords", "custard"]
-    ]
-  end
-
-  it "should convert iptc data into a hash" do
-    image = Exiv2::ImageFactory.open("spec/files/test.jpg")
-    image.read_metadata
-    iptc_hash = image.iptc_data.to_hash
-    iptc_hash.should be_a(Hash)
-    iptc_hash.should == {
-      "Iptc.Application2.Caption" => "Rhubarb rhubarb rhubard",
-      "Iptc.Application2.Keywords" => ["fish", "custard"]
-    }
-  end
-
   it "should handle a Pathname being passed to open" do
     image = Exiv2::ImageFactory.open(Pathname.new("spec/files/test.jpg"))
     image.read_metadata
@@ -37,30 +13,91 @@ describe Exiv2 do
       Exiv2::ImageFactory.open("tmp/no-such-file.jpg")
     }.should raise_error(Exiv2::BasicError)
   end
-  
-  it "should read XMP data" do
+
+  let(:image) do
     image = Exiv2::ImageFactory.open("spec/files/test.jpg")
     image.read_metadata
-    xmp_data = image.xmp_data
-    xmp_data.should be_a(Exiv2::XmpData)
-    xmp_data.inspect.should == '#<Exiv2::XmpData: {"Xmp.dc.description"=>"lang=\"x-default\" This is a description", "Xmp.dc.title"=>"lang=\"x-default\" Pickled"}>'
-    xmp_data.to_a.should == [
-      ["Xmp.dc.title", "lang=\"x-default\" Pickled"],
-      ["Xmp.dc.description", "lang=\"x-default\" This is a description"]
-    ]
+    image
   end
 
-  it "should convert xmp data into a hash" do
-    image = Exiv2::ImageFactory.open("spec/files/test.jpg")
-    image.read_metadata
-    iptc_hash = image.xmp_data.to_hash
-    iptc_hash.should be_a(Hash)
-    iptc_hash.should == {
-      "Xmp.dc.title" => "lang=\"x-default\" Pickled",
-      "Xmp.dc.description" => "lang=\"x-default\" This is a description"
-    }
+  context "IPTC data" do
+    before do
+      @iptc_data = image.iptc_data
+    end
+
+    it "should read IPTC data" do
+      @iptc_data.should be_a(Exiv2::IptcData)
+      @iptc_data.inspect.should == '#<Exiv2::IptcData: {"Iptc.Application2.Caption"=>"Rhubarb rhubarb rhubard", "Iptc.Application2.Keywords"=>["fish", "custard"]}>'
+      @iptc_data.to_a.should == [
+        ["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
+      iptc_hash.should be_a(Hash)
+      iptc_hash.should == {
+        "Iptc.Application2.Caption"  => "Rhubarb rhubarb rhubard",
+        "Iptc.Application2.Keywords" => ["fish", "custard"]
+      }
+    end
+  end
+
+  context "XMP data" do
+    before do
+      @xmp_data = image.xmp_data
+    end
+
+    it "should read XMP data" do
+      @xmp_data.should be_a(Exiv2::XmpData)
+      @xmp_data.inspect.should == '#<Exiv2::XmpData: {"Xmp.dc.description"=>"lang=\"x-default\" This is a description", "Xmp.dc.title"=>"lang=\"x-default\" Pickled"}>'
+      @xmp_data.to_a.should == [
+        ["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
+      xmp_hash.should be_a(Hash)
+      xmp_hash.should == {
+        "Xmp.dc.title"       => "lang=\"x-default\" Pickled",
+        "Xmp.dc.description" => "lang=\"x-default\" This is a description"
+      }
+    end
+
   end
 
+  context "EXIF data" do
+    before do
+      @exif_data = image.exif_data
+    end
 
+    it "should read Exif data" do
+      @exif_data.should be_a(Exiv2::ExifData)
+      @exif_data.inspect.should == "#<Exiv2::ExifData: {\"Exif.Photo.PixelXDimension\"=>\"32\", \"Exif.Photo.ExifVersion\"=>\"48 50 49 48\", \"Exif.Image.Software\"=>\"plasq skitch\", \"Exif.Photo.PixelYDimension\"=>\"32\", \"Exif.Image.ExifTag\"=>\"52\"}>"
+      @exif_data.to_a.should == [
+        ["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
+      exif_hash.should be_a(Hash)
+      exif_hash.should == {
+        "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
+
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exiv2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Pete Yandell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +10:00
+date: 2011-08-23 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,9 @@ files:
 - ext/exiv2/exiv2.cpp
 - ext/exiv2/extconf.rb
 - lib/exiv2.rb
+- lib/exiv2/exif_data.rb
 - lib/exiv2/iptc_data.rb
+- lib/exiv2/shared_methods.rb
 - lib/exiv2/version.rb
 - lib/exiv2/xmp_data.rb
 - spec/exiv2_spec.rb