fog-google 1.24.0 → 1.25.0

data/lib/fog/{storage/google_json.rb → google/storage/storage_json.rb}

@@ -1,9 +1,9 @@
 module Fog
-  module Storage
-    class GoogleJSON < Fog::Service
-      autoload :Mock, File.expand_path("../google_json/mock", __FILE__)
-      autoload :Real, File.expand_path("../google_json/real", __FILE__)
-      autoload :Utils, File.expand_path("../google_json/utils", __FILE__)
+  module Google
+    class StorageJSON < Fog::Service
+      autoload :Mock, "fog/google/storage/storage_json/mock"
+      autoload :Real, "fog/google/storage/storage_json/real"
+      autoload :Utils, "fog/google/storage/storage_json/utils"
 
       requires :google_project
       recognizes(
@@ -27,9 +27,9 @@ module Fog
       GOOGLE_STORAGE_JSON_BASE_URL = "https://www.googleapis.com/storage/".freeze
       GOOGLE_STORAGE_BUCKET_BASE_URL = "https://storage.googleapis.com/".freeze
 
-      # Version of IAM API used for blob signing, see Fog::Storage::GoogleJSON::Real#iam_signer
+      # Version of IAM API used for blob signing, see Fog::Google::StorageJSON::Real#iam_signer
       GOOGLE_STORAGE_JSON_IAM_API_VERSION = "v1".freeze
-      GOOGLE_STORAGE_JSON_IAM_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/devstorage.full_control).freeze
+      GOOGLE_STORAGE_JSON_IAM_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/iam).freeze
 
       # TODO: Come up with a way to only request a subset of permissions.
       # https://cloud.google.com/storage/docs/json_api/v1/how-tos/authorizing
@@ -37,7 +37,7 @@ module Fog
 
       ##
       # Models
-      model_path "fog/storage/google_json/models"
+      model_path "fog/google/storage/storage_json/models"
 
       collection :directories
       model :directory
@@ -47,7 +47,7 @@ module Fog
 
       ##
       # Requests
-      request_path "fog/storage/google_json/requests"
+      request_path "fog/google/storage/storage_json/requests"
       request :copy_object
       request :delete_bucket
       request :delete_object

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/mock.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Mock
         include Utils
 

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/models/directories.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Directories < Fog::Collection
-        model Fog::Storage::GoogleXML::Directory
+        model Fog::Google::StorageXML::Directory
 
         def all
           data = service.get_service.body["Buckets"]
@@ -10,10 +10,10 @@ module Fog
         end
 
         def get(key, options = {})
-          remap_attributes(options,             :delimiter  => "delimiter",
-                                                :marker     => "marker",
-                                                :max_keys   => "max-keys",
-                                                :prefix     => "prefix")
+          remap_attributes(options,             :delimiter => "delimiter",
+                                                :marker => "marker",
+                                                :max_keys => "max-keys",
+                                                :prefix => "prefix")
           data = service.get_bucket(key, options).body
           directory = new(:key => data["Name"])
           options = {}

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/models/directory.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Directory < Fog::Model
         identity :key, :aliases => %w(Name name)
 
@@ -23,7 +23,7 @@ module Fog
 
         def files
           @files ||= begin
