lib/file_data/formats/exif/exif.rb in file_data-4.0.0 vs lib/file_data/formats/exif/exif.rb in file_data-5.0.0

@@ -3,25 +3,26 @@
 
 module FileData
   # Convenience class for extracting exif data from a file or stream
   class Exif
     # Create methods that forward to ExifReader
-    ExifReader.public_instance_methods.each do |method_name|
-      define_method(method_name) do |input, *other_args|
+    # Each method requires the stream as a parameter to help the user
+    # fall into a "pit of success" by only opening and closing
+    # the stream once to get data
+    ExifReader.public_instance_methods(false).each do |method_name|
+      define_singleton_method(method_name) do |input, *other_args|
         delegate_to_exif_reader(input, method_name, other_args)
       end
     end
 
-    private
-
-    def delegate_to_exif_reader(input, name, other_args)
+    def self.delegate_to_exif_reader(input, name, other_args)
       streamify(input) do |stream|
         exif = ExifJpeg.new(stream).exif
-        ExifReader.new.send(name, exif, *other_args)
+        ExifReader.new(exif).send(name, *other_args)
       end
     end
 
-    def streamify(input)
+    def self.streamify(input)
       if input.is_a?(String)
         File.open(input, 'rb') { |f| yield f }
       else
         yield input
       end