fastly 0.5 → 0.9

data/Changes

@@ -0,0 +1,13 @@
+2011-12-15 v0.9
+
+Add mapping from backends to directors and directors to origins
+
+2011-11-03 v0.8
+
+Add list_* to all objects
+
+Add Healthchecks and Syslog endpoint streaming
+
+2011-11-02 v0.5
+
+Initial releasee

data/README.md

@@ -2,7 +2,7 @@ Fastly - client library for interacting with the Fastly web acceleration service
 
 # Example
  
-    fastly = Net::Fastly.new(%login_opts);
+    fastly = Fastly.new(login_opts);
 
     current_user     = fastly.current_user;
     current_customer = fastly.current_customer;

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.5"
+  VERSION = "0.9"
 
   require 'fastly/fetcher'
   require 'fastly/client'
@@ -16,11 +16,13 @@ class Fastly
   require 'fastly/customer'
   require 'fastly/director'  
   require 'fastly/domain'
+  require 'fastly/healthcheck'
   require 'fastly/invoice'
   require 'fastly/match'
   require 'fastly/origin'
   require 'fastly/service'
   require 'fastly/settings'
+  require 'fastly/syslog'
   require 'fastly/user'
   require 'fastly/vcl'
   require 'fastly/version'
@@ -79,12 +81,15 @@ class Fastly
   end
 
 
-  [User, Customer, Backend, Director, Domain, Match, Origin, Service, VCL, Version].each do |klass|   
+  [User, Customer, Backend, Director, Domain, Healthcheck, Match, Origin, Service, Syslog, VCL, Version].each do |klass|   
     type = klass.to_s.downcase.split("::")[-1]
-    # self.send :define_method, "list_#{type}s".to_sym do
-    #   list(klass)
-    # end
-
+    # unless the class doesn't have a list path or it already exists
+    unless klass.list_path.nil? || klass.respond_to?("list_#{type}s".to_sym)
+        self.send :define_method, "list_#{type}s".to_sym do |*args|
+            list(klass, *args)
+        end
+    end
+    
     self.send :define_method, "get_#{type}".to_sym do |*args|
       get(klass, *args)
     end
@@ -125,6 +130,14 @@ class Fastly
   ##
   # :method: create_origin(opts)
   # opts must contain service_id, version and name params
+  
+  ##
+  # :method: create_healthcheck(opts)
+  # opts must contain service_id, version and name params
+  
+  ##
+  # :method: create_syslog(opts)
+  # opts must contain service_id, version and name params
 
   ##
   # :method: create_vcl(opts)
@@ -157,6 +170,10 @@ class Fastly
   ## 
   # :method: get_domain(service_id, number, name)
   # Get a Domain
+  
+  ## 
+  # :method: get_healthcheck(service_id, number, name)
+  # Get a Healthcheck
 
   ## 
   # :method: get_match(service_id, number, name)
@@ -165,6 +182,10 @@ class Fastly
   ## 
   # :method: get_origin(service_id, number, name)
   # Get an Origin
+  
+  ## 
+  # :method: get_syslog(service_id, number, name)
+  # Get a Syslog
 
   ## 
   # :method: get_vcl(service_id, number, name)
@@ -212,6 +233,11 @@ class Fastly
   # :method: update_domain(domain)
   # You can also call
   #    domain.save!
+  
+  ## 
+  # :method: update_healthcheck(healthcheck)
+  # You can also call
+  #    healthcheck.save!
 
   ## 
   # :method: update_match(match)
@@ -222,6 +248,16 @@ class Fastly
   # :method: update_origin(origin)
   # You can also call
   #    origin.save!
+  
+  ## 
+  # :method: update_settings(settings)
+  # You can also call
+  #    settings.save!
+
+  ## 
+  # :method: update_syslog(syslog)
+  # You can also call
+  #    syslog.save!
 
   ## 
   # :method: update_vcl(vcl)
@@ -233,11 +269,6 @@ class Fastly
   # You can also call
   #    version.save!
 
-  ## 
-  # :method: update_settings(settings)
-  # You can also call
-  #    settings.save!
-
 
   ## 
   # :method: delete_user(user) 