-            Fog::Storage::GoogleXML::Files.new(
+            Fog::Google::StorageXML::Files.new(
               :directory => self,
               :service => service
             )

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/models/file.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class File < Fog::Model
         identity :key, :aliases => "Key"
 

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/models/files.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Files < Fog::Collection
         extend Fog::Deprecation
         deprecate :get_url, :get_https_url
@@ -10,18 +10,18 @@ module Fog
         attribute :directory
         attribute :is_truncated,    :aliases => "IsTruncated"
         attribute :marker,          :aliases => "Marker"
-        attribute :max_keys,        :aliases => ["MaxKeys", "max-keys"]
+        attribute :max_keys,        :aliases => %w(MaxKeys max-keys)
         attribute :prefix,          :aliases => "Prefix"
 
-        model Fog::Storage::GoogleXML::File
+        model Fog::Google::StorageXML::File
 
         def all(options = {})
           requires :directory
           options = {
-            "delimiter"   => delimiter,
-            "marker"      => marker,
-            "max-keys"    => max_keys,
-            "prefix"      => prefix
+            "delimiter" => delimiter,
+            "marker" => marker,
+            "max-keys" => max_keys,
+            "prefix" => prefix
           }.merge!(options)
           options = options.reject { |_key, value| value.nil? || value.to_s.empty? }
           merge_attributes(options)
@@ -36,16 +36,16 @@ module Fog
         end
 
         alias_method :each_file_this_page, :each
-        def each
+        def each(&block)
           if !block_given?
             self
           else
             subset = dup.all
 
-            subset.each_file_this_page { |f| yield f }
+            subset.each_file_this_page(&block)
             while subset.is_truncated
               subset = subset.all(:marker => subset.last.key)
-              subset.each_file_this_page { |f| yield f }
+              subset.each_file_this_page(&block)
             end
 
             self

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/real.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         include Utils
 

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/copy_object.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Copy an object from one Google Storage bucket to another
         #
@@ -28,7 +28,7 @@ module Fog
                   :headers  => headers,
                   :host     => "#{target_bucket_name}.#{@host}",
                   :method   => "PUT",
-                  :parser   => Fog::Parsers::Storage::Google::CopyObject.new,
+                  :parser   => Fog::Google::Parsers::Storage::CopyObject.new,
                   :path     => Fog::Google.escape(target_object_name))
         end
       end

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/delete_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Delete an Google Storage bucket
         #

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/delete_object.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Delete an object from Google Storage
         #

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/delete_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Get an expiring object url from Google Storage for deleting an object
         #

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/get_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # List information about objects in an Google Storage bucket
         #
@@ -40,7 +40,7 @@ module Fog
                   :host     => "#{bucket_name}.#{@host}",
                   :idempotent => true,
                   :method   => "GET",
-                  :parser   => Fog::Parsers::Storage::Google::GetBucket.new,
+                  :parser   => Fog::Google::Parsers::Storage::GetBucket.new,
                   :query    => options)
         end
       end

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/get_bucket_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Get access control list for an Google Storage bucket
         #
@@ -30,7 +30,7 @@ module Fog
                   :host       => "#{bucket_name}.#{@host}",
                   :idempotent => true,
                   :method     => "GET",
-                  :parser     => Fog::Parsers::Storage::Google::AccessControlList.new,
+                  :parser     => Fog::Google::Parsers::Storage::AccessControlList.new,
                   :query      => { "acl" => nil })
         end
       end

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/get_object.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Get an object from Google Storage
         #

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/get_object_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Get access control list for an Google Storage object
         #
@@ -38,7 +38,7 @@ module Fog
                   :host       => "#{bucket_name}.#{@host}",
                   :idempotent => true,
                   :method     => "GET",
-                  :parser     => Fog::Parsers::Storage::Google::AccessControlList.new,
+                  :parser     => Fog::Google::Parsers::Storage::AccessControlList.new,
                   :path       => Fog::Google.escape(object_name),
                   :query      => query)
         end

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/get_object_http_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       module GetObjectHttpUrl
         def get_object_http_url(bucket_name, object_name, expires, options = {})
           raise ArgumentError.new("bucket_name is required") unless bucket_name

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/get_object_https_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       module GetObjectHttpsUrl
         def get_object_https_url(bucket_name, object_name, expires, options = {})
           raise ArgumentError.new("bucket_name is required") unless bucket_name

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/get_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Get an expiring object url from Google Storage
         #
@@ -15,14 +15,14 @@ module Fog
         #   * body<~String> - url for object
 
         def get_object_url(bucket_name, object_name, expires, options = {})
-          Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})")
+          Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})")
           get_object_https_url(bucket_name, object_name, expires, options)
         end
       end
 
       class Mock # :nodoc:all
         def get_object_url(bucket_name, object_name, expires, options = {})
-          Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})")
+          Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})")
           get_object_https_url(bucket_name, object_name, expires, options)
         end
       end

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/get_service.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # List information about Google Storage buckets for authorized user
         #
@@ -19,7 +19,7 @@ module Fog
                   :host     => @host,
                   :idempotent => true,
                   :method   => "GET",
-                  :parser   => Fog::Parsers::Storage::Google::GetService.new)
+                  :parser   => Fog::Google::Parsers::Storage::GetService.new)
         end
       end
 

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/head_object.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Get headers for an object from Google Storage
         #

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/put_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Create an Google Storage bucket
         #

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/put_bucket_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Mock
         def put_bucket_acl(_bucket_name, _acl)
           # :no-coverage:

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/put_object.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Create an object in an Google Storage bucket
         #

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/put_object_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # TODO: move this methods to helper to use them with put_bucket_acl request
         def tag(name, value)

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/requests/put_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         # Get an expiring object url from Google Storage for putting an object
         #

