fog-google 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4cdb744e462698db3a86387dda02b2a0f824770
-  data.tar.gz: dfe92b3f8aad70f7e32052023b5f6c87e6f53d03
+  metadata.gz: d34bfdbe9d48d888a666b8097dafa7246fc8ab6f
+  data.tar.gz: 3319d90e425fdf1f9d53d3f3ff06e5b5473f8558
 SHA512:
-  metadata.gz: 12ecf2148f5534ddde97f71432c7c8c4d4f080b266454d84d3d116cf5acab7d0a18256cc496744ef8f786b6badfec50be52c09e4934230c40558c136a40406cb
-  data.tar.gz: 3454bf53193dc44d67b7ada9b37a7fb6d7bb3e586b730ac50a1fbb4353ce19ffbc374ba7b31e0861c0927bd01fd7298701f70ec6bdebcf3a90eb073bc62b8d42
+  metadata.gz: 14805dd5f5e1e0d4411c971b43b6c5cce08692be4a512f5e07c008462f26e6f1dbaa5791110fde190115b5a481c8ef7029a2345c7248c42b156ac48a3ebf0b4a
+  data.tar.gz: a23a1dc7faaa20c0887fe4419a6b6f15d21b96094aa41a31826eb7895ae7295b35d241d6dee14436baf4ca8451be524fb498edfdffc654dc32a1bf1d287a2d81

data/lib/fog/google.rb

@@ -183,7 +183,10 @@ module Fog
             :api_method => api_method,
             :parameters => parameters,
         }
-        client_parms[:body_object] = body_object if body_object
+        # The Google API complains when given null values for enums, so just don't pass it any null fields
+        # XXX It may still balk if we have a nested object, e.g.:
+        #   {:a_field => "string", :a_nested_field => { :an_empty_nested_field => nil } }
+        client_parms[:body_object] = body_object.reject { |k, v| v.nil? } if body_object
 
         result = @client.execute(client_parms)
 

data/lib/fog/google/models/compute/backend_service.rb

@@ -37,14 +37,13 @@ module Fog
           reload
         end
 
-        def destroy(async=false)
+        def destroy(async=true)
           requires :name
 
-          operation = service.delete_backend_service(name)
+          data = service.delete_backend_service(name)
+          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'])
           unless async
-            Fog.wait_for do
-              operation.body["status"] == "DONE"
-            end
+            operation.wait_for { ready? }
           end
           operation
         end

data/lib/fog/google/models/compute/backend_services.rb

@@ -13,8 +13,12 @@ module Fog
         end
 
         def get(identity)
+          response = nil
           response = service.get_backend_service(identity)
-          new(response.body) unless response.nil?
+          return nil if response.nil?
+          new(response.body)
+        rescue Fog::Errors::NotFound
+          nil
         end
       end
     end

data/lib/fog/google/models/compute/http_health_checks.rb

@@ -13,7 +13,7 @@ module Fog
         end
 
         def get(identity)
-          resonse = nil
+          response = nil
           response = service.get_http_health_check(identity)
           return nil if response.nil?
           new(response.body)

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/tests/models/compute/backend_service_tests.rb

@@ -1,6 +1,7 @@
 require 'securerandom'
 Shindo.tests("Fog::Compute[:google] | backend service model", ['google']) do
   random_string = SecureRandom.hex
+  @health_check = create_test_http_health_check(Fog::Compute[:google])
   model_tests(Fog::Compute[:google].backend_services, {:name => "fog-test-backend-service-#{random_string}",
-      :health_checks => [@health_check]})
+      :health_checks => [@health_check.self_link]})
 end

data/tests/models/compute/backend_services_tests.rb

@@ -3,6 +3,6 @@ Shindo.tests("Fog::Compute[:google] | backend_services model", ['google']) do
   random_string = SecureRandom.hex
   @health_check = create_test_http_health_check(Fog::Compute[:google])
   collection_tests(Fog::Compute[:google].backend_services, {:name => "fog-backend-services-test-#{random_string}", 
-      :health_checks => [@health_check]})
+      :health_checks => [@health_check.self_link]})
 
 end

data/tests/models/compute/image_tests.rb

@@ -1,6 +1,6 @@
 require 'securerandom'
 Shindo.tests("Fog::Compute[:google] | image model", ['google']) do
   random_string = SecureRandom.hex
-  source = 'https://www.google.com/images/srpr/logo4w.png'
+  source = 'http://storage.googleapis.com/fog-test-bucket/fog-test-raw-disk-source.image.tar.gz'
   model_tests(Fog::Compute[:google].images, {:name => "fog-test-images-#{random_string}", "rawDisk" => { "source" => source } })
 end

data/tests/models/compute/images_tests.rb

@@ -1,6 +1,6 @@
 require 'securerandom'
 Shindo.tests("Fog::Compute[:google] | images model", ['google']) do
   random_string = SecureRandom.hex
-  source = 'https://www.google.com/images/srpr/logo4w.png'
+  source = 'http://storage.googleapis.com/fog-test-bucket/fog-test-raw-disk-source.image.tar.gz'
   collection_tests(Fog::Compute[:google].images, {:name => "fog-test-images-#{random_string}", "rawDisk" => { "source" => source } })
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nat Welch