fastly 1.1.4 → 1.1.5

data/lib/fastly/condition.rb

@@ -1,40 +1,40 @@
 class Fastly
-    # An endpoint to stream syslogs to
-    class Condition < BelongsToServiceAndVersion
-        attr_accessor :service_id, :name, :priority, :statement, :type
+  # An endpoint to stream syslogs to
+  class Condition < BelongsToServiceAndVersion
+    attr_accessor :service_id, :name, :priority, :statement, :type
 
-        ##
-        # :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 condition
+    ##
+    # :attr: name
+    #
+    # The name of the condition
 
-        ##
-        # :attr: statement
-        #
-        # The statement of the condition, should be a varnish if statement line
+    ##
+    # :attr: statement
+    #
+    # The statement of the condition, should be a varnish if statement line
 
-        ##
-        # :attr: priority
-        #
-        # What order to run them in, higher priority gets executed after lower priority
+    ##
+    # :attr: priority
+    #
+    # What order to run them in, higher priority gets executed after lower priority
 
-        ##
-        # :attr: type
-        #
-        # request, cache or response
-        #
-        # request has req. object only
-        # cache has req. and beresp.
-        # response has req. and resp.
-    end
+    ##
+    # :attr: type
+    #
+    # request, cache or response
+    #
+    # request has req. object only
+    # cache has req. and beresp.
+    # response has req. and resp.
+  end
 end

data/lib/fastly/customer.rb

@@ -20,7 +20,7 @@ class Fastly
 
     # Return a user object representing the owner of this Customer
     def owner
-      self.fetcher.get(User,self.owner_id)
+      fetcher.get(User, owner_id)
     end
   end
 end

data/lib/fastly/director.rb

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

data/lib/fastly/fetcher.rb

@@ -2,7 +2,7 @@ class Fastly
   # :nodoc:
   class AuthRequired < RuntimeError; end
   # :nodoc:
-  class FullAuthRequired <  Fastly::AuthRequired; end
+  class FullAuthRequired <  AuthRequired; end
   # :nodoc:
   class Error < RuntimeError; end
   # :nodoc:
@@ -10,14 +10,14 @@ class Fastly
   # :nodoc:
   class AdminRequired < AuthRequired; end
 
+  # Encapsulates HTTP client interactions
   module Fetcher # :nodoc: all
-
     # Get the current Fastly::Client
-    def client(opts={})
-      @client ||= Fastly::Client.new(opts)
+    def client(opts = {})
+      @client ||= Client.new(opts)
     end
 
-    def list(klass, opts={})
+    def list(klass, opts = {})
       list = client.get(klass.list_path(opts))
       return [] if list.nil?
       list.map { |hash| klass.new(hash, self) }
@@ -29,23 +29,21 @@ class Fastly
       else
         hash = client.get(klass.get_path(*args))
       end
-      return nil if hash.nil?
-      return klass.new(hash, self)
+      hash.nil? ? nil : klass.new(hash, self)
     end
 
     def create(klass, opts)
-      hash = client.post(klass.post_path(opts),opts)
-      return klass.new(hash, self)
+      hash = client.post(klass.post_path(opts), opts)
+      klass.new(hash, self)
     end
 
     def update(klass, obj)
       hash = client.put(klass.put_path(obj), obj.as_hash)
-      return klass.new(hash, self)
+      klass.new(hash, self)
     end
 
     def delete(klass, obj)
-      return client.delete(klass.delete_path(obj))
+      client.delete(klass.delete_path(obj))
     end
-
   end
 end

data/lib/fastly/gem_version.rb

@@ -1,4 +1,4 @@
+# The current version of the library
 class Fastly
-  # The current version of the library
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/lib/fastly/gzip.rb

@@ -3,37 +3,36 @@ class Fastly
   class Gzip < BelongsToServiceAndVersion
     attr_accessor :service_id, :name, :extensions, :content_types, :cache_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 condition
+    ##
+    # :attr: name
+    #
+    # The name of the condition
 
-	##
-	# :attr: extensions
-	#
-	# File extensions to be gzipped. Seems to want them in a list like
-	# "js css html"
+    ##
+    # :attr: extensions
+    #
+    # File extensions to be gzipped. Seems to want them in a list like
+    # "js css html"
 
-	##
-	# :attr: content_types
-	#
-	# Content types to be gzipped. Seems to want them in a list like
-	# "text/html application/x-javascript"
-
-	##
-	# :attr" cache_condition
-	#
-	# Cache condition to be used to determine when to apply this gzip setting
+    ##
+    # :attr: content_types
+    #
+    # Content types to be gzipped. Seems to want them in a list like
+    # "text/html application/x-javascript"
 
+    ##
+    # :attr" cache_condition
+    #
+    # Cache condition to be used to determine when to apply this gzip setting
   end
 end

data/lib/fastly/header.rb

@@ -3,86 +3,85 @@ class Fastly
   class Header < BelongsToServiceAndVersion
     attr_accessor :service_id, :name, :action, :cache_condition, :request_condition, :response_condition, :ignore_if_set, :type, :dst, :src, :substitution, :priority, :regexp
 
-        ##
-        # :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 header setting
+    ##
+    # :attr: name
+    #
+    # The name of the header setting
 
