exifparser 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfccf0b6c6c4f20652f918d8148755d04f25f27a
-  data.tar.gz: 618cd09ea78771458c1767854e53d7c5283565a5
+  metadata.gz: 11b4a6e56cc19c607d633de9d7357f9ad44aa089
+  data.tar.gz: e1e3fb345b0d276ec721d7d5c207e913ab7d5721
 SHA512:
-  metadata.gz: 28174bc9b81c4997584c8d1f1138c1e1308307d83ce5f326d901b35657e5060896232c5f5684b71110d8981b1b22c80a153aa7d4d9918c93cb385dde7246bcc5
-  data.tar.gz: 357d72674ce7806b3148b19a0f5e7bcb51b801c0ac721dfe2cf2bc9ad92588af1a372219b82ff503c355cc2d86348d4704e35a3a377fa768b401acc1d92b7421
+  metadata.gz: b351d605e8c9552f1f1cc9629318afd459383bf7d890b413300d91e959cddd85a140683fab13fef1bbd1f877003a5dc1d0b738dd67f98439f4b6f2c8ba32fa2b
+  data.tar.gz: 17e8345dcce5f1f24feb8e4271de06f613b2a1c3ca95c22a222ddee96ab5c5a48d8519e36a41ed69f9e661acc580a0e23626bbd30135e1f295732ed059104503

data/lib/exifparser.rb

@@ -99,13 +99,13 @@ module Exif
     #
     # create a new object. fpath is String.
     #
-    def initialize(fpath)
-      @fpath = fpath
-      @scanner = nil
-      File.open(fpath, "rb") do |f|
-        @scanner = Exif::Scanner.new(f)
-        @scanner.scan
-      end
+    def initialize(file_handler)
+      @scanner = Exif::Scanner.new prepare_file(file_handler)
+      @scanner.scan
+      init_from_scanner
+    end
+
+    def init_from_scanner
       @IFD0 = @scanner.result[:IFD0]
       @IFD1 = @scanner.result[:IFD1]
       @Exif = @scanner.result[:Exif]
@@ -115,6 +115,16 @@ module Exif
       @thumbnail = @scanner.result[:Thumbnail]
     end
 
+    def prepare_file(handler)
+      if handler.is_a? String
+        @fpath = handler
+        File.open(handler, "rb")
+      elsif handler.is_a?(StringIO) || handler.is_a?(File)
+        @fpath = 'dummy_file'
+        handler
+      end
+    end
+
     def inspect
       sprintf("#<%s filename=\"%s\" entries: IFD0(%d) IFD1(%d) Exif(%d) GPS(%d) Interoperability(%d) MakerNote(%d)>", self.class, @fpath, @IFD0.length, @IFD1.length, @Exif.length, @GPS.length, @Interoperability.length, @MakerNote.length)
     end
@@ -227,6 +237,15 @@ module Exif
       end
     end
 
+    def marshal_dump
+      {scanner: Marshal.dump(@scanner)}
+    end
+
+    def marshal_load marshaled
+      @scanner = Marshal.load marshaled[:scanner]
+      init_from_scanner
+    end
+
     private
 
     def search_tag(tagID, ifd=nil)

data/lib/exifparser/scan.rb

@@ -210,6 +210,20 @@ module Exif
       puts(sprintf("scan time: %1.4f sec.", toc-tic)) if $DEBUG
     end
 
+    def marshal_dump
+      {
+        result: Marshal.dump(@result),
+        tiffHeader0: Marshal.dump(@tiffHeader0),
+        byteOrder_module: Marshal.dump(@byteOrder_module)
+      }
+    end
+
+    def marshal_load marshaled
+      @result = Marshal.load marshaled[:result]
+      @tiffHeader0 = Marshal.load marshaled[:tiffHeader0]
+      @byteOrder_module = Marshal.load marshaled[:byteOrder_module]
+    end
+
     private
 
     def fin_read_n(n)

data/lib/exifparser/version.rb

@@ -1,3 +1,3 @@
 module ExifParser
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exifparser
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - kp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler