fastly 1.1.4 → 1.1.5

data/test/missing_api_key_test.rb

@@ -16,7 +16,7 @@ class MissingApiKeyTest < Fastly::TestCase
   end
 
   def test_purging
-    service_name = "fastly-test-service-#{get_rand}"
+    service_name = "fastly-test-service-#{random_string}"
     service      = @fastly.create_service(:name => service_name)
 
     assert_raises Fastly::AuthRequired do

data/test/stats_test.rb

@@ -1,14 +1,15 @@
 require 'helper'
 
-FROM = "2011-01-01 00:00:00"
+FROM = '2011-01-01 00:00:00'
 
+# Testing client components related to stats
 class StatsTest < Fastly::TestCase
-
   def setup
-    opts = login_opts(:api_key).merge(:use_curb => false)
+    opts = login_opts(:api_key)
+
     begin
       @fastly = Fastly.new(opts)
-    rescue Exception => e
+    rescue => e
       warn e.inspect
       warn e.backtrace.join("\n")
       exit(-1)
@@ -17,69 +18,60 @@ class StatsTest < Fastly::TestCase
 
   def test_regions
     regions = @fastly.regions
-    assert(regions.size>0)
+    assert_equal true, (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");
+    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");
+    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)
+    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")
+    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 = @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
+    assert_raises Fastly::Error do
+      @fastly.stats(:from => FROM, :field => 'requests', :aggregate => true)
     end
-    assert stats.nil?
 
     # stats aggregate with service
-    begin
-      stats = @fastly.stats(:from => $FROM, :service => service1, :aggregate => true)
-    rescue Fastly::Error => e
+    assert_raises Fastly::Error do
+      @fastly.stats(:from => FROM, :service => service1, :aggregate => true)
     end
-    assert stats.nil?
 
-    begin
-      stats = @fastly.stats(:from => $FROM, :service => service1, :field => "requests", :aggregate => true)
-    rescue Fastly::Error => e
+    assert_raises Fastly::Error do
+      @fastly.stats(:from => FROM, :service => service1, :field => 'requests', :aggregate => true)
     end
-    assert stats.nil?
   end
-
 end

metadata

@@ -1,46 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: fastly
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
-- Fastly Inc
+- Fastly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.15
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.15
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: curb-fu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
 description: Client library for the Fastly acceleration system
 email:
-- support@fastly.com
+- simon@fastly.com
+- zeke@templ.in
+- tyler@fastly.com
 executables:
 - fastly_create_domain
 - fastly_upload_vcl
@@ -58,12 +60,14 @@ files:
 - bin/fastly_create_domain
 - bin/fastly_upload_vcl
 - fastly.gemspec
+- lib/ext/curb_fu/response/base.rb
 - lib/fastly.rb
 - 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/client/curl.rb
 - lib/fastly/condition.rb
 - lib/fastly/customer.rb
 - lib/fastly/director.rb
@@ -115,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Client library for the Fastly acceleration system