@@ -278,6 +309,10 @@ class Fastly
   # You can also call
   #    domain.delete!
 
+  ## 
+  # :method: delete_healthcheck(healthcheck)
+  # You can also call
+  #    healthcheck.delete!
 
   ## 
   # :method: delete_match(match)
@@ -290,18 +325,74 @@ class Fastly
   # You can also call
   #    origin.delete!
 
+  ## 
+  # :method: delete_syslog(syslog)
+  # You can also call
+  #    syslog.delete!
+
 
   ## 
   # :method: delete_vcl(vcl)
   # You can also call
   #    vcl.delete!
 
-
   ## 
   # :method: delete_version(version)
   # You can also call
   #    version.delete!
 
+  # :method: list_users
+  # 
+  # Get a list of all users
+
+  # :method: list_customers 
+  # 
+  # Get a list of all customers
+
+  # :method: list_versions
+  # 
+  # Get a list of all versions
+
+  # :method: list_services 
+  # 
+  # Get a list of all services
+
+  # :method: list_backends 
+  # 
+  # Get a list of all backends
+
+  # :method: list_directors 
+  # 
+  # Get a list of all directors
+
+  # :method: list_domains 
+  # 
+  # Get a list of all domains
+
+  # :method: list_healthchecks
+  # 
+  # Get a list of all healthchecks
+
+  # :method: list_matchs 
+  # 
+  # Get a list of all matches
+
+  # :method: list_origins 
+  # 
+  # Get a list of all origins
+
+  # :method: list_syslogs
+  # 
+  # Get a list of all syslogs
+
+  # :method: list_vcls 
+  # 
+  # Get a list of all vcls
+
+  # :method: list_versions 
+  # 
+  # Get a list of all versions
+
 
 
   ##

data/lib/fastly/backend.rb

@@ -2,7 +2,7 @@ class Fastly
   # An individual host you want to serve assets off
   class Backend < BelongsToServiceAndVersion
     attr_accessor :service_id, :name, :address, :ipv4, :ipv6, :hostname, :use_ssl, :client_cert, :port, 
-                  :connect_timeout, :first_byte_timeout, :between_bytes_timeout, :error_threshold, :max_conn, :weight, :comment
+                  :connect_timeout, :first_byte_timeout, :between_bytes_timeout, :error_threshold, :max_conn, :weight, :comment, :healthcheck
 
     ## 
     # :attr: service_id
@@ -94,6 +94,11 @@ class Fastly
     # :attr: weight
     # 
     # the weight assigned to this backend (default 100)
+    
+    ##
+    # :attr: healthcheck
+    #
+    # the name of a healthcheck to associate with this backend. See the Healthcheck object
 
   end
 end

data/lib/fastly/director.rb

@@ -43,5 +43,21 @@ class Fastly
     # :attr: comment 
     # 
     # a free form comment field
+    
+    # Add a Backend object to a Director
+    #
+    # Return true on success and false on failure
+    def add_backend(backend) 
+      hash = fetcher.client.post(Fastly::Director.put_path(self)+"/backend/#{backend.name}")
+      return !hash.nil?
+    end
+    
+    # Delete a Backend object from a Director
+    #
+    # Return true on success and false on failure
+    def delete_backend(backend) 
+      hash = fetcher.client.delete(Fastly::Director.put_path(self)+"/backend/#{backend.name}")
+      return !hash.nil?
+    end
   end
 end

data/lib/fastly/healthcheck.rb

