exifr 1.2.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9dc9aa8ca96c37f0d49fc68580132e0be08dd2ea
-  data.tar.gz: 21b6bc149591d16f5ed2388d375ff66827b4de7f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWI5ZThmNGM1M2E2NDBhNzgyMzBmMDY0NWRlMzg0YjI5YWZkZjU2MA==
+  data.tar.gz: !binary |-
+    OTNiZmFhMTdmZTdhZjc5MThlYzFjZGNlNTZmZmI0Njc5ZTdhNjEwMw==
 SHA512:
-  metadata.gz: 5b23487cd273bac7a76ef89db722b25910e89a16ca0fafea6545c4d5202a036cdc6a6c7fae6ef16b5d8cb8ad50113235744b5f5f3147000d42702be240d1eb2c
-  data.tar.gz: 3a868dbb615345422bcc11e79277fdad1d62a77fb7ddcee06ab80dcf0749b76a306746abe0dab031e561413e65c06fc533e6cf275e68a340c7f097171731ed91
+  metadata.gz: !binary |-
+    NzlmOTQxYzE5M2YyYjVlNDQ4YTgyYWIxZjdjY2IyYTYwODg5NDU0YTUzMTVj
+    YWViYzI4YWE0ZDBmYTRjMmI0MzIwMTgwNGRjYjVkNDdmNjNmNWNhN2ZlZWUx
+    ZWEzYzU2MzY0ZjkyMjJjZTJmZjNiZDhjMzUwY2ZjNTg5ZTJkMTg=
+  data.tar.gz: !binary |-
+    ZDNiMDhhZWUxODU3M2U3NTExZTUzMTYxM2FhZjkzNTk5NmM2MmM1MGFkYjAw
+    YmE0MTI2MGI5NTdlZWFlZTI4MjJjY2IzZTMyMGNlZGVmZDlhMWVkODhjZDk2
+    YWJjNGZmZDM1ZjdlZWUzOWIxYzRkODdjMzcyOTdhNGY2OGQ4Mjk=

data/CHANGELOG

@@ -1,3 +1,7 @@
+EXIF Reader 1.3.0
+* workaround warnings when using the ruby "-w" option
+* NOTE: requiring only 'exifr' will nolonger provide EXIFR::JPEG or EXIFR::TIFF, require 'exifr/jpeg' or 'exifr/tiff' instead
+
 EXIF Reader 1.2.6
 * bug fix; "[GH#48] handle empty file as malformed jpeg"; thanks Hoàng Xuân Phú
 

data/README.rdoc

@@ -1,7 +1,11 @@
 = EXIF Reader
