fastly 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d1ee5f00e5a54a06df32a4dbc1e41ce8f8cdb0
-  data.tar.gz: 3f71dd70500900ccc6f9441f527942460e65c370
+  metadata.gz: d69da680f547ebe68df65f4db6905661e72c7ee4
+  data.tar.gz: d6d8a88750d2e60542ea233f7ee49f1a4e489a68
 SHA512:
-  metadata.gz: 0ac1c20ca21c3105213e374d01544053cacccbb5d5f2e04bc39705b005c8f21fd1093c1534db32c043bf7ada317d1315e135be0651316260626bd84f16a66f53
-  data.tar.gz: 70ad854b592e01a1d068cc622c44d351269638de477652cfec6b25d955a2a535cc67c192c340953c04a0fe573a990c29d495781a19facce49edf5b7880574e53
+  metadata.gz: 540d77b92fd5f5b21b973798e7c4916c710520635a41a2857062b29221eafb53a8379a3cdd9de40deadf4c448eaa070e30c4fc6c7ecd68c34b9fb7292aef6ebc
+  data.tar.gz: ee06bc2486afa8cf08e29451268aa8b5a395a6ee213c4f65569514960531bea0e2fb75e22a65d51ff4f14b350245ba93f4e1df5e5353622abbf9aeb5e9205a50

data/.gitignore

@@ -6,3 +6,4 @@ run_test.sh
 doc/*
 .*.sw?
 .env
+gemfiles/*.lock

data/.travis.yml

@@ -1,9 +1,15 @@
 language: ruby
 script: 'bundle exec rake test:unit'
 sudo: false
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+matrix:
+  include:
+    - rvm: 1.9
+      gemfile: gemfiles/ruby_1.9.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/HEAD.gemfile
+    - rvm: 2.1.9
+      gemfile: gemfiles/HEAD.gemfile
+    - rvm: 2.2.5
+      gemfile: gemfiles/HEAD.gemfile
+    - rvm: 2.3.1
+      gemfile: gemfiles/HEAD.gemfile

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "ruby-1.9" do
+  gem "rubocop", "~> 0.41.0"
+end
+
+appraise "HEAD" do
+  gem "rubocop", "~> 0.42"
+end

data/CHANGELOG.md

@@ -2,10 +2,37 @@
 
 ## [Unreleased](https://github.com/fastly/fastly-ruby/tree/HEAD)
 
-[Full Changelog](https://github.com/fastly/fastly-ruby/compare/v1.4.2...HEAD)
+[Full Changelog](https://github.com/fastly/fastly-ruby/compare/v1.6.0...HEAD)
 
 **Merged pull requests:**
 
+- fix: use Appraisal to fix dependency conflicts [\#97](https://github.com/fastly/fastly-ruby/pull/97) ([lanej](https://github.com/lanej))
+- Add `format\_version` to S3Logging and Syslog resources [\#96](https://github.com/fastly/fastly-ruby/pull/96) ([schisamo](https://github.com/schisamo))
+
+## [v1.6.0](https://github.com/fastly/fastly-ruby/tree/v1.6.0) (2016-07-14)
+[Full Changelog](https://github.com/fastly/fastly-ruby/compare/v1.5.0...v1.6.0)
+
+**Merged pull requests:**
+
+- Always add api key to requests if provided [\#93](https://github.com/fastly/fastly-ruby/pull/93) ([blithe](https://github.com/blithe))
+- Fix header regex test [\#92](https://github.com/fastly/fastly-ruby/pull/92) ([blithe](https://github.com/blithe))
+- Remove Origin model [\#91](https://github.com/fastly/fastly-ruby/pull/91) ([blithe](https://github.com/blithe))
+
+## [v1.5.0](https://github.com/fastly/fastly-ruby/tree/v1.5.0) (2016-07-08)
+[Full Changelog](https://github.com/fastly/fastly-ruby/compare/v1.4.2...v1.5.0)
+
+**Closed issues:**
+
+- Support Edge Dictionaries [\#66](https://github.com/fastly/fastly-ruby/issues/66)
+- version.locked? method returns incorrect value of true for unlocked version [\#47](https://github.com/fastly/fastly-ruby/issues/47)
+
+**Merged pull requests:**
+
+- build for all recent ruby patch-levels [\#90](https://github.com/fastly/fastly-ruby/pull/90) ([thommahoney](https://github.com/thommahoney))
+- add Fastly::Dictionary\#item [\#89](https://github.com/fastly/fastly-ruby/pull/89) ([lanej](https://github.com/lanej))
+- fix initialize [\#88](https://github.com/fastly/fastly-ruby/pull/88) ([lanej](https://github.com/lanej))
+- Raised ArgumentError if api\_key or user/pass are not passed in.  [\#87](https://github.com/fastly/fastly-ruby/pull/87) ([andriantoniades](https://github.com/andriantoniades))
+- Add support for dictionary items [\#86](https://github.com/fastly/fastly-ruby/pull/86) ([icco](https://github.com/icco))
 - Reintroduced :locked so the version.locked? check works [\#83](https://github.com/fastly/fastly-ruby/pull/83) ([eddieroger](https://github.com/eddieroger))
 
 ## [v1.4.2](https://github.com/fastly/fastly-ruby/tree/v1.4.2) (2016-05-23)

data/Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
+  gem 'appraisal', '~> 2.1'
   gem 'rake', '~> 10.3.2'
   gem 'rdoc', '~> 4.1.1'
   gem 'minitest', '~> 5.3.4'
   gem 'pry'
-  gem 'rubocop'
   gem 'webmock'
 end

data/gemfiles/HEAD.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "~> 0.42"
+
+group :development, :test do
+  gem "appraisal", "~> 2.1"
+  gem "rake", "~> 10.3.2"
+  gem "rdoc", "~> 4.1.1"
+  gem "minitest", "~> 5.3.4"
+  gem "pry"
+  gem "webmock"
+end
+
+gemspec :path => "../"

data/gemfiles/ruby_1.9.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "~> 0.41.0"
+
+group :development, :test do
+  gem "appraisal", "~> 2.1"
+  gem "rake", "~> 10.3.2"
+  gem "rdoc", "~> 4.1.1"
+  gem "minitest", "~> 5.3.4"
+  gem "pry"
+  gem "webmock"
+end
+
+gemspec :path => "../"

data/lib/fastly/gem_version.rb

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

data/lib/fastly/s3_logging.rb

@@ -1,7 +1,7 @@
 class Fastly
   # An s3 endpoint to stream logs to
   class S3Logging < BelongsToServiceAndVersion
-    attr_accessor :service_id, :name, :bucket_name, :access_key, :secret_key, :path, :period, :gzip_level, :format, :response_condition, :timestamp_format, :domain, :redundancy
+    attr_accessor :service_id, :name, :bucket_name, :access_key, :secret_key, :path, :period, :gzip_level, :format, :format_version, :response_condition, :timestamp_format, :domain, :redundancy
 
     ##
     # :attr: service_id
@@ -54,6 +54,13 @@ class Fastly
     #
     # Apache style log formatting
 
+    ##
+    # :attr: format_version
+    #
+    # The version of the custom logging format used for the configured endpoint.
+    # Can be either 1 (the default, version 1 log format) or 2 (the version 2
+    # log format).
+
     ##
     # :attr: response_condition
     #

data/lib/fastly/syslog.rb

@@ -1,7 +1,7 @@
 class Fastly
   # An endpoint to stream syslogs to
   class Syslog < BelongsToServiceAndVersion
-    attr_accessor :service_id, :name, :comment, :ipv4, :ipv6, :hostname, :port, :token, :format, :response_conditions, :use_tls, :tls_hostname, :tls_ca_cert
+    attr_accessor :service_id, :name, :comment, :ipv4, :ipv6, :hostname, :port, :token, :format, :format_version, :response_conditions, :use_tls, :tls_hostname, :tls_ca_cert
 
     ##
     # :attr: service_id
@@ -63,6 +63,13 @@ class Fastly
     #
     # Format to log like in apache format
 
+    ##
+    # :attr: format_version
+    #
+    # The version of the custom logging format used for the configured endpoint.
+    # Can be either 1 (the default, version 1 log format) or 2 (the version 2
+    # log format).
+
     ##
     # :attr: response_condition
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastly
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Fastly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Client library for the Fastly acceleration system
 email:
@@ -24,6 +24,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - HISTORY.md
@@ -33,6 +34,8 @@ files:
 - bin/fastly_create_domain
 - bin/fastly_upload_vcl
 - fastly.gemspec
+- gemfiles/HEAD.gemfile
+- gemfiles/ruby_1.9.gemfile
 - lib/fastly.rb
 - lib/fastly/backend.rb
 - lib/fastly/base.rb
@@ -109,4 +112,3 @@ test_files:
 - test/missing_api_key_test.rb
 - test/stats_test.rb
 - test/test_helper.rb
-has_rdoc: