fastly 1.00 → 1.1.0

data/test/full_login_test.rb

@@ -1,12 +1,8 @@
-#!/usr/bin/env ruby 
+require 'helper'
 
-require 'rubygems'
-require 'test/unit'
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-
-class FullLoginTest < Test::Unit::TestCase
+class FullLoginTest < Fastly::TestCase
   include CommonTests
-  
+
   def setup
     @opts = login_opts(:full).merge(:use_curb => false)
     begin
@@ -18,7 +14,7 @@ class FullLoginTest < Test::Unit::TestCase
       exit(-1)
     end
   end
-  
+
   def test_raw_client
     user     = @client.get('/current_user')
     assert user
@@ -29,8 +25,8 @@ class FullLoginTest < Test::Unit::TestCase
     assert customer
     assert_equal @opts[:customer], customer['name']
   end
-  
-  
+
+
   def test_current_user_and_customer
     user     = @fastly.current_user
     assert user
@@ -40,28 +36,28 @@ class FullLoginTest < Test::Unit::TestCase
     customer = @fastly.current_customer
     assert customer
     assert_equal @opts[:customer], customer.name
-    
+
     tmp_customer = user.customer
     assert_equal customer.id, tmp_customer.id
-    
+
     tmp_user = customer.owner
     assert tmp_user
     assert_equal user.id, tmp_user.id
   end
-  
-  
+
+
   def test_fetching_particular_user
     current_user = @fastly.current_user
     assert current_user
-    
+
     id_user = @fastly.get_user(current_user.id)
     assert_equal current_user.id, id_user.id
     assert_equal current_user.name, id_user.name
-    
+
     # FIXME looking up by login doesn't work yet
     #login_user = @fastly.get_user(current_user.login)
     #assert_equal current_user.id, login_user.id
-    #assert_equal current_user.name, login_user.name  
+    #assert_equal current_user.name, login_user.name
 
     current_customer = @fastly.current_customer
     assert current_customer
@@ -77,7 +73,7 @@ class FullLoginTest < Test::Unit::TestCase
     user     = @fastly.create_user(:login => email, :name => "New User")
     assert user
     assert_equal customer.id, user.customer_id
-    assert_equal "New User", user.name 
+    assert_equal "New User", user.name
     assert_equal email, user.login
 
     tmp       = @fastly.get_user(user.id)
@@ -85,13 +81,13 @@ class FullLoginTest < Test::Unit::TestCase
     assert tmp
     assert_equal user.id, tmp.id
     assert_equal user.name, tmp.name
-    
+
     user.name = "Updated Name"
-    tmp      = @fastly.update_user(user) 
+    tmp      = @fastly.update_user(user)
     assert tmp
     assert_equal user.id, tmp.id
     assert_equal "Updated Name", tmp.name
-    
+
     assert @fastly.delete_user(user)
     tmp       = @fastly.get_user(user.id)
     assert_equal nil, tmp

data/test/helper.rb

@@ -1,4 +1,20 @@
-require File.expand_path(File.dirname(__FILE__) + '/common')
+require 'common'
+require 'fastly'
+require 'minitest/autorun'
+
+# Accommodate a more modern version of Minitest compared to the stdlib
+if defined? Minitest::Test
+  class Fastly::TestCase < Minitest::Test
+  end
+else
+  class Fastly::TestCase < MiniTest::Unit::TestCase
+  end
+end
+
+class Fastly::TestCase
+  # Map inconsistency between Test::Unit and Minitest
+  alias :assert_raise :assert_raises
+end
 
 def login_opts(mode=:full)
   opts = { }
@@ -6,7 +22,7 @@ def login_opts(mode=:full)
     key = "FASTLY_TEST_BASE_#{what.to_s.upcase}"
     opts["base_#{what}".to_sym] = ENV[key] if ENV.has_key?(key)
   end
-  
+
   required = :full == mode ? [:user, :name, :password, :customer] : [:api_key, :customer]
   required.each do |what|
       key ="FASTLY_TEST_#{what.to_s.upcase}"
@@ -21,4 +37,4 @@ end
 
 def get_rand
   "#{Process.pid}-#{Time.now.to_i}-#{Kernel.rand(1000)}"
-end
+end

data/test/stats_test.rb

