fastly 0.97 → 0.98

data/Changes

@@ -1,3 +1,18 @@
+2012-02-02 v0.98
+
+Make deactivate! work
+Add active?
+Add Service.purge_by_key
+
+2012-01-27 v0.97
+
+Fix invoice tests with new billing API
+
+2012-01-16 v0.96
+
+Fix version.locked?
+Make fastly_upload_vcl work
+
 2011-12-19 v0.95
 
 Fix the way invoices and stats are fetched

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.97"
+  VERSION = "0.98"
 
   require 'fastly/fetcher'
   require 'fastly/client'
@@ -51,17 +51,17 @@ class Fastly
   # Whether or not we're fully (username and password) authed
   # Some methods require full username and password rather than just auth token
   def fully_authed?
-    client.authed? # for now
-    #client.fully_authed?
+    client.fully_authed?
   end
 
   # Return a Customer object representing the customer of the current logged in user.
   def current_customer
-    raise Fastly::FullAuthRequired unless self.fully_authed?
+    raise Fastly::AuthRequired unless self.authed?
     @current_customer ||= get(Customer)
   end
 
   # Return a User object representing the current logged in user.
+  # NOTE: requires you to be fully authed - will not work with only an API key
   def current_user
     raise Fastly::FullAuthRequired unless self.fully_authed?
     @current_user ||= get(User)

data/lib/fastly/fetcher.rb

@@ -18,14 +18,12 @@ class Fastly
     end
     
     def list(klass, opts={})
-      raise Fastly::FullAuthRequired unless self.fully_authed?
       list = client.get(klass.list_path, opts)
       return [] if list.nil?
       list.map { |hash| klass.new(hash, self) }
     end
 
     def get(klass, *args)
-      raise Fastly::FullAuthRequired unless self.fully_authed?
       if [User, Customer].include?(klass) && args.empty?
         hash = client.get("/current_#{klass.path}")
       else
@@ -36,19 +34,16 @@ class Fastly
     end
     
     def create(klass, opts)
-      raise Fastly::FullAuthRequired unless self.fully_authed?
       hash = client.post(klass.post_path(opts),opts)
       return klass.new(hash, self)
     end
 
     def update(klass, obj)
-      raise Fastly::FullAuthRequired unless self.fully_authed?
       hash = client.put(klass.put_path(obj), obj.as_hash)
       return klass.new(hash, self)
     end
 
     def delete(klass, obj)
-      raise Fastly::FullAuthRequired unless self.fully_authed?
       return client.delete(klass.delete_path(obj))
     end
 

data/lib/fastly/service.rb

@@ -38,7 +38,6 @@ class Fastly
     # * daily
     # * 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}", opts)
       return hash
@@ -50,7 +49,6 @@ class Fastly
     # 
     # Otherwise it returns the invoice for the current month so far.
     def invoice(year=nil, month=nil)
-      raise Fastly::FullAuthRequired unless fetcher.fully_authed?
       opts = { :service_id => self.id }
       unless year.nil? || month.nil?
         opts[:year]  = year
@@ -61,10 +59,15 @@ class Fastly
 
     # Purge all assets from this service.
     def purge_all
-      raise  Fastly::AuthRequired unless self.authed?
       res = client.put(get_path(self.id)+"/purge_all")
     end
 
+
+    # Purge anything with the specific key from the given service.
+    def purge_by_key(key)
+       res = client.put(get_path(self.id)+"/purge/#{key}")
+    end
+
     # Set all the versions that this service has had.
     def versions=(versions)
       @versions = versions
@@ -72,16 +75,19 @@ class Fastly
 
     # Get a sorted array of all the versions that this service has had.
     def versions
-      raise  Fastly::FullAuthRequired unless fetcher.fully_authed?
       @versions.map { |v| Fastly::Version.new(v, fetcher) }.sort { |a,b| a.number.to_i <=> b.number.to_i }
     end
 
     # Get an individual Version object. By default returns the latest version
     def version(number=-1)
-      raise  Fastly::FullAuthRequired unless fetcher.fully_authed?
       versions[number]
     end
     
+    # A deep hash of nested details
+    def details(opts={})
+      client.get(get_path(self.id)+"/details", opts);
+    end
+    
     # Get the Customer object for this Service
     def customer
       fetcher.get(Fastly::Customer, customer_id)