@@ -0,0 +1,64 @@
+class Fastly
+  # A way of keeping track of any of your hosts which are down
+  class Healthcheck < BelongsToServiceAndVersion
+    attr_accessor :service_id, :name, :comment, :path, :host, :http_version, :timeout, :window, :threshold
+
+    ## 
+    # :attr: service_id
+    # 
+    # The id of the service this belongs to.
+    # 
+
+    ## 
+    # :attr: version
+    # 
+    # The number of the version this belongs to.
+    # 
+
+    ## 
+    # :attr: name
+    # 
+    # The name of this Healthcheck
+    # 
+
+    ## 
+    # :attr: comment 
+    # 
+    # A free form comment field
+    
+    ## 
+    # :attr: method
+    # 
+    # Which HTTP method to use
+
+    ## 
+    # :attr: host
+    # 
+    # Which host to check
+
+    ## 
+    # :attr: path
+    # 
+    # Path to check
+
+    ## 
+    # :attr: http_version
+    # 
+    # 1.0 or 1.1 (defaults to 1.1)
+
+    ## 
+    # :attr: timeout
+    # 
+    # Timeout in seconds
+
+    ## 
+    # :attr: window
+    # 
+    # How large window to keep track for healthchecks
+
+    ## 
+    # :attr: threshold
+    # 
+    # How many have to be ok for it work
+  end
+end

data/lib/fastly/origin.rb

@@ -19,5 +19,22 @@ class Fastly
     # :attr: name
     # 
     # The domain name of this domain
+    
+    
+    # Add a Director object to an Origin
+    #
+    # Return true on success and false on failure
+    def add_director(director) 
+      hash = fetcher.client.post(Fastly::Origin.put_path(self)+"/director/#{director.name}")
+      return !hash.nil?
+    end
+    
+    # Delete a Director object from an Origin
+    #
+    # Return true on success and false on failure
+    def delete_director(director) 
+      hash = fetcher.client.delete(Fastly::Origin.put_path(self)+"/director/#{director.name}")
+      return !hash.nil?
+    end
   end
 end

data/lib/fastly/service.rb

@@ -1,7 +1,7 @@
 class Fastly
   # Represents something you want to serve - this can be, for example, a whole web site, a Wordpress site, or just your image servers
   class Service < Base
-    attr_accessor :id, :customer, :name, :comment
+    attr_accessor :id, :customer_id, :name, :comment
     @versions = []
     
     ## 
@@ -11,7 +11,7 @@ class Fastly
     # 
 
     ## 
-    # :attr: customer
+    # :attr: customer_id
     # 
     # The id of the customer this belongs to
     # 
@@ -73,11 +73,7 @@ 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 = []
-      @versions.each_pair { |number, version|
-        versions.push Fastly::Version.new({ :number => number, :service_id => self.id, :comment => version['comment'] || "" }, fetcher)
-      }
-      versions.sort {|a,b| a.number.to_i <=> b.number.to_i }
+      @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
@@ -85,12 +81,11 @@ class Fastly
       raise  Fastly::FullAuthRequired unless fetcher.fully_authed?
       versions[number]
     end
-
-  end
-
-  # Get a list of all the services that the current customer has.
-  def list_services(opts={})
-     list(Fastly::Service, opts)
+    
+    # Get the Customer object for this Service
+    def customer
+      fetcher.get(Fastly::Customer, customer_id)
+    end
   end
 
   # Search all the services that the current customer has.

data/lib/fastly/settings.rb

@@ -33,7 +33,7 @@ class Fastly
 
     # :nodoc:
     def self.list_path(opts={})
-      raise "You can't list settings"
+      nil
     end
 
     # :nodoc:

data/lib/fastly/syslog.rb

@@ -0,0 +1,65 @@
+class Fastly
+    # An endpoint to stream syslogs to 
+    class Syslog < BelongsToServiceAndVersion
+        attr_accessor :service_id, :name, :comment, :ipv4, :ipv6, :hostname, :port, :format
+
+        ## 
+        # :attr: service_id
+        # 
+        # The id of the service this belongs to.
+        # 
+
+        ## 
+        # :attr: version
+        # 
+        # The number of the version this belongs to.
+        # 
+
+        ## 
+        # :attr: name
+        # 
+        # The domain name of this domain
+        # 
+
+        ## 
+        # :attr: comment 
+        # 
+        # a free form comment field
+
+        ## 
+        # :attr: address
+        # 
+        # A magic field - will automagically be set to whichever of ipv4, ipv6 or hostname is currently set.
+        # 
+        # Conversely if you set the address field then the correct field from ipv4, ipv6 or hostname will be set. 
+        
+        ## 
+        # :attr: ipv4
+        # 
+        # the ipv4 address of the host to stream logs to (this, hostname or ipv6 must be set)
+
+        
+        ## 
+        # :attr: ipv6
+        # 
+        # the ipv6 address of the host to stream logs to  (this, hostname or ipv4 must be set)
+
+        
+        ## 
+        # :attr: hostname
+        # 
+        # the hostname to to stream logs to  (this, ipv4 or ipv6 must be set)
+ 
+        
+        ## 
+        # :attr: port 
+        # 
+        # the port to stream logs to (defaults to 514)
+
+        
+        ## 
+        # :attr: format
+        # 
+        # Format to log like in apache format
+    end
+end

data/test/common.rb

@@ -14,20 +14,20 @@ module CommonTests
     settings    = @fastly.get_settings(service.id, version.number)
     assert settings
     assert_equal settings.service_id, service.id
-    assert_equal settings.version, version.number
+    assert_equal settings.version.to_s, version.number.to_s
 
     default_ttl = settings.settings['general.default_ttl']
     settings    = version.settings
     assert settings
     assert_equal settings.service_id, service.id
-    assert_equal settings.version, version.number
+    assert_equal settings.version.to_s, version.number.to_s
     assert_equal settings.settings['general.default_ttl'], default_ttl
     
     settings.settings['general.default_ttl'] = default_ttl = "888888888"
     settings.save!;
 
     settings = version.settings
-    assert_equal settings.settings['general.default_ttl'], default_ttl;
+    assert_equal settings.settings['general.default_ttl'].to_s, default_ttl;
     
     services = @fastly.list_services
     assert !services.empty?
@@ -62,19 +62,19 @@ module CommonTests
     backend = @fastly.create_backend(:service_id => service.id, :version => number, :address => '74.125.224.146', :name => backend_name)
     assert backend
     assert_equal backend.service_id, service.id
-    assert_equal backend.ipv4, '74.125.224.146'
+    #assert_equal backend.ipv4, '74.125.224.146'
     assert_equal backend.address, '74.125.224.146'
-    assert_equal backend.port, '80'
+    assert_equal backend.port.to_s, '80'
     
-    backend.hostname = 'thegestalt.org'
+    backend.address  = 'thegestalt.org'
     backend.port     = '9092'
     @fastly.update_backend(backend)
     backend          = @fastly.get_backend(service.id, number, backend_name)
     
     assert backend
     assert_equal backend.address, 'thegestalt.org'
-    assert_equal backend.hostname, 'thegestalt.org'
-    assert_equal backend.port, '9092'
+    #assert_equal backend.hostname, 'thegestalt.org'
+    assert_equal backend.port.to_s, '9092'
     
     
     domain_name = "fastly-test-domain-#{get_rand}-example.com"
@@ -99,6 +99,9 @@ module CommonTests
     assert_equal director.version_number.to_s, number.to_s
     assert_equal director.version.number.to_s, number.to_s
     
+    assert director.add_backend(backend)
+    generated2  = version3.generated_vcl
+    
     origin_name = "fastly-test-origin-#{get_rand}"
     origin      = @fastly.create_origin(:service_id => service.id, :version => number, :name => origin_name)
     assert origin
@@ -144,9 +147,27 @@ 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
+    
+    invoices    = @fastly.list_invoices(Time.now.year, Time.now.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       invoices[0].service_id

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fastly
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 25
   prerelease: 
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 9
+  version: "0.9"
 platform: ruby
 authors: 
 - Fastly Inc
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-12-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -88,6 +88,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Changes
 - Gemfile
 - README.md
 - Rakefile
@@ -102,11 +103,13 @@ files:
 - lib/fastly/director.rb
 - lib/fastly/domain.rb
 - lib/fastly/fetcher.rb
+- lib/fastly/healthcheck.rb
 - lib/fastly/invoice.rb
 - lib/fastly/match.rb
 - lib/fastly/origin.rb
 - lib/fastly/service.rb
 - lib/fastly/settings.rb
+- lib/fastly/syslog.rb
 - lib/fastly/user.rb
 - lib/fastly/vcl.rb
 - lib/fastly/version.rb