fastly 1.1.4 → 1.1.5

data/lib/fastly/settings.rb

@@ -1,3 +1,4 @@
+# Settings Object
 class Fastly
   # Represent arbitary key value settings for a given Version
   class Settings < Base
@@ -31,23 +32,23 @@ class Fastly
     end
 
     # :nodoc:
-    def self.list_path(opts={})
+    def self.list_path(_opts = {})
       nil
     end
 
     # :nodoc:
     def self.post_path
-      raise "You can't POST to an setting"
+      fail "You can't POST to an setting"
     end
 
     # :nodoc:
     def self.delete_path
-      raise "You can't DELETE to an setting"
+      fail "You can't DELETE to an setting"
     end
 
     # :nodoc:
     def delete!
-      raise "You can't delete an invoice"
+      fail "You can't delete an invoice"
     end
 
     # :nodoc:
@@ -58,17 +59,15 @@ class Fastly
 
   # Get the Settings object for the specified Version
   def get_settings(service, number)
-    klass            = Fastly::Settings
-    hash             = client.get(Fastly::Settings.get_path(service, number))
-
+    hash = client.get(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)
+    hash['settings'] = Hash[['general.default_host', 'general.default_ttl'].collect { |var| [var, hash.delete(var)] }]
+    Settings.new(hash, self)
   end
 
   # Update the Settings object for the specified Version
-  def update_settings(opts={})
-    update(Fastly::Settings, opts)
+  def update_settings(opts = {})
+    update(Settings, opts)
   end
 end

data/lib/fastly/syslog.rb

@@ -1,70 +1,66 @@
 class Fastly
-    # An endpoint to stream syslogs to
-    class Syslog < BelongsToServiceAndVersion
-        attr_accessor :service_id, :name, :comment, :ipv4, :ipv6, :hostname, :port, :format, :response_conditions
+  # An endpoint to stream syslogs to
+  class Syslog < BelongsToServiceAndVersion
+    attr_accessor :service_id, :name, :comment, :ipv4, :ipv6, :hostname, :port, :format, :response_conditions
 
-        ##
-        # :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 domain name of this domain
-        #
+    ##
+    # :attr: name
+    #
+    # The domain name of this domain
+    #
 
-        ##
-        # :attr: comment
-        #
-        # a free form comment field
+    ##
+    # :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: 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: 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: 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: hostname
-        #
-        # the hostname to to stream logs to  (this, ipv4 or ipv6 must be set)
+    ##
+    # :attr: format
+    #
+    # Format to log like in apache format
 
-
-        ##
-        # :attr: port
-        #
-        # the port to stream logs to (defaults to 514)
-
-
-        ##
-        # :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
+    ##
+    # :attr: response_condition
+    #
+    # name of a response_condition to filter the log on, if empty it always logs
+  end
 end

data/lib/fastly/user.rb

@@ -25,10 +25,9 @@ class Fastly
     #
     # The role this user has (one of admin, owner, superuser, user, engineer, billing)
 
-
     # Get the Customer object this user belongs to
     def customer
-      @customer ||= fetcher.get(Customer, self.customer_id)
+      @customer ||= fetcher.get(Customer, customer_id)
     end
 
     # Whether or not this User is the owner of the Customer they belong to
@@ -43,20 +42,19 @@ class Fastly
       :superuser  => 10,
       :user       => 20,
       :engineer   => 30,
-      :billing    => 30,
+      :billing    => 30
     }
 
     # Does this User have sufficient permissions to perform the given role
     def can_do?(test_role)
       test_priority = PRIORITIES[test_role.to_sym] || 1000
-      my_priority = PRIORITIES[self.role.to_sym] || 1000
+      my_priority = PRIORITIES[role.to_sym] || 1000
 
       if test_priority == my_priority
-        test_role.to_s == :owner ? owner? : test_role.to_sym == self.role.to_sym
+        test_role.to_s == :owner ? owner? : test_role.to_sym == role.to_sym
       else
         my_priority < test_priority
       end
     end
-
   end
 end

data/lib/fastly/util.rb

