format_parser 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c08f5e2482e524cf7b6c54eb4de371bbf1a107
-  data.tar.gz: 3c33f9336c6ec7479b03102f8dbc4ab8610a6420
+  metadata.gz: 4bc81ce8d64a13fe43d93e7fe24b17ea484e64a4
+  data.tar.gz: 8d559f3fdd9f0a814b479ade6997a3d6bd7dd4a5
 SHA512:
-  metadata.gz: b9892a12a6007744c70baa01200d432b40868d6f8d854b506dea7349ef84282133f49ab244a9d383b7772221d29dc950ae07c604b57247784f42aae74a03474b
-  data.tar.gz: 643b274aa45ef8a11dde7e178d03036488767ba56f4e4680edf647ebb5098aff52c08bcecc9578c73bd6835aa235ac31358032806e0c28c5c113d8edad9734e1
+  metadata.gz: d555a6eb131261f3c9bb2418e1c7acf12dfb07de4d3b2af65a8135247b8900ddb8e1c60bc6c0d6985ac3c2bfdfc81c0902396e21436a4b4b7a5fd6eee7dcf4d7
+  data.tar.gz: c955511e375429fb93068220a1b7d70875a7e71760f14652fd191ad8d1a8b5c20ff20258cda030468acfc53cde070436b8515fe9af7e0f757dbe2c2d66722a03

data/README.md

@@ -148,6 +148,9 @@ Therefore we adapt the following approaches:
 
 Unless specified otherwise in this section the fixture files are MIT licensed and from the FastImage and Dimensions projects.
 
+### JPEG
+- `divergent_pixel_dimensions_exif.jpg` is used with permission from LiveKom GmbH
+
 ### AIFF
 - fixture.aiff was created by one of the project maintainers and is MIT licensed
 

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/lib/parsers/jpeg_parser.rb

@@ -15,6 +15,7 @@ class FormatParser::JPEGParser
     @width             = nil
     @height            = nil
     @orientation       = nil
+    @intrinsics = {}
     scan
   end
 
@@ -51,7 +52,8 @@ class FormatParser::JPEGParser
           format: :jpg,
           width_px: @width,
           height_px: @height,
-          orientation: @orientation
+          orientation: @orientation,
+          intrinsics: @intrinsics,
         )
       end
     end
@@ -90,8 +92,10 @@ class FormatParser::JPEGParser
       if scanner.scan_image_exif
         @exif_output = scanner.exif_data
         @orientation = scanner.orientation unless scanner.orientation.nil?
-        @width = @exif_output.pixel_x_dimension || scanner.width
-        @height = @exif_output.pixel_y_dimension || scanner.height
+        @intrinsics[:exif_pixel_x_dimension] = @exif_output.pixel_x_dimension
+        @intrinsics[:exif_pixel_y_dimension] = @exif_output.pixel_y_dimension
+        @width = scanner.width
+        @height = scanner.height
       end
     end
   end

data/spec/parsers/jpeg_parser_spec.rb

@@ -18,18 +18,34 @@ describe FormatParser::JPEGParser do
     end
   end
 
-  describe 'is able to parse all the JPEG exif examples from FastImage' do
+  it 'is able to parse JPEG examples with EXIF tags containing different orientations from FastImage' do
     Dir.glob(fixtures_dir + '/exif-orientation-testimages/jpg/*.jpg').each do |jpeg_path|
-      it "is able to parse #{File.basename(jpeg_path)}" do
-        parsed = subject.call(File.open(jpeg_path, 'rb'))
-        expect(parsed).not_to be_nil
+      parsed = subject.call(File.open(jpeg_path, 'rb'))
+      expect(parsed).not_to be_nil
 
-        expect(parsed.orientation).to be_kind_of(Symbol)
-        expect(parsed.width_px).to be > 0
-
-        expect(parsed.height_px).to be_kind_of(Integer)
-        expect(parsed.height_px).to be > 0
-      end
+      expect(parsed.orientation).to be_kind_of(Symbol)
+      expect(parsed.width_px).to be > 0
+      expect(parsed.height_px).to be > 0
     end
+
+    bottom_left_path = fixtures_dir + '/exif-orientation-testimages/jpg/bottom_left.jpg'
+    parsed = subject.call(File.open(bottom_left_path, 'rb'))
+    expect(parsed.orientation).to eq(:bottom_left)
+    expect(parsed.width_px).to eq(1240)
+    expect(parsed.height_px).to eq(1754)
+
+    top_right_path = fixtures_dir + '/exif-orientation-testimages/jpg/right_bottom.jpg'
+    parsed = subject.call(File.open(top_right_path, 'rb'))
+    expect(parsed.orientation).to eq(:right_bottom)
+    expect(parsed.width_px).to eq(1754)
+    expect(parsed.height_px).to eq(1240)
+  end
+
+  it 'gives true pixel dimensions priority over pixel dimensions in EXIF tags' do
+    jpeg_path = fixtures_dir + '/JPEG/divergent_pixel_dimensions_exif.jpg'
+    result = subject.call(File.open(jpeg_path, 'rb'))
+    expect(result.width_px).to eq(1920)
+    expect(result.height_px).to eq(1280)
+    expect(result.intrinsics).to eq(exif_pixel_x_dimension: 8214, exif_pixel_y_dimension: 5476)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Noah Berman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ks
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A library for efficient parsing of file metadata