exif 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5f29f76bf91ba37f5eb1a1e0478b65552e5c82e
-  data.tar.gz: afce46bfa42cb13bdb7d59f80d3c069dbb054486
+  metadata.gz: 5e2d459e26e4c1bc0cc6c02e6c1e87c8a7168796
+  data.tar.gz: e430895590e8ceaa7595f19c38aa0b062780c527
 SHA512:
-  metadata.gz: 747ab5defb0329b534fec43e4312023352b92e370672814c9b6bdeff0a467874217ce2ed2d1325eb73d4b6f242d67ccb033cdd7960b263c0ab49ae7fcbe8d329
-  data.tar.gz: f6d9b9757c9148eb555f83450feeb417df157728bd3758d8476a7a20fa2dcca89df63c2daeec1900ac5caf70ccdc03e9cbd3bb73dc60745032809d07e5e8a75b
+  metadata.gz: 5e5b91c5f772dbdc7c8bef203b2101b8f57122c081a30ef841da082de6ba42cd8c942698024678136930ae895a95f59931b28ea4dc7e988d2f4445ae5d38bf48
+  data.tar.gz: 9dd8285f7a418fed4bf545be7039feb702bd246aa524754090a88196a573adbd491c9a005736c3eaff8458338bdeaabb182d6e02cf83756eed229f2daf1d4395

data/README.md

@@ -10,8 +10,8 @@ Ruby wrapper for libexif
 
 ```ruby
 data = Exif::Data.new('sample.jpg')
-data[:image_width]  # => 4000
-data[:gps_latitude] # => '24, 10.6817,  0'
+data.image_width  # => 4000
+data.gps_latitude # => '24, 10.6817,  0'
 
 # get all entries in an IFD
 data[0]                 # => {image_width: 4000, image_length: 2670, ...}
@@ -19,6 +19,7 @@ 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 => {...}}
 ```
 
 ## Tag Rreference
@@ -174,5 +175,4 @@ data[:interoperability] # => {...}
 
 # TODO
 
-1. `Exif.underscore!` is too slow
-2. Support reading from String.
+1. Support reading from String.

data/benchmark/benchmark.rb

@@ -0,0 +1,23 @@
+$: << File.expand_path('../../lib', __FILE__)
+require 'benchmark'
+require 'exif'
+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 }
+  end
+  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/ext/exif/data.c