-	##
-	# :attr: action
-	#
-	# Action to perform on the header. Can be:
-	# - 'set' - Sets (or resets) a header
-	# - 'append' - Appends to an existing header
-	# - 'delete' - Delete a header
-	# - 'regex' - Perform a single regex replacement on a header
-	# - 'regex_repeat' - Perform a global regex replacement on a header
+    ##
+    # :attr: action
+    #
+    # Action to perform on the header. Can be:
+    # - 'set' - Sets (or resets) a header
+    # - 'append' - Appends to an existing header
+    # - 'delete' - Delete a header
+    # - 'regex' - Perform a single regex replacement on a header
+    # - 'regex_repeat' - Perform a global regex replacement on a header
 
-	##
-	# :attr: ignore_if_set
-	#
-	# Don't add the header if it is already set. Only applies to the 'set'
-	# action
+    ##
+    # :attr: ignore_if_set
+    #
+    # Don't add the header if it is already set. Only applies to the 'set'
+    # action
 
-	##
-	# :attr: type
-	#
-	#  - 'request' - Performs on the request before lookup occurs
-        # - 'fetch' - Performs on the request to the origin server
-        # - 'cache' - Performs on the response before it's stored in the cache
-        # - 'response' - Performs on the response before delivering to the client
+    ##
+    # :attr: type
+    #
+    # - 'request' - Performs on the request before lookup occurs
+    # - 'fetch' - Performs on the request to the origin server
+    # - 'cache' - Performs on the response before it's stored in the cache
+    # - 'response' - Performs on the response before delivering to the client
 
-	##
-	# :attr: dst
-	#
-	# Header to set
+    ##
+    # :attr: dst
+    #
+    # Header to set
 
-	##
-	# :attr: src
-	#
-	# Variable to be used as a source for the header content. Does not apply
-	# to the 'delete' action.
+    ##
+    # :attr: src
+    #
+    # Variable to be used as a source for the header content. Does not apply
+    # to the 'delete' action.
 
-	##
-	# :attr: regexp
-	#
-	# Regular expression to use with the 'regex' and 'regex_repeat' actions.
+    ##
+    # :attr: regexp
+    #
+    # Regular expression to use with the 'regex' and 'regex_repeat' actions.
 
-	##
-	# :attr: substitution
-	#
-	# Value to substitute in place of regular expression. (Only applies to
-	# 'regex' and 'regex_repeat'.)
+    ##
+    # :attr: substitution
+    #
+    # Value to substitute in place of regular expression. (Only applies to
+    # 'regex' and 'regex_repeat'.)
 
-	##
-	# :attr: priority
-	#
-	# Lower priorities execute first.
+    ##
+    # :attr: priority
+    #
+    # Lower priorities execute first.
 
-	##
-	# :attr: request_condition
-	#
-	# Optional name of a request condition to apply
+    ##
+    # :attr: request_condition
+    #
+    # Optional name of a request condition to apply
 
-	##
-	# :attr: cache_condition
-	#
-	# Optional name of a cache condition to apply
-
-	##
-	# :attr: response_condition
-	#
-	# Optional name of a response condition to apply
+    ##
+    # :attr: cache_condition
+    #
+    # Optional name of a cache condition to apply
 
+    ##
+    # :attr: response_condition
+    #
+    # Optional name of a response condition to apply
   end
 end

data/lib/fastly/invoice.rb

@@ -1,3 +1,4 @@
+# Invoice object
 class Fastly
   # An invoice for a time period
   class Invoice < Base
@@ -38,7 +39,6 @@ class Fastly
     #
     # A hash reference with all the different regions and their subtotals
 
-
     # Get the start time of this invoice as a DateTime object in UTC
     def start
       DateTime.parse(start_time).new_offset(0)
@@ -52,14 +52,16 @@ class Fastly
     private
 
     def self.get_path(*args)
-      opts = args.size>0 ? args[0] : {}
-      url  = "/billing"
-      if opts.has_key?(:service_id)
-        url += "/service/#{opts[:service_id]}"
-      end
-      if opts.has_key?(:year) && opts.has_key?(:month)
+      opts = args.size > 0 ? args[0] : {}
+
+      url  = '/billing'
+
+      url += "/service/#{opts[:service_id]}" if opts.key?(:service_id)
+
+      if opts.key?(:year) && opts.key?(:month)
         url += "/year/#{opts[:year]}/month/#{opts[:month]}"
       end
+
       url
     end
 
@@ -68,39 +70,38 @@ class Fastly
     end
 
     def self.post_path
-      raise "You can't POST to an invoice"
+      fail "You can't POST to an invoice"
     end
 
     def self.put_path
-      raise "You can't PUT to an invoice"
+      fail "You can't PUT to an invoice"
     end
 
     def self.delete_path
-      raise "You can't DELETE to an invoice"
+      fail "You can't DELETE to an invoice"
     end
 
     def save!
-      raise "You can't save an invoice"
+      fail "You can't save an invoice"
     end
 
     def delete!
-      raise "You can't delete an invoice"
+      fail "You can't delete an invoice"
     end
   end
 
-
   # Return an array of Invoice objects representing invoices for all services.
   #
   # If a year and month are passed in returns the invoices for that whole month.
   #
   # Otherwise it returns the invoices for the current month so far.
-  def get_invoice(year=nil, month=nil)
+  def get_invoice(year = nil, month = nil)
     opts = {}
     unless year.nil? || month.nil?
       opts[:year]  = year
       opts[:month] = month
     end
-    get(Fastly::Invoice, opts)
-  end
 
+    get(Invoice, opts)
+  end
 end