Merge pull request #299 from emilymye/storage_fileget

Fix arguments for storage list_objects and enable :prefix

Author: icco

lib/fog/storage/google_json/models/directories.rb

@@ -21,7 +21,15 @@ def get(bucket_name, options = {})
             :projection => projection
           ).to_h
 
-          new(data)
+          directory = new(data)
+          # Because fog-aws accepts these arguments on files at the
+          # directories.get level, we need to preload the directory files
+          # with these attributes here.
+          files_attr_names = %i(delimiter page_token max_results prefix)
+
+          file_opts = options.select { |k, _| files_attr_names.include? k }
+          directory.files(file_opts)
+          directory
         rescue ::Google::Apis::ClientError => e
           # metageneration check failures returns HTTP 412 Precondition Failed
           raise e unless e.status_code == 404 || e.status_code == 412

lib/fog/storage/google_json/models/directory.rb

@@ -37,11 +37,10 @@ def destroy
           false
         end
 
-        def files
+        def files(attr = {})
           @files ||= begin
             Fog::Storage::GoogleJSON::Files.new(
-              :directory => self,
-              :service => service
+              attr.merge(:directory => self, :service => service)
             )
           end
         end

lib/fog/storage/google_json/models/files.rb

@@ -16,8 +16,8 @@ class Files < Fog::Collection
 
         def all(options = {})
           requires :directory
-
-          data = service.list_objects(directory.key, options).to_h[:items] || []
+          data = service.list_objects(directory.key, attributes.merge(options))
+                        .to_h[:items] || []
           load(data)
         end
 

lib/fog/storage/google_json/requests/list_objects.rb

@@ -20,8 +20,19 @@ class Real
         #   object as distinct results (defaults to False)
         # @return [Google::Apis::StorageV1::Objects]
         def list_objects(bucket, options = {})
-          request_options = ::Google::Apis::RequestOptions.default.merge(options)
-          @storage_json.list_objects(bucket, :options => request_options)
+          allowed_opts = %i(
+            delimiter
+            max_results
+            page_token
+            prefix
+            projection
+            versions
+          )
+
+          @storage_json.list_objects(
+            bucket,
+            options.select { |k, _| allowed_opts.include? k }
+          )
         end
       end