fastly 1.00 → 1.1.0

data/lib/fastly/s3_logging.rb

@@ -0,0 +1,68 @@
+class Fastly
+  # An s3 endpoint to stream logs to
+  class S3Logging < BelongsToServiceAndVersion
+    attr_accessor :service_id, :name, :bucket_name, :access_key, :secret_key, :path, :period, :gzip_level, :format, :response_condition
+
+        ## 
+        # :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 for this s3 rule
+
+	##
+	# :attr: bucket_name
+	#
+	# The name of the s3 bucket
+
+	##
+	# :attr: access_key
+	#
+	# The bucket's s3 account access key
+
+	##
+	# :attr: secret_key
+	#
+	# The bucket's s3 account secret key
+
+	##
+	# :attr: path
+	#
+	# The path to upload logs to
+
+	##
+	# :attr: period
+	#
+	# How frequently the logs should be dumped (in seconds, default 3600)
+
+	##
+	# :attr: gzip_level
+	#
+	# What level of gzip compression to have when dumping the logs (default
+	# 0, no compression).
+
+	##
+	# :attr: format
+	#
+	# Apache style log formatting
+
+	##
+	# :attr: response_condition
+	#
+	# When to execute the s3 logging. If empty, always execute.
+
+    private
+      # The path here is a bit non-standard
+      def self.path
+	"logging/s3"
+      end
+  end
+end

data/lib/fastly/service.rb

@@ -59,13 +59,13 @@ class Fastly
 
     # Purge all assets from this service.
     def purge_all
-      res = client.put(get_path(self.id)+"/purge_all")
+      res = fetcher.client.post(Fastly::Service.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}")
+       res = fetcher.client.post(Fastly::Service.get_path(self.id)+"/purge/#{key}")
     end
 
     # Set all the versions that this service has had.
@@ -85,7 +85,7 @@ class Fastly
     
     # A deep hash of nested details
     def details(opts={})
-      client.get(get_path(self.id)+"/details", opts);
+      fetcher.client.get(Fastly::Service.get_path(self.id)+"/details", opts);
     end
     
     # Get the Customer object for this Service
@@ -109,4 +109,4 @@ class Fastly
     return nil if hash.nil?
     klass.new(hash, self)
   end
-end
+end

data/lib/fastly/settings.rb

@@ -19,7 +19,6 @@ class Fastly
     #
     # Return a hash containing key/value pairs of settings
     #
-    
 
     # :nodoc:
     def self.get_path(service, number)
@@ -38,12 +37,12 @@ class Fastly
 
     # :nodoc:
     def self.post_path 
-      raise "You can't POST to an invoice"
+      raise "You can't POST to an setting"
     end
 
     # :nodoc:
     def self.delete_path
-      raise "You can't DELETE to an invoice"
+      raise "You can't DELETE to an setting"
     end
     
     # :nodoc:
@@ -59,7 +58,13 @@ class Fastly
   
   # Get the Settings object for the specified Version
   def get_settings(service, number)
-    get(Fastly::Settings, service, number)
+    klass            = Fastly::Settings
+    hash             = client.get(Fastly::Settings.get_path(service, number))
+    
+    return nil if hash.nil?
+    hash["settings"] = Hash[["general.default_host", "general.default_ttl"].collect { |var| [var, hash.delete(var)] }]
+    
+    return klass.new(hash, self)
   end
 
   # Update the Settings object for the specified Version

data/lib/fastly/string.rb

@@ -0,0 +1,7 @@
+# add an underscore method to String, so we can easily convert CamelCase to
+# camel_case for CacheSetting and RequestSetting objects.
+class String
+  def underscore
+    gsub(/([^A-Z])([A-Z]+)/, '\1_\2').downcase
+  end
+end

data/lib/fastly/syslog.rb

@@ -1,7 +1,7 @@
 class Fastly
     # An endpoint to stream syslogs to 
     class Syslog < BelongsToServiceAndVersion
-        attr_accessor :service_id, :name, :comment, :ipv4, :ipv6, :hostname, :port, :format
+        attr_accessor :service_id, :name, :comment, :ipv4, :ipv6, :hostname, :port, :format, :response_conditions
 
         ## 
         # :attr: service_id
@@ -61,5 +61,10 @@ class Fastly
         # :attr: format
         # 
         # Format to log like in apache format
+        
+        ## 
+        # :attr: response_condition
+        #
+        # name of a response_condition to filter the log on, if empty it always logs
     end
 end

data/lib/fastly/version.rb

@@ -96,6 +96,13 @@ class Fastly
       return Fastly::Version.new(hash, fetcher)
     end
 
+    # Create an entirely new version, not cloned from the previous one.
+    def self.create_new(fetcher, opts)
+      hash = fetcher.client.post(Fastly::Version.post_path(opts))
+      return nil if hash.nil?
+      return Fastly::Version.new(hash, fetcher)
+    end
+
     # Get the generated VCL object for this Version (which must have been activated first)
     #
     # Won't return the content of the VCL unless you pass in 

data/test/admin_test.rb

@@ -1,10 +1,6 @@
-#!/usr/bin/env ruby 
+require 'helper'
 
-require 'rubygems'
-require 'test/unit'
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-
-class AdminTest < Test::Unit::TestCase
+class AdminTest < Fastly::TestCase
   def setup
     opts = login_opts(:full).merge(:use_curb => false)
     begin
@@ -16,20 +12,20 @@ class AdminTest < Test::Unit::TestCase
       exit(-1)
     end
   end
-  
+
   def test_creating_and_updating_customer
     return unless @fastly.current_user.can_do?(:admin)
     customer = @fastly.create_customer(:name => "fastly-ruby-test-customer-#{get_rand}")
     email    = "fastly-ruby-test-#{get_rand}-new@example.com"
     user     = @fastly.create_user(:login => email, :name => "New User")
     customer.owner_id = user.id
-    
+
     tmp = @fastly.update_customer(customer)
     assert tmp
     assert_equal customer.id, tmp.id
     assert_equal customer.owner.id, tmp.owner.id
   end
-  
+
   def test_creating_and_updating_customer_with_owner
     return unless @fastly.current_user.can_do?(:admin)
     email    = "fastly-ruby-test-#{get_rand}-new@example.com"
@@ -37,5 +33,5 @@ class AdminTest < Test::Unit::TestCase
     assert customer
     assert_equal customer.owner.login, email
   end
-  
-end
+
+end

data/test/api_key_test.rb

@@ -1,11 +1,8 @@
-#!/usr/bin/env ruby 
-require 'rubygems'
-require 'test/unit'
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require 'helper'
 
-class ApiKeyTest < Test::Unit::TestCase
+class ApiKeyTest < Fastly::TestCase
   include CommonTests
-  
+
   def setup
     @opts = login_opts(:api_key)
     begin
@@ -16,21 +13,21 @@ class ApiKeyTest < Test::Unit::TestCase
       exit(-1)
     end
   end
-  
+
   def test_raw_client
     user = customer = nil
     assert_raise(Fastly::Error) {
       user     = @client.get('/current_user')
     }
-    assert_equal nil, user    
+    assert_equal nil, user
 
     customer = @client.get('/current_customer')
     assert customer
     assert_equal @opts[:customer], customer['name']
   end
-  
-  
-  def test_current_user_and_customer 
+
+
+  def test_current_user_and_customer
     current_user  = current_customer = nil
     assert_raise(Fastly::FullAuthRequired) {
       current_user = @fastly.current_user
@@ -40,9 +37,9 @@ class ApiKeyTest < Test::Unit::TestCase
     customer = @fastly.current_customer
     assert customer
     assert_equal @opts[:customer], customer.name
-  end 
-  
-  
+  end
+
+
   def test_purging
     #assert @fastly.purge('foo')
     # TODO Won't work until we get fixtures in Heavenly

data/test/common.rb

@@ -22,61 +22,61 @@ module CommonTests
     assert_equal settings.service_id, service.id
     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'].to_s, default_ttl;
-    
+
     services = @fastly.list_services
     assert !services.empty?
     assert !services.select { |s| s.name == name }.empty?
-    
+
     service = @fastly.search_services( :name => name )
     assert service
     assert name, service.name
-    
-    
+
+
     service = @fastly.search_services( :name => name, :version => version.number )
     assert services
     assert name, service.name
-    
+
     version2    = @fastly.create_version(:service_id => service.id)
     assert version2
-    assert_equal = version.number.to_i+1, version2.number.to_i 
-    
+    assert_equal = version.number.to_i+1, version2.number.to_i
+
     version3 = version2.clone
     assert version3
-    assert_equal = version2.number.to_i+1, version3.number.to_i 
-    
+    assert_equal = version2.number.to_i+1, version3.number.to_i
+
     number = version3.number.to_i
-    
+
     backend_name = "fastly-test-backend-#{get_rand}"
-    backend = begin 
-      @fastly.create_backend(:service_id => service.id, :version => number, :hostname => 'localhost', :name => backend_name) 
-    rescue Fastly::Error 
+    backend = begin
+      @fastly.create_backend(:service_id => service.id, :version => number, :hostname => 'localhost', :name => backend_name)
+    rescue Fastly::Error
     end
     assert_nil backend
-    
+
     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.address, '74.125.224.146'
     assert_equal backend.port.to_s, '80'
-    
+
     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.to_s, '9092'
-    
-    
+
+
     domain_name = "fastly-test-domain-#{get_rand}-example.com"
     domain  = @fastly.create_domain(:service_id => service.id, :version => number, :name => domain_name)
     assert domain
@@ -84,13 +84,13 @@ module CommonTests
     assert_equal domain.service.id, service.id
     assert_equal domain.version_number.to_s, number.to_s
     assert_equal domain.version.number.to_s, number.to_s
-    
+
     domain.comment = "Flibbety gibbet"
     domain.save!
     domain         = @fastly.get_domain(service.id, number, domain_name)
     assert_equal domain.name, domain_name
     assert_equal domain.comment, "Flibbety gibbet"
-    
+
     director_name = "fastly-test-director-#{get_rand}"
     director      = @fastly.create_director(:service_id => service.id, :version => number, :name => director_name)
     assert director
@@ -98,10 +98,10 @@ module CommonTests
     assert_equal director.service.id, service.id
     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
@@ -109,7 +109,56 @@ module CommonTests
     assert_equal origin.service.id, service.id
     assert_equal origin.version_number.to_s, number.to_s
     # assert_equal origin.version.number.to_s, number.to_s
-    
+
+    condition_name = "fastly-test-condition-#{get_rand}"
+    condition_statement = 'req.url ~ "^/foo"'
+    condition = @fastly.create_condition(:service_id => service.id, :version => number, :name => condition_name, :statement => condition_statement, :type => "REQUEST")
+    assert condition
+    assert_equal condition_name, condition.name
+    assert_equal condition_statement, condition.statement
+
+    cache_condition_name = "cache-#{condition_name}" 
+    cache_condition = @fastly.create_condition(:service_id => service.id, :version => number, :name => cache_condition_name, :statement => condition_statement, :type => "CACHE")
+    assert cache_condition
+    assert_equal cache_condition_name, cache_condition.name
+    assert_equal condition_statement, cache_condition.statement
+
+    cache_setting_name = "fastly-cache-setting-#{get_rand}"
+    cache_setting = @fastly.create_cache_setting( :service_id => service.id, :version => number, :name => cache_setting_name, :ttl => 3600, :stale_ttl => 10001, :cache_condition => cache_condition_name)
+    assert cache_setting
+    assert_equal cache_setting.name, cache_setting_name
+    assert_equal cache_setting.ttl.to_s, 3600.to_s
+    assert_equal cache_setting.stale_ttl.to_s, 10001.to_s
+    assert_equal cache_setting.cache_condition, cache_condition_name
+
+    gzip_name = "fastly-test-gzip-#{get_rand}"
+    gzip = @fastly.create_gzip( :service_id => service.id, :version => number, :name => gzip_name, :extensions => "js css html", :content_types => "text/html")
+    assert gzip
+    assert_equal gzip_name, gzip.name
+    assert_equal "text/html", gzip.content_types
+    assert_equal "js css html", gzip.extensions
+
+    response_obj_name = "fastly-test-response-obj-#{get_rand}"
+    response_obj = @fastly.create_response_object( :service_id => service.id, :version => number, :name => response_obj_name, :status => 418, :response => "I'm a teapot", :content_type => "text/plain", :content => "short and stout")
+    assert response_obj
+    assert_equal response_obj_name, response_obj.name
+    assert_equal 418.to_s, response_obj.status
+    assert_equal "I'm a teapot", response_obj.response
+    assert_equal "text/plain", response_obj.content_type
+    assert_equal "short and stout", response_obj.content
+
+    response_condition_name = "fastly-response-condition-#{get_rand}"
+    response_condition = @fastly.create_condition(:service_id => service.id, :version => number, :name => response_condition_name, :statement => condition_statement, :type => "RESPONSE")
+    header_name = "fastly-header-test-#{get_rand}"
+    header = @fastly.create_header( :service_id => service.id, :version => number, :name => header_name, :response_condition => response_condition.name, :ignore_if_set => 1, :type => "response", :dst => "http.Cache-Control", :src => '"max-age=301"', :priority => 10, :action => "set")
+    assert header
+    assert_equal header.name, header_name
+    assert_equal header.response_condition, response_condition.name
+    assert_equal header.ignore_if_set.to_s, 1.to_s
+    assert_equal header.dst, "http.Cache-Control"
+    assert_equal header.src, '"max-age=301"'
+    assert_equal header.action, "set"
+
     assert version3.activate!
     assert version3.deactivate!
     assert !@fastly.get_service(version3.service_id).version.active
@@ -117,17 +166,23 @@ module CommonTests
     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(:no_content => true)
     assert generated
     assert generated.content.nil?
     generated = version3.generated_vcl
     assert !generated.content.nil?
     assert generated.content.match(/\.port = "9092"/ms)
-    
+
     assert version3.validate
 
-    #assert @fastly.deactivate_version(version2)
+    version3.deactivate!
+
+    version4 = Fastly::Version.create_new(service.fetcher, :service_id => service.id)
+    assert version4.number != version3.number
+    assert @fastly.list_directors(:service_id => service.id, :version => version4.number).length == 0
+
+    @fastly.delete_service(service)
   end
 
   def test_stats
@@ -139,13 +194,17 @@ module CommonTests
     assert tmp
     assert_equal name, tmp.name
 
-    stats       = service.stats
-    assert stats
-    
+    begin
+      stats       = service.stats
+    rescue Fastly::Error => e
+    end
+    assert stats.nil?
+
     stats       = service.stats(:all, :year => 2011, :month => 10)
-    assert stats    
+    assert stats
+    @fastly.delete_service(service)
   end
-  
+
   def test_invoices
     name        = "fastly-test-service-#{get_rand}"
     service     = @fastly.create_service(:name => name)
@@ -156,20 +215,21 @@ module CommonTests
     assert invoice
     assert invoice.regions
     assert_equal invoice.service_id, service.id
- 
+
     invoice     = @fastly.get_invoice
     assert_equal Fastly::Invoice,  invoice.class
-    
+
     year        = Time.now.year
     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 1,     invoice.start.day
     assert_equal year,  invoice.end.year
     assert_equal month, invoice.end.month
-  end                              
+    @fastly.delete_service(service)
+  end
 
-end
+end