@@ -1,4 +1,5 @@
 class Fastly
+  # Collection of frequently used utility methods
   module Util
     def self.class_to_path(klass, append_s = false)
       klass_string = klass.to_s.split('::')[-1]

data/lib/fastly/version.rb

@@ -16,25 +16,21 @@ class Fastly
     #
     # The name of this version.
 
-
     ##
     # :attr: active
     #
     # Whether this version is active or not.
 
-
     ##
     # :attr: locked
     #
     # Whether this version is locked or not.
 
-
     ##
     # :attr: staging
     #
     # Whether this version is in staging or not.
 
-
     ##
     # :attr: testing
     #
@@ -54,17 +50,17 @@ class Fastly
 
     # Is this Version locked
     def locked?
-      return @locked.to_i > 0
+      @locked.to_i > 0
     end
 
     # Set whether this Version is locked
     def locked=(is_locked)
-      @locked = is_locked ? "1" : "0"
+      @locked = is_locked ? '1' : '0'
     end
 
     # Get the Service object this Version belongs to
     def service
-      fetcher.get(Fastly::Service, service_id)
+      fetcher.get(Service, service_id)
     end
 
     # Get the Settings object for this Version
@@ -74,33 +70,34 @@ class Fastly
 
     # Is version active?
     def active?
-      return @active.to_i > 0
+      @active.to_i > 0
     end
 
     # Activate this version
     def activate!
-      hash = fetcher.client.put(Fastly::Version.put_path(self)+"/activate")
-      return !hash.nil?
+      hash = fetcher.client.put("#{Version.put_path(self)}/activate")
+      !hash.nil?
     end
 
     # Deactivate this version
     def deactivate!
-       hash = fetcher.client.put(Fastly::Version.put_path(self)+"/deactivate")
-       return !hash.nil?
+      hash = fetcher.client.put("#{Version.put_path(self)}/deactivate")
+      !hash.nil?
     end
 
     # Clone this Version
     def clone
-      hash = fetcher.client.put(Fastly::Version.put_path(self)+"/clone")
+      hash = fetcher.client.put("#{Version.put_path(self)}/clone")
       return nil if hash.nil?
-      return Fastly::Version.new(hash, fetcher)
+      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))
+      hash = fetcher.client.post(Version.post_path(opts))
       return nil if hash.nil?
-      return Fastly::Version.new(hash, fetcher)
+
+      Version.new(hash, fetcher)
     end
 
     # Get the generated VCL object for this Version (which must have been activated first)
@@ -108,22 +105,23 @@ class Fastly
     # Won't return the content of the VCL unless you pass in
     #    :include_content => true
     # in the opts
-    def generated_vcl(opts={})
-      hash = fetcher.client.get(Fastly::Version.put_path(self)+"/generated_vcl", opts)
+    def generated_vcl(opts = {})
+      hash = fetcher.client.get("#{Version.put_path(self)}/generated_vcl", opts)
       opts = {
         'content'    => hash['vcl'] || hash['content'],
         'name'       => hash['md5'],
         'version'    => hash['version'],
         'service_id' => hash['service']
       }
-      return Fastly::VCL.new(opts, fetcher)
+
+      VCL.new(opts, fetcher)
     end
 
     # Upload a VCL file for this Version
     def upload_vcl(name, content)
-      hash = fetcher.client.post(Fastly::Version.put_path(self)+"/vcl", :name => name, :content => content)
+      hash = fetcher.client.post("#{Version.put_path(self)}/vcl", name: name, content: content)
       return nil if hash.nil?
-      return Fastly::VCL.new(hash, fetcher)
+      VCL.new(hash, fetcher)
     end
 
     # Upload a VCL file for this Version and set as the main VCL
@@ -136,30 +134,27 @@ class Fastly
     # Won't return the content of the VCL unless you pass in
     #    :include_content => true
     # in the opts
-    def vcl(name, opts={})
+    def vcl(name, opts = {})
       fetcher.get_vcl(service_id, number, name, opts)
     end
 
     # Delete a VCL file for this Version
     def delete_vcl(name)
