exif 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e2d459e26e4c1bc0cc6c02e6c1e87c8a7168796
-  data.tar.gz: e430895590e8ceaa7595f19c38aa0b062780c527
+  metadata.gz: b333d92e91da900e3092613d33281d08b2b83de8
+  data.tar.gz: 09eb52bf0bad1c86ff330ebfa8da62543cc76fa3
 SHA512:
-  metadata.gz: 5e5b91c5f772dbdc7c8bef203b2101b8f57122c081a30ef841da082de6ba42cd8c942698024678136930ae895a95f59931b28ea4dc7e988d2f4445ae5d38bf48
-  data.tar.gz: 9dd8285f7a418fed4bf545be7039feb702bd246aa524754090a88196a573adbd491c9a005736c3eaff8458338bdeaabb182d6e02cf83756eed229f2daf1d4395
+  metadata.gz: 27d623c15fb6ad2a9ac9e65ff960220bd5afa5ae1899e8eb0a0f5e009b79746a9aced6b1285b2a699507a1e84ad52957950737539a9b787d7c37a581ee30df9e
+  data.tar.gz: 1a3d1eaf3eb5f7be85f5badca07a174df54a6df99664a092854c8cbfff22799adab34592729c354261403a518e6221abee7c1b9885bfed15183cd7f2b69dabaa

data/README.md

@@ -1,27 +1,61 @@
-# Exif
-
-Ruby wrapper for libexif
+Ruby EXIF reader written in C extension.
 
 # Installation
 
     $ gem install exif
 
+Please make sure you have installed `libexif` first.
+
 # Usage
 
 ```ruby
 data = Exif::Data.new('sample.jpg')
+data.model        # => "NIKON D600"
 data.image_width  # => 4000
-data.gps_latitude # => '24, 10.6817,  0'
+data.gps_longitude # => 121.51246
+data.date_time    # => 2013-12-08 21:14:11 0800
 
 # get all entries in an IFD
 data[0]                 # => {image_width: 4000, image_length: 2670, ...}
-data[1]                 # => {x_resolution: "72"}, y_resolution: "72", ...}
+data[1]                 # => {x_resolution: "72", y_resolution: "72", ...}
 data[:exif]             # => exposure_time: "1/125 sec.", f_number: "f/8.0"}
 data[:gps]              # => {gps_version_id: "2.2.0.0", gps_latitude_ref: "N", ...}
 data[:interoperability] # => {...}
 data.to_h               # => {0 => {...}, 1 => {...}, :exif => {...}}
 ```
 
+# How fast?
+
+There is another excellent work called [exifr](https://github.com/remvee/exifr) made by [@remvee](https://github.com/remvee). That's pure Ruby while this one is C extension. If you program JRuby, you may want to choose exifr, otherwise you can try this gem for speed purpose, it's about 8 times faster. A small benchmark shows below:
+
+```ruby
+require 'benchmark'
+require 'exif'
+require 'exifr'
+N = 500
+FILE_PATH = 'sample.jpg'
+Benchmark.bmbm do |x|
+  x.report '[exifr] init' do
+    N.times{ EXIFR::JPEG.new(FILE_PATH).width }
+  end
+  x.report '[exif]  init' do
+    N.times{ Exif::Data.new(FILE_PATH).image_width }
+  end
+end
+```
+
+```
+$ ruby benchmark/benchmark.rb
+Rehearsal ------------------------------------------------
+[exifr] init   0.810000   0.020000   0.830000 (  0.840701)
+[exif]  init   0.090000   0.010000   0.100000 (  0.099700)
+--------------------------------------- total: 0.930000sec
+
+                   user     system      total        real
+[exifr] init   0.810000   0.020000   0.830000 (  0.830644)
+[exif]  init   0.090000   0.010000   0.100000 (  0.095148)
+```
+
 ## Tag Rreference
 
 - aperture_value

data/benchmark/benchmark.rb

@@ -5,8 +5,6 @@ require 'exifr'
 
 N = 500
 FILE_PATH = File.expand_path('../../spec/sample.jpg', __FILE__)
-exifr = EXIFR::JPEG.new(FILE_PATH)
-exif  = Exif::Data.new(FILE_PATH)
 Benchmark.bmbm do |x|
   x.report '[exifr] init' do
     N.times{ EXIFR::JPEG.new(FILE_PATH).width }
@@ -14,10 +12,4 @@ Benchmark.bmbm do |x|
   x.report '[exif]  init' do
     N.times{ Exif::Data.new(FILE_PATH).image_width }
   end
-  x.report '[exifr] get width' do
-    N.times{ exifr.width }
-  end
-  x.report '[exif]  get width' do
-    N.times{ exif.image_width }
-  end
 end

data/exif.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jian Weihang"]
   spec.email         = ["tonytonyjan@gmail.com"]
   spec.extensions    = ["ext/exif/extconf.rb"]
-  spec.summary       = %q{Wrapper of libexif}
-  spec.description   = %q{Wrapper of libexif}
+  spec.summary       = %q{Ruby EXIF reader written in C extension.}
+  spec.description   = %q{Ruby EXIF reader written in C extension.}
   spec.homepage      = "https://github.com/tonytonyjan/exif"
   spec.license       = "MIT"
 

data/ext/exif/data.c

@@ -1,4 +1,5 @@
 #include <libexif/exif-data.h>
+#include <time.h>
 #include "data.h"
 
 extern VALUE rb_mExif;
@@ -93,13 +94,59 @@ static void each_entry(ExifEntry *ee, void *self_ptr){
     value = rb_float_new(atof(buf));
     break;
   default:
-    value = rb_str_new_cstr(buf);
+    value = process_value(self, ee->tag, buf);
   }
   rb_hash_aset(rb_hash_aref(rb_contents, IFD2SYM[ifd]), tag_name, value);
   rb_hash_aset(rb_contents, tag_name, value);
   rb_iv_set(*self, attr_name, value);
 }
 