@@ -98,7 +104,6 @@ class Fastly
   # 
   #   service = fastly.search_services(:name => name, :version => number)  
   def search_services(opts)
-    raise  Fastly::FullAuthRequired unless self.fully_authed?
     klass = Fastly::Service
     hash  = client.get(klass.post_path+"/search", opts)
     return nil if hash.nil?

data/lib/fastly/version.rb

@@ -54,7 +54,7 @@ class Fastly
     
     # Is this Version locked
     def locked?
-      return @locked.to_i > 1
+      return @locked.to_i > 0
     end
     
     # Set whether this Version is locked
@@ -72,23 +72,25 @@ class Fastly
       fetcher.get_settings(service_id, number)
     end
 
+    # Is version active?
+    def active?
+      return @active.to_i > 0
+    end
+
     # Activate this version
     def activate!
-      raise Fastly::FullAuthRequired unless fetcher.fully_authed?
       hash = fetcher.client.put(Fastly::Version.put_path(self)+"/activate")
       return !hash.nil?
     end
 
-    # XXX Not currently
-    # def deactivate!
-    #    raise Fastly::FullAuthRequired unless fetcher.fully_authed?
-    #    hash = fetcher.client.put(Fastly::Version.put_path(self)+"/deactivate")
-    #    return !hash.nil?
-    # end
+    # Deactivate this version
+    def deactivate!
+       hash = fetcher.client.put(Fastly::Version.put_path(self)+"/deactivate")
+       return !hash.nil?
+    end
 
     # Clone this Version
     def clone
-      raise Fastly::FullAuthRequired unless fetcher.fully_authed?
       hash = fetcher.client.put(Fastly::Version.put_path(self)+"/clone")
       return nil if hash.nil?
       return Fastly::Version.new(hash, fetcher)
@@ -100,7 +102,6 @@ class Fastly
     #    :include_content => true
     # in the opts
     def generated_vcl(opts={})
-      raise Fastly::FullAuthRequired unless fetcher.fully_authed?
       hash = fetcher.client.get(Fastly::Version.put_path(self)+"/generated_vcl", opts)
       opts = {
         'content'    => hash['vcl'] || hash['content'],
@@ -113,7 +114,6 @@ class Fastly
 
     # Upload a VCL file for this Version
     def upload_vcl(name, content)
-      raise Fastly::FullAuthRequired unless fetcher.fully_authed?
       hash = fetcher.client.post(Fastly::Version.put_path(self)+"/vcl", :name => name, :content => content)
       return nil if hash.nil?
       return Fastly::VCL.new(hash, fetcher)
@@ -125,13 +125,11 @@ class Fastly
     #    :include_content => true
     # in the opts
     def vcl(name, opts={})
-      raise Fastly::FullAuthRequired unless fetcher.fully_authed?
       fetcher.get_vcl(service_id, number, name, opts)
     end
 
     # Validate this Version
     def validate
-      raise Fastly::FullAuthRequired unless fetcher.fully_authed?
       hash = fetcher.client.get(Fastly::Version.put_path(self)+"/validate")
       return !hash.nil?
     end

data/test/api_key_test.rb

@@ -32,7 +32,7 @@ class ApiKeyTest < Test::Unit::TestCase
   
   def test_current_user_and_customer 
     current_user  = current_customer = nil
-    assert_raise(Fastly::Error) {
+    assert_raise(Fastly::FullAuthRequired) {
       current_user = @fastly.current_user
     }
     assert_equal nil, current_user

data/test/common.rb

@@ -111,11 +111,17 @@ module CommonTests
     # assert_equal origin.version.number.to_s, number.to_s
     
     assert version3.activate!
+    assert version3.deactivate!
+    assert !@fastly.get_service(version3.service_id).version.active
+    assert !@fastly.get_service(version3.service_id).version.active?
+    assert version3.activate!
+    assert @fastly.get_service(version3.service_id).version.active
+    assert @fastly.get_service(version3.service_id).version.active?
     
-    generated = version3.generated_vcl
+    generated = version3.generated_vcl(:no_content => true)
     assert generated
     assert generated.content.nil?
-    generated = version3.generated_vcl(:include_content => true)
+    generated = version3.generated_vcl
     assert !generated.content.nil?
     assert generated.content.match(/\.port = "9092"/ms)
     

metadata

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