fastly 0.9 → 0.95

data/Changes

@@ -1,3 +1,7 @@
+2011-12-19 v0.95
+
+Fix the way invoices and stats are fetched
+
 2011-12-15 v0.9
 
 Add mapping from backends to directors and directors to origins

data/lib/fastly.rb

@@ -5,7 +5,7 @@
 # A client library for interacting with the Fastly web acceleration service
 class Fastly
   # The current version of the library
-  VERSION = "0.9"
+  VERSION = "0.95"
 
   require 'fastly/fetcher'
   require 'fastly/client'

data/lib/fastly/invoice.rb

@@ -38,6 +38,17 @@ class Fastly
     # 
     # A hash reference with all the different regions and their subtotals
     
+    
+    # Get the start time of this invoice as a DateTime object in UTC
+    def start
+      DateTime.parse(start_time).new_offset(0)
+    end
+    
+    # Get the end time of this invoice as a DateTime object in UTC
+    def end
+      DateTime.parse(end_time).new_offset(0)
+    end
+    
     private
     
     def self.get_path(*args)
@@ -89,7 +100,9 @@ class Fastly
       opts[:year]  = year
       opts[:month] = month
     end
-    list(Fastly::Invoice, opts)
+    list = client.get(Fastly::Invoice.list_path(opts))
+    return [] if list.nil?
+    list.map { |hash| Fastly::Invoice.new(hash, self) }
   end
   
 end

data/lib/fastly/service.rb

@@ -37,10 +37,10 @@ class Fastly
     # * hourly
     # * daily
     # * all
-    def stats(type=:all)
+    def stats(type=:all, opts={})
       raise Fastly::FullAuthRequired unless fetcher.fully_authed?
       raise Fastly::Error "Unknown stats type #{type}" unless [:minutely,:hourly,:daily,:all].include?(type.to_sym)
-      hash = fetcher.client.get(Fastly::Service.get_path(self.id)+"/stats/#{type}")
+      hash = fetcher.client.get(Fastly::Service.get_path(self.id)+"/stats/#{type}", opts)
       return hash
     end
 

data/test/common.rb

@@ -135,6 +135,9 @@ module CommonTests
 
     stats       = service.stats
     assert stats
+    
+    stats       = service.stats(:all, :year => 2011, :month => 10)
+    assert stats    
   end
   
   def test_invoices
@@ -160,7 +163,11 @@ module CommonTests
     assert_equal Fastly::Invoice, invoices[0].class
     assert       invoices[0].service_id
     
-    invoices    = @fastly.list_invoices(Time.now.year, Time.now.month)
+    year        = Time.now.year
+    month       = Time.now.month-1
+    month       = 12 if month == 0
+    
+    invoices    = @fastly.list_invoices(year, month)
     services    = @fastly.list_services
     begin
       customer  = @fastly.current_customer
@@ -169,7 +176,12 @@ module CommonTests
     end
     
     assert_equal invoices.size, services.size
-    assert_equal Fastly::Invoice, invoices[0].class
+    assert_equal Fastly::Invoice,  invoices[0].class
+    assert_equal year,  invoices[0].start.year
+    assert_equal month, invoices[0].start.month
+    assert_equal 1,     invoices[0].start.day    
+    assert_equal year,  invoices[0].end.year
+    assert_equal month, invoices[0].end.month
     assert       invoices[0].service_id
   end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fastly
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 181
   prerelease: 
   segments: 
   - 0
-  - 9
-  version: "0.9"
+  - 95
+  version: "0.95"
 platform: ruby
 authors: 
 - Fastly Inc
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 Z
+date: 2011-12-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json