fastly 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0270d26d5f2da61fe372839853d8710120d239bb
-  data.tar.gz: a5354c14c11c76a1a0ec5e4a129f7a90a0cd6fe2
+  metadata.gz: f311beb83bf3886557b6da399d17d49682ec4ffb
+  data.tar.gz: f47f3014d3b66738f9938e3b84e5ab4d46b9a8d5
 SHA512:
-  metadata.gz: 85ec2dddf754bdc0f3f8f574877641195bd6c19ede0782a8008ca785a7530b4a4bf56ca2d10aa3449b21b294f30183dbfcbbd3fbc7c858bfd4bfc2cf27356d65
-  data.tar.gz: d2d3c5ede4170d3592266be5865f6165e75c6ba71204999859fa53107a9f21ac8b820622143db28320f052f411d1e5e17c0c1426ca9f214ce4a5428c9ed1c39f
+  metadata.gz: be5c1f769e551f2bbf7a16bab3508a14191c42cee4f9e7a95075c4be14f9e76aee9d1294e14b4d0bfa13f4bad7de9cb2f130bb6670a6e37ebee7217649dc0f4f
+  data.tar.gz: 9b8c4b14104b4d3148e2c9679a92db0a8e5f59fd2e0e4fbf21ddebb908f37ddd2fe8e4746974333074a665046cb8cda70eca279b5789cee1fb37d89b4959d008

data/HISTORY.md

@@ -1,9 +1,13 @@
 # HEAD
 