@@ -0,0 +1,85 @@
+require 'helper'
+
+FROM = "2011-01-01 00:00:00"
+
+class StatsTest < Fastly::TestCase
+
+  def setup
+    opts = login_opts(:api_key).merge(:use_curb => false)
+    begin
+      @fastly = Fastly.new(opts)
+    rescue Exception => e
+      warn e.inspect
+      warn e.backtrace.join("\n")
+      exit(-1)
+    end
+  end
+
+  def test_regions
+    regions = @fastly.regions
+    assert(regions.size>0)
+  end
+
+  def test_usage
+    usage = @fastly.usage(:from => FROM)
+    assert(usage["usa"], "Found a USA region in usage");
+    assert(usage["usa"]["requests"], "USA region has a requests field");
+
+    usage = @fastly.usage(:from => FROM, :by_service => 1)
+    assert(usage["usa"], "Found a USA region in usage");
+    assert(usage["usa"]["requests"].nil?, "USA region doesn't have a requests field");
+  end
+
+
+  def test_stats
+    stats = @fastly.stats(:from => $FROM)
+    service1, service2 = stats.keys
+    assert(stats[service1][0]["requests"], "Found requests")
+    assert(stats[service1][0]["hits"], "Found hits")
+    assert(stats[service2][0]["requests"], "Found requests")
+    assert(stats[service2][0]["hits"], "Found hits")
+
+    stats = @fastly.stats(:from => $FROM, :field => "requests")
+    assert(stats[service1][0]["requests"],  "Found requests")
+    assert(stats[service1][0]["hits"].nil?, "Didn't find hits")
+    assert(stats[service2][0]["requests"],  "Found requests")
+    assert(stats[service2][0]["hits"].nil?, "Didn't find hits")
+
+    stats = @fastly.stats(:from => $FROM, :service => service1)
+    assert_equal(stats[0]["service_id"], service1, "Got correct service id")
+    assert(stats[0]["requests"], "Found requests")
+    assert(stats[0]["hits"], "Found hits")
+
+    stats = @fastly.stats(:from => $FROM, :field => "requests", :service => service1)
+    assert_equal(stats[0]["service_id"], service1, "Got correct service id")
+    assert(stats[0]["requests"], "Found requests")
+    assert(stats[0]["hits"].nil?, "Didn't find hits")
+
+    stats = @fastly.stats(:from => $FROM, :aggregate => true)
+    assert(stats[0]["service_id"].nil?, "No service id")
+    assert(stats[0]["requests"], "Found requests")
+    assert(stats[0]["hits"], "Found hits")
+
+    stats = nil
+    # stats aggregate with field
+    begin
+      stats = @fastly.stats(:from => $FROM, :field => "requests", :aggregate => true)
+    rescue Fastly::Error => e
+    end
+    assert stats.nil?
+
+    # stats aggregate with service
+    begin
+      stats = @fastly.stats(:from => $FROM, :service => service1, :aggregate => true)
+    rescue Fastly::Error => e
+    end
+    assert stats.nil?
+
+    begin
+      stats = @fastly.stats(:from => $FROM, :service => service1, :field => "requests", :aggregate => true)
+    rescue Fastly::Error => e
+    end
+    assert stats.nil?
+  end
+
+end

metadata

@@ -1,70 +1,98 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fastly
-version: !ruby/object:Gem::Version 
-  version: "1.00"
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Fastly Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
+date: 2014-06-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id005 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: curb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.7.15
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: curb-fu
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 0.7.15
+- !ruby/object:Gem::Dependency
+  name: curb-fu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
   name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.11"
-  type: :runtime
-  version_requirements: *id004
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: Client library for the Fastly acceleration system
-email: 
+email:
 - support@fastly.com
-executables: 
+executables:
 - fastly_upload_vcl
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
+- ".travis.yml"
 - Changes
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/fastly_upload_vcl
@@ -73,17 +101,26 @@ files:
 - lib/fastly/backend.rb
 - lib/fastly/base.rb
 - lib/fastly/belongs_to_service_and_version.rb
+- lib/fastly/cache_setting.rb
 - lib/fastly/client.rb
+- lib/fastly/condition.rb
 - lib/fastly/customer.rb
 - lib/fastly/director.rb
 - lib/fastly/domain.rb
 - lib/fastly/fetcher.rb
+- lib/fastly/gem_version.rb
+- lib/fastly/gzip.rb
+- lib/fastly/header.rb
 - lib/fastly/healthcheck.rb
 - lib/fastly/invoice.rb
 - lib/fastly/match.rb
 - lib/fastly/origin.rb
+- lib/fastly/request_setting.rb
+- lib/fastly/response_object.rb
+- lib/fastly/s3_logging.rb
 - lib/fastly/service.rb
 - lib/fastly/settings.rb
+- lib/fastly/string.rb
 - lib/fastly/syslog.rb
 - lib/fastly/user.rb
 - lib/fastly/vcl.rb
@@ -93,33 +130,35 @@ files:
 - test/common.rb
 - test/full_login_test.rb
 - test/helper.rb
+- test/stats_test.rb
 homepage: http://github.com/fastly/fastly-ruby
-licenses: []
-
+licenses:
+- MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id005
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id005
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Client library for the Fastly acceleration system
-test_files: 
+test_files:
 - test/admin_test.rb
 - test/api_key_test.rb
 - test/common.rb
 - test/full_login_test.rb
 - test/helper.rb
-has_rdoc: 
+- test/stats_test.rb