fastly 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 303ad518137e3776d1eb3d3c8f01248428cb9cae
-  data.tar.gz: 4eb4cceb4e98c19e9da337df56ab520b271cdb8c
+  metadata.gz: 10d1ee5f00e5a54a06df32a4dbc1e41ce8f8cdb0
+  data.tar.gz: 3f71dd70500900ccc6f9441f527942460e65c370
 SHA512:
-  metadata.gz: efe685e5ffb5ed74d0817ee3fda2a4e9e4239685e817c20df42a56fa6ac7ae5d53d8f21c2a52a05fb6a4a9454a59121c8b6d8cbaa3a311cd7f632f629dcf1551
-  data.tar.gz: e6156561472906f58a67ccd7e6da2586836b6926397371b31732516f05675f32632126d60268d7aa642a2919fcce314af44d2543cb7d841e3ade9b86cf0af288
+  metadata.gz: 0ac1c20ca21c3105213e374d01544053cacccbb5d5f2e04bc39705b005c8f21fd1093c1534db32c043bf7ada317d1315e135be0651316260626bd84f16a66f53
+  data.tar.gz: 70ad854b592e01a1d068cc622c44d351269638de477652cfec6b25d955a2a535cc67c192c340953c04a0fe573a990c29d495781a19facce49edf5b7880574e53

data/lib/fastly.rb

@@ -22,7 +22,6 @@ require 'fastly/healthcheck'
 require 'fastly/gzip'
 require 'fastly/invoice'
 require 'fastly/match'
-require 'fastly/origin'
 require 'fastly/request_setting'
 require 'fastly/response_object'
 require 'fastly/service'
@@ -143,7 +142,7 @@ class Fastly
     client.get_stats('/stats/regions')
   end
 
-  [User, Customer, Backend, CacheSetting, Condition, Dictionary, DictionaryItem, Director, Domain, Header, Healthcheck, Gzip, Match, Origin, RequestSetting, ResponseObject, Service, S3Logging, Syslog, VCL, Version].each do |klass|
+  [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)
@@ -203,10 +202,6 @@ class Fastly
   # :method: create_match(opts)
   # opts must contain service_id, version and name params
 
-  ##
-  # :method: create_origin(opts)
-  # opts must contain service_id, version and name params
-
   ##
   # :method: create_healthcheck(opts)
   # opts must contain service_id, version and name params
@@ -291,10 +286,6 @@ class Fastly
   # :method: get_match(service_id, number, name)
   # Get a Match
 
-  ##
-  # :method: get_origin(service_id, number, name)
-  # Get an Origin
-
   ##
   # :method: get_s3_logging(service_id, number, name)
   # Get a S3 logging
@@ -394,11 +385,6 @@ class Fastly
   # You can also call
   #    match.save!
 
-  ##
-  # :method: update_origin(origin)
-  # You can also call
-  #    origin.save!
-
   ##
   # :method: update_settings(settings)
   # You can also call
@@ -509,11 +495,6 @@ class Fastly
   # You can also call
   #    match.delete!(match)
 
-  ##
-  # :method: delete_origin(origin)
-  # You can also call
-  #    origin.delete!
-
   ##
   # :method: delete_s3_logging(s3_logging)
   # You can also call
@@ -608,10 +589,6 @@ class Fastly
   #
   # Get a list of all matches
 
-  # :method: list_origins(:service_id => service.id, :version => version.number)
-  #
-  # Get a list of all origins
-
   # :method: list_syslogs(:service_id => service.id, :version => version.number)
   #
   # Get a list of all syslogs

data/lib/fastly/client.rb

@@ -119,7 +119,9 @@ class Fastly
     end
 
     def headers(extras={})
-      headers = fully_authed? ? { 'Cookie' => cookie } : { 'Fastly-Key' => api_key }
+      headers = fully_authed? ? { 'Cookie' => cookie } : {}
+      headers['Fastly-Key'] = api_key if api_key
+
       headers.merge('Content-Accept' => 'application/json', 'User-Agent' => "fastly-ruby-v#{Fastly::VERSION}").merge(extras.keep_if {|k,v| !v.nil? })
     end
 

data/lib/fastly/gem_version.rb

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

data/test/api_key_test.rb

@@ -24,28 +24,76 @@ class Fastly
       end
 
       describe 'purging' do
-        before do
-          @opts = login_opts(:api_key)
+        describe 'with only api key' do
+          before do
+            @opts = login_opts(:api_key)
             @client = Fastly::Client.new(@opts)
             @fastly = Fastly.new(@opts)
-          service_name = "fastly-test-service-#{random_string}"
-          @service      = @fastly.create_service(:name => service_name)
-        end
+            service_name = "fastly-test-service-#{random_string}"
+            @service      = @fastly.create_service(:name => service_name)
+          end
+
+          after do
+            @fastly.delete_service(@service)
+          end
+
+          it 'allows purging' do
+            response = @service.purge_by_key('somekey')
+
+            assert_equal 'ok', response['status']
+          end
 
-        after do
-          @fastly.delete_service(@service)
+          it 'allows soft purging' do
+            response = @service.purge_by_key('somekey', soft: true)
+
+            assert_equal 'ok', response['status']
+          end
         end
 
