format_parser 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e97554eb9bf6ca4a4ea76daa0f226c370f707e270931759375e9f6b72c1e7f40
-  data.tar.gz: 946767ce39eb4a96420fd52852f514333baa33ec20d256241acc7208863aaf87
+  metadata.gz: 0d10f78d5d1a472fc6af704132ac8b98542a141de3d5b8a998faebfa5a994b30
+  data.tar.gz: 65636e308c67d8ccc3e3ff592e5cfe02bf5c105ac32b85d17825279211b362db
 SHA512:
-  metadata.gz: 612b8b1af86329fce62e3eb035b30178485679a76516fcfe8a72c3785ef782855098609e7189559df2fd5929663d5b7ec3b7319e5e44a7048229aa13b5fc5dc9
-  data.tar.gz: 8ffa31f8c498d72eb734b15d9b5de99c44742e1651a200b5484da8e7d5bc5bba5d52092a9b8b52d7374646265be2ecd0f0b4f06bc4798b4da9a16f83d3749512
+  metadata.gz: bec31abec6687c7b8dd57783da5e2aec175e1f538097b03eba095c49bd636fc38d562b21e3da1b2ca24f74caffb37b9953e139372ce30be19aea502947b532ca
+  data.tar.gz: 51e593f4c14049467f657e786a2c9d54f91713d1ab45badbdd67d27876e1b61f3542936cb184cb72f0885745673b8423ce4ceda5c0b5cdb4661f96ebf2f6d59e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.20.1
+* Make sure EXIF results work correctly with ActiveSupport JSON encoders
+
 ## 0.20.0
 * Correctly tag the license on Rubygems as MIT (Hippocratic) for easier audit
 

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '0.20.0'
+  VERSION = '0.20.1'
 end

data/lib/parsers/exif_parser.rb

@@ -100,17 +100,7 @@ module FormatParser::EXIFParser
     end
 
     def to_json(*maybe_coder)
-      # Let EXIF tags that come later overwrite the properties from the tags
-      # that come earlier
-      overlay = @multiple_exif_results.each_with_object({}) do |one_exif_frame, h|
-        h.merge!(one_exif_frame.to_hash)
-      end
-      # Overwrite the orientation with our custom method implementation, because
-      # it does reject 0-values.
-      overlay[:orientation] = orientation
-
-      sanitized = FormatParser::AttributesJSON._sanitize_json_value(overlay)
-      sanitized.to_json(*maybe_coder)
+      to_hash.to_json(*maybe_coder)
     end
 
     def orientation_sym
@@ -135,10 +125,27 @@ module FormatParser::EXIFParser
       0 # If none were found - the orientation is unknown
     end
 
+    # ActiveSupport will attempt to call #to_hash first, and
+    # #to_hash is a decent default implementation to have
+    def to_hash
+      # Let EXIF tags that come later overwrite the properties from the tags
+      # that come earlier
+      overlay = @multiple_exif_results.each_with_object({}) do |one_exif_frame, h|
+        h.merge!(one_exif_frame.to_hash)
+      end
+      # Overwrite the orientation with our custom method implementation, because
+      # it does reject 0-values.
+      overlay[:orientation] = orientation
+
+      FormatParser::AttributesJSON._sanitize_json_value(overlay)
+    end
+
     private
 
-    def respond_to_missing?(method_name)
-      @multiple_exif_results.last.respond_to?(method_name)
+    # respond_to_missing? accepts 2 arguments: the method name symbol
+    # and whether the method being looked up can be private or not
+    def respond_to_missing?(method_name, include_private_methods)
+      @multiple_exif_results.last.respond_to?(method_name, include_private_methods)
     end
 
     def method_missing(*a)

data/spec/parsers/exif_parser_spec.rb

@@ -14,6 +14,34 @@ describe FormatParser::EXIFParser do
     end
   end
 
+  describe 'EXIFStack' do
+    it 'supports respond_to? for methods it does not have' do
+      # Peculiar thing: we need to support respond_to?(:to_hash)
+      # for compatibility with ActiveSupport JSON output. When you call as_json
+      # on an object ActiveSupport implements that as_json method and will then
+      # call #as_json on the contained objects as necessary, _or_ call
+      # other methods if it thinks it is necessary.
+      #
+      # Although we _will_ be implementing to_hash specifically
+      # the respond_to_missing must be implemented correctly
+      stack = FormatParser::EXIFParser::EXIFStack.new([{}, {}])
+      expect(stack).not_to respond_to(:no_such_method__at_all)
+    end
+
+    it 'returns a Hash from #to_hash' do
+      first_fake_exif = double(orientation: 1, to_hash: {foo: 123, bar: 675})
+      second_fake_exif = double(orientation: 4, to_hash: {foo: 245})
+
+      stack = FormatParser::EXIFParser::EXIFStack.new([first_fake_exif, second_fake_exif])
+      stack_as_hash = stack.to_hash
+
+      # In this instance we DO need an actual type_check, because #to_hash
+      # is used by default type coercions in Ruby
+      expect(stack_as_hash).to be_kind_of(Hash)
+      expect(stack_as_hash).to eq(foo: 245, bar: 675, orientation: 4)
+    end
+  end
+
   it 'is able to deal with an orientation tag which a tuple value for orientation' do
     path = fixtures_dir + '/EXIF/double_orientation.exif.bin'
     exif_data = File.open(path, 'rb') do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Noah Berman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ks