@@ -7,11 +7,15 @@ static VALUE IFD2SYM[5];
 
 void init_data(){
   rb_cData = rb_define_class_under(rb_mExif, "Data", rb_cObject);
-  IFD2SYM[0] = INT2NUM(0);                            // EXIF_IFD_0
-  IFD2SYM[1] = INT2NUM(1);                            // EXIF_IFD_1
-  IFD2SYM[2] = ID2SYM(rb_intern("exif"));             // EXIF_IFD_EXIF
-  IFD2SYM[3] = ID2SYM(rb_intern("gps"));              // EXIF_IFD_GPS
-  IFD2SYM[4] = ID2SYM(rb_intern("interoperability")); // EXIF_IFD_INTEROPERABILITY
+  IFD2SYM[EXIF_IFD_0]                = INT2NUM(0);
+  IFD2SYM[EXIF_IFD_1]                = INT2NUM(1);
+  IFD2SYM[EXIF_IFD_EXIF]             = ID2SYM(rb_intern("exif"));
+  IFD2SYM[EXIF_IFD_GPS]              = ID2SYM(rb_intern("gps"));
+  IFD2SYM[EXIF_IFD_INTEROPERABILITY] = ID2SYM(rb_intern("interoperability"));
+  int length = sizeof(attrs) / sizeof(char*);
+  for(int i = 0; i < length; ++i) rb_define_attr(rb_cData, attrs[i], 1, 0);
+  rb_define_attr(rb_cData, "contents", 1, 0);
+  rb_define_alias(rb_cData, "to_h", "contents");
   rb_define_singleton_method(rb_cData, "new", rb_new, 1);
   rb_define_method(rb_cData, "dump", rb_dump, 0);
   rb_define_method(rb_cData, "[]", rb_value, 1);
@@ -22,10 +26,8 @@ static VALUE rb_new(VALUE self, VALUE file_path){
   ExifData *ed = exif_data_new_from_file(StringValueCStr(file_path));
   if(!ed) rb_raise(rb_eRuntimeError, "File not readable or no EXIF data in file.");
   VALUE rb_data = Data_Wrap_Struct(self, NULL, exif_data_free, ed);
-  rb_define_attr(self, "contents", 1, 0);
-  VALUE rb_h = rb_hash_new();
-  exif_data_foreach_content(ed, each_content, &rb_h);
-  rb_iv_set(rb_data, "@contents", rb_h);
+  rb_iv_set(rb_data, "@contents", rb_hash_new());
+  exif_data_foreach_content(ed, each_content, &rb_data);
   return rb_data;
 }
 
@@ -41,21 +43,23 @@ static VALUE rb_value(VALUE self, VALUE key){
   return rb_hash_aref(rb_contents, key);
 }
 
-static void each_content(ExifContent *ec, void *rb_h_ptr){
-  VALUE *rb_h = (VALUE*)rb_h_ptr;
+static void each_content(ExifContent *ec, void *self_ptr){
+  VALUE *self = (VALUE*)self_ptr;
+  VALUE rb_contents = rb_iv_get(*self, "@contents");
+  Check_Type(rb_contents, T_HASH);
   ExifIfd ifd = exif_content_get_ifd(ec);
   VALUE ifd_name = IFD2SYM[ifd]; //rb_str_new_cstr(exif_ifd_get_name(ifd));
   if(ifd == EXIF_IFD_COUNT) rb_raise(rb_eRuntimeError, "Con't get IFD.");
-  else rb_hash_aset(*rb_h, ifd_name, rb_hash_new());
-  exif_content_foreach_entry(ec, each_entry, rb_h_ptr);
+  else rb_hash_aset(rb_contents, ifd_name, rb_hash_new());
+  exif_content_foreach_entry(ec, each_entry, self);
 }
 
-static void each_entry(ExifEntry *ee, void *rb_h_ptr){
-  VALUE *rb_h = (VALUE*)rb_h_ptr;
+static void each_entry(ExifEntry *ee, void *self_ptr){
+  VALUE *self = (VALUE*)self_ptr;
+  VALUE rb_contents = rb_iv_get(*self, "@contents");
   ExifIfd ifd = exif_entry_get_ifd(ee);
-  VALUE tag_name = rb_str_new_cstr(exif_tag_get_name_in_ifd(ee->tag, ifd));
-  rb_funcall(rb_mExif, rb_intern("underscore!"), 1, tag_name);
-  tag_name = ID2SYM(rb_intern_str(tag_name));
+  char *attr_name = attr_string(ifd, ee->tag);
+  VALUE tag_name = ID2SYM(rb_intern(attr_name + 1));
   char buf[500];
   exif_entry_get_value(ee, buf, sizeof(buf));
   VALUE value;
@@ -91,6 +95,451 @@ static void each_entry(ExifEntry *ee, void *rb_h_ptr){
   default:
     value = rb_str_new_cstr(buf);
   }
-  rb_hash_aset(rb_hash_aref(*rb_h, IFD2SYM[ifd]), tag_name, value);
-  if(NIL_P(rb_hash_aref(*rb_h, tag_name))) rb_hash_aset(*rb_h, tag_name, value);
+  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 char* attr_string(ExifIfd ifd, ExifTag tag){
+  switch((int)tag){
+  case EXIF_TAG_INTEROPERABILITY_INDEX: /* EXIF_TAG_GPS_LATITUDE_REF */
+    return ifd == EXIF_IFD_GPS ? "@gps_latitude_ref" : "@interoperability_index";
+    break;
+  case EXIF_TAG_INTEROPERABILITY_VERSION: /* EXIF_TAG_GPS_LATITUDE */
+    return ifd == EXIF_IFD_GPS ? "@gps_latitude" : "@interoperability_version";
+    break;
+  case EXIF_TAG_NEW_SUBFILE_TYPE:
+    return "@new_subfile_type";
+    break;
+  case EXIF_TAG_IMAGE_WIDTH:
+    return "@image_width";
+    break;
+  case EXIF_TAG_IMAGE_LENGTH:
+    return "@image_length";
+    break;
+  case EXIF_TAG_BITS_PER_SAMPLE:
+    return "@bits_per_sample";
+    break;
+  case EXIF_TAG_COMPRESSION:
+    return "@compression";
+    break;
+  case EXIF_TAG_PHOTOMETRIC_INTERPRETATION:
+    return "@photometric_interpretation";
+    break;
+  case EXIF_TAG_FILL_ORDER:
+    return "@fill_order";
+    break;
+  case EXIF_TAG_DOCUMENT_NAME:
+    return "@document_name";
+    break;
+  case EXIF_TAG_IMAGE_DESCRIPTION:
+    return "@image_description";
+    break;
+  case EXIF_TAG_MAKE:
+    return "@make";
+    break;
+  case EXIF_TAG_MODEL:
+    return "@model";
+    break;
+  case EXIF_TAG_STRIP_OFFSETS:
+    return "@strip_offsets";
+    break;
+  case EXIF_TAG_ORIENTATION:
+    return "@orientation";
+    break;
+  case EXIF_TAG_SAMPLES_PER_PIXEL:
+    return "@samples_per_pixel";
+    break;
+  case EXIF_TAG_ROWS_PER_STRIP:
+    return "@rows_per_strip";
+    break;
+  case EXIF_TAG_STRIP_BYTE_COUNTS:
+    return "@strip_byte_counts";
+    break;
+  case EXIF_TAG_X_RESOLUTION:
+    return "@x_resolution";
+    break;
+  case EXIF_TAG_Y_RESOLUTION:
+    return "@y_resolution";
+    break;
+  case EXIF_TAG_PLANAR_CONFIGURATION:
+    return "@planar_configuration";
+    break;
+  case EXIF_TAG_RESOLUTION_UNIT:
+    return "@resolution_unit";
+    break;
+  case EXIF_TAG_TRANSFER_FUNCTION:
+    return "@transfer_function";
+    break;
+  case EXIF_TAG_SOFTWARE:
+    return "@software";
+    break;
+  case EXIF_TAG_DATE_TIME:
+    return "@date_time";
+    break;
+  case EXIF_TAG_ARTIST:
+    return "@artist";
+    break;
+  case EXIF_TAG_WHITE_POINT:
+    return "@white_point";
+    break;
+  case EXIF_TAG_PRIMARY_CHROMATICITIES:
+    return "@primary_chromaticities";
+    break;
+  case EXIF_TAG_SUB_IFDS:
+    return "@sub_ifds";
+    break;
+  case EXIF_TAG_TRANSFER_RANGE:
+    return "@transfer_range";
+    break;
+  case EXIF_TAG_JPEG_PROC:
+    return "@jpeg_proc";
+    break;
+  case EXIF_TAG_JPEG_INTERCHANGE_FORMAT:
+    return "@jpeg_interchange_format";
+    break;
+  case EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH:
+    return "@jpeg_interchange_format_length";
+    break;
+  case EXIF_TAG_YCBCR_COEFFICIENTS:
+    return "@ycbcr_coefficients";
+    break;
+  case EXIF_TAG_YCBCR_SUB_SAMPLING:
+    return "@ycbcr_sub_sampling";
+    break;
+  case EXIF_TAG_YCBCR_POSITIONING:
+    return "@ycbcr_positioning";
+    break;
+  case EXIF_TAG_REFERENCE_BLACK_WHITE:
+    return "@reference_black_white";
+    break;
+  case EXIF_TAG_XML_PACKET:
+    return "@xml_packet";
+    break;
+  case EXIF_TAG_RELATED_IMAGE_FILE_FORMAT:
+    return "@related_image_file_format";
+    break;
+  case EXIF_TAG_RELATED_IMAGE_WIDTH:
+    return "@related_image_width";
+    break;
+  case EXIF_TAG_RELATED_IMAGE_LENGTH:
+    return "@related_image_length";
+    break;
+  case EXIF_TAG_CFA_REPEAT_PATTERN_DIM:
+    return "@cfa_repeat_pattern_dim";
+    break;
+  case EXIF_TAG_CFA_PATTERN:
+    return "@cfa_pattern";
+    break;
+  case EXIF_TAG_BATTERY_LEVEL:
+    return "@battery_level";
+    break;
+  case EXIF_TAG_COPYRIGHT:
+    return "@copyright";
+    break;
+  case EXIF_TAG_EXPOSURE_TIME:
+    return "@exposure_time";
+    break;
+  case EXIF_TAG_FNUMBER:
+    return "@fnumber";
+    break;
+  case EXIF_TAG_IPTC_NAA:
+    return "@iptc_naa";
+    break;
+  case EXIF_TAG_IMAGE_RESOURCES:
+    return "@image_resources";
+    break;
+  case EXIF_TAG_EXIF_IFD_POINTER:
+    return "@exif_ifd_pointer";
+    break;
+  case EXIF_TAG_INTER_COLOR_PROFILE:
+    return "@inter_color_profile";
+    break;
+  case EXIF_TAG_EXPOSURE_PROGRAM:
+    return "@exposure_program";
+    break;
+  case EXIF_TAG_SPECTRAL_SENSITIVITY:
+    return "@spectral_sensitivity";
+    break;
+  case EXIF_TAG_GPS_INFO_IFD_POINTER:
+    return "@gps_info_ifd_pointer";
+    break;
+  case EXIF_TAG_ISO_SPEED_RATINGS:
+    return "@iso_speed_ratings";
+    break;
+  case EXIF_TAG_OECF:
+    return "@oecf";
+    break;
+  case EXIF_TAG_TIME_ZONE_OFFSET:
+    return "@time_zone_offset";
+    break;
+  case EXIF_TAG_EXIF_VERSION:
+    return "@exif_version";
+    break;
+  case EXIF_TAG_DATE_TIME_ORIGINAL:
+    return "@date_time_original";
+    break;
+  case EXIF_TAG_DATE_TIME_DIGITIZED:
+    return "@date_time_digitized";
+    break;
+  case EXIF_TAG_COMPONENTS_CONFIGURATION:
+    return "@components_configuration";
+    break;
+  case EXIF_TAG_COMPRESSED_BITS_PER_PIXEL:
+    return "@compressed_bits_per_pixel";
+    break;
+  case EXIF_TAG_SHUTTER_SPEED_VALUE:
+    return "@shutter_speed_value";
+    break;
+  case EXIF_TAG_APERTURE_VALUE:
+    return "@aperture_value";
+    break;
+  case EXIF_TAG_BRIGHTNESS_VALUE:
+    return "@brightness_value";
+    break;
+  case EXIF_TAG_EXPOSURE_BIAS_VALUE:
+    return "@exposure_bias_value";
+    break;
+  case EXIF_TAG_MAX_APERTURE_VALUE:
+    return "@max_aperture_value";
+    break;
+  case EXIF_TAG_SUBJECT_DISTANCE:
+    return "@subject_distance";
+    break;
+  case EXIF_TAG_METERING_MODE:
+    return "@metering_mode";
+    break;
+  case EXIF_TAG_LIGHT_SOURCE:
+    return "@light_source";
+    break;
+  case EXIF_TAG_FLASH:
+    return "@flash";
+    break;
+  case EXIF_TAG_FOCAL_LENGTH:
+    return "@focal_length";
+    break;
+  case EXIF_TAG_SUBJECT_AREA:
+    return "@subject_area";
+    break;
+  case EXIF_TAG_TIFF_EP_STANDARD_ID:
+    return "@tiff_ep_standard_id";
+    break;
+  case EXIF_TAG_MAKER_NOTE:
+    return "@maker_note";
+    break;
+  case EXIF_TAG_USER_COMMENT:
+    return "@user_comment";
+    break;
+  case EXIF_TAG_SUB_SEC_TIME:
+    return "@sub_sec_time";
+    break;
+  case EXIF_TAG_SUB_SEC_TIME_ORIGINAL:
+    return "@sub_sec_time_original";
+    break;
+  case EXIF_TAG_SUB_SEC_TIME_DIGITIZED:
+    return "@sub_sec_time_digitized";
+    break;
+  case EXIF_TAG_XP_TITLE:
+    return "@xp_title";
+    break;
+  case EXIF_TAG_XP_COMMENT:
+    return "@xp_comment";
+    break;
+  case EXIF_TAG_XP_AUTHOR:
+    return "@xp_author";
+    break;
+  case EXIF_TAG_XP_KEYWORDS:
+    return "@xp_keywords";
+    break;
+  case EXIF_TAG_XP_SUBJECT:
+    return "@xp_subject";
+    break;
+  case EXIF_TAG_FLASH_PIX_VERSION:
+    return "@flash_pix_version";
+    break;
+  case EXIF_TAG_COLOR_SPACE:
+    return "@color_space";
+    break;
+  case EXIF_TAG_PIXEL_X_DIMENSION:
+    return "@pixel_x_dimension";
+    break;
+  case EXIF_TAG_PIXEL_Y_DIMENSION:
+    return "@pixel_y_dimension";
+    break;
+  case EXIF_TAG_RELATED_SOUND_FILE:
+    return "@related_sound_file";
+    break;
+  case EXIF_TAG_INTEROPERABILITY_IFD_POINTER:
+    return "@interoperability_ifd_pointer";
+    break;
+  case EXIF_TAG_FLASH_ENERGY:
+    return "@flash_energy";
+    break;
+  case EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE:
+    return "@spatial_frequency_response";
+    break;
+  case EXIF_TAG_FOCAL_PLANE_X_RESOLUTION:
+    return "@focal_plane_x_resolution";
+    break;
+  case EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION:
+    return "@focal_plane_y_resolution";
+    break;
+  case EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT:
+    return "@focal_plane_resolution_unit";
+    break;
+  case EXIF_TAG_SUBJECT_LOCATION:
+    return "@subject_location";
+    break;
+  case EXIF_TAG_EXPOSURE_INDEX:
+    return "@exposure_index";
+    break;
+  case EXIF_TAG_SENSING_METHOD:
+    return "@sensing_method";
+    break;
+  case EXIF_TAG_FILE_SOURCE:
+    return "@file_source";
+    break;
+  case EXIF_TAG_SCENE_TYPE:
+    return "@scene_type";
+    break;
+  case EXIF_TAG_NEW_CFA_PATTERN:
+    return "@new_cfa_pattern";
+    break;
+  case EXIF_TAG_CUSTOM_RENDERED:
+    return "@custom_rendered";
+    break;
+  case EXIF_TAG_EXPOSURE_MODE:
+    return "@exposure_mode";
+    break;
+  case EXIF_TAG_WHITE_BALANCE:
+    return "@white_balance";
+    break;
+  case EXIF_TAG_DIGITAL_ZOOM_RATIO:
+    return "@digital_zoom_ratio";
+    break;
+  case EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM:
+    return "@focal_length_in_35mm_film";
+    break;
+  case EXIF_TAG_SCENE_CAPTURE_TYPE:
+    return "@scene_capture_type";
+    break;
+  case EXIF_TAG_GAIN_CONTROL:
+    return "@gain_control";
+    break;
+  case EXIF_TAG_CONTRAST:
+    return "@contrast";
+    break;
+  case EXIF_TAG_SATURATION:
+    return "@saturation";
+    break;
+  case EXIF_TAG_SHARPNESS:
+    return "@sharpness";
+    break;
+  case EXIF_TAG_DEVICE_SETTING_DESCRIPTION:
+    return "@device_setting_description";
+    break;
+  case EXIF_TAG_SUBJECT_DISTANCE_RANGE:
+    return "@subject_distance_range";
+    break;
+  case EXIF_TAG_IMAGE_UNIQUE_ID:
+    return "@image_unique_id";
+    break;
+  case EXIF_TAG_GAMMA:
+    return "@gamma";
+    break;
+  case EXIF_TAG_PRINT_IMAGE_MATCHING:
+    return "@print_image_matching";
+    break;
+  case EXIF_TAG_PADDING:
+    return "@padding";
+    break;
+  case EXIF_TAG_GPS_VERSION_ID:
+    return "@gps_version_id";
+    break;
+  case EXIF_TAG_GPS_LONGITUDE_REF:
+    return "@gps_longitude_ref";
+    break;
+  case EXIF_TAG_GPS_LONGITUDE:
+    return "@gps_longitude";
+    break;
+  case EXIF_TAG_GPS_ALTITUDE_REF:
+    return "@gps_altitude_ref";
+    break;
+  case EXIF_TAG_GPS_ALTITUDE:
+    return "@gps_altitude";
+    break;
+  case EXIF_TAG_GPS_TIME_STAMP:
+    return "@gps_time_stamp";
+    break;
+  case EXIF_TAG_GPS_SATELLITES:
+    return "@gps_satellites";
+    break;
+  case EXIF_TAG_GPS_STATUS:
+    return "@gps_status";
+    break;
+  case EXIF_TAG_GPS_MEASURE_MODE:
+    return "@gps_measure_mode";
+    break;
+  case EXIF_TAG_GPS_DOP:
+    return "@gps_dop";
+    break;
+  case EXIF_TAG_GPS_SPEED_REF:
+    return "@gps_speed_ref";
+    break;
+  case EXIF_TAG_GPS_SPEED:
+    return "@gps_speed";
+    break;
+  case EXIF_TAG_GPS_TRACK_REF:
+    return "@gps_track_ref";
+    break;
+  case EXIF_TAG_GPS_TRACK:
+    return "@gps_track";
+    break;
+  case EXIF_TAG_GPS_IMG_DIRECTION_REF:
+    return "@gps_img_direction_ref";
+    break;
+  case EXIF_TAG_GPS_IMG_DIRECTION:
+    return "@gps_img_direction";
+    break;
+  case EXIF_TAG_GPS_MAP_DATUM:
+    return "@gps_map_datum";
+    break;
+  case EXIF_TAG_GPS_DEST_LATITUDE_REF:
+    return "@gps_dest_latitude_ref";
+    break;
+  case EXIF_TAG_GPS_DEST_LATITUDE:
+    return "@gps_dest_latitude";
+    break;
+  case EXIF_TAG_GPS_DEST_LONGITUDE_REF:
+    return "@gps_dest_longitude_ref";
+    break;
+  case EXIF_TAG_GPS_DEST_LONGITUDE:
+    return "@gps_dest_longitude";
+    break;
+  case EXIF_TAG_GPS_DEST_BEARING_REF:
+    return "@gps_dest_bearing_ref";
+    break;
+  case EXIF_TAG_GPS_DEST_BEARING:
+    return "@gps_dest_bearing";
+    break;
+  case EXIF_TAG_GPS_DEST_DISTANCE_REF:
+    return "@gps_dest_distance_ref";
+    break;
+  case EXIF_TAG_GPS_DEST_DISTANCE:
+    return "@gps_dest_distance";
+    break;
+  case EXIF_TAG_GPS_PROCESSING_METHOD:
+    return "@gps_processing_method";
+    break;
+  case EXIF_TAG_GPS_AREA_INFORMATION:
+    return "@gps_area_information";
+    break;
+  case EXIF_TAG_GPS_DATE_STAMP:
+    return "@gps_date_stamp";
+    break;
+  case EXIF_TAG_GPS_DIFFERENTIAL:
+    return "@gps_differential";
+    break;
+  }
+  return NULL;
 }

data/ext/exif/data.h

@@ -4,6 +4,8 @@
 #include <libexif/exif-data.h>
 #include "ruby.h"
 
+static char *attrs[] = {"aperture_value", "artist", "battery_level", "bits_per_sample", "brightness_value", "cfa_pattern", "cfa_repeat_pattern_dim", "color_space", "components_configuration", "compressed_bits_per_pixel", "compression", "contrast", "copyright", "custom_rendered", "date_time", "date_time_digitized", "date_time_original", "device_setting_description", "digital_zoom_ratio", "document_name", "exif_ifd_pointer", "exif_version", "exposure_bias_value", "exposure_index", "exposure_mode", "exposure_program", "exposure_time", "file_source", "fill_order", "flash", "flash_energy", "flash_pix_version", "fnumber", "focal_length", "focal_length_in_35mm_film", "focal_plane_resolution_unit", "focal_plane_x_resolution", "focal_plane_y_resolution", "gain_control", "gamma", "gps_altitude", "gps_altitude_ref", "gps_area_information", "gps_date_stamp", "gps_dest_bearing", "gps_dest_bearing_ref", "gps_dest_distance", "gps_dest_distance_ref", "gps_dest_latitude", "gps_dest_latitude_ref", "gps_dest_longitude", "gps_dest_longitude_ref", "gps_differential", "gps_dop", "gps_img_direction", "gps_img_direction_ref", "gps_info_ifd_pointer", "gps_latitude", "gps_latitude_ref", "gps_longitude", "gps_longitude_ref", "gps_map_datum", "gps_measure_mode", "gps_processing_method", "gps_satellites", "gps_speed", "gps_speed_ref", "gps_status", "gps_time_stamp", "gps_track", "gps_track_ref", "gps_version_id", "image_description", "image_length", "image_resources", "image_unique_id", "image_width", "inter_color_profile", "interoperability_ifd_pointer", "interoperability_index", "interoperability_version", "iptc_naa", "iso_speed_ratings", "jpeg_interchange_format", "jpeg_interchange_format_length", "jpeg_proc", "light_source", "make", "maker_note", "max_aperture_value", "metering_mode", "model", "new_cfa_pattern", "new_subfile_type", "oecf", "orientation", "padding", "photometric_interpretation", "pixel_x_dimension", "pixel_y_dimension", "planar_configuration", "primary_chromaticities", "print_image_matching", "reference_black_white", "related_image_file_format", "related_image_length", "related_image_width", "related_sound_file", "resolution_unit", "rows_per_strip", "samples_per_pixel", "saturation", "scene_capture_type", "scene_type", "sensing_method", "sharpness", "shutter_speed_value", "software", "spatial_frequency_response", "spectral_sensitivity", "strip_byte_counts", "strip_offsets", "sub_ifds", "sub_sec_time", "sub_sec_time_digitized", "sub_sec_time_original", "subject_area", "subject_distance", "subject_distance_range", "subject_location", "tiff_ep_standard_id", "time_zone_offset", "transfer_function", "transfer_range", "user_comment", "white_balance", "white_point", "x_resolution", "xml_packet", "xp_author", "xp_comment", "xp_keywords", "xp_subject", "xp_title", "y_resolution", "ycbcr_coefficients", "ycbcr_positioning", "ycbcr_sub_sampling"};
+
 void init_data();
 
 static VALUE rb_new(VALUE self, VALUE file_path);
@@ -12,5 +14,6 @@ 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 char* attr_string(ExifIfd ifd, ExifTag tag);
 
 #endif /* DATA_H */

data/lib/exif.rb

@@ -1,5 +1,4 @@
 require 'exif/version'
-require 'exif/underscore'
 require 'exif/exif'
 
 module Exif

data/lib/exif/version.rb

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

data/spec/exif_spec.rb

@@ -10,13 +10,15 @@ describe Exif do
   # end
 
   it 'works' do
-    expect(@data.contents[0][:image_width]).to eq 4000
-    expect(@data.contents[:image_width]).to eq 4000
+    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.contents[:gps][:gps_latitude]).to eq '24, 10.6817,  0'
-    expect(@data.contents[:gps_latitude]).to eq '24, 10.6817,  0'
+    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'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exif
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jian Weihang
@@ -66,6 +66,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmark/benchmark.rb
 - exif.gemspec
 - ext/exif/data.c
 - ext/exif/data.h
@@ -73,7 +74,6 @@ files:
 - ext/exif/exif.h
 - ext/exif/extconf.rb
 - lib/exif.rb
-- lib/exif/underscore.rb
 - lib/exif/version.rb
 - spec/exif_spec.rb
 - spec/sample.jpg

data/lib/exif/underscore.rb

@@ -1,12 +0,0 @@
-module Exif
-  module_function
-  def underscore!(word)
-    word.to_s.gsub!('::', '/')
-    word.gsub!(/(?:([A-Za-z\d])|^)((?=a)b)(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
-    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-    word.tr!("-", "_")
-    word.downcase!
-    word
-  end
-end