-        it 'allows purging' do
-          response = @service.purge_by_key('somekey')
+        describe 'with cookie and api key' do
+          before do
+            @opts = login_opts(:both)
+            @client = Fastly::Client.new(@opts)
+            @fastly = Fastly.new(@opts)
+            service_name = "fastly-test-service-#{random_string}"
+            @service      = @fastly.create_service(:name => service_name)
+          end
+
+          after do
+            @fastly.delete_service(@service)
+          end
+
+          it 'allows purging' do
+            response = @service.purge_by_key('somekey')
+
+            assert_equal 'ok', response['status']
+          end
+
+          it 'allows soft purging' do
+            response = @service.purge_by_key('somekey', soft: true)
 
-          assert_equal 'ok', response['status']
+            assert_equal 'ok', response['status']
+          end
         end
 
-        it 'allows soft purging' do
-          response = @service.purge_by_key('somekey', soft: true)
+        describe 'with cookie only' do
+          before do
+            @opts = login_opts(:full)
+            @client = Fastly::Client.new(@opts)
+            @fastly = Fastly.new(@opts)
+            service_name = "fastly-test-service-#{random_string}"
+            @service      = @fastly.create_service(:name => service_name)
+          end
+
+          after do
+            @fastly.delete_service(@service)
+          end
 
-          assert_equal 'ok', response['status']
+          it 'does not allow purging' do
+            assert_raises Fastly::KeyAuthRequired do
+              @service.purge_by_key('somekey')
+            end
+          end
         end
       end
     end

data/test/common.rb

@@ -101,14 +101,6 @@ module CommonTests
     assert director.add_backend(backend)
     # generated2  = version3.generated_vcl
 
-    origin_name = "fastly-test-origin-#{random_string}"
-    origin      = @fastly.create_origin(:service_id => service.id, :version => number, :name => origin_name)
-    assert origin
-    assert_equal origin_name, origin.name
-    assert_equal service.id, origin.service.id
-    assert_equal number.to_s, origin.version_number.to_s
-    # assert_equal origin.version.number.to_s, number.to_s
-
     condition_name = "fastly-test-condition-#{random_string}"
     condition_statement = 'req.url ~ "^/foo"'
     condition = @fastly.create_condition(:service_id => service.id, :version => number, :name => condition_name, :statement => condition_statement, :type => 'REQUEST')
@@ -149,7 +141,7 @@ module CommonTests
     response_condition_name = "fastly-response-condition-#{random_string}"
     response_condition = @fastly.create_condition(:service_id => service.id, :version => number, :name => response_condition_name, :statement => condition_statement, :type => 'RESPONSE')
     header_name = "fastly-header-test-#{random_string}"
-    header = @fastly.create_header(:service_id => service.id, :version => number, :name => header_name, :response_condition => response_condition.name, :ignore_if_set => 1, :type => 'response', :dst => 'http.Cache-Control', :src => '"max-age=301"', :priority => 10, :action => 'set', :regex => /foo/)
+    header = @fastly.create_header(:service_id => service.id, :version => number, :name => header_name, :response_condition => response_condition.name, :ignore_if_set => 1, :type => 'response', :dst => 'http.Cache-Control', :src => '"max-age=301"', :priority => 10, :action => 'set', :regex => 'foo')
     assert header
     assert_equal header_name, header.name
     assert_equal response_condition.name, header.response_condition
@@ -157,7 +149,7 @@ module CommonTests
     assert_equal 'http.Cache-Control', header.dst
     assert_equal '"max-age=301"', header.src
     assert_equal 'set', header.action
-    assert_equal(/foo/, header.regex)
+    assert_equal('foo', header.regex)
 
     assert version3.activate!
     assert version3.deactivate!

data/test/helper.rb

@@ -14,7 +14,15 @@ def login_opts(mode = :full)
     opts["base_#{what}".to_sym] = ENV[key] if ENV.key?(key)
   end
 
-  required = :full == mode ? [:user, :password] : [:api_key]
+  required = case mode
+             when :full
+               [:user, :password]
+             when :both
+               [:user, :password, :api_key]
+             else
+               [:api_key]
+             end
+
   required.each do |what|
     key = "FASTLY_TEST_#{what.to_s.upcase}"
     unless ENV.key?(key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastly
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Fastly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies: []
 description: Client library for the Fastly acceleration system
 email:
@@ -52,7 +52,6 @@ files:
 - 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

data/lib/fastly/origin.rb

@@ -1,39 +0,0 @@
-class Fastly
-  # A logical group of directors - for example the asset server directors from all your DCNs
-  class Origin < BelongsToServiceAndVersion
-    attr_accessor :service_id, :name, :comment
-
-    ##
-    # :attr: service_id
-    #
-    # The id of the service this belongs to.
-    #
-
-    ##
-    # :attr: version
-    #
-    # The number of the version this belongs to.
-    #
-
-    ##
-    # :attr: name
-    #
-    # The domain name of this domain
-
-    # Add a Director object to an Origin
-    #
-    # Return true on success and false on failure
-    def add_director(director)
-      hash = fetcher.client.post("#{Origin.put_path(self)}/director/#{director.name}")
-      !hash.nil?
-    end
-
-    # Delete a Director object from an Origin
-    #
-    # Return true on success and false on failure
-    def delete_director(director)
-      hash = fetcher.client.delete("#{Origin.put_path(self)}/director/#{director.name}")
-      !hash.nil?
-    end
-  end
-end