fastbill 0.0.5 → 0.0.6

data/lib/fastbill/invoice.rb

@@ -8,28 +8,40 @@ class Invoice
     @auth = auth
     @is_new = true
   end
-  
-  def get(id = nil, customer_id = nil, month = nil, year = nil)
+  def get(id = nil, customer_id = nil, year = nil, month = nil)
+    invoices = []
+    body = '<?xml version="1.0" encoding="utf-8"?><FBAPI><SERVICE>invoice.get</SERVICE><FILTER>'
     if id
-      #fetch invoice
-      options = {
-        :basic_auth => @auth,
-        :headers => {
-          "Content-Type" => "application/xml"
-        },
-        :body => '<?xml version="1.0" encoding="utf-8"?><FBAPI><SERVICE>invoice.get</SERVICE><FILTER><INVOICE_ID>' + id.to_s + '</INVOICE_ID></FILTER></FBAPI>'
-      }
-      r = self.class.post('/api/0.1/api.php', options)
-      body = Crack::XML.parse r.body
-      if !body['FBAPI']["RESPONSE"]["INVOICES"].nil?
-        hydrate(body['FBAPI']["RESPONSE"]["INVOICES"]["INVOICE"])
-        self
-      else
-        false
-      end
+      body = body + '<INVOICE_ID>' + id.to_s + '</INVOICE_ID>'
+    elsif customer_id
+      body = body + '<CUSTOMER_ID>' + customer_id.to_s + '</CUSTOMER_ID>'
+    elsif year
+      body = body + '<YEAR>' + year.to_s + '</YEAR>'
+    elsif month
+      body = body + '<MONTH>' + month.to_s + '</MONTH>'
+    end
+    body = body + '</FILTER></FBAPI>'
+    options = {
+      :basic_auth => @auth,
+      :headers => {
+        "Content-Type" => "application/xml"
+      },
+      :body => body
+    }
+    r = self.class.post('/api/0.1/api.php', options)
+    body = Crack::XML.parse r.body
+    if body['FBAPI']["RESPONSE"]["INVOICES"]["INVOICE"].class.to_s == 'Hash'
+      inv = Invoice.new(@auth)
+      inv.hydrate(body['FBAPI']["RESPONSE"]["INVOICES"]["INVOICE"])
+      invoices.push inv
     else
-      #search invoices
+      for invoice in body['FBAPI']["RESPONSE"]["INVOICES"]["INVOICE"].each
+        inv = Invoice.new(@auth)
+        inv.hydrate(invoice)
+        invoices.push inv
+      end
     end
+    invoices
   end
   def save
     
@@ -61,9 +73,12 @@ class Invoice
     end
     @invoice_items = []
     for item in body["ITEMS"].each
-      i =  InvoiceItem.new(@auth)
-      i.hydrate(item.last)
-      @invoice_items.push i
+      begin
+        i =  InvoiceItem.new(@auth)
+        i.hydrate(item.last)
+        @invoice_items.push i
+      rescue
+      end
     end
   end
   def parse_date(date)

data/lib/fastbill/version.rb

@@ -1,3 +1,3 @@
 module Fastbill
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastbill
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70250807431580 !ruby/object:Gem::Requirement
+  requirement: &70108860467460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250807431580
+  version_requirements: *70108860467460
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70250807507420 !ruby/object:Gem::Requirement
+  requirement: &70108860536240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250807507420
+  version_requirements: *70108860536240
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &70250807548360 !ruby/object:Gem::Requirement
+  requirement: &70108860610780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250807548360
+  version_requirements: *70108860610780
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70250807613500 !ruby/object:Gem::Requirement
+  requirement: &70108860726580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250807613500
+  version_requirements: *70108860726580
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &70250807680700 !ruby/object:Gem::Requirement
+  requirement: &70108860872240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250807680700
+  version_requirements: *70108860872240
 description: a basic ruby wrapper for the methods provided by the fastbill API
 email:
 - kai@4ware.net