fastly 0.98 → 0.99

data/Changes

@@ -1,3 +1,8 @@
+2012-05-01 v0.99
+
+Fix some SSL issues
+Allow some admin functionality
+
 2012-02-02 v0.98
 
 Make deactivate! work

data/README.md

@@ -2,13 +2,13 @@ Fastly - client library for interacting with the Fastly web acceleration service
 
 # Example
  
-    fastly = Fastly.new(login_opts);
+    fastly = Fastly.new(login_opts)
 
-    current_user     = fastly.current_user;
-    current_customer = fastly.current_customer;
+    current_user     = fastly.current_user
+    current_customer = fastly.current_customer
 
-    user     = fastly.get_user(current_user.id);
-    customer = fastly.get_customer(current_customer.id);
+    user     = fastly.get_user(current_user.id)
+    customer = fastly.get_customer(current_customer.id)
 
     puts "Name: #{user.name}"
     puts "Works for #{user.customer.name}"
@@ -16,35 +16,41 @@ Fastly - client library for interacting with the Fastly web acceleration service
     puts "Which has the owner #{customer.owner.name}"
 
     # Let's see which services we have defined
-    customer.list_services.each do |service|
-        puts service.id
-        puts service.name
-        service.versions.each do |version
-            puts "\t#{version.number}"
+    fastly.list_services.each do |service|
+      puts "Service ID: #{service.id}"
+      puts "Service Name: #{service.name}"
+      puts "Service Versions:"
+      service.versions.each do |version|
+          puts "\t#{version.number}"
+      end
     end
 
-    service        = fastly.create_service(:name => "MyFirstService");
-    latest_version = service.version;
+    service        = fastly.create_service(:name => "MyFirstService")
+    latest_version = service.version
 
     # Create a domain and a backend for the service ...
-    domain         = fastly.create_domain(:service_id => service.id, :version => latest_version.number, :name => "www.example.com");
-    backend        = fastly.create_backend(:service_id => service.id, :version => latest_version.number, :ipv4 => "127.0.0.1", :port => 80);
+    domain         = fastly.create_domain(:service_id => service.id, :version => latest_version.number, :name => "www.example.com")
+    backend        = fastly.create_backend(:service_id => service.id, :version => latest_version.number, :name => "Backend 1", :ipv4 => "192.0.43.10", :port => 80)
 
     # ... and activate it. You're now hosted on Fastly.
     latest_version.activate
 
     # Let's take a peek at the VCL that Fastly generated for us
-    vcl = latest_version.generated_vcl;
+    vcl = latest_version.generated_vcl
     puts "Generated VCL file is:\n#{vcl.content}"
 
     # Now let's create a new version ...
-    new_version    = latest_version.clone;
+    new_version    = latest_version.clone
     # ... add a new backend ...
-    new_backend    = fastly.create_backend(:service_id => service.id, :version => new_version.number, :ipv4 => "192.168.0.1", :port => 8080);
-    # ... and upload some custome vcl (presuming we have permissions)
-    new_version.upload_vcl(vcl_name, File.read(vcl_file));    
+    new_backend    = fastly.create_backend(:service_id => service.id, :version => new_version.number, :name => "Backend 2", :ipv4 => "74.125.224.136", :port => 8080)
+    # ... add a director to switch between them
+    director       = fastly.create_director(:service_id => service.id, :version => new_version.number, :name => "My Director")
+    director.add_backend(backend)
+    director.add_backend(new_backend)
+    # ... and upload some custom vcl (presuming we have permissions)
+    new_version.upload_vcl(vcl_name, File.read(vcl_file))
 
-    new_version.activate;
+    new_version.activate
 
 # Copyright
  

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.98"
+  VERSION = "0.99"
 
   require 'fastly/fetcher'
   require 'fastly/client'
@@ -67,6 +67,15 @@ class Fastly
     @current_user ||= get(User)
   end
 
+  # Set the current customer to act as.
+  # NOTE: this will only work if you're an admin
+  def set_customer(id)
+      raise Fastly::FullAuthRequired "You must be fully authed to set the customer" unless self.fully_authed?;
+      raise Fastly::AdminRequired "You must be an admin to set the customer" unless self.current_user.can_do?(:admin);
+      @current_customer = nil 
+      client.set_customer(id);
+  end
+
   # Return a hash representing all commands available.
   #
   # Useful for information.

data/lib/fastly/client.rb

@@ -15,18 +15,19 @@ class Fastly
             CURB_FU=false
         end
 
-        attr_accessor :http, :api_key, :user, :password, :cookie
+        attr_accessor :http, :api_key, :user, :password, :cookie, :customer
 
         def initialize(opts)
             [:api_key, :user, :password].each do |key|
                 self.send("#{key}=", opts[key]) if opts.has_key?(key)
             end
-            base   = opts[:base_url]      || "https://api.fastly.com"
-            port   = opts[:base_port]     || 80
-            uri    = URI.parse(base)
-            scheme = uri.scheme
-            host   = uri.host
-            curb = opts.has_key?(:use_curb) ? !!opts[:use_curb] && CURB_FU : CURB_FU
+            base      = opts[:base_url]      || "https://api.fastly.com"
+            customer  = opts[:customer]
+            uri       = URI.parse(base)
+            scheme    = uri.scheme
+            host      = uri.host
+            curb      = opts.has_key?(:use_curb)  ? !!opts[:use_curb] && CURB_FU : CURB_FU
+            port      = opts.has_key?(:base_port) ?   opts[:base_port]           : (scheme == "https") ? 443 : 80
             self.http = curb ? Fastly::Client::Curl.new(host, port) : Net::HTTP.new(host, port)
             self.http.use_ssl = (scheme == "https")
             return self unless fully_authed?
@@ -49,6 +50,10 @@ class Fastly
         def fully_authed?
             !(user.nil? || password.nil?)
         end
+        
+        def set_customer(id)
+          
+        end
 
         def get(path, params={})
             path += "?"+make_params(params) unless params.empty? 
@@ -81,7 +86,9 @@ class Fastly
         end
 
         def headers
-            (fully_authed? ? { 'Cookie' => cookie } : { 'X-Fastly-Key' => api_key }).merge( 'Content-Accept' => 'application/json')
+            headers = fully_authed? ? { 'Cookie' => cookie } : { 'X-Fastly-Key' => api_key }
+            headers.merge( 'Fastly-Explicit-Customer' => customer ) if customer
+            headers.merge( 'Content-Accept' => 'application/json')
         end
 
         def make_params(params)
@@ -102,7 +109,7 @@ class Fastly
         class Curl
             attr_accessor :host, :port, :protocol
 
-            def initialize(host, port=80)
+            def initialize(host, port=443)
                 self.host     = host
                 self.port     = port
                 self.protocol = 'https'

data/lib/fastly/fetcher.rb

@@ -7,13 +7,13 @@ class Fastly
   class Error < RuntimeError; end
   # :nodoc:
   class Unauthorized < AuthRequired; end 
+  # :nodoc:
+  class AdminRequired < AuthRequired; end
       
   module Fetcher # :nodoc: all 
 
     # Get the current Fastly::Client
     def client(opts={})
-      opts[:base_url]  ||= 'api.fastly.com'
-      opts[:base_port] ||= 80
       @client ||= Fastly::Client.new(opts)
     end
     

metadata

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