fog-google 1.24.1 → 1.26.0

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class File < Fog::Model
         identity :key, :aliases => ["Key", :name]
 

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

@@ -1,8 +1,8 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Files < Fog::Collection
-        model Fog::Storage::GoogleJSON::File
+        model Fog::Google::StorageJSON::File
 
         extend Fog::Deprecation
         deprecate :get_url, :get_https_url
@@ -11,7 +11,7 @@ module Fog
         attribute :delimiter,       :aliases => "Delimiter"
         attribute :directory
         attribute :page_token,      :aliases => %w(pageToken page_token)
-        attribute :max_results,     :aliases => ["MaxKeys", "max-keys"]
+        attribute :max_results,     :aliases => %w(MaxKeys max-keys)
         attribute :prefix,          :aliases => "Prefix"
         attribute :next_page_token
 
@@ -24,14 +24,14 @@ module Fog
         end
 
         alias_method :each_file_this_page, :each
-        def each
+        def each(&block)
           if block_given?
             subset = dup.all
 
-            subset.each_file_this_page { |f| yield f }
+            subset.each_file_this_page(&block)
             while subset.next_page_token
               subset = subset.all(:page_token => subset.next_page_token)
-              subset.each_file_this_page { |f| yield f }
+              subset.each_file_this_page(&block)
             end
           end
           self
@@ -43,6 +43,7 @@ module Fog
           new(data)
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
+
           nil
         end
 

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         include Utils
         include Fog::Google::Shared
@@ -34,7 +36,7 @@ module Fog
 DATA
 
           google_headers = {}
-          canonical_google_headers = ""
+          canonical_google_headers = +""
           params[:headers].each do |key, value|
             google_headers[key] = value if key[0..6] == "x-goog-"
           end
@@ -45,7 +47,7 @@ DATA
           end
           string_to_sign << canonical_google_headers.to_s
 
-          canonical_resource = "/"
+          canonical_resource = +"/"
           if subdomain = params.delete(:subdomain)
             canonical_resource << "#{CGI.escape(subdomain).downcase}/"
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Copy an object from one Google Storage bucket to another
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Delete an Google Storage bucket
         # https://cloud.google.com/storage/docs/json_api/v1/buckets/delete

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Delete an object from Google Storage
         # https://cloud.google.com/storage/docs/json_api/v1/objects/delete

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get an expiring object url from Google Storage for deleting an object
         # https://cloud.google.com/storage/docs/access-control#Signed-URLs

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # List information about objects in an Google Storage bucket #
         # https://cloud.google.com/storage/docs/json_api/v1/buckets#resource

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get access control list entry for an Google Storage bucket
         # @see https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/get

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

@@ -1,8 +1,8 @@
 require "tempfile"
 
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get an object from Google Storage
         # @see https://cloud.google.com/storage/docs/json_api/v1/objects/get

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get access control list for an Google Storage object
         # https://cloud.google.com/storage/docs/json_api/v1/objectAccessControls/get

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       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_json → google/storage/storage_json}/requests/get_object_https_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       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_json → google/storage/storage_json}/requests/get_object_metadata.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Fetch metadata for an object in Google Storage
         #

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

@@ -1,18 +1,18 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get an expiring object url from GCS
         # Deprecated, redirects to get_object_https_url.rb
         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(0..0)})")
+          Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
           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(0..0)})")
+          Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
           get_object_https_url(bucket_name, object_name, expires, **options)
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get access control list for an Google Storage bucket
         # @see https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/list

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Retrieves a list of buckets for a given project
         # https://cloud.google.com/storage/docs/json_api/v1/buckets/list

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # List access control list for an Google Storage object
         # https://cloud.google.com/storage/docs/json_api/v1/objectAccessControls/get

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Lists objects in a bucket matching some criteria.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Create a Google Storage bucket
         # @see https://cloud.google.com/storage/docs/json_api/v1/buckets/insert

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Change access control list for an Google Storage bucket
         # https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/insert

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Create an object in an Google Storage bucket
         # https://cloud.google.com/storage/docs/json_api/v1/objects/insert

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Change access control list for an Google Storage object
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get an expiring object url from Google Storage for putting an object
         # https://cloud.google.com/storage/docs/access-control#Signed-URLs

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

@@ -1,19 +1,21 @@
-require 'addressable'
+# frozen_string_literal: true
+
+require "addressable"
 
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       module Utils
         def http_url(params, expires)
-          "http://" << host_path_query(params, expires)
+          "http://#{host_path_query(params, expires)}"
         end
 
         def https_url(params, expires)
-          "https://" << host_path_query(params, expires)
+          "https://#{host_path_query(params, expires)}"
         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
 

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,7 +27,7 @@ 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/iam).freeze
 
@@ -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,8 @@
+# frozen_string_literal: true
+
 module Fog
-  module Storage
-    class GoogleXML
+  module Google
+    class StorageXML
       class Real
         include Utils
 
@@ -46,7 +48,7 @@ module Fog
 DATA
 
           google_headers = {}
-          canonical_google_headers = ""
+          canonical_google_headers = +""
           params[:headers].each do |key, value|
             google_headers[key] = value if key[0..6] == "x-goog-"
           end
@@ -57,7 +59,7 @@ DATA
           end
           string_to_sign << canonical_google_headers.to_s
 
-          canonical_resource = "/"
+          canonical_resource = +"/"
           if subdomain = params.delete(:subdomain)
             canonical_resource << "#{CGI.escape(subdomain).downcase}/"
           end

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
@@ -49,7 +49,7 @@ module Fog
         def get_bucket(bucket_name, options = {})
           raise ArgumentError.new("bucket_name is required") unless bucket_name
           response = Excon::Response.new
-          name = /(\w+\.?)*/.match(bucket_name)
+          name = /([a-zA-Z0-9][a-zA-Z0-9\-_.]+[a-zA-Z0-9])/.match(bucket_name)
           if bucket_name == name.to_s
             if bucket = data[:buckets][bucket_name]
               contents = bucket[:objects].values.sort_by { |a| a["Key"] }.reject do |object|

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
         #