Coder#load: Conditionally call Formats.remove_root

lib/active_resource/coder.rb

@@ -70,6 +70,8 @@ def load(value)
       return if value.nil?
       value = resource_class.format.decode(value) if value.is_a?(String)
       raise ArgumentError.new("expected value to be Hash, but was #{value.class}") unless value.is_a?(Hash)
+      value = Formats.remove_root(value) if value.keys.first.to_s == resource_class.element_name
+
       resource_class.new(value, value[resource_class.primary_key])
     end
   end

test/cases/base/serialization_test.rb

@@ -100,7 +100,7 @@ class SerializationTest < ActiveSupport::TestCase
   test "#load decodes a Hash into an instance" do
     resource = Person.new(id: 1, name: "Matz")
 
-    decoded = Person.coder.load(resource.serializable_hash)
+    decoded = Person.coder.load(JSON.parse(resource.encode))
 
     assert_equal resource.id, decoded.id
     assert_equal resource.name, decoded.name
@@ -110,45 +110,52 @@ class SerializationTest < ActiveSupport::TestCase
   test "#load builds the instance as persisted when the default primary key is present" do
     resource = Person.new(id: 1, name: "Matz")
 
-    decoded = Person.coder.load(resource.encode)
+    [ resource.encode, JSON.parse(resource.encode) ].each do |encoded|
+      decoded = Person.coder.load(encoded)
 
-    assert_predicate decoded, :persisted?
-    assert_not_predicate decoded, :new_record?
+      assert_predicate decoded, :persisted?
+      assert_not_predicate decoded, :new_record?
+    end
   end
 
   test "#load builds the instance as persisted when the configured primary key is present" do
     previous_value, Person.primary_key = Person.primary_key, "pk"
     resource = Person.new(pk: 1, name: "Matz")
 
-    decoded = Person.coder.load(resource.encode)
+    [ resource.encode, JSON.parse(resource.encode) ].each do |encoded|
+      decoded = Person.coder.load(encoded)
 
-    assert_equal 1, decoded.id
-    assert_predicate decoded, :persisted?
-    assert_not_predicate decoded, :new_record?
+      assert_equal 1, decoded.id
+      assert_predicate decoded, :persisted?
+      assert_not_predicate decoded, :new_record?
+    end
   ensure
     Person.primary_key = previous_value
   end
 
   test "#load builds the instance as a new record when the default primary key is absent" do
     resource = Person.new(name: "Matz")
 
-    decoded = Person.coder.load(resource.encode)
+    [ resource.encode, JSON.parse(resource.encode) ].each do |encoded|
+      decoded = Person.coder.load(encoded)
 
-    assert_nil decoded.id
-    assert_not_predicate decoded, :persisted?
-    assert_predicate decoded, :new_record?
+      assert_nil decoded.id
+      assert_not_predicate decoded, :persisted?
+      assert_predicate decoded, :new_record?
+    end
   end
 
   test "#load builds the instance as a new record when the configured primary key is absent" do
     previous_value, Person.primary_key = Person.primary_key, "pk"
-
     resource = Person.new(name: "Matz")
 
-    decoded = Person.coder.load(resource.encode)
+    [ resource.encode, JSON.parse(resource.encode) ].each do |encoded|
+      decoded = Person.coder.load(encoded)
 
-    assert_nil decoded.id
-    assert_not_predicate decoded, :persisted?
-    assert_predicate decoded, :new_record?
+      assert_nil decoded.id
+      assert_not_predicate decoded, :persisted?
+      assert_predicate decoded, :new_record?
+    end
   ensure
     Person.primary_key = previous_value
   end
@@ -163,6 +170,14 @@ class SerializationTest < ActiveSupport::TestCase
     assert_raises(ArgumentError, match: "expected value to be Hash, but was Integer") { Person.coder.load(1) }
   end
 
+  test "#load does not remove a non-root key from a single-key Hash" do
+    payload = { "friends" => [ { "id" => 1 } ] }
+
+    decoded = Person.coder.load(payload)
+
+    assert_equal [ 1 ], decoded.friends.map(&:id)
+  end
+
   test "#dump encodes resources" do
     resource = Person.new(id: 1, name: "Matz")