amazon_flex_pay 0.9.3 → 0.9.4

data/lib/amazon_flex_pay.rb

@@ -5,7 +5,7 @@ require 'openssl'
 require 'rubygems'
 require 'rest_client'
 require 'multi_xml'
-require 'active_support/core_ext/string/inflections' # camelcase, underscore
+require 'active_support/inflector' # camelcase, underscore
 
 require 'amazon_flex_pay/signing'
 require 'amazon_flex_pay/model'
@@ -16,7 +16,7 @@ require 'amazon_flex_pay/api'
 require 'amazon_flex_pay/pipelines'
 
 module AmazonFlexPay
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
   API_VERSION = '2010-08-28'
   PIPELINE_VERSION = '2009-01-09'
 

data/lib/amazon_flex_pay/model.rb

@@ -96,20 +96,16 @@ module AmazonFlexPay
       assign(hash)
     end
 
-    protected
-
     # Formats all attributes into a hash of parameters.
     def to_hash
       self.class.attribute_names.inject({}) do |hash, name|
-        val = send(name.underscore)
-        if val.nil? or val == '' or val == []
-          hash
-        else
-          hash.merge(format_key(name) => val.is_a?(AmazonFlexPay::Model) ? val.to_hash : format_value(val))
-        end
+        val = format_value(send(name.underscore))
+        val.empty? ? hash : hash.merge(format_key(name) => val)
       end
     end
 
+    protected
+
     # By default all parameter keys are CamelCase.
     def format_key(key)
       key.camelcase
@@ -118,6 +114,9 @@ module AmazonFlexPay
     # Formats times and booleans as Amazon desires them.
     def format_value(val)
       case val
+        when AmazonFlexPay::Model
+        val.to_hash
+
         when Time
         val.utc.strftime('%Y-%m-%dT%H:%M:%SZ')
 

data/test/amazon_flex_pay_test.rb

@@ -48,11 +48,13 @@ class AmazonFlexPayTest < AmazonFlexPay::Test
 
     class Response < AmazonFlexPay::API::Base::BaseResponse; end
   end
-  
+
   should "respond with data structures even when models are empty" do
     tr = TestRequest.new
     assert tr.stuffs.is_a?(Array)
     assert tr.amount.respond_to?(:value)
+    assert !tr.to_hash.has_key?('Stuffs')
+    assert !tr.to_hash.has_key?('Amount')
   end
 
   should "add necessary fields and sign api requests" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amazon_flex_pay
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Lance Ivy