fog-google 1.24.0 → 1.25.0

data/test/integration/factories/collection_factory.rb

@@ -11,7 +11,7 @@ class CollectionFactory
   #
   # @param async [FalseClass or TrueClass] perform resource destruction asynchronously
   def cleanup(async = false)
-    suit_name = @example.gsub(/\W/, "").tr("_", "-").downcase.split('-')[0]
+    suit_name = @example.gsub(/\W/, "").tr("_", "-").downcase.split("-")[0]
     resources = @subject.all.select { |resource| resource.name.match(/#{PREFIX}-[0-9]*-#{suit_name}/) }
     if DEBUG
       p "Cleanup invoked in #{self} for example: #{@example}"
@@ -22,7 +22,7 @@ class CollectionFactory
     resources.each { |r| Fog.wait_for { !@subject.all.map(&:identity).include? r.identity } }
   end
 
-  # Creates a collection object instance e.g. Fog::Compute::Google::Server
+  # Creates a collection object instance e.g. Fog::Google::Compute::Server
   #
   # @param custom_params [Hash] override factory creation parameters or provide
   #   additional ones. Useful in tests where you need to create a slightly different

data/test/integration/storage/storage_shared.rb

@@ -6,7 +6,7 @@ require "tempfile"
 
 class StorageShared < FogIntegrationTest
   def setup
-    @client = Fog::Storage::Google.new
+    @client = Fog::Google::Storage.new
     # Enable retries during the suite. This prevents us from
     # having to manually rate limit our requests.
     ::Google::Apis::RequestOptions.default.retries = 5

data/test/integration/test_authentication.rb

@@ -8,28 +8,28 @@ class TestAuthentication < FogIntegrationTest
   end
 
   def test_authenticates_with_json_key_location
-    c = Fog::Compute::Google.new(:google_key_location => nil,
+    c = Fog::Google::Compute.new(:google_key_location => nil,
                                  :google_key_string => nil,
                                  :google_json_key_location => @google_json_key_location,
                                  :google_json_key_string => nil)
-    assert_kind_of(Fog::Compute::Google::Real, c)
+    assert_kind_of(Fog::Google::Compute::Real, c)
   end
 
   def test_authenticates_with_json_key_string
-    c = Fog::Compute::Google.new(:google_key_location => nil,
+    c = Fog::Google::Compute.new(:google_key_location => nil,
                                  :google_key_string => nil,
                                  :google_json_key_location => nil,
                                  :google_json_key_string => @google_json_key_string)
-    assert_kind_of(Fog::Compute::Google::Real, c)
+    assert_kind_of(Fog::Google::Compute::Real, c)
   end
 
   def test_raises_argument_error_when_google_project_is_missing
-    assert_raises(ArgumentError) { Fog::Compute::Google.new(:google_project => nil) }
+    assert_raises(ArgumentError) { Fog::Google::Compute.new(:google_project => nil) }
   end
 
   def test_raises_argument_error_when_google_keys_are_given
     assert_raises(ArgumentError) do
-      Fog::Compute::Google.new(:google_key_location => nil,
+      Fog::Google::Compute.new(:google_key_location => nil,
                                :google_key_string => nil,
                                :google_json_key_location => nil,
                                :google_json_key_string => nil)

data/test/unit/compute/test_common_collections.rb

@@ -10,18 +10,18 @@ class UnitTestCollections < Minitest::Test
     # Exceptions that do not pass test_common_methods:
     #
     # Projects do not have a "list" method in compute API, so 'all' is not implemented
-    @common_method_exceptions = [Fog::Compute::Google::Projects]
+    @common_method_exceptions = [Fog::Google::Compute::Projects]
     # Enumerate all descendants of Fog::Collection
     descendants = ObjectSpace.each_object(Fog::Collection.singleton_class).to_a
 
-    @collections = descendants.select { |d| d.name.match(/Fog::Compute::Google/) }
+    @collections = descendants.select { |d| d.name.match(/Fog::Google::Compute/) }
   end
 
   def teardown
     Fog.unmock!
   end
 
-  # This tests whether Fog::Compute::Google collections have common lifecycle methods
+  # This tests whether Fog::Google::Compute collections have common lifecycle methods
   def test_common_methods
     subjects = @collections - @common_method_exceptions
     subjects.each do |klass|

data/test/unit/compute/test_common_models.rb

@@ -7,17 +7,17 @@ class UnitTestModels < Minitest::Test
                                google_project: "foo")
 
     # Do not test models that do not have a create method in API
-    exceptions = [Fog::Compute::Google::MachineType,
-                  Fog::Compute::Google::Region,
-                  Fog::Compute::Google::DiskType,
-                  Fog::Compute::Google::Operation,
-                  Fog::Compute::Google::Zone,
-                  Fog::Compute::Google::Snapshot,
-                  Fog::Compute::Google::Project]
+    exceptions = [Fog::Google::Compute::MachineType,
+                  Fog::Google::Compute::Region,
+                  Fog::Google::Compute::DiskType,
+                  Fog::Google::Compute::Operation,
+                  Fog::Google::Compute::Zone,
+                  Fog::Google::Compute::Snapshot,
+                  Fog::Google::Compute::Project]
     # Enumerate all descendants of Fog::Model
     descendants = ObjectSpace.each_object(Fog::Model.singleton_class).to_a
 
-    @models = descendants.select { |d| d.name.match(/Fog::Compute::Google/) } - exceptions
+    @models = descendants.select { |d| d.name.match(/Fog::Google::Compute/) } - exceptions
   end
 
   def teardown
@@ -25,7 +25,7 @@ class UnitTestModels < Minitest::Test
   end
 
   def test_common_methods
-    # This tests whether Fog::Compute::Google models have common lifecycle methods
+    # This tests whether Fog::Google::Compute models have common lifecycle methods
     @models.each do |klass|
       obj = klass.new
       assert obj.respond_to?(:save), "#{klass} should have a .save method"

data/test/unit/compute/test_disk.rb

@@ -12,15 +12,15 @@ class UnitTestDisk < Minitest::Test
   end
 
   def test_new_disk
-    disk = Fog::Compute::Google::Disk.new(
-      :name         => "fog-1",
-      :size_gb      => 10,
-      :zone         => "us-central1-a",
+    disk = Fog::Google::Compute::Disk.new(
+      :name => "fog-1",
+      :size_gb => 10,
+      :zone => "us-central1-a",
       :source_image => "debian-7-wheezy-v20131120"
     )
-    assert_equal("fog-1",                     disk.name,         "Fog::Compute::Google::Disk name is incorrect: #{disk.name}")
-    assert_equal(10,                          disk.size_gb,      "Fog::Compute::Google::Disk size_gb is incorrect: #{disk.size_gb}")
-    assert_equal("us-central1-a",             disk.zone,         "Fog::Compute::Google::Disk zone is incorrect: #{disk.zone}")
-    assert_equal("debian-7-wheezy-v20131120", disk.source_image, "Fog::Compute::Google::Disk source_image is incorrect: #{disk.source_image}")
+    assert_equal("fog-1",                     disk.name,         "Fog::Google::Compute::Disk name is incorrect: #{disk.name}")
+    assert_equal(10,                          disk.size_gb,      "Fog::Google::Compute::Disk size_gb is incorrect: #{disk.size_gb}")
+    assert_equal("us-central1-a",             disk.zone,         "Fog::Google::Compute::Disk zone is incorrect: #{disk.zone}")
+    assert_equal("debian-7-wheezy-v20131120", disk.source_image, "Fog::Google::Compute::Disk source_image is incorrect: #{disk.source_image}")
   end
 end

data/test/unit/compute/test_server.rb

@@ -15,7 +15,7 @@ class UnitTestServer < Minitest::Test
     key = "ssh-rsa IAMNOTAREALSSHKEYAMA== user@host.subdomain.example.com"
 
     File.stub :read, key do
-      server = Fog::Compute::Google::Server.new(
+      server = Fog::Google::Compute::Server.new(
         :name => "foo",
         :machine_type => "bar",
         :disks => ["baz"],
@@ -23,7 +23,7 @@ class UnitTestServer < Minitest::Test
         :public_key_path => key
       )
       assert_equal(server.public_key, key,
-                   "Fog::Compute::Google::Server loads public_key properly")
+                   "Fog::Google::Compute::Server loads public_key properly")
     end
   end
 end

data/test/unit/dns/test_common_collections.rb

@@ -9,18 +9,18 @@ class UnitTestDNSCollections < Minitest::Test
     # Exceptions that do not pass test_common_methods:
     #
     # DNS Projects API does not support 'list', so 'all' method is not possible
-    @common_methods_exceptions = [Fog::DNS::Google::Projects]
+    @common_methods_exceptions = [Fog::Google::DNS::Projects]
     # Enumerate all descendants of Fog::Collection
     descendants = ObjectSpace.each_object(Fog::Collection.singleton_class)
 
-    @collections = descendants.select { |d| d.name.match(/Fog::DNS::Google/) }
+    @collections = descendants.select { |d| d.name.match(/Fog::Google::DNS/) }
   end
 
   def teardown
     Fog.unmock!
   end
 
-  # This tests whether Fog::Compute::Google collections have common lifecycle methods
+  # This tests whether Fog::Google::Compute collections have common lifecycle methods
   def test_common_methods
     subjects = @collections - @common_methods_exceptions
     subjects.each do |klass|

data/test/unit/monitoring/test_comon_collections.rb

@@ -20,7 +20,7 @@ class UnitTestMonitoringCollections < Minitest::Test
     Fog.unmock!
   end
 
-  # This tests whether Fog::Compute::Google collections have common lifecycle methods
+  # This tests whether Fog::Google::Compute collections have common lifecycle methods
   def test_common_methods
     subjects = @collections - @common_method_exceptions
 

data/test/unit/pubsub/test_common_collections.rb

@@ -16,7 +16,7 @@ class UnitTestPubsubCollections < Minitest::Test
   end
 
   def test_common_methods
-    # This tests whether Fog::Compute::Google collections have common lifecycle methods
+    # This tests whether Fog::Google::Compute collections have common lifecycle methods
     @collections.each do |klass|
       obj = klass.new
       assert obj.respond_to?(:all), "#{klass} should have an .all method"

data/test/unit/sql/test_common_collections.rb

@@ -23,7 +23,7 @@ class UnitTestSQLCollections < Minitest::Test
     Fog.unmock!
   end
 
-  # This tests whether Fog::Compute::Google collections have common lifecycle methods
+  # This tests whether Fog::Google::Compute collections have common lifecycle methods
   def test_common_methods
     subjects = @collections - @common_method_exceptions
     subjects.each do |klass|

data/test/unit/storage/test_common_json_collections.rb

@@ -10,7 +10,7 @@ class UnitTestStorageJSONCollections < Minitest::Test
     descendants = ObjectSpace.each_object(Fog::Collection.singleton_class)
 
     @collections = descendants.select do |d|
-      d.name.match(/Fog::Storage::GoogleJSON/)
+      d.name.match(/Fog::Google::StorageJSON/)
     end
   end
 
@@ -19,7 +19,7 @@ class UnitTestStorageJSONCollections < Minitest::Test
   end
 
   def test_common_methods
-    # This tests whether Fog::Compute::Google collections have common lifecycle methods
+    # This tests whether Fog::Google::Compute collections have common lifecycle methods
     @collections.each do |klass|
       obj = klass.new
       assert obj.respond_to?(:all), "#{klass} should have an .all method"

data/test/unit/storage/test_common_xml_collections.rb

@@ -12,7 +12,7 @@ class UnitTestStorageXMLCollections < Minitest::Test
     descendants = ObjectSpace.each_object(Fog::Collection.singleton_class)
 
     @collections = descendants.select do |d|
-      d.name.match(/Fog::Storage::GoogleXML/)
+      d.name.match(/Fog::Google::StorageXML/)
     end
   end
 
@@ -21,7 +21,7 @@ class UnitTestStorageXMLCollections < Minitest::Test
   end
 
   def test_common_methods
-    # This tests whether Fog::Compute::Google collections have common lifecycle methods
+    # This tests whether Fog::Google::Compute collections have common lifecycle methods
     @collections.each do |klass|
       obj = klass.new
       assert obj.respond_to?(:all), "#{klass} should have an .all method"
@@ -39,11 +39,11 @@ class UnitTestStorageXMLCollections < Minitest::Test
   end
 
   def test_metadata
-    attr = { key: 'test-file', body: "hello world\x00" }
+    attr = { key: "test-file", body: "hello world\x00" }
     f = @bucket.files.new(attr)
     assert_equal({}, f.metadata)
 
-    metadata = { 'x-goog-meta-my-header' => 'hello world' }
+    metadata = { "x-goog-meta-my-header" => "hello world" }
     f = @bucket.files.new(attr.merge(metadata))
     assert_equal(metadata, f.metadata)
   end