format_parser 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ef925f9f8fdd532ac2020248ca86200a5519243b1d061f9eeded80ef760b15c
-  data.tar.gz: 71a06ee9fb528d1ff89b2291e85383afa9bb480a048395bc08533271d0355a35
+  metadata.gz: f23bfcabe71704fa85eca744312d6b8f48b97087c13cef3129a027b413d2b6ad
+  data.tar.gz: df7d94ff90f305b8a65deb7734718035e86494a5eaf129f437ba603f1b2935c8
 SHA512:
-  metadata.gz: f1cd0d8851cafd96762449310334b8c2a35e154aba4fbfbab7acae8f58a837f02fc55dea0f877a29a237651a373467226a78ceee2b8fb9f16bbbea97c2870141
-  data.tar.gz: 3b5ceb254bc8256abe0f53f6ff0f15e357f3c4e381bc82b411cb3fcfd57df368bcf18c3ad914506d7d43a5827a4654d54ceff569a8d39366184d2557bafdfcdf
+  metadata.gz: 6beaa829ff6fee1f9a0c83f2ab3478fa1ea64798693d4b1025cb5d225923a0eb65a98c7355a5a15d764b34e51a51cdf8bb43718ea5297b92fc51bb4bceae842b
+  data.tar.gz: 2bad249ebf76f964d2a565daf8ec0cfd47176b85ae12c1e9f804575bacc2af0636c12a4291220b0b1f7ae1e4ee66926d9543d77c5aa97707b98abc919231fa6b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.13.4
+* Make sure JSON data never contains NaN, fix the test that was supposed to verify that but didn't
+* Forcibly UTF-8 sanitize all EXIF data when building JSON
+
 ## 0.13.3
 * Add a fixture to make sure all parsers can cope with an empty file when using `parse_http`
 * Terminate the ZIP parser early with empty input

data/lib/attributes_json.rb

@@ -45,8 +45,14 @@ module FormatParser::AttributesJSON
   def _sanitize_json_value(value, nesting = 0)
     raise ArgumentError, 'Nested JSON-ish structure too deep' if nesting > MAXIMUM_JSON_NESTING_WHEN_SANITIZING
     case value
-    when Float::INFINITY
-      nil
+    when Float
+      # Float::NAN cannot be case-matched as it is does not equal itself. Float::INIFINITY can,
+      # but it is easier to fold these two into a single case
+      if value.nan? || value.infinite?
+        nil
+      else
+        value
+      end
     when String
       FormatParser.string_to_lossy_utf8(value)
     when Hash
@@ -59,6 +65,7 @@ module FormatParser::AttributesJSON
       value
     end
   end
+  module_function :_sanitize_json_value
 
   # Implements to_json with sane defaults, with or without arguments
   def to_json(*maybe_generator_state)

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '0.13.3'
+  VERSION = '0.13.4'
 end

data/lib/parsers/exif_parser.rb

@@ -59,7 +59,9 @@ module FormatParser::EXIFParser
     end
 
     def to_json(*maybe_coder)
-      __getobj__.to_hash.to_json(*maybe_coder)
+      hash_representation = __getobj__.to_hash
+      sanitized = FormatParser::AttributesJSON._sanitize_json_value(hash_representation)
+      sanitized.to_json(*maybe_coder)
     end
 
     def orientation

data/spec/attributes_json_spec.rb

@@ -47,7 +47,7 @@ describe FormatParser::AttributesJSON do
       include FormatParser::AttributesJSON
       attr_accessor :some_nan
       def some_nan
-        (1.0 / 0.0).to_f
+        Float::NAN
       end
     end
     instance = anon_class.new

data/spec/parsers/jpeg_parser_spec.rb

@@ -120,4 +120,14 @@ describe FormatParser::JPEGParser do
     expect(result.width_px).to eq(2500)
     expect(result.display_width_px).to eq(1250) # The image is actually rotated
   end
+
+  it 'outputs EXIF with binary data in such a way that it can be JSON-serialized' do
+    pic_path = fixtures_dir + '/JPEG/exif-with-binary-bytes-in-fields.jpg'
+
+    result = subject.call(File.open(pic_path, 'rb'))
+    expect(result).not_to be_nil
+
+    serialized = JSON.pretty_generate(result)
+    expect(serialized).to be_kind_of(String)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Noah Berman