fastly 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d69da680f547ebe68df65f4db6905661e72c7ee4
-  data.tar.gz: d6d8a88750d2e60542ea233f7ee49f1a4e489a68
+  metadata.gz: 5c4e9505c38a1b0faecb9f4736028f0f65e97aeb
+  data.tar.gz: 0551e76c05ef7cf3ef0a6273ad9b3c5386741c44
 SHA512:
-  metadata.gz: 540d77b92fd5f5b21b973798e7c4916c710520635a41a2857062b29221eafb53a8379a3cdd9de40deadf4c448eaa070e30c4fc6c7ecd68c34b9fb7292aef6ebc
-  data.tar.gz: ee06bc2486afa8cf08e29451268aa8b5a395a6ee213c4f65569514960531bea0e2fb75e22a65d51ff4f14b350245ba93f4e1df5e5353622abbf9aeb5e9205a50
+  metadata.gz: a097ce55c406517e7d35e70beb08381bf7f49f5e0aac21f42be35d1fe3c2a2b9c78ce17342675590484d9e71501e2d84e73098f6310795d3fc146c748de8f7b8
+  data.tar.gz: fef8fa3bb0a808fc7644107592c9195e77d85708cacad79c42a11cfbcf17f878597177045ec7b072a8f791974c401f91fba52bad31a0b07c0797840301417ff9

data/CHANGELOG.md

@@ -1,8 +1,7 @@
 # Change Log
 
-## [Unreleased](https://github.com/fastly/fastly-ruby/tree/HEAD)
-
-[Full Changelog](https://github.com/fastly/fastly-ruby/compare/v1.6.0...HEAD)
+## [v1.6.1](https://github.com/fastly/fastly-ruby/tree/v1.6.1) (2016-09-06)
+[Full Changelog](https://github.com/fastly/fastly-ruby/compare/v1.6.0...v1.6.1)
 
 **Merged pull requests:**
 

data/lib/fastly.rb

@@ -9,6 +9,8 @@ require 'fastly/fetcher'
 require 'fastly/client'
 require 'fastly/base'
 require 'fastly/belongs_to_service_and_version'
+require 'fastly/acl'
+require 'fastly/acl_entry'
 require 'fastly/backend'
 require 'fastly/cache_setting'
 require 'fastly/condition'
@@ -142,7 +144,7 @@ class Fastly
     client.get_stats('/stats/regions')
   end
 
-  [User, Customer, Backend, CacheSetting, Condition, Dictionary, DictionaryItem, Director, Domain, Header, Healthcheck, Gzip, Match, RequestSetting, ResponseObject, Service, S3Logging, Syslog, VCL, Version].each do |klass|
+  [ACL, ACLEntry, User, Customer, Backend, CacheSetting, Condition, Dictionary, DictionaryItem, Director, Domain, Header, Healthcheck, Gzip, Match, RequestSetting, ResponseObject, Service, S3Logging, Syslog, VCL, Version].each do |klass|
     type = Util.class_to_path(klass)
 
     if klass.respond_to?(:pluralize)
@@ -151,6 +153,12 @@ class Fastly
       plural = "#{type}s"
     end
 
+    if klass.respond_to?(:singularize)
+      singular = klass.singularize
+    else
+      singular = type
+    end
+
     # unless the class doesn't have a list path or it already exists
     unless klass.list_path.nil? || klass.respond_to?("list_#{plural}".to_sym)
       send :define_method, "list_#{plural}".to_sym do |*args|
@@ -158,19 +166,19 @@ class Fastly
       end
     end
 
-    send :define_method, "get_#{type}".to_sym do |*args|
+    send :define_method, "get_#{singular}".to_sym do |*args|
       get(klass, *args)
     end
 
-    send :define_method, "create_#{type}".to_sym do |obj|
+    send :define_method, "create_#{singular}".to_sym do |obj|
       create(klass, obj)
     end
 
-    send :define_method, "update_#{type}".to_sym do |obj|
+    send :define_method, "update_#{singular}".to_sym do |obj|
       update(klass, obj)
     end
 
-    send :define_method, "delete_#{type}".to_sym do |obj|
+    send :define_method, "delete_#{singular}".to_sym do |obj|
       delete(klass, obj)
     end
   end

data/lib/fastly/acl.rb

@@ -0,0 +1,62 @@
+class Fastly
+  # Acces Control List configuration
+  class ACL < BelongsToServiceAndVersion
+    attr_accessor :id, :service_id, :name
+
+    ##
+    # :attr: service_id
+    #
+    # The id of the service this belongs to.
+
+    ##
+    # :attr: version
+    #
+    # The number of the version this belongs to.
+
+    ##
+    # :attr: name
+    #
+    # The name for the ACL.
+
+    ##
+    # List ACL entries that belong to the ACL
+    def list_entries
+      fetcher.list_acl_entries(:service_id => service_id, :acl_id => id)
+    end
+
+    ##
+    # Create an ACL entry and add it to the ACL
+    #
+    def create_entry(opts = {})
+      fetcher.create_acl_entry(
+        service_id: service_id,
+        acl_id: id,
+        ip: opts[:ip],
+        negated: opts[:negated],
+        subnet: opts[:subnet],
+        comment: opts[:comment]
+      )
+    end
+
+    ##
+    # Retrieve an ACL entry
+    #
+    def get_entry(entry_id)
+      fetcher.get_acl_entry(service_id, id, entry_id)
+    end
+
+    ##
+    # Update an ACL entry
+    #
+    def update_entry(entry)
+      fetcher.update_acl_entry(entry)
+    end
+
+    ##
+    # Delete an ACL entry
+    #
+    def delete_entry(entry)
+      fetcher.delete_acl_entry(entry)
+    end
+  end
+end

data/lib/fastly/acl_entry.rb

@@ -0,0 +1,61 @@
+require 'cgi'
+
+class Fastly
+  # Acces Control List Entry configuration
+  class ACLEntry < Base
+    attr_accessor :id, :service_id, :ip, :subnet, :acl_id, :negated, :comment
+
+    ##
+    # :attr: ip
+    #
+    # The IP address.
+
+    ##
+    # :attr: subnet
+    #
+    # Optional subnet for the IP address.
+
+    ##
+    # :attr: acl_id
+    #
+    # The ACL this entry belongs to.
+
+    ##
+    # :attr: negated
+    #
+    # A boolean that will negate the match if true.
+
+    ##
+    # :attr: comment
+    #
+    # A descriptive note.
+
+    def self.get_path(service_id, acl_id, id)
+      "/service/#{service_id}/acl/#{acl_id}/entry/#{CGI.escape(id)}"
+    end
+
+    def self.post_path(opts)
+      "/service/#{opts[:service_id]}/acl/#{opts[:acl_id]}/entry"
+    end
+
+    def self.put_path(object)
+      get_path(object.service_id, object.acl_id, object.id)
+    end
+
+    def self.delete_path(object)
+      put_path(object)
+    end
+
+    def self.list_path(opts = {})
+      "/service/#{opts[:service_id]}/acl/#{opts[:acl_id]}/entries"
+    end
+
+    def self.singularize
+      'acl_entry'
+    end
+
+    def self.pluralize
+      'acl_entries'
+    end
+  end
+end

data/lib/fastly/client.rb

@@ -102,6 +102,11 @@ class Fastly
       extras = params.delete(:headers) || {}
       uri    = URI.parse(url)
       http   = Net::HTTP.new(uri.host, uri.port)
+
+      if uri.is_a? URI::HTTPS
+        http.use_ssl = true
+      end
+
       resp   = http.request Net::HTTP::Purge.new(uri.request_uri, headers(extras))
 
       fail Error, resp.body unless resp.kind_of?(Net::HTTPSuccess)

data/lib/fastly/gem_version.rb

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

data/test/fastly/acl_entry_test.rb

@@ -0,0 +1,110 @@
+require'test_helper'
+
+describe Fastly::ACLEntry do
+  let(:fastly) { Fastly.new(api_key: 'secret') }
+  let(:service) { fastly.create_service(name: 'acl_service') }
+  let(:acl) { fastly.create_acl(service_id: service.id, version: 1, name: 'acl_group') }
+  let(:acl_entry) { fastly.create_acl_entry(service_id: 'serviceid', acl_id: 'aclid', ip: '1.2.3.5') }
+  let(:response) { nil }
+
+  before do
+    # Must be first
+    stub_request(:any, /api.fastly.com/)
+      .to_return(:status => 200, :body => response)
+
+    # shared Service
+    create_service_response_body = JSON.dump(
+      'id' => 'aclserviceid',
+      'name' => 'acl_service'
+    )
+    stub_request(:post, 'https://api.fastly.com/service')
+      .to_return(:status => 200, :body => create_service_response_body)
+
+    # shared ACL
+    create_acl_response_body = JSON.dump(
+      'id' => 'aclid',
+      'name' => 'acl_group'
+    )
+    stub_request(:post, 'https://api.fastly.com/service/aclserviceid/version/1/acl')
+      .to_return(:status => 200, :body => create_acl_response_body)
+
+    # shared ACLEntry
+    create_acl_entry_response_body = JSON.dump(
+      'id' => 'aclentryid',
+      'acl_id' => 'aclid',
+      'ip' => '1.2.3.5',
+      'service_id' => 'serviceid'
+    )
+
+    stub_request(:post, 'https://api.fastly.com/service/serviceid/acl/aclid/entry')
+      .to_return(:status => 200, :body => create_acl_entry_response_body)
+  end
+
+  describe '#create_entry' do
+    let(:response) do
+      JSON.dump(
+        'id' => 'aclentryid',
+        'ip' => '1.2.3.5'
+      )
+    end
+
+    it 'creates an ACL entry' do
+      assert_equal acl_entry.ip, '1.2.3.5'
+    end
+  end
+
+  describe '#get_entry' do
+    let(:response) do
+      JSON.dump(
+        'id' => 'aclentryid',
+        'ip' => '1.2.3.5'
+      )
+    end
+
+    it 'gets an ACL entry' do
+      assert_equal fastly.get_acl_entry('serviceid', 1, 'aclentryid').ip, acl_entry.ip
+    end
+  end
+
+  describe '#update_entry' do
+    let(:response) do
+      JSON.dump(
+        'id' => 'aclentryid',
+        'ip' => '1.2.3.5',
+        'subnet' => 8
+      )
+    end
+
+    it 'updates an ACL entry' do
+      acl_entry.subnet = 8
+      fastly.update_acl_entry(acl_entry)
+      assert_equal acl_entry.ip, '1.2.3.5'
+      assert_equal acl_entry.subnet, 8
+    end
+  end
+
+  describe '#delete_entry' do
+    let(:response) { '{"status": "ok"}' }
+
+    it 'deletes an ACL entry' do
+      assert_equal fastly.delete_acl_entry(acl_entry), true
+    end
+  end
+
+  describe '#list_entries' do
+    let(:response) do
+      JSON.dump(
+        [
+          {
+            'id' => 'aclentryid',
+            'ip' => '1.2.3.5'
+          }
+        ]
+      )
+    end
+
+    it 'lists ACL entries' do
+      assert_equal fastly.list_acl_entries.first.id, 'aclentryid'
+    end
+  end
+end

data/test/fastly/acl_test.rb

@@ -0,0 +1,163 @@
+require'test_helper'
+
+describe Fastly::ACL do
+  let(:fastly) { Fastly.new(api_key: 'secret') }
+  let(:service) { fastly.create_service(name: 'acl_service') }
+  let(:acl) { fastly.create_acl(service_id: service.id, version: 1, name: 'acl_group') }
+  let(:acl_entry) { acl.create_entry(ip: '1.2.3.5') }
+  let(:response) { nil }
+
+  before do
+    # Must be first
+    stub_request(:any, /api.fastly.com/)
+      .to_return(:status => 200, :body => response)
+
+    # shared Service
+    create_service_response_body = JSON.dump(
+      'id' => 'aclserviceid',
+      'name' => 'acl_service'
+    )
+    stub_request(:post, 'https://api.fastly.com/service')
+      .to_return(:status => 200, :body => create_service_response_body)
+
+    # shared ACL
+    create_acl_response_body = JSON.dump(
+      'id' => 'aclid',
+      'name' => 'acl_group'
+    )
+    stub_request(:post, 'https://api.fastly.com/service/aclserviceid/version/1/acl')
+      .to_return(:status => 200, :body => create_acl_response_body)
+
+    # shared ACLEntry
+    create_acl_entry_response_body = JSON.dump(
+      'id' => 'aclentryid',
+      'ip' => '1.2.3.5'
+    )
+    stub_request(:post, 'https://api.fastly.com/service//acl/aclid/entry')
+      .to_return(:status => 200, :body => create_acl_entry_response_body)
+  end
+
+  it 'creates a new ACL' do
+    assert_equal acl.name, 'acl_group'
+  end
+
+  describe '#get_acl' do
+    let(:response) do
+      JSON.dump(
+        'id' => 'aclid',
+        'name' => 'acl_group'
+      )
+    end
+
+    it 'gets an ACL' do
+      assert_equal fastly.get_acl(service.id, 1, acl.id).id, 'aclid'
+    end
+  end
+
+  describe '#update_acl' do
+    let(:response) do
+      JSON.dump(
+        'id' => 'aclid',
+        'name' => 'acl_group_2'
+      )
+    end
+
+    it 'updates an ACL' do
+      acl.name = 'acl_group_2'
+      assert_equal fastly.update_acl(acl).name, 'acl_group_2'
+    end
+  end
+
+  describe '#delete_acl' do
+    let(:response) { '{"status": "ok"}' }
+
+    it 'deletes an ACL' do
+      assert_equal fastly.delete_acl(acl), true
+    end
+  end
+
+  describe '#list_acls' do
+    let(:response) do
+      JSON.dump(
+        [
+          {
+            'id' => 'aclid',
+            'name' => 'acl_group'
+          }
+        ]
+      )
+    end
+
+    it 'lists ACLs' do
+      assert_equal fastly.list_acls.first.id, 'aclid'
+    end
+  end
+
+  describe '#create_entry' do
+    let(:response) do
+      JSON.dump(
+        'id' => 'aclentryid',
+        'ip' => '1.2.3.5'
+      )
+    end
+
+    it 'creates an ACL entry' do
+      assert_equal acl_entry.ip, '1.2.3.5'
+    end
+  end
+
+  describe '#get_entry' do
+    let(:response) do
+      JSON.dump(
+        'id' => 'aclentryid',
+        'ip' => '1.2.3.5'
+      )
+    end
+
+    it 'gets an ACL entry' do
+      assert_equal acl.get_entry('aclentryid').ip, acl_entry.ip
+    end
+  end
+
+  describe '#update_entry' do
+    let(:response) do
+      JSON.dump(
+        'id' => 'aclentryid',
+        'ip' => '1.2.3.5',
+        'subnet' => 8
+      )
+    end
+
+    it 'updates an ACL entry' do
+      acl_entry.subnet = 8
+      acl.update_entry(acl_entry)
+      assert_equal acl_entry.ip, '1.2.3.5'
+      assert_equal acl_entry.subnet, 8
+    end
+  end
+
+  describe '#delete_entry' do
+    let(:response) { '{"status": "ok"}' }
+
+    it 'deletes an ACL entry' do
+      assert_equal acl.delete_entry(acl_entry), true
+    end
+  end
+
+  describe '#list_entries' do
+    let(:response) do
+      JSON.dump(
+        [
+          {
+            'id' => 'aclentryid',
+            'ip' => '1.2.3.5'
+          }
+        ]
+      )
+    end
+
+    it 'lists ACL entries' do
+      assert_equal acl.list_entries.first.id, 'aclentryid'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastly
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Fastly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies: []
 description: Client library for the Fastly acceleration system
 email:
@@ -37,6 +37,8 @@ files:
 - gemfiles/HEAD.gemfile
 - gemfiles/ruby_1.9.gemfile
 - lib/fastly.rb
+- lib/fastly/acl.rb
+- lib/fastly/acl_entry.rb
 - lib/fastly/backend.rb
 - lib/fastly/base.rb
 - lib/fastly/belongs_to_service_and_version.rb
@@ -68,6 +70,8 @@ files:
 - test/admin_test.rb
 - test/api_key_test.rb
 - test/common.rb
+- test/fastly/acl_entry_test.rb
+- test/fastly/acl_test.rb
 - test/fastly/client_test.rb
 - test/fastly/dictionary_test.rb
 - test/fastly/util_test.rb
@@ -104,6 +108,8 @@ test_files:
 - test/admin_test.rb
 - test/api_key_test.rb
 - test/common.rb
+- test/fastly/acl_entry_test.rb
+- test/fastly/acl_test.rb
 - test/fastly/client_test.rb
 - test/fastly/dictionary_test.rb
 - test/fastly/util_test.rb