Merge pull request #625 from stripe/ob-skip-to-hash-for-nil

Skip calling to_hash for nil

lib/stripe/stripe_object.rb

@@ -116,7 +116,7 @@ def as_json(*a)
 
  def to_hash
  maybe_to_hash = lambda do |value|
- value.respond_to?(:to_hash) ? value.to_hash : value
+ value && value.respond_to?(:to_hash) ? value.to_hash : value
  end
 
  @values.each_with_object({}) do |(key, value), acc|

test/stripe/stripe_object_test.rb

@@ -115,23 +115,40 @@ class TestObject < Stripe::StripeObject; end
  end
  end
 
- should "recursively call to_hash on its values" do
- # deep nested hash (when contained in an array) or StripeObject
- nested_hash = { id: 7, foo: "bar" }
- nested = Stripe::StripeObject.construct_from(nested_hash)
-
- obj = Stripe::StripeObject.construct_from(id: 1,
- # simple hash that contains a StripeObject to help us test deep
- # recursion
- nested: { object: "list", data: [nested] },
- list: [nested])
-
- expected_hash = {
- id: 1,
- nested: { object: "list", data: [nested_hash] },
- list: [nested_hash],
- }
- assert_equal expected_hash, obj.to_hash
+ context "#to_hash" do
+ should "skip calling to_hash on nil" do
+ module NilWithToHash
+ def to_hash
+ raise "Can't call to_hash on nil"
+ end
+ end
+ # include is private in Ruby 2.0
+ NilClass.send(:include, NilWithToHash)
+
+ hash_with_nil = { id: 3, foo: nil }
+ obj = StripeObject.construct_from(hash_with_nil)
+ expected_hash = { id: 3, foo: nil }
+ assert_equal expected_hash, obj.to_hash
+ end
+
+ should "recursively call to_hash on its values" do
+ # deep nested hash (when contained in an array) or StripeObject
+ nested_hash = { id: 7, foo: "bar" }
+ nested = Stripe::StripeObject.construct_from(nested_hash)
+
+ obj = Stripe::StripeObject.construct_from(id: 1,
+ # simple hash that contains a StripeObject to help us test deep
+ # recursion
+ nested: { object: "list", data: [nested] },
+ list: [nested])
+
+ expected_hash = {
+ id: 1,
+ nested: { object: "list", data: [nested_hash] },
+ list: [nested_hash],
+ }
+ assert_equal expected_hash, obj.to_hash
+ end
  end
 
  should "assign question mark accessors for booleans" do