fastly 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 157f02122af9a68df50590bc12a13d0d599fc6c1
-  data.tar.gz: 2707b8264a8486d57b73680c35d886b8f257085e
+  metadata.gz: bdfb1410a5983996fdaab6611019b3c122f90c2a
+  data.tar.gz: 89083b0cda077826a976d285efa5af46b186183a
 SHA512:
-  metadata.gz: c6f80a5791b94be1543fbf4ca796da8b072ad1a25a124bb1c2cdd3463061df8f6b4a9a576392be5157f5242b04e02a2429bd93ee48365e0f8cd954cae874ca56
-  data.tar.gz: 7bc87a9ec25869021326398335cc1e3265027f2bc1abe49ca8ff2b9208710c529b94e67c5cb095e17819a217625148a7fd4b16378d9635d1d99707f2442988f8
+  metadata.gz: 34d4a4dc95364918761063fe691a517f32940f2eb0f8e42f5bb9511f46399aedab2366386a4cb64e69900a5bafed166150684e536d23022ad8dae20dabed51eb
+  data.tar.gz: 80401c0919ac37b87cb7c6cca8b2764bba6649a9d6fb05e91e565d8bb83d275996418c1a63c3fb9dcae0b2e90a1eab850a41a4a7793c3c7402e0051b1e17377b

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v2.1.0](https://github.com/fastly/fastly-ruby/tree/v2.0.0) (2018-06-18)
+[Full Changelog](https://github.com/fastly/fastly-ruby/compare/v2.0.0...v2.1.0)
+
+** Merged pull requests:**
+
+- Fix tests in continuous integration [\#134](https://github.com/fastly/fastly-ruby/pull/134) ([jamesarosen](https://github.com/jamesarosen))
+- Add more user relationships to Fastly::Customer [\#133](https://github.com/fastly/fastly-ruby/pull/133) ([jamesarosen](https://github.com/jamesarosen))
+
 ## [v2.0.0](https://github.com/fastly/fastly-ruby/tree/v2.0.0) (2018-05-17)
 [Full Changelog](https://github.com/fastly/fastly-ruby/compare/v1.15.0...v2.0.0)
 

data/Gemfile

@@ -8,5 +8,6 @@ group :development, :test do
   gem 'rdoc', '~> 4.1.1'
   gem 'minitest', '~> 5.3.4'
   gem 'pry'
+  gem 'rubocop', '~> 0.57.2', require: false
   gem 'webmock'
 end

data/Rakefile

@@ -32,15 +32,17 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('README.md', 'lib/**/*.rb')
 end
 
+require 'rake/testtask'
+
 namespace :test do
   desc 'Run all unit tests'
-  task :unit do
-    sh 'bundle exec ruby -Itest -Ilib test/fastly/*_test.rb'
+  Rake::TestTask.new(:unit) do |t|
+    t.libs << 'test'
+    t.test_files = FileList['test/fastly/*_test.rb']
+    t.verbose = true
   end
 end
 
-require 'rake/testtask'
-
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList['test/*test.rb']

data/lib/fastly/customer.rb

@@ -1,13 +1,24 @@
 class Fastly
   # A Customer account
   class Customer < Base
-    attr_accessor :id, :name, :owner_id
+    attr_accessor :billing_contact_id, :id, :legal_contact_id, :name,
+                  :owner_id, :security_contact_id, :technical_contact_id
+
+    ##
+    # :attr: billing_contact_id
+    #
+    # The id of the user to be contacted for billing issues.
 
     ##
     # :attr: id
     #
     # The id of this customer
 
+    ##
+    # :attr: legal_contact_id
+    #
+    # The id of the user to be contacted for legal issues.
+
     ##
     # :attr: name
     #
@@ -18,9 +29,50 @@ class Fastly
     #
     # The id of the user that owns this customer
 
-    # Return a user object representing the owner of this Customer
+    ##
+    # :attr: security_contact_id
+    #
+    # The id of the user to be contacted for security issues.
+
+    ##
+    # :attr: technical_contact_id
+    #
+    # The id of the user to be contacted for technical issues.
+
+    ##
+    # The billing contact as a Fastly::User
+    def billing_contact
+      get_user billing_contact_id
+    end
+
+    ##
+    # The legal contact as a Fastly::User
+    def legal_contact
+      get_user legal_contact_id
+    end
+
+    ##
+    # The account owner as a Fastly::User
     def owner
-      fetcher.get(User, owner_id)
+      get_user owner_id
+    end
+
+    ##
+    # The security contact as a Fastly::User
+    def security_contact
+      get_user security_contact_id
+    end
+
+    ##
+    # The technical contact as a Fastly::User
+    def technical_contact
+      get_user technical_contact_id
+    end
+
+    private
+
+    def get_user(id)
+      id ? fetcher.get(User, id) : nil
     end
   end
 end

data/lib/fastly/gem_version.rb

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

data/test/fastly/customer_test.rb

@@ -0,0 +1,48 @@
+require_relative '../test_helper'
+
+describe Fastly::Customer do
+
+  let(:fastly)      { Fastly.new(api_key: 'secret') }
+  let(:customer_id) { SecureRandom.hex(6) }
+  let(:owner_id)    { SecureRandom.hex(6) }
+
+  let(:customer) do
+    stub_request(:post, "#{Fastly::Client::DEFAULT_URL}/login").to_return(body: '{}', status: 200, headers: { 'Set-Cookie' => 'tasty!' })
+
+    customer_body = JSON.dump(
+      'id' => customer_id,
+      'owner_id' => owner_id,
+      'legal_contact_id' => owner_id,
+    )
+    stub_request(:get, "#{Fastly::Client::DEFAULT_URL}/customer/#{customer_id}").to_return(body: customer_body, status: 200)
+
+    owner_body = JSON.dump(
+      'id' => owner_id,
+      'name' => 'Sugar Watkins',
+    )
+    stub_request(:get, "#{Fastly::Client::DEFAULT_URL}/user/#{owner_id}").to_return(body: owner_body, status: 200)
+
+    fastly.get_customer(customer_id)
+  end
+
+  describe '#legal_contact' do
+    it 'returns the legal contact as a Fastly::User' do
+      assert customer.legal_contact.is_a?(Fastly::User)
+      assert_equal 'Sugar Watkins', customer.legal_contact.name
+    end
+  end
+
+  describe '#owner' do
+    it 'returns the owner as a Fastly::User' do
+      assert customer.owner.is_a?(Fastly::User)
+      assert_equal 'Sugar Watkins', customer.owner.name
+    end
+  end
+
+  describe '#technical_contact' do
+    it 'returns nil when the customer has no technical contact' do
+      assert_nil customer.technical_contact_id
+      assert_nil customer.technical_contact
+    end
+  end
+end

data/test/fastly/syslog_test.rb

@@ -38,7 +38,7 @@ describe Fastly::Syslog do
         'format' => '%h %l %u %t \'%r\' %>s %b',
       )
 
-      get_item_url = "#{Fastly::Client::DEFAULT_URL}/service/#{service_id}/version/#{version}/syslog/#{syslog.name}"
+      get_item_url = "#{Fastly::Client::DEFAULT_URL}/service/#{service_id}/version/#{version}/logging/syslog/#{syslog.name}"
       get_service_url = "#{Fastly::Client::DEFAULT_URL}/service/#{service_id}/version/#{version}"
 
       stub_request(:get, get_service_url).to_return(status: 200, body: '{}', headers: {})

data/test/test_helper.rb

@@ -1,3 +1,4 @@
 require 'minitest/autorun'
+require 'securerandom'
 require 'webmock/minitest'
 require 'fastly'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastly
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Fastly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies: []
 description: Client library for the Fastly acceleration system
 email:
@@ -77,6 +77,7 @@ files:
 - test/fastly/acl_entry_test.rb
 - test/fastly/acl_test.rb
 - test/fastly/client_test.rb
+- test/fastly/customer_test.rb
 - test/fastly/dictionary_test.rb
 - test/fastly/syslog_test.rb
 - test/fastly/util_test.rb
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Client library for the Fastly acceleration system
@@ -116,6 +117,7 @@ test_files:
 - test/fastly/acl_entry_test.rb
 - test/fastly/acl_test.rb
 - test/fastly/client_test.rb
+- test/fastly/customer_test.rb
 - test/fastly/dictionary_test.rb
 - test/fastly/syslog_test.rb
 - test/fastly/util_test.rb