+{<img src="https://badge.fury.io/rb/exifr.svg" alt="Gem Version" />}[https://badge.fury.io/rb/exifr]
+{<img src="https://circleci.com/gh/remvee/exifr/tree/master.svg?style=shield&circle-token=7d957be2d7195f5d07a7c1962926ee626b050c2e" alt="Circle CI" />}[https://circleci.com/gh/remvee/exifr]
+
 EXIF Reader is a module to read metadata from JPEG and TIFF images.
 
 == Examples
+  require 'exifr/jpeg'
   EXIFR::JPEG.new('IMG_6841.JPG').width               # => 2272
   EXIFR::JPEG.new('IMG_6841.JPG').height              # => 1704
   EXIFR::JPEG.new('IMG_6841.JPG').exif?               # => true
@@ -9,7 +13,10 @@ EXIF Reader is a module to read metadata from JPEG and TIFF images.
   EXIFR::JPEG.new('IMG_6841.JPG').date_time           # => Fri Feb 09 16:48:54 +0100 2007
   EXIFR::JPEG.new('IMG_6841.JPG').exposure_time.to_s  # => "1/15"
   EXIFR::JPEG.new('IMG_6841.JPG').f_number.to_f       # => 2.0
+  EXIFR::JPEG.new('enkhuizen.jpg').gps.latitude       # => 52.7197888888889
+  EXIFR::JPEG.new('enkhuizen.jpg').gps.longitude      # => 5.28397777777778
 
+  require 'exifr/tiff'
   EXIFR::TIFF.new('DSC_0218.TIF').width               # => 3008
   EXIFR::TIFF.new('DSC_0218.TIF')[1].width            # => 160
   EXIFR::TIFF.new('DSC_0218.TIF').model               # => "NIKON D1X"
@@ -17,9 +24,6 @@ EXIF Reader is a module to read metadata from JPEG and TIFF images.
   EXIFR::TIFF.new('DSC_0218.TIF').exposure_time.to_s  # => "1/100"
   EXIFR::TIFF.new('DSC_0218.TIF').f_number.to_f       # => 5.0
 
-  EXIFR::JPEG.new('enkhuizen.jpg').gps.latitude       # => 52.7197888888889
-  EXIFR::JPEG.new('enkhuizen.jpg').gps.longitude      # => 5.28397777777778
-
 == Logging warnings
 When EXIF information is malformed, a warning is logged to STDERR with
 the standard Ruby logger.  Log to some other location by supplying an
@@ -50,4 +54,4 @@ examples at https://github.com/amberbit/xmp
 R.W. van 't Veer
 
 == Copyright
-Copyright (c) 2006-2015 - R.W. van 't Veer
+Copyright (c) 2006-2017 - R.W. van 't Veer

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2013 - R.W. van 't Veer
+# Copyright (c) 2006-2017 - R.W. van 't Veer
 
 require 'rake/testtask'
 
@@ -7,6 +7,7 @@ task :default => :test
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'tests'
   t.test_files = FileList['tests/*_test.rb']
+  t.warning = true
 end
 
 begin

data/lib/exifr.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2015 - R.W. van 't Veer
+# Copyright (c) 2006-2017 - R.W. van 't Veer
 
 require 'logger'
 
@@ -10,6 +10,3 @@ module EXIFR
   class << self; attr_accessor :logger; end
   self.logger = Logger.new(STDERR)
 end
-
-require 'exifr/jpeg'
-require 'exifr/tiff'

data/lib/exifr/jpeg.rb

@@ -1,6 +1,7 @@
-# Copyright (c) 2006-2015 - R.W. van 't Veer
+# Copyright (c) 2006-2017 - R.W. van 't Veer
 
 require 'exifr'
+require 'exifr/tiff'
 require 'stringio'
 require 'delegate'
 

data/lib/exifr/tiff.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2015 - R.W. van 't Veer
+# Copyright (c) 2007-2017 - R.W. van 't Veer
 
 require 'exifr'
 require 'rational'
@@ -245,16 +245,16 @@ module EXIFR
     self.mktime_proc = proc { |*args| Time.local(*args) }
 
     time_proc = proc do |value|
-      value.map do |value|
-        if value =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
+      value.map do |v|
+        if v =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
           begin
             mktime_proc.call($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i)
           rescue => ex
-            EXIFR.logger.warn("Bad date/time value #{value.inspect}: #{ex}")
+            EXIFR.logger.warn("Bad date/time value #{v.inspect}: #{ex}")
             nil
           end
         else
-          value
+          v
         end
       end
     end
@@ -356,13 +356,13 @@ module EXIFR
                       :date_time_original => time_proc,
                       :date_time_digitized => time_proc,
                       :date_time => time_proc,
-                      :orientation => proc { |v| v.map{|v| ORIENTATIONS[v]} },
+                      :orientation => proc { |x| x.map{|y| ORIENTATIONS[y]} },
                       :gps_latitude => degrees_proc,
                       :gps_longitude => degrees_proc,
                       :gps_dest_latitude => degrees_proc,
                       :gps_dest_longitude => degrees_proc,
-                      :shutter_speed_value => proc { |v| v.map { |v| v.abs < 100 ? rational(1, (2 ** v).to_i) : nil } },
-                      :aperture_value => proc { |v| v.map { |v| round(1.4142 ** v, 1) } }
+                      :shutter_speed_value => proc { |x| x.map { |y| y.abs < 100 ? rational(1, (2 ** y).to_i) : nil } },
+                      :aperture_value => proc { |x| x.map { |y| round(1.4142 ** y, 1) } }
                     })
 
     # Names for all recognized TIFF fields.
@@ -377,9 +377,9 @@ module EXIFR
           @ifds << ifd
         end
 
-        @jpeg_thumbnails = @ifds.map do |ifd|
-          if ifd.jpeg_interchange_format && ifd.jpeg_interchange_format_length
-            start, length = ifd.jpeg_interchange_format, ifd.jpeg_interchange_format_length
+        @jpeg_thumbnails = @ifds.map do |v|
+          if v.jpeg_interchange_format && v.jpeg_interchange_format_length
+            start, length = v.jpeg_interchange_format, v.jpeg_interchange_format_length
             data[start..(start + length)]
           end
         end.compact
@@ -424,6 +424,14 @@ module EXIFR
       (super + TAGS + IFD.instance_methods(false)).uniq
     end
 
+    def encode_with(coder)
+      coder["ifds"] = @ifds
+    end
+
+    def to_yaml_properties
+      ['@ifds']
+    end
+
     class << self
       alias instance_methods_without_tiff_extras instance_methods
       def instance_methods(include_super = true) # :nodoc:
@@ -508,6 +516,10 @@ module EXIFR
         IFD.new(@data, @offset_next) if next?
       end
 
+      def encode_with(coder)
+        coder["fields"] = @fields
+      end
+
       def to_yaml_properties
         ['@fields']
       end

data/tests/jpeg_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006-2015 - R.W. van 't Veer
+# Copyright (c) 2006-2017 - R.W. van 't Veer
 
 require 'test_helper'
 

data/tests/test_helper.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006-2015 - R.W. van 't Veer
+# Copyright (c) 2006-2017 - R.W. van 't Veer
 
 require 'stringio'
 require 'pp'
@@ -24,7 +24,8 @@ TestCase = begin
            end
 
 $:.unshift("#{File.dirname(__FILE__)}/../lib")
-require 'exifr'
+require 'exifr/jpeg'
+require 'exifr/tiff'
 include EXIFR
 
 EXIFR.logger = Logger.new(StringIO.new)

data/tests/tiff_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (c) 2006-2015 - R.W. van 't Veer
+# Copyright (c) 2006-2017 - R.W. van 't Veer
 
 require 'test_helper'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exifr
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors:
 - R.W. van 't Veer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-01 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies: []
 description: EXIF Reader is a module to read EXIF from JPEG and TIFF images.
 email: remco@remvee.net
@@ -57,25 +57,25 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--title"
+- --title
 - EXIF Reader for Ruby API Documentation
-- "--main"
+- --main
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Read EXIF from JPEG and TIFF images