activeresource-zoho_invoice 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e869fc0ecbce0191959acf0425c34ed6b01be17
-  data.tar.gz: cd40201f9d38b350c21598fbb4a435b583173215
+  metadata.gz: 7c14b2d4a27f6b0e6b41a769c1bc02c172e4ed5b
+  data.tar.gz: 7f084e3312c1e88dd6af54516961aefb0f062d0c
 SHA512:
-  metadata.gz: 34f337b37e63146553557c203957693fc674681231c0fc92d89ed22d4dc2b30c68a5f03ace5d57f03d5a9b41707a927dd7b5e0c40e941764b58646a01cef5c2a
-  data.tar.gz: b7303fdeee6cd3cfb0c9dd4adc8d92ab5e41d6e05383b8660d50553ffba6ea7ec6c03fbc46e45d597b90dd52a4a8a65a39ec677ad4746acc59b3922ec85f4c39
+  metadata.gz: 17826a918d136dc40c377a95013f669152a4cf9e61ad51dfbff5ab709881c7e92dc2870e383aaf81645f76b774e33e74c4d45ee4d4f0031bb84a6a088cddc0a7
+  data.tar.gz: 688837c1c220e90e064b7a0584fa2302ff1592000b6d3cd7bfbbcd0ca65f1c3d7777543af762f85a7088d318e15487d1e90cef3b2a035f6315e6dd355a9d47b8

data/lib/zoho_invoice_resource/formats/base.rb

@@ -36,6 +36,20 @@ module ZohoInvoiceResource
         end
       end
 
+      private
+
+      def remove_empty!(hash)
+        hash.each do |key, value|
+          case value
+          when Hash
+            remove_empty!(value)
+          when Array
+            value.compact!
+          end
+          hash.delete(key) if value.nil? || value == [] || value == {}
+        end
+      end
+
       def normalize_date(date)
         if date.match %r|\d{4}/\d{2}/\d{2}|
           date.tr('/', '-')

data/lib/zoho_invoice_resource/formats/customer.rb

@@ -5,18 +5,42 @@ module ZohoInvoiceResource
         options[:root] = options[:root].try(:camelize)
         # updatable attributes restricted
         data = {
-          'CustomerID'     => record.customer_id,
-          'Name'           => record.name,
-          'PaymentsDue'    => record.payments_due,
-          'BillingAddress' => record.billing_address,
-          'BillingCity'    => record.billing_city,
-          'BillingState'   => record.billing_state,
-          'BillingZip'     => record.billing_zip,
-          'BillingCountry' => record.billing_country,
-          'Notes'          => record.notes,
-          #'CustomFields'   => {}
+          'CustomerID'      => record.customer_id,
+          'Name'            => record.name,
+          'PaymentsDue'     => record.payments_due,
+          'BillingAddress'  => record.billing_address,
+          'BillingCity'     => record.billing_city,
+          'BillingState'    => record.billing_state,
+          'BillingZip'      => record.billing_zip,
+          'BillingCountry'  => record.billing_country,
+          'BillingFax'      => record.billing_fax,
+          'ShippingAddress' => record.shipping_address,
+          'ShippingCity'    => record.shipping_city,
+          'ShippingState'   => record.shipping_state,
+          'ShippingZip'     => record.shipping_zip,
+          'ShippingCountry' => record.shipping_country,
+          'ShippingFax'     => record.shipping_fax,
+          'Contacts'        => [],
+          'Notes'           => record.notes,
+          'CustomFields'    => {}
         }
-        data.to_xml(options).tapp
+        record.contacts.each do |contact|
+          item = {
+            'ContactID'  => contact.contact_id,
+            'Salutation' => contact.salutation,
+            'FirstName'  => contact.first_name,
+            'LastName'   => contact.last_name,
+            'EMail'      => contact.e_mail,
+            'Phone'      => contact.phone,
+            'Mobile'     => contact.mobile
+          }
+          data['Contacts'] << item
+        end if record.contacts
+        data['CustomFields']['CustomFieldValue1'] = record.custom_fields.custom_field_value1 if record.custom_fields.custom_field_label1
+        data['CustomFields']['CustomFieldValue2'] = record.custom_fields.custom_field_value2 if record.custom_fields.custom_field_label2
+        data['CustomFields']['CustomFieldValue3'] = record.custom_fields.custom_field_value3 if record.custom_fields.custom_field_label3
+        remove_empty!(data)
+        data.to_xml(options)
       end
 
       def decode(xml)

data/lib/zoho_invoice_resource/formats/invoice.rb

@@ -18,12 +18,11 @@ module ZohoInvoiceResource
             'Price' => invoice_item.price
           }
           data['InvoiceItems'] << item
-        end
-        data.delete('InvoiceItems') if data['InvoiceItems'].empty?
+        end if record.invoice_items
         data['CustomFields']['CustomField1'] = record.custom_fields.custom_field1 if record.custom_fields.custom_label1
         data['CustomFields']['CustomField2'] = record.custom_fields.custom_field2 if record.custom_fields.custom_label2
         data['CustomFields']['CustomField3'] = record.custom_fields.custom_field3 if record.custom_fields.custom_label3
-        data.delete('CustomFields') if data['CustomFields'].empty?
+        remove_empty!(data)
         data.to_xml(options)
       end
     end

data/lib/zoho_invoice_resource/version.rb

@@ -1,3 +1,3 @@
 module ZohoInvoiceResource
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeresource-zoho_invoice
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Toru KAWAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource