fastly 1.1.4 → 1.1.5

data/lib/fastly/origin.rb

@@ -20,21 +20,20 @@ class Fastly
     #
     # 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?
+      hash = fetcher.client.post("#{Origin.put_path(self)}/director/#{director.name}")
+      !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?
+      hash = fetcher.client.delete("#{Origin.put_path(self)}/director/#{director.name}")
+      !hash.nil?
     end
   end
 end

data/lib/fastly/request_setting.rb

@@ -3,88 +3,87 @@ class Fastly
   class RequestSetting < BelongsToServiceAndVersion
     attr_accessor :service_id, :name, :force_miss, :force_ssl, :action, :bypass_busy_wait, :max_stale_age, :hash_keys, :xff, :time_support, :geo_headers, :default_host, :request_condition
 
-        ##
-        # :attr: service_id
-        #
-        # The id of the service this belongs to.
+    ##
+    # :attr: service_id
+    #
+    # The id of the service this belongs to.
 
-        ##
-        # :attr: version
-        #
-        # The number of the version this belongs to.
+    ##
+    # :attr: version
+    #
+    # The number of the version this belongs to.
 
-        ##
-        # :attr: name
-        #
-        # The name of the request setting
+    ##
+    # :attr: name
+    #
+    # The name of the request setting
 
-	##
-	# :attr: force_miss
-	#
-	# Allows you to force a cache miss for the request. Replaces the item
-	# in the cache if the content is cacheable
+    ##
+    # :attr: force_miss
+    #
+    # Allows you to force a cache miss for the request. Replaces the item
+    # in the cache if the content is cacheable
 
-	##
-	# :attr: force_ssl
-	#
-	# Force the request to use SSL, redirecting a non-SSL request to SSL.
+    ##
+    # :attr: force_ssl
+    #
+    # Force the request to use SSL, redirecting a non-SSL request to SSL.
 
-	##
-	# :attr: action
-	#
-	# Allows you to terminate request handling and immediately perform an
-	# action. When set it can be lookup or pass (ignore the cache completely)
+    ##
+    # :attr: action
+    #
+    # Allows you to terminate request handling and immediately perform an
+    # action. When set it can be lookup or pass (ignore the cache completely)
 
-	##
-	# :attr: bypass_busy_wait
-	#
-	# Disable collapsed forwarding, so you don't wait for other objects to
-	# origin
+    ##
+    # :attr: bypass_busy_wait
+    #
+    # Disable collapsed forwarding, so you don't wait for other objects to
+    # origin
 
-	##
-	# :attr: max_stale_age
-	#
-	# How old an object is allowed to be to serve stale-if-error or
-	# state-while-revalidate
+    ##
+    # :attr: max_stale_age
+    #
+    # How old an object is allowed to be to serve stale-if-error or
+    # state-while-revalidate
 
-	##
-	# :attr: hash_keys
-	#
-	# Comma separated list of varnish request object fields that should be
-	# in the hash key
+    ##
+    # :attr: hash_keys
+    #
+    # Comma separated list of varnish request object fields that should be
+    # in the hash key
 
-	##
-	# :attr: xff
-	#
-	# X-Forwarded-For: should be clear, leave, append, append_all, or
-	# overwrite
+    ##
+    # :attr: xff
+    #
+    # X-Forwarded-For: should be clear, leave, append, append_all, or
+    # overwrite
 
-	##
-	# :attr: timer_support
-	#
-	#  Injects the X-Timer info into the request for viewing origin fetch
-	# durations
+    ##
+    # :attr: timer_support
+    #
+    #  Injects the X-Timer info into the request for viewing origin fetch
+    # durations
 
-	##
-	# :attr: geo_headers
-	#
-	# Injects Fastly-Geo-Country, Fastly-Geo-City, and Fastly-Geo-Region
-	# into the request headers
+    ##
+    # :attr: geo_headers
+    #
+    # Injects Fastly-Geo-Country, Fastly-Geo-City, and Fastly-Geo-Region
+    # into the request headers
 
-	##
-	# :attr: default_host
-	#
-	# Sets the host header
+    ##
+    # :attr: default_host
+    #
+    # Sets the host header
 
-	##
-	# :attr: request_condition
-	#
-	# Name of condition object used to test whether or not these settings
-	# should be used
+    ##
+    # :attr: request_condition
+    #
+    # Name of condition object used to test whether or not these settings
+    # should be used
 
-    private
-     def self.path
-       Util.class_to_path(self, true)
-     end
+    def self.path
+      Util.class_to_path(self, true)
+    end
   end
 end

data/lib/fastly/response_object.rb

@@ -3,52 +3,51 @@ class Fastly
   class ResponseObject < BelongsToServiceAndVersion
     attr_accessor :service_id, :name, :cache_condition, :request_condition, :status, :response, :content, :content_type
 
-        ##
-        # :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 the response object
-
-	##
-	# :attr: cache_condition
-	#
-	# Name of the cache condition used to test whether this response object
-	# should be used.
-
-	##
-	# :attr: request_condition
-	#
-	# Name of the request condition used to test whether this response object
-	# should be used.
-
-	##
-	# :attr: status
-	#
-	# The HTTP status code, defaults to 200
-
-	##
-	# :attr: response
-	#
-	# The HTTP response, defaults to "Ok"
-
-	##
-	# :attr: content
-	#
-	# The content to deliver for the response object, can be empty.
-
-	##
-	# :attr: content_type
-	#
-	# The MIME type of the content, can be empty.
-
+    ##
+    # :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 the response object
+
+    ##
+    # :attr: cache_condition
+    #
+    # Name of the cache condition used to test whether this response object
+    # should be used.
+
+    ##
+    # :attr: request_condition
+    #
+    # Name of the request condition used to test whether this response object
+    # should be used.
+
+    ##
+    # :attr: status
+    #
+    # The HTTP status code, defaults to 200
+
+    ##
+    # :attr: response
+    #
+    # The HTTP response, defaults to "Ok"
+
+    ##
+    # :attr: content
+    #
+    # The content to deliver for the response object, can be empty.
+
+    ##
+    # :attr: content_type
+    #
+    # The MIME type of the content, can be empty.
   end
 end

data/lib/fastly/s3_logging.rb

@@ -3,66 +3,64 @@ class Fastly
   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: service_id
+    #
+    # The id of the service this belongs to.
 
-        ##
-        # :attr: version
-        #
-        # The number of the version this belongs to.
+    ##
+    # :attr: version
+    #
+    # The number of the version this belongs to.
 
-        ##
-        # :attr: name
-        #
-        # The name for this s3 rule
+    ##
+    # :attr: name
+    #
+    # The name for this s3 rule
 
-	##
-	# :attr: bucket_name
-	#
-	# The name of the s3 bucket
+    ##
+    # :attr: bucket_name
+    #
+    # The name of the s3 bucket
 
-	##
-	# :attr: access_key
-	#
-	# The bucket's s3 account access key
+    ##
+    # :attr: access_key
+    #
+    # The bucket's s3 account access key
 
-	##
-	# :attr: secret_key
-	#
-	# The bucket's s3 account secret key
+    ##
+    # :attr: secret_key
+    #
+    # The bucket's s3 account secret key
 
-	##
-	# :attr: path
-	#
-	# The path to upload logs to
+    ##
+    # :attr: path
+    #
+    # The path to upload logs to
 
-	##
-	# :attr: period
-	#
-	# How frequently the logs should be dumped (in seconds, default 3600)
+    ##
+    # :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: gzip_level
+    #
+    # What level of gzip compression to have when dumping the logs (default
+    # 0, no compression).
 
-	##
-	# :attr: format
-	#
-	# Apache style log formatting
+    ##
+    # :attr: format
+    #
+    # Apache style log formatting
 
-	##
-	# :attr: response_condition
-	#
-	# When to execute the s3 logging. If empty, always execute.
+    ##
+    # :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
+    def self.path
+      'logging/s3'
+    end
   end
 end

data/lib/fastly/service.rb

@@ -1,7 +1,9 @@
+# Service object
 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_id, :name, :comment
+    attr_accessor :id, :customer_id, :name, :comment, :versions
+
     @versions = []
 
     ##
@@ -27,7 +29,6 @@ class Fastly
     #
     # a free form comment field
 
-
     ##
     #
     # Get a hash of stats from different data centers.
@@ -37,10 +38,9 @@ class Fastly
     # * hourly
     # * daily
     # * all
-    def stats(type=:all, opts={})
-      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
+    def stats(type = :all, opts = {})
+      fail Error, "Unknown stats type #{type}" unless [:minutely, :hourly, :daily, :all].include?(type.to_sym)
+      fetcher.client.get("#{Service.get_path(id)}/stats/#{type}", opts)
     end
 
     # Return a Invoice object representing the invoice for this service
@@ -48,50 +48,46 @@ class Fastly
     # If a year and month are passed in returns the invoice for that whole month.
     #
     # Otherwise it returns the invoice for the current month so far.
-    def invoice(year=nil, month=nil)
-      opts = { :service_id => self.id }
+    def invoice(year = nil, month = nil)
+      opts = { service_id: id }
+
       unless year.nil? || month.nil?
         opts[:year]  = year
         opts[:month] = month
       end
-      fetcher.get(Fastly::Invoice, opts)
+
+      fetcher.get(Invoice, opts)
     end
 
     # Purge all assets from this service.
     def purge_all
-      fetcher.client.post(Fastly::Service.get_path(self.id)+"/purge_all")
+      fetcher.client.post("#{Service.get_path(id)}/purge_all")
     end
 
     # Purge anything with the specific key from the given service.
     def purge_by_key(key)
       require_api_key!
-
-      fetcher.client.post(Fastly::Service.get_path(self.id)+"/purge/#{key}")
-    end
-
-    # Set all the versions that this service has had.
-    def versions=(versions)
-      @versions = versions
+      fetcher.client.post("#{Service.get_path(id)}/purge/#{key}")
     end
 
     # Get a sorted array of all the versions that this service has had.
     def versions
-      @versions.map { |v| Fastly::Version.new(v, fetcher) }.sort { |a,b| a.number.to_i <=> b.number.to_i }
+      @versions.map { |v| 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)
+    def version(number = -1)
       versions[number]
     end
 
     # A deep hash of nested details
-    def details(opts={})
-      fetcher.client.get(Fastly::Service.get_path(self.id)+"/details", opts);
+    def details(opts = {})
+      fetcher.client.get("#{Service.get_path(id)}/details", opts)
     end
 
     # Get the Customer object for this Service
     def customer
-      fetcher.get(Fastly::Customer, customer_id)
+      fetcher.get(Customer, customer_id)
     end
   end
 
@@ -105,9 +101,7 @@ class Fastly
   #
   #   service = fastly.search_services(:name => name, :version => number)
   def search_services(opts)
-    klass = Fastly::Service
-    hash  = client.get(klass.post_path+"/search", opts)
-    return nil if hash.nil?
-    klass.new(hash, self)
+    hash = client.get("#{Service.post_path}/search", opts)
+    hash.nil? ? nil : Service.new(hash, self)
   end
 end