lib/mousetrap/subscription.rb in cameroncox-mousetrap-0.5.3.5 vs lib/mousetrap/subscription.rb in cameroncox-mousetrap-0.5.3.6

@@ -52,22 +52,25 @@
       }
     end
 
     def current_invoice
       invoice_record = if invoices.kind_of?(Array)
-        invoices['invoice'].first
+        Invoice.new({
+          :id     => invoices['invoice'][0]['id'],
+          :number => invoices['invoice'][0]['number'],
+          :created_at => invoices['invoice'][0]['createdDatetime']
+          :billing_date => invoices['invoice'][0]['billingDatetime']
+        })
       else
-        invoices['invoice']
+        Invoice.new({
+          :id     => invoices['invoice']['id'],
+          :number => invoices['invoice']['number'],
+          :created_at => invoices['invoice']['createdDatetime']
+          :billing_date => invoices['invoice']['billingDatetime']
+        })
       end
 
-      attributes = {
-        :id => invoice_record['id'],
-        :number => invoice_record['number'],
-        :created_at => invoice_record['createdDatetime'],
-        :billing_date => invoice_record['billingDatetime']
-      }
-
-      Invoice.new(attributes)
+      invoice_record
     end
 
     def attributes_for_api
       self.class.attributes_for_api(attributes)
     end