+static VALUE process_value(VALUE *self_ptr, ExifTag tag, char *buf){
+  ExifData *ed;
+  Data_Get_Struct(*self_ptr, ExifData, ed);
+  switch((int)tag){
+  case EXIF_TAG_DATE_TIME:
+  case EXIF_TAG_DATE_TIME_ORIGINAL:
+  case EXIF_TAG_DATE_TIME_DIGITIZED:
+  {
+    int i;
+    struct tm timer;
+    // "2013:09:10 16:31:21"
+    buf[4] = buf[7] = buf[10] = buf[13] = buf[16] = '\0';
+    timer.tm_year = atoi(buf) - 1900;
+    timer.tm_mon  = atoi(buf + 5) - 1;
+    timer.tm_mday = atoi(buf + 8);
+    timer.tm_hour = atoi(buf + 11);
+    timer.tm_min  = atoi(buf + 14);
+    timer.tm_sec  = atoi(buf + 17);
+    return rb_time_new(mktime(&timer), 0);
+    break;
+  }
+  case EXIF_TAG_GPS_LATITUDE:
+  case EXIF_TAG_GPS_LONGITUDE:
+  {
+    char *l = buf, *r = buf + 1;
+    double degrees, minutes, seconds;
+    // "121, 30.7476,  0"
+    while(*r != ',') r++;
+    *r = '\0'; r++;
+    degrees = atof(l); l = r;
+    while(*r != ',') r++;
+    *r = '\0';
+    minutes = atof(l); l = r + 1;
+    seconds = atof(l);
+    ExifTag ref_tag = tag == EXIF_TAG_GPS_LATITUDE ? EXIF_TAG_GPS_LATITUDE_REF : EXIF_TAG_GPS_LONGITUDE_REF;
+    ExifEntry *entry = exif_content_get_entry(ed->ifd[EXIF_IFD_GPS], ref_tag);
+    char ref_value; exif_entry_get_value(entry, &ref_value, 1);
+    double degree = (degrees * 3600 + minutes * 60 + seconds) / 3600;
+    if(ref_value == 'S' || ref_value == 'W') degree *= -1;
+    return rb_float_new(degree);
+  }
+  default:
+    return rb_str_new_cstr(buf);
+  }
+}
+
 static char* attr_string(ExifIfd ifd, ExifTag tag){
   switch((int)tag){
   case EXIF_TAG_INTEROPERABILITY_INDEX: /* EXIF_TAG_GPS_LATITUDE_REF */

data/ext/exif/data.h

@@ -14,6 +14,7 @@ static VALUE rb_value(VALUE self, VALUE key);
 
 static void each_content(ExifContent *ec, void *user_data);
 static void each_entry(ExifEntry *, void *user_data);
+static VALUE process_value(VALUE *self_ptr, ExifTag tag, char *buf);
 static char* attr_string(ExifIfd ifd, ExifTag tag);
 
 #endif /* DATA_H */

data/lib/exif/version.rb

@@ -1,3 +1,3 @@
 module Exif
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/spec/exif_spec.rb

@@ -10,15 +10,9 @@ describe Exif do
   # end
 
   it 'works' do
-    expect(@data.to_h[0][:image_width]).to eq 4000
-    expect(@data.to_h[:image_width]).to eq 4000
-    expect(@data[0][:image_width]).to eq 4000
-    expect(@data[:image_width]).to eq 4000
+    expect(@data.model).to eq 'NIKON D600'
     expect(@data.image_width).to eq 4000
-    expect(@data.to_h[:gps][:gps_latitude]).to eq '24, 10.6817,  0'
-    expect(@data.to_h[:gps_latitude]).to eq '24, 10.6817,  0'
-    expect(@data[:gps][:gps_latitude]).to eq '24, 10.6817,  0'
-    expect(@data[:gps_latitude]).to eq '24, 10.6817,  0'
-    expect(@data.gps_latitude).to eq '24, 10.6817,  0'
+    expect(@data.gps_latitude).to be_within(0.0001).of(24.178028333333334)
+    expect(@data.date_time).to eq Time.new(2013,12,8,21,14,11)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exif
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Jian Weihang
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Wrapper of libexif
+description: Ruby EXIF reader written in C extension.
 email:
 - tonytonyjan@gmail.com
 executables: []
@@ -101,7 +101,7 @@ rubyforge_project:
 rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
-summary: Wrapper of libexif
+summary: Ruby EXIF reader written in C extension.
 test_files:
 - spec/exif_spec.rb
 - spec/sample.jpg