fog-google 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b820a5dc7b807feb4752b1fbb3f6e90f05c612
-  data.tar.gz: 96049683a48c63bdcd071a63bf93ceb0638374b0
+  metadata.gz: ef7499d519d94d003fb7caf199d15250717a618e
+  data.tar.gz: fa30717e9415e38d0ee2c14854e71e7447cc2756
 SHA512:
-  metadata.gz: 108ae3707ddb9ba0c96eba2ed16246911b7ccea06a8801a6f87ae59e53361d03baed08f64e1649c7787d74560a910820a8e978e00d9610b5f38e943d2531e13c
-  data.tar.gz: 0c9e5ef0a46e80d978c81f4ebf80f26ae6166b5ba43a902b087dc97c788153380cfff19f17970d89238254e6dd714b3a322501a991a8d7c8699d3afc9709e68e
+  metadata.gz: 7a1e5831c3181960e635ed4723c6111e90d27c38efc508d443df7d13c6431ed41f522caab1de40b3fe0ca09709877771965e56b625bc258c8c77f2614353ef11
+  data.tar.gz: 3cd03f1027a93777a6d3257dabadae1390485a05fbe5bb020a85945ae4c6d0e1bb2a62e61a0c570e6cbe1016e69cffbdb213a45841cb36551540e4bf3ecf9600

data/CONTRIBUTORS.md

@@ -1,11 +1,16 @@
-* Alexander Lomov <lomov.as@gmail.com>
+With also previous help from unnamed Google employees and [Fog contributors](https://github.com/fog/fog/blob/master/CONTRIBUTORS.md)
+
+* Akshay Moghe <amoghe@maginatics.com>
+* Alex Coomans <alex@alexcoomans.com>
 * Alexander Kolesen <akolesen@iron.io>
-* althras <althras@gmail.com>
+* Alexander Lomov <lomov.as@gmail.com>
 * Andrew Leonard <andy@hurricane-ridge.com>
 * Antonio <0x414f@gmail.com>
 * Ariel Zavala <arielo.zavala@gmail.com>
-* ashmrtnz <ashmrtnz@google.com>
-* Akshay Moghe <amoghe@maginatics.com>
+* Artem <code@temik.me>
+* Artem <temikus@google.com>
+* Artem Yakimenko <code@temik.me>
+* Artem Yakimenko <temikus@google.com>
 * Benson Kalahar <bensonk42@gmail.com>
 * Bob Lail and Luke Booth <pair=bob.lail+luke.booth@cphepdev.com>
 * Brett Porter <brett@apache.org>
@@ -14,30 +19,71 @@
 * Chris Gianelloni <wolf31o2@gmail.com>
 * Dan Prince <dprince@redhat.com>
 * Daniel Broudy <broudy@google.com>
+* Daniel van Gils <daniel@cloud66.com>
+* David Salgado <david@digitalronin.com>
+* Dawid Janczak <dawid.janczak@gmail.com>
 * Dean Putney <dean@glowforge.com>
+* Dean Putney <putney.dean@gmail.com>
+* Dima <dima@cloud66.com>
 * Doug Henderson <dhenderson@maestrodev.com>
+* Emily Ye <emilyye@google.com>
+* Eric Johnson <erjohnso@google.com>
 * Eric Johnson <erjohnso@google.com>
+* Ervin Weber <webervin@users.noreply.github.com>
 * Ferran Rodenas <frodenas@gmail.com>
 * Frederick Cheung <frederick.cheung@gmail.com>
+* Imri Zvik <imrizvik@gmail.com>
+* Isaac Hollander McCreery <ihmccreery@google.com>
+* Isaac Hollander McCreery <ihmccreery@users.noreply.github.com>
 * Jacob Mattingley <jem@ubalo.com>
+* Jakob Krigovsky <jakob@krigovsky.com>
 * James Herdman <james.herdman@me.com>
-* jordangbull <jordangbull@gmail.com>
+* Jared <j.schaber@innovati.ws>
+* Jeffrey Dang <jcdang@gmail.com>
+* Joe Selman <jsselman@google.com>
+* Jonathan Yankovich <jonathan.yankovich@gmail.com>
+* Julian Cheal <jcheal@redhat.com>
 * Juris Galang <jurisgalang@gmail.com>
-* kbockmanrs <kevin@rightscale.com>
+* Kyle Boutette <Everlag@users.noreply.github.com>
+* Kyle Boutette <boutette@google.com>
 * Lance Ivy <lance@cainlevy.net>
-* leonidlm <leonidlm@gmail.com>
+* Leila <leyla.myosotis@gmail.com>
+* Leila-Kuntar <leyla.myosotis@gmail.com>
+* Marcel Hild <hild@b4mad.net>
 * Marcin Owsiany <porridge@google.com>
+* Martin Lazarov <martin@lazarov.bg>
 * Matt Darby <matt.darby@rackspace.com>
 * Michael Elfassy <michaelelfassy@napps.ca>
+* Miguel Martinez <miguel@bitnami.com>
+* Misha Brukman <mbrukman@google.com>
+* Myosotis <leyla.myosotis@gmail.com>
 * Nat Welch <nat@natwelch.com>
-* neillturner <neillwturner@gmail.com>
+* Paul Thornthwaite <paul@brightbox.co.uk>
 * Paul Thornthwaite <tokengeek@gmail.com>
+* Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
 * Paulo Henrique Lopes Ribeiro <plribeiro@zertico.com>
+* Paulo Ribeiro <paulo@majority.co>
+* Pradeep G <itsprdp@gmail.com>
+* Rama McIntosh <rama@contix.com>
+* Riccardo Carlesso <palladiusbonton@gmail.com>
+* Riccardo Carlesso <riccardo.carlesso@gmail.com>
+* Richard Wallace <rwallace@gmail.com>
 * Romain Haenni <admin@zlabs.ch>
 * Romain Vrignaud <rvrignaud@gmail.com>
-* snyquist2 <snyquist@google.com>
 * Stephen von Takach <steve@advancedcontrol.com.au>
+* Tim Downey <tdowney@pivotal.io>
 * Timur Alperovich <timur.alperovich@gmail.com>
-* unknown <bturner_2@pibuk-lp71.pibenchmark.com>
+* Vadim Shaulski <sh.vadim@gmail.com>
 * Wesley Beary <geemus@gmail.com>
-* Google Inc.
+* Zach Robinson <zrobinson@pivotal.io>
+* althras <althras@gmail.com>
+* ashmrtnz <ashmrtnz@google.com>
+* canausa <tscanausa@gmail.com>
+* geemus <geemus@gmail.com>
+* jordangbull <jordangbull@gmail.com>
+* kbockmanrs <kevin@rightscale.com>
+* leonidlm <leonidlm@gmail.com>
+* lkuntar <leyla.myosotis@gmail.com>
+* neillturner <neillwturner@gmail.com>
+* scott rushforth <scott@spotman.net>
+* snyquist2 <snyquist@google.com>

data/LICENSE.md

@@ -1,6 +1,6 @@
-he MIT License (MIT)
+The MIT License (MIT)
 
-Copyright (c) 2014-2015 [CONTRIBUTORS.md](https://github.com/fog/fog-google/blob/master/CONTRIBUTORS.md)
+Copyright (c) 2014-2018 [CONTRIBUTORS.md](https://github.com/fog/fog-google/blob/master/CONTRIBUTORS.md)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -17,4 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -49,7 +49,6 @@ Add the following two lines to your application's `Gemfile`:
 
 ```ruby
 gem 'fog-google'
-gem 'google-api-client', '~> 0.8.6'
 ```
 
 And then execute:

data/fog-google.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "mime-types"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "osrcry"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.1.0".freeze
+    VERSION = "1.2.0".freeze
   end
 end

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

@@ -21,7 +21,15 @@ module Fog
             :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

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

@@ -37,11 +37,10 @@ module Fog
           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

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

@@ -16,8 +16,8 @@ module Fog
 
         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
 

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

@@ -20,8 +20,19 @@ module Fog
         #   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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: osrcry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -705,7 +719,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.