-      hash = fetcher.client.delete(Fastly::Version.put_path(self)+"/vcl/" + name )
-      return nil if hash.nil?
-      return hash
+      hash = fetcher.client.delete("#{Version.put_path(self)}/vcl/#{name}")
+      hash.nil? ? nil : hash
     end
 
     # Validate this Version
     def validate
-      hash = fetcher.client.get(Fastly::Version.put_path(self)+"/validate")
-      return !hash.nil?
+      hash = fetcher.client.get("#{Version.put_path(self)}/validate")
+      !hash.nil?
     end
 
-    private
-
     def self.get_path(service, number)
       "/service/#{service}/version/#{number}"
     end
 
-    def self.post_path(opts)
+    def self.post_path(opts = {})
       "/service/#{opts[:service_id]}/version"
     end
 

data/test/admin_test.rb

@@ -1,12 +1,13 @@
 require 'helper'
 
+# Admin-related tests
 class AdminTest < Fastly::TestCase
   def setup
-    opts = login_opts(:full).merge(:use_curb => false)
+    opts = login_opts(:full)
     begin
       @client = Fastly::Client.new(opts)
       @fastly = Fastly.new(opts)
-    rescue Exception => e
+    rescue => e
       warn e.inspect
       warn e.backtrace.join("\n")
       exit(-1)
@@ -15,9 +16,9 @@ class AdminTest < Fastly::TestCase
 
   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 = @fastly.create_customer(:name => "fastly-ruby-test-customer-#{random_string}")
+    email    = "fastly-ruby-test-#{random_string}-new@example.com"
+    user     = @fastly.create_user(:login => email, :name => 'New User')
     customer.owner_id = user.id
 
     tmp = @fastly.update_customer(customer)
@@ -28,10 +29,9 @@ class AdminTest < Fastly::TestCase
 
   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"
-    customer = @fastly.create_customer(:name => "fastly-ruby-test-customer-#{get_rand}", :owner => { :login => email, :name => "Test NewOwner" })
+    email    = "fastly-ruby-test-#{random_string}-new@example.com"
+    customer = @fastly.create_customer(:name => "fastly-ruby-test-customer-#{random_string}", :owner => { :login => email, :name => 'Test NewOwner' })
     assert customer
     assert_equal customer.owner.login, email
   end
-
 end

data/test/api_key_test.rb

@@ -1,46 +1,27 @@
 require 'helper'
 
-class ApiKeyTest < Fastly::TestCase
-  include CommonTests
+# API Key Tests
+class Fastly
+  describe 'ApiKeyTest' do
+    let(:opts)             { login_opts(:api_key) }
+    let(:client)           { Client.new(opts) }
+    let(:fastly)           { Fastly.new(opts) }
 
-  def setup
-    @opts = login_opts(:api_key)
-    begin
-      @client = Fastly::Client.new(@opts)
-      @fastly = Fastly.new(@opts)
-    rescue Exception => e
-      pp e
-      exit(-1)
-    end
-  end
-
-  def test_raw_client
-    user = customer = nil
-    assert_raise(Fastly::Error) {
-      user     = @client.get('/current_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
-    current_user  = current_customer = nil
-    assert_raise(Fastly::FullAuthRequired) {
-      current_user = @fastly.current_user
-    }
-    assert_equal nil, current_user
+    describe '#current_{user,customer}' do
+      it 'should not have access to current user 'do
+        assert_raises(Error) do
+          client.get('/current_user')
+        end
 
-    customer = @fastly.current_customer
-    assert customer
-    assert_equal @opts[:customer], customer.name
-  end
+        assert_raises(FullAuthRequired) do
+          fastly.current_user
+        end
+      end
 
-  def test_purging
-    #assert @fastly.purge('foo')
-    # TODO Won't work until we get fixtures in Heavenly
-    #assert @fastly.purge_all('foo')
+      it 'should have access to current customer' do
+        assert_instance_of Hash, client.get('/current_customer')
+        assert_instance_of Customer, fastly.current_customer
+      end
+    end
   end
 end