fastly 0.96 → 0.97

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.96"
+  VERSION = "0.97"
 
   require 'fastly/fetcher'
   require 'fastly/client'

data/lib/fastly/invoice.rb

@@ -94,15 +94,13 @@ class Fastly
   # If a year and month are passed in returns the invoices for that whole month. 
   # 
   # Otherwise it returns the invoices for the current month so far.
-  def list_invoices(year=nil, month=nil)
+  def get_invoice(year=nil, month=nil)
     opts = {}
     unless year.nil? || month.nil?
       opts[:year]  = year
       opts[:month] = month
     end
-    list = client.get(Fastly::Invoice.list_path(opts))
-    return [] if list.nil?
-    list.map { |hash| Fastly::Invoice.new(hash, self) }
+    get(Fastly::Invoice, opts)
   end
   
 end

data/test/api_key_test.rb

@@ -23,10 +23,10 @@ class ApiKeyTest < Test::Unit::TestCase
       user     = @client.get('/current_user')
     }
     assert_equal nil, user    
-    assert_raise(Fastly::Error) {
-      customer = @client.get('/current_customer')
-    }
-    assert_equal nil, customer
+
+    customer = @client.get('/current_customer')
+    assert customer
+    assert_equal @opts[:customer], customer['name']
   end
   
   
@@ -37,10 +37,9 @@ class ApiKeyTest < Test::Unit::TestCase
     }
     assert_equal nil, current_user
 
-    assert_raise(Fastly::Error) {
-      current_customer = @fastly.current_customer
-    }
-    assert_equal nil, current_customer    
+    customer = @fastly.current_customer
+    assert customer
+    assert_equal @opts[:customer], customer.name
   end 
   
   

data/test/common.rb

@@ -150,39 +150,20 @@ module CommonTests
     assert invoice
     assert invoice.regions
     assert_equal invoice.service_id, service.id
-    
-    invoices    = @fastly.list_invoices
-    services    = @fastly.list_services
-    begin
-      customer  = @fastly.current_customer
-      services  = services.select { |s| s.customer_id == customer.id }
-    rescue
-    end
-    
-    assert_equal invoices.size, services.size
-    assert_equal Fastly::Invoice, invoices[0].class
-    assert       invoices[0].service_id
+ 
+    invoice     = @fastly.get_invoice
+    assert_equal Fastly::Invoice,  invoice.class
     
     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
-      services  = services.select { |s| s.customer_id == customer.id }
-    rescue
-    end
-    
-    assert_equal invoices.size, services.size
-    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
+    month       = Time.now.month
+    
+    invoice     = @fastly.get_invoice(year, month)
+    assert_equal Fastly::Invoice,  invoice.class
+    assert_equal year,  invoice.start.year
+    assert_equal month, invoice.start.month
+    assert_equal 1,     invoice.start.day    
+    assert_equal year,  invoice.end.year
+    assert_equal month, invoice.end.month
+  end                              
 
 end

data/test/full_login_test.rb

@@ -45,6 +45,7 @@ class FullLoginTest < Test::Unit::TestCase
     assert_equal customer.id, tmp_customer.id
     
     tmp_user = customer.owner
+    assert tmp_user
     assert_equal user.id, tmp_user.id
   end
   

data/test/helper.rb

@@ -7,7 +7,7 @@ def login_opts(mode=:full)
     opts["base_#{what}".to_sym] = ENV[key] if ENV.has_key?(key)
   end
   
-  required = :full == mode ? [:user, :name, :password, :customer] : [:api_key]
+  required = :full == mode ? [:user, :name, :password, :customer] : [:api_key, :customer]
   required.each do |what|
       key ="FASTLY_TEST_#{what.to_s.upcase}"
       unless ENV.has_key?(key)

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fastly
 version: !ruby/object:Gem::Version 
-  hash: 203
+  hash: 201
   prerelease: 
   segments: 
   - 0
-  - 96
-  version: "0.96"
+  - 97
+  version: "0.97"
 platform: ruby
 authors: 
 - Fastly Inc
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-01-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json