iptc 0.0.5 → 0.0.7

data/README.md

@@ -8,4 +8,6 @@ Read IPTC::JPEG::Image for more information.
 The IPTC library parses the APP13 JPEG Tag and generates a hash of properties for a given file.
 
 Original code from http://raa.ruby-lang.org/project/jpeg-jfif-iptc/
-Gemified, reorganized and modified in 2010 by Jens Kraemer.
+Gemified, reorganized and modified in 2010 by Jens Kraemer.
+
+Ownership retaken from Github in 2011 by Pierre Baillet.

data/lib/iptc/jpeg/image.rb

@@ -31,7 +31,7 @@ module IPTC
       def initialize data_name, content, quick=true
         @logger = Logger.new(STDOUT)
         @logger.datetime_format = "%H:%M:%S"
-        @logger.level = Logger::DEBUG # $DEBUG?(Logger::DEBUG):(Logger::INFO)
+        @logger.level = $DEBUG?(Logger::DEBUG):(Logger::INFO)
       
         @data_name = data_name
         @content = content

data/lib/iptc/jpeg/marker.rb

@@ -12,9 +12,9 @@ module IPTC
         
           # The NewMarker constructor method.
           # Inspect the object space in order to find something usable later
-          def Marker.NewMarker(type,data, logger)
+          def Marker.NewMarker(type, data, logger)
             marker_class = "#{type}Marker"
-              if JPEG::Markers.constants.include?(marker_class.to_s)
+              if JPEG::Markers.constants.include?(marker_class.to_sym)
                   return JPEG::Markers.const_get(marker_class).new(type, data)
               else
                 if !@@missing.include?(type)
@@ -39,7 +39,7 @@ module IPTC
               end
           end
 
-          def initialize(type,data)
+          def initialize(type, data)
               @logger = Logger.new(STDOUT)
               @logger.datetime_format = "%H:%M:%S"
               @logger.level = $DEBUG?(Logger::DEBUG):(Logger::INFO)

data/lib/iptc/jpeg/marker_headers.rb

@@ -1,3 +1,5 @@
+# -*- coding: binary -*-
+
 module IPTC
   module JPEG
       MARKERS = {

data/lib/iptc/jpeg/markers.rb

@@ -43,7 +43,7 @@ module IPTC
       # See also the IPTC::MarkerNomenclature.
       class APP13Marker < Marker
         def initialize(type, data)
-          @header = "Photoshop 3.0\0008BIM"
+          @header = "Photoshop 3.0\000"
 
           super(type, data)
           @prefix = "iptc"
@@ -53,46 +53,85 @@ module IPTC
           return read(@header.length)==@header
         end
 
+        SHORT = 1
+        WORD = 2
+        LONG = 4
+
+        def word
+          read(WORD).unpack("n")[0]
+        end
+        def long
+          read(LONG).unpack("N")[0]
+        end
+
         def parse
           l "APP13 marker parsed"
-          @markers = Array.new        
+          @markers = Array.new
+
+          # http://www.fileformat.info/format/psd/egff.htm
+          # this one is much up to date.
 
+          while @content.pos < @content.length - 1
+            l @content.pos
+            l @content.length
 
-          @bim_type = read(2)
-          @bim_dummy = read(4)
-          size = read(2)
+            eight_bim = read(LONG)
+            l eight_bim
+            raise "Not a 8BIM packet(#{eight_bim.inspect} #{read(10)}" if eight_bim != "8BIM"
+            @bim_type = word()
 
-          content = StringIO.new(read(size.unpack('n')[0]))
+            # Read name length and normalize to even number of bytes
+            # Weird, always read 4 bytes
+            padding = read(4)
+            bim_size = word()
 
-          while !content.eof?
+            # http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Photoshop.html
+            case @bim_type 
 
-            header = content.read(2)
+            when 0x0404 # IPTC
+              content = StringIO.new(read(bim_size))
 
-            # http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html
-            case header
-            when "\x1c\x01"
-              # skip the envelope
               while !content.eof?
-                if content.read(1) == "\x1c"
-                  content.pos = content.pos - 1
-                  break
+
+                header = content.read(2).unpack("n")[0]
+
+                # http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/IPTC.html
+                case header
+                when 0x1C01
+                  # skip the envelope
+                  while !content.eof?
+                    if content.read(1) == "\x1c"
+                      content.pos = content.pos - 1
+                      break
+                    end
+                  end
+                when 0x1C02
+
+                  type = content.read(1).unpack('c')[0]
+                  size = content.read(2)
+                  value = content.read(size.unpack('n')[0])
+
+                  l "Found marker #{type}"
+                  marker = IPTC::Marker.new(type, value)
+                  @values[@prefix+"/"+IPTC::MarkerNomenclature.markers(type.to_i).name] ||= []
+                  @values[@prefix+"/"+IPTC::MarkerNomenclature.markers(type.to_i).name] << value
+                  @markers << marker
+
+                else
+                  # raise InvalidBlockException.new("Invalid BIM segment #{header.inspect} in marker\n#{@original_content.inspect}")
                 end
               end
-            when "\x1c\x02"
-
-              type = content.read(1).unpack('c')[0]
-              size = content.read(2)
-              value = content.read(size.unpack('n')[0])
-
-              l "Found marker #{type}"
-              marker = IPTC::Marker.new(type, value)
-              @values[@prefix+"/"+IPTC::MarkerNomenclature.markers(type.to_i).name] ||= []
-              @values[@prefix+"/"+IPTC::MarkerNomenclature.markers(type.to_i).name] << value
-              @markers << marker
-
+            when 0x03ED
+              hRes = long()
+              hResUnit = word()
+              widthUnit = word()
+              vRes = long()
+              vResUnit = word()
+              heightUnit = word()
             else
-              # raise InvalidBlockException.new("Invalid BIM segment #{header.inspect} in marker\n#{@original_content.inspect}")
+              read(bim_size)
             end
+            read(1) if bim_size%2 == 1
           end
           return @values
         end

data/lib/iptc/multiple_hash.rb

@@ -31,6 +31,9 @@ module IPTC
         end
       end
     end
+    def keys
+      return @internal.keys
+    end
     def each
       @internal.each do |key, values|
         values.each do |value|

data/lib/iptc/version.rb

@@ -1,3 +1,3 @@
 module IPTC
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,35 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: iptc
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Pierre Baillet
 - Jens Kraemer
+- Tristan Bartement
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-09 00:00:00 +01:00
-default_executable: 
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies: []
-
-description: Original code from http://raa.ruby-lang.org/project/jpeg-jfif-iptc/, gemified and updated by Jens Kraemer, Futher fixes by Pierre Baillet
-email: 
+description: Original code from http://raa.ruby-lang.org/project/jpeg-jfif-iptc/,
+  gemified and updated by Jens Kraemer, Futher fixes by Pierre Baillet
+email:
 - pierre@baillet.name
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/iptc/jpeg/image.rb
 - lib/iptc/jpeg/marker.rb
 - lib/iptc/jpeg/marker_headers.rb
@@ -42,41 +33,28 @@ files:
 - lib/iptc.rb
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: http://github.com/octplane/ruby-iptc
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: ruby-iptc
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Pure ruby IPTC metadata reader
 test_files: []
-