-# 2014-09-29 v1.1.4
-* Require API for purge by key
+## 2014-12-15 v1.1.5
+* major refactor and reorganization of code (merged branch https://github.com/fastly/fastly-ruby/pull/31)
+* bump curb dep to 0.8.6 for ruby 2.1 support (see https://github.com/fastly/fastly-ruby/issues/43)
 
-#### 2014-07-25 v1.1.3
+2014-09-29 v1.1.4
+* Require API Key for purge by key requests
+
+2014-07-25 v1.1.3
 * Add test:unit rake task
 * Add Rubocop and some rubocop cleanup
 * Clarify gem name in documentation

data/README.md

@@ -75,9 +75,7 @@ new_version.activate!
 The test suite requires the following `ENV` variables to be set:
 
 * `FASTLY_TEST_USER` - Your user email
-* `FASTLY_TEST_NAME` - Your name on your account (ie "John Smith")
 * `FASTLY_TEST_PASSWORD` - Your account password
-* `FASTLY_TEST_CUSTOMER` - Your customer or company name (ie. "Fastly" or "Acme, Inc.")
 * `FASTLY_TEST_API_KEY` - Your API key (found at https://app.fastly.com/#account)
 
 While the test suite is safe to be run on all accounts and isn't harmful to your

data/bin/fastly_upload_vcl

@@ -8,25 +8,25 @@
 # License::   Distributes under the same terms as Ruby
 #
 # = USAGE
-# 
+#
 #     fastly_upload_vcl <options> <service id or name> <path to vcl file>
-# 
+#
 # = CONFIGURATION
-# 
+#
 # You can either have a config file in either ~/.fastly or /etc/fastly with
-# 
+#
 #     api_key = <key>
-#     
+#
 # or a config file with
-# 
+#
 #     user     = <login>
 #     password = <password>
-# 
+#
 # Alternatively you can pass in any of those options on the command line
-# 
+#
 #     fastly_upload_vcl --api_key  <key> <service id or name> <path to vcl file>
 #     fastly_upload_vcl --user <login> --password <password> <service id or name> <path to vcl file>
-# 
+#
 
 require 'rubygems'
 require 'fastly'
@@ -34,26 +34,26 @@ require 'fastly'
 # :nodoc:
 def die(message)
   warn message
-  exit -1
+  exit(-1)
 end
 
-params      = Fastly.get_options("#{ENV['HOME']}/.fastly", "/etc/fastly")
+params      = Fastly.get_options("#{ENV['HOME']}/.fastly", '/etc/fastly')
 
-service_id  = ARGV.shift || die("You must pass in a service id")
-vcl_file    = ARGV.shift || die("You must pass in a vcl file")
+service_id  = ARGV.shift || die('You must pass in a service id')
+vcl_file    = ARGV.shift || die('You must pass in a vcl file')
 
-die("Couldn't find any of the config files - #{configs.join(',')}") unless params.keys.size>0
+die("Couldn't find any of the config files - #{configs.join(',')}") unless params.keys.size > 0
 die("Couldn't find vcl file #{vcl_file}") unless File.file?(vcl_file)
 
-fastly  = Fastly.new(params) 
+fastly  = Fastly.new(params)
 
 service = fastly.get_service(service_id) || die("Couldn't find service #{service_id}")
 version = service.version
 die "Can't upload a vcl file to the last (#{version.number}) version of #{service.name} (#{service.id}) because it's locked" if version.locked?
 puts "Uploading #{vcl_file} to version #{version.number}"
 begin
-  name    = File.basename(vcl_file, ".vcl")
-  content = File.new(vcl_file, "r").read
+  name    = File.basename(vcl_file, '.vcl')
+  content = File.new(vcl_file, 'r').read
   vcl     = version.vcl(name)
   if vcl
     vcl.content = content
@@ -65,4 +65,4 @@ begin
 rescue => e
   die("Couldn't upload vcl: #{e}")
 end
-puts "Done! You should now go and activate it at https://app.fastly.com/#configure"
+puts 'Done! You should now go and activate it at https://app.fastly.com/#configure'

data/fastly.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'fastly/gem_version'
 
 Gem::Specification.new do |s|
-  s.name        = "fastly"
+  s.name        = 'fastly'
   s.version     = Fastly::VERSION
-  s.authors     = ["Fastly Inc"]
-  s.email       = ["support@fastly.com"]
-  s.homepage    = "http://github.com/fastly/fastly-ruby"
-  s.summary     = %q{Client library for the Fastly acceleration system}
-  s.description = %q{Client library for the Fastly acceleration system}
+  s.authors     = ['Fastly']
+  s.email       = ['simon@fastly.com', 'zeke@templ.in', 'tyler@fastly.com']
+  s.homepage    = 'http://github.com/fastly/fastly-ruby'
+  s.summary     = %q(Client library for the Fastly acceleration system)
+  s.description = %q(Client library for the Fastly acceleration system)
   s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
-  s.add_dependency 'curb', '>=0.7.15'
-  s.add_dependency 'curb-fu', '>=0.6.1'
+  s.add_dependency 'curb', '~> 0.8.6'
+  s.add_dependency 'curb-fu', '~> 0.6.2'
 end

data/lib/ext/curb_fu/response/base.rb

@@ -0,0 +1,20 @@
+require 'curb-fu'
+
+module CurbFu
+  module Response
+    # :nodoc: all
+    class Base
+      def get_fields(key)
+        if (match = @headers.find { |k, _| k.downcase == key.downcase })
+          [match.last].flatten
+        else
+          []
+        end
+      end
+
+      def [](key)
+        get_fields(key).last
+      end
+    end
+  end
+end

data/lib/fastly.rb

@@ -3,36 +3,38 @@
 # License::   Distributes under the same terms as Ruby
 
 # A client library for interacting with the Fastly web acceleration service
+require 'fastly/gem_version'
+require 'fastly/util'
+require 'ext/curb_fu/response/base'
+require 'fastly/fetcher'
+require 'fastly/client'
+
+require 'fastly/base'
+require 'fastly/belongs_to_service_and_version'
+require 'fastly/backend'
+require 'fastly/cache_setting'
+require 'fastly/condition'
+require 'fastly/customer'
+require 'fastly/director'
+require 'fastly/domain'
+require 'fastly/header'
+require 'fastly/healthcheck'
+require 'fastly/gzip'
+require 'fastly/invoice'
+require 'fastly/match'
+require 'fastly/origin'
+require 'fastly/request_setting'
+require 'fastly/response_object'
+require 'fastly/service'
+require 'fastly/settings'
+require 'fastly/syslog'
+require 'fastly/s3_logging'
+require 'fastly/user'
+require 'fastly/vcl'
+require 'fastly/version'
+
+# Top-level Fastly class
 class Fastly
-  require 'fastly/gem_version'
-  require 'fastly/util'
-  require 'fastly/fetcher'
-  require 'fastly/client'
-
-  require 'fastly/base'
-  require 'fastly/belongs_to_service_and_version'
-  require 'fastly/backend'
-  require 'fastly/cache_setting'
-  require 'fastly/condition'
-  require 'fastly/customer'
-  require 'fastly/director'
-  require 'fastly/domain'
-  require 'fastly/header'
-  require 'fastly/healthcheck'
-  require 'fastly/gzip'
-  require 'fastly/invoice'
-  require 'fastly/match'
-  require 'fastly/origin'
-  require 'fastly/request_setting'
-  require 'fastly/response_object'
-  require 'fastly/service'
-  require 'fastly/settings'
-  require 'fastly/syslog'
-  require 'fastly/s3_logging'
-  require 'fastly/user'
-  require 'fastly/vcl'
-  require 'fastly/version'
-
   include Fastly::Fetcher
 
   # Create a new Fastly client. Options are
@@ -45,7 +47,7 @@ class Fastly
   #
   # Some methods require full username and password rather than just auth token.
   def initialize(opts)
-    self.client(opts)
+    client(opts)
     self
   end
 
@@ -62,26 +64,17 @@ class Fastly
 
   # Return a Customer object representing the customer of the current logged in user.
   def current_customer
-    raise Fastly::AuthRequired unless self.authed?
+    fail AuthRequired unless authed?
     @current_customer ||= get(Customer)
   end
 
   # Return a User object representing the current logged in user.
   # NOTE: requires you to be fully authed - will not work with only an API key
   def current_user
-    raise Fastly::FullAuthRequired unless self.fully_authed?
+    fail FullAuthRequired unless fully_authed?
     @current_user ||= get(User)
   end
 
-  # Set the current customer to act as.
-  # NOTE: this will only work if you're an admin
-  def set_customer(id)
-      raise Fastly::FullAuthRequired "You must be fully authed to set the customer" unless self.fully_authed?;
-      raise Fastly::AdminRequired "You must be an admin to set the customer" unless self.current_user.can_do?(:admin);
-      @current_customer = nil
-      client.set_customer(id);
-  end
-
   # Return a hash representing all commands available.
   #
   # Useful for information.
@@ -91,8 +84,7 @@ class Fastly
 
   # Purge the specified path from your cache.
   def purge(path)
-    res = client.post("/purge/#{path}")
-    #res = client.post("/purge/", :path => path)
+    client.post("/purge/#{path}")
   end
 
   # Fetches historical stats for each of your fastly services and groups the results by service id.
@@ -112,13 +104,13 @@ class Fastly
   #
   # See http://docs.fastly.com/docs/stats for details.
   def stats(opts)
-    raise Fastly::Error.new("You can't specify a field or a service for an aggregate request") if opts[:aggregate] && (opts[:field] || opts[:service])
+    if opts[:aggregate] && (opts[:field] || opts[:service])
+      fail Error, "You can't specify a field or a service for an aggregate request"
+    end
 
-    url  = "/stats"
+    url  = '/stats'
 
-    if opts.delete(:aggregate)
-      url += "/aggregate"
-    end
+    url += '/aggregate' if opts.delete(:aggregate)
 
     if service = opts.delete(:service)
       url += "/service/#{service}"
@@ -128,12 +120,12 @@ class Fastly
       url += "/field/#{field}"
     end
 
-    client.get_stats(url, opts);
+    client.get_stats(url, opts)
   end
 
   # Returns usage information aggregated across all Fastly services and grouped by region.
   #
-  # If the :by_service flag is passed then teturns usage information aggregated by service and grouped by service & region.
+  # If the :by_service flag is passed then returns usage information aggregated by service and grouped by service & region.
   #
   # Other options available are:
   #
@@ -144,43 +136,43 @@ class Fastly
   #
   # See http://docs.fastly.com/docs/stats for details.
   def usage(opts)
-    url  = "/stats/usage";
-    url += "_by_service" if opts.delete(:by_service)
+    url  = '/stats/usage'
+    url += '_by_service' if opts.delete(:by_service)
     client.get_stats(url, opts)
   end
 
   # Fetches the list of codes for regions that are covered by the Fastly CDN service.
   def regions
-    client.get_stats("/stats/regions")
+    client.get_stats('/stats/regions')
   end
 
   [User, Customer, Backend, CacheSetting, Condition, Director, Domain, Header, Healthcheck, Gzip, Match, Origin, RequestSetting, ResponseObject, Service, S3Logging, Syslog, VCL, Version].each do |klass|
     type = Util.class_to_path(klass)
+
     # 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
+      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|
+    send :define_method, "get_#{type}".to_sym do |*args|
       get(klass, *args)
     end
 
-    self.send :define_method, "create_#{type}".to_sym do |obj|
+    send :define_method, "create_#{type}".to_sym do |obj|
       create(klass, obj)
     end
 
-    self.send :define_method, "update_#{type}".to_sym do |obj|
+    send :define_method, "update_#{type}".to_sym do |obj|
       update(klass, obj)
     end
 
-    self.send :define_method, "delete_#{type}".to_sym do |obj|
+    send :define_method, "delete_#{type}".to_sym do |obj|
       delete(klass, obj)
     end
   end
 
-
   # :method: create_version(opts)
   # opts must contain a service_id param
 
@@ -433,7 +425,6 @@ class Fastly
   # You can also call
   #    version.save!
 
-
   ##
   # :method: delete_user(user)
   # You can also call
@@ -449,25 +440,21 @@ class Fastly
   # You can also call
   #    service.delete!
 
-
   ##
   # :method: delete_version(version)
   # You can also call
   #    version.delete!
 
-
   ##
   # :method:delete_backend(backend)
   # You can also call
   #    backend.delete!
 
-
   ##
   # :method: delete_director(backend)
   # You can also call
   #    backend.delete!
 
-
   ##
   # :method: delete_domain(domain
   # You can also call
@@ -483,7 +470,6 @@ class Fastly
   # You can also call
   #    match.delete!(match)
 
-
   ##
   # :method: delete_origin(origin)
   # You can also call
@@ -499,7 +485,6 @@ class Fastly
   # You can also call
   #    syslog.delete!
 
-
   ##
   # :method: delete_vcl(vcl)
   # You can also call
@@ -616,8 +601,6 @@ class Fastly
   #
   # Get a list of all versions
 
-
-
   ##
   # Attempts to load various config options in the form
   #
@@ -631,18 +614,19 @@ class Fastly
     options = {}
     return options unless File.exist?(file)
 
-    File.open(file, "r") do |infile|
-      while (line = infile.gets) do
+    File.open(file, 'r') do |infile|
+      while line = infile.gets
         line.chomp!
-        next if     line =~ /^#/;
-        next if     line =~ /^\s*$/;
-        next unless line =~ /=/;
+        next if line =~ /^#/
+        next if line =~ /^\s*$/
+        next unless line =~ /=/
         line.strip!
         key, val = line.split(/\s*=\s*/, 2)
-        options[key.to_sym] = val;
+        options[key.to_sym] = val
       end
     end
-    options;
+
+    options
   end
 
   ##
@@ -656,18 +640,20 @@ class Fastly
   #
   def self.get_options(*files)
     options = {}
+
     files.each do |file|
       next unless File.exist?(file)
       options = load_config(file)
       break
     end
 
-    while (ARGV.size>0 && ARGV[0] =~ /^-+(\w+)\=(\w+)$/) do
-      options[$1.to_sym] = $2;
-      ARGV.shift;
+    while ARGV.size > 0 && ARGV[0] =~ /^-+(\w+)\=(\w+)$/
+      options[$1.to_sym] = $2
+      ARGV.shift
     end
-    raise"Couldn't find options from command line arguments or #{files.join(', ')}" unless options.size>0
-    options;
+
+    fail "Couldn't find options from command line arguments or #{files.join(', ')}" unless options.size > 0
+
+    options
   end
 end
-