data/lib/fog/{storage/google_xml → google/storage/storage_xml}/utils.rb

@@ -1,17 +1,17 @@
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       module Utils
         # https://cloud.google.com/storage/docs/access-control#predefined-acl
-        VALID_ACLS = [
-          "authenticated-read",
-          "bucket-owner-full-control",
-          "bucket-owner-read",
-          "private",
-          "project-private",
-          "public-read",
-          "public-read-write"
-        ].freeze
+        VALID_ACLS = %w(
+          authenticated-read
+          bucket-owner-full-control
+          bucket-owner-read
+          private
+          project-private
+          public-read
+          public-read-write
+        ).freeze
 
         def http_url(params, expires)
           "http://" << host_path_query(params, expires)
@@ -22,7 +22,7 @@ module Fog
         end
 
         def url(params, expires)
-          Fog::Logger.deprecation("Fog::Storage::Google => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::Google::Storage => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
           https_url(params, expires)
         end
 
@@ -46,7 +46,7 @@ module Fog
 
         def request_params(params)
           subdomain = params[:host].split(".#{@host}").first
-          if @path_style || subdomain !~ /^(?!goog)(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+          if @path_style || subdomain !~ /^(?!goog)(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![.-])|-(?!\.)){1,61}[a-z0-9]$/
             if subdomain =~ /_/
               # https://github.com/fog/fog/pull/1258#issuecomment-10248620.
               Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not DNS compliant (only characters a through z, digits 0 through 9, and the hyphen).")
@@ -61,12 +61,13 @@ module Fog
             end
 
             params[:host] = params[:host].split("#{subdomain}.")[-1]
-            params[:path] =
-              if params[:path]
+            if params[:path]
+              params[:path] =
                 "#{subdomain}/#{params[:path]}"
-              else
+            else
+              params[:path] =
                 subdomain.to_s
-              end
+            end
 
             subdomain = nil
           end

data/lib/fog/{storage/google_xml.rb → google/storage/storage_xml.rb}

@@ -1,20 +1,20 @@
 module Fog
-  module Storage
-    class GoogleXML < Fog::Service
-      autoload :Mock, File.expand_path("../google_xml/mock", __FILE__)
-      autoload :Real, File.expand_path("../google_xml/real", __FILE__)
-      autoload :Utils, File.expand_path("../google_xml/utils", __FILE__)
+  module Google
+    class StorageXML < Fog::Service
+      autoload :Mock, "fog/google/storage/storage_xml/mock"
+      autoload :Real, "fog/google/storage/storage_xml/real"
+      autoload :Utils, "fog/google/storage/storage_xml/utils"
 
       requires :google_storage_access_key_id, :google_storage_secret_access_key
       recognizes :host, :port, :scheme, :persistent, :path_style
 
-      model_path "fog/storage/google_xml/models"
+      model_path "fog/google/storage/storage_xml/models"
       collection :directories
       model :directory
       collection :files
       model :file
 
-      request_path "fog/storage/google_xml/requests"
+      request_path "fog/google/storage/storage_xml/requests"
       request :copy_object
       request :delete_bucket
       request :delete_object

data/lib/fog/{storage/google.rb → google/storage.rb}

@@ -1,18 +1,18 @@
 module Fog
-  module Storage
-    class Google < Fog::Service
+  module Google
+    class Storage < Fog::Service
       def self.new(options = {})
         begin
           fog_creds = Fog.credentials
-        rescue
+        rescue StandardError
           fog_creds = nil
         end
 
         if options.keys.include?(:google_storage_access_key_id) ||
            (!fog_creds.nil? && fog_creds.keys.include?(:google_storage_access_key_id))
-          Fog::Storage::GoogleXML.new(options)
+          Fog::Google::StorageXML.new(options)
         else
-          Fog::Storage::GoogleJSON.new(options)
+          Fog::Google::StorageJSON.new(options)
         end
       end
     end

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.24.0".freeze
+    VERSION = "1.25.0".freeze
   end
 end

data/lib/fog/google.rb

@@ -4,20 +4,17 @@ require "fog/xml"
 require "fog/google/version"
 
 module Fog
-  module Compute
-    autoload :Google, File.expand_path("../compute/google", __FILE__)
-  end
-
-  module DNS
-    autoload :Google, File.expand_path("../dns/google", __FILE__)
-  end
-
   module Google
+    autoload :Compute, File.expand_path("../google/compute", __FILE__)
+    autoload :DNS, File.expand_path("../google/dns", __FILE__)
     autoload :Mock, File.expand_path("../google/mock", __FILE__)
     autoload :Monitoring, File.expand_path("../google/monitoring", __FILE__)
     autoload :Pubsub, File.expand_path("../google/pubsub", __FILE__)
     autoload :Shared, File.expand_path("../google/shared", __FILE__)
     autoload :SQL, File.expand_path("../google/sql", __FILE__)
+    autoload :Storage, File.expand_path("../google/storage", __FILE__)
+    autoload :StorageJSON, 'fog/google/storage/storage_json'
+    autoload :StorageXML, 'fog/google/storage/storage_xml'
 
     extend Fog::Provider
 
@@ -37,17 +34,34 @@ module Fog
         "%" + Regexp.last_match(1).unpack("H2" * Regexp.last_match(1).bytesize).join("%").upcase
       end
     end
-  end
 
-  module Parsers
-    module Storage
-      autoload :Google, File.expand_path("../parsers/storage/google", __FILE__)
+    module Parsers
+      autoload :Storage, 'fog/google/parsers/storage'
     end
   end
+end
 
-  module Storage
-    autoload :Google, File.expand_path("../storage/google", __FILE__)
-    autoload :GoogleJSON, File.expand_path("../storage/google_json", __FILE__)
-    autoload :GoogleXML, File.expand_path("../storage/google_xml", __FILE__)
+# Add shims for backward compatibility
+# This allows old style references like Fog::Compute::Google to work
+# by redirecting them to the new namespace Fog::Google::Compute
+
+module Fog
+  # List of services from the original module
+  GOOGLE_SERVICES = %w[Compute DNS Monitoring Pubsub Storage SQL]
+
+  # Dynamically create shim modules for each service
+  GOOGLE_SERVICES.each do |service|
+    # Create the module namespace
+    const_set(service, Module.new) unless const_defined?(service)
+
+    # Get reference to the module
+    service_module = const_get(service)
+
+    # Define the Google submodule with the shim
+    service_module.const_set(:Google, Module.new)
+    service_module::Google.define_singleton_method(:new) do |*args|
+      warn "[DEPRECATION] `Fog::#{service}::Google.new` is deprecated. Please use `Fog::Google::#{service}.new` instead."
+      Fog::Google.const_get(service).new(*args)
+    end
   end
 end

data/test/integration/compute/core_compute/test_client_options.rb

@@ -4,7 +4,7 @@ class TestComputeClient < FogIntegrationTest
   def test_client_options
     # XXX This is a very rudimentary test checking that proxy option is applied
     client_options = { proxy_url: "https://user:password@host:8080" }
-    connection = Fog::Compute::Google.new(google_client_options: client_options)
+    connection = Fog::Google::Compute.new(google_client_options: client_options)
 
     err = assert_raises(ArgumentError) { connection.servers.all }
     assert_match(/unsupported proxy/, err.message)

data/test/integration/compute/core_compute/test_disks.rb

@@ -36,10 +36,10 @@ class TestDisks < FogIntegrationTest
 
     snapshot = disk.create_snapshot("fog-test-snapshot")
 
-    assert(snapshot.is_a?(Fog::Compute::Google::Snapshot),
+    assert(snapshot.is_a?(Fog::Google::Compute::Snapshot),
            "Resulting snapshot should be a snapshot object.")
 
-    assert_raises(ArgumentError) { snapshot.set_labels(["bar", "test"]) }
+    assert_raises(ArgumentError) { snapshot.set_labels(%w(bar test)) }
 
     snapshot.set_labels(foo: "bar", fog: "test")
 

data/test/integration/compute/core_compute/test_snapshots.rb

@@ -4,7 +4,7 @@ require "base64"
 
 class TestComputeSnapshots < FogIntegrationTest
   def setup
-    @client = Fog::Compute::Google.new
+    @client = Fog::Google::Compute.new
     # Ensure any resources we create with test prefixes are removed
     Minitest.after_run do
       delete_test_resources