gcloud 0.10.0 → 0.11.0

data/lib/gcloud/storage/file/verifier.rb

@@ -38,7 +38,7 @@ module Gcloud
           gcloud_digest = gcloud_file.crc32c
           local_digest = crc32c_for local_file
           if gcloud_digest != local_digest
-            fail FileVerificationError.for_md5(gcloud_digest, local_digest)
+            fail FileVerificationError.for_crc32c(gcloud_digest, local_digest)
           end
         end
 
@@ -52,13 +52,13 @@ module Gcloud
 
         def self.md5_for local_file
           ::File.open(Pathname(local_file).to_path, "rb") do |f|
-            ::Digest::MD5.base64digest f.read
+            ::Digest::MD5.file(f).base64digest
           end
         end
 
         def self.crc32c_for local_file
           ::File.open(Pathname(local_file).to_path, "rb") do |f|
-            ::Digest::CRC32c.base64digest f.read
+            ::Digest::CRC32c.file(f).base64digest
           end
         end
       end

data/lib/gcloud/storage/project.rb

@@ -109,37 +109,33 @@ module Gcloud
       #     puts bucket.name
       #   end
       #
-      # @example Retrieve all buckets with names that begin with a given prefix:
+      # @example Retrieve buckets with names that begin with a given prefix:
       #   require "gcloud"
       #
       #   gcloud = Gcloud.new
       #   storage = gcloud.storage
       #
       #   user_buckets = storage.buckets prefix: "user-"
+      #   user_buckets.each do |bucket|
+      #     puts bucket.name
+      #   end
       #
-      # @example With pagination: (See {Bucket::List#token})
+      # @example Retrieve all buckets: (See {Bucket::List#all})
       #   require "gcloud"
       #
       #   gcloud = Gcloud.new
       #   storage = gcloud.storage
       #
-      #   all_buckets = []
-      #   tmp_buckets = storage.buckets
-      #   while tmp_buckets.any? do
-      #     tmp_buckets.each do |bucket|
-      #       all_buckets << bucket
-      #     end
-      #     # break loop if no more buckets available
-      #     break if tmp_buckets.token.nil?
-      #     # get the next group of buckets
-      #     tmp_buckets = storage.buckets token: tmp_buckets.token
+      #   buckets = storage.buckets
+      #   buckets.all do |bucket|
+      #     puts bucket.name
       #   end
       #
       def buckets prefix: nil, token: nil, max: nil
         options = { prefix: prefix, token: token, max: max }
         resp = connection.list_buckets options
         if resp.success?
-          Bucket::List.from_response resp, connection
+          Bucket::List.from_response resp, connection, prefix, max
         else
           fail ApiError.from_response(resp)
         end
@@ -180,8 +176,7 @@ module Gcloud
       # bucket. See {Bucket::Cors} for details.
       #
       # The API call to create the bucket may be retried under certain
-      # conditions. See {Gcloud::Backoff} to control this behavior, or
-      # specify the wanted behavior in the call with the `:retries:` option.
+      # conditions. See {Gcloud::Backoff} to control this behavior.
       #
       # You can pass [website
       # settings](https://cloud.google.com/storage/docs/website-configuration)
@@ -245,8 +240,6 @@ module Gcloud
       #   . By default, the object prefix is the name of the bucket for which
       #   the logs are enabled. For more information, see [Access
       #   Logs](https://cloud.google.com/storage/docs/access-logs).
-      # @param [Integer] retries The number of times the API call should be
-      #   retried. Default is {Gcloud::Backoff.retries}.
       # @param [Symbol, String] storage_class Defines how objects in the bucket
       #   are stored and determines the SLA and the cost of storage. Values
       #   include `:standard`, `:nearline`, and `:dra` (Durable Reduced
@@ -280,14 +273,6 @@ module Gcloud
       #
       #   bucket = storage.create_bucket "my-bucket"
       #
-      # @example Specify the number of retries to attempt:
-      #   require "gcloud"
-      #
-      #   gcloud = Gcloud.new
-      #   storage = gcloud.storage
-      #
-      #   bucket = storage.create_bucket "my-bucket", retries: 5
-      #
       # @example Add CORS rules in a block:
       #   require "gcloud"
       #
@@ -307,13 +292,13 @@ module Gcloud
       #
       def create_bucket bucket_name, acl: nil, default_acl: nil, cors: nil,
                         location: nil, logging_bucket: nil, logging_prefix: nil,
-                        retries: nil, storage_class: nil, versioning: nil,
-                        website_main: nil, website_404: nil
+                        storage_class: nil, versioning: nil, website_main: nil,
+                        website_404: nil
         opts = { acl: acl_rule(acl), default_acl: acl_rule(default_acl),
                  cors: cors, location: location, logging_bucket: logging_bucket,
-                 logging_prefix: logging_prefix, retries: retries,
-                 storage_class: storage_class, versioning: versioning,
-                 website_main: website_main, website_404: website_404 }
+                 logging_prefix: logging_prefix, storage_class: storage_class,
+                 versioning: versioning, website_main: website_main,
+                 website_404: website_404 }
         if block_given?
           cors_builder = Bucket::Cors.new
           yield cors_builder

data/lib/gcloud/translate.rb

@@ -231,6 +231,26 @@ module Gcloud
   # languages[0].name #=> "Afrikaans"
   # ```
   #
+  # ## Configuring Backoff
+  #
+  # The {Gcloud::Backoff} class allows users to globally configure how Cloud API
+  # requests are automatically retried in the case of some errors, such as a
+  # `500` or `503` status code, or a specific internal error code such as
+  # `rateLimitExceeded`.
+  #
+  # If an API call fails, the response will be inspected to see if the call
+  # should be retried. If the response matches the criteria, then the request
+  # will be retried after a delay. If another error occurs, the delay will be
+  # increased incrementally before a subsequent attempt. The first retry will be
+  # delayed one second, the second retry two seconds, and so on.
+  #
+  # ```ruby
+  # require "gcloud"
+  # require "gcloud/backoff"
+  #
+  # Gcloud::Backoff.retries = 5 # Raise the maximum number of retries from 3
+  # ```
+  #
   module Translate
   end
 end

data/lib/gcloud/translate/connection.rb

@@ -14,6 +14,7 @@
 
 
 require "gcloud/version"
+require "gcloud/backoff"
 require "google/api_client"
 
 module Gcloud
@@ -45,14 +46,14 @@ module Gcloud
                    prettyprint: false
                  }.delete_if { |_, v| v.nil? }
 
-        @client.execute(
+        execute(
           api_method: @translate.translations.list,
           parameters: params
         )
       end
 
       def detect text
-        @client.execute(
+        execute(
           api_method: @translate.detections.list,
           parameters: { q: Array(text), prettyprint: false }
         )
@@ -62,7 +63,7 @@ module Gcloud
         params = { target:      language,
                    prettyprint: false }.delete_if { |_, v| v.nil? }
 
-        @client.execute(
+        execute(
           api_method: @translate.languages.list,
           parameters: params
         )
@@ -71,6 +72,14 @@ module Gcloud
       def inspect
         "#{self.class}(#{@project})"
       end
+
+      protected
+
+      def execute options
+        Gcloud::Backoff.new.execute_gapi do
+          @client.execute options
+        end
+      end
     end
   end
 end

data/lib/gcloud/version.rb

@@ -14,5 +14,5 @@
 
 
 module Gcloud
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/lib/gcloud/vision.rb

@@ -239,6 +239,26 @@ module Gcloud
   # annotation = vision.annotate image, faces: 5
   # ```
   #
+  # ## Configuring Backoff
+  #
+  # The {Gcloud::Backoff} class allows users to globally configure how Cloud API
+  # requests are automatically retried in the case of some errors, such as a
+  # `500` or `503` status code, or a specific internal error code such as
+  # `rateLimitExceeded`.
+  #
+  # If an API call fails, the response will be inspected to see if the call
+  # should be retried. If the response matches the criteria, then the request
+  # will be retried after a delay. If another error occurs, the delay will be
+  # increased incrementally before a subsequent attempt. The first retry will be
+  # delayed one second, the second retry two seconds, and so on.
+  #
+  # ```ruby
+  # require "gcloud"
+  # require "gcloud/backoff"
+  #
+  # Gcloud::Backoff.retries = 5 # Raise the maximum number of retries from 3
+  # ```
+  #
   module Vision
     class << self
       ##

data/lib/gcloud/vision/connection.rb

@@ -14,6 +14,7 @@
 
 
 require "gcloud/version"
+require "gcloud/backoff"
 require "google/api_client"
 
 module Gcloud
@@ -40,7 +41,7 @@ module Gcloud
       end
 
       def annotate requests
-        @client.execute(
+        execute(
           api_method: @vision.images.annotate,
           body_object: { requests: requests }
         )
@@ -49,6 +50,14 @@ module Gcloud
       def inspect
         "#{self.class}(#{@project})"
       end
+
+      protected
+
+      def execute options
+        Gcloud::Backoff.new.execute_gapi do
+          @client.execute options
+        end
+      end
     end
   end
 end

data/lib/gcloud/vision/image.rb

@@ -72,28 +72,19 @@ module Gcloud
       #
       # @see {#url?}
       #
-      def content?
+      def io?
         !@io.nil?
       end
 
       ##
       # @private Whether the Image is a URL.
       #
-      # @see {#content?}
+      # @see {#io?}
       #
       def url?
         !@url.nil?
       end
 
-      ##
-      # @private The contents of the image, encoded via Base64.
-      #
-      # @return [String]
-      #
-      def content
-        @content ||= Base64.encode64 @io.read
-      end
-
       ##
       # @private The URL of the image.
       #
@@ -347,8 +338,14 @@ module Gcloud
 
       # @private
       def to_s
-        return "(io)" if content?
-        "(url: #{url})"
+        @to_s ||= begin
+          if io?
+            @io.rewind
+            "(#{@io.read(16)}...)"
+          else
+            "(#{url})"
+          end
+        end
       end
 
       # @private
@@ -359,8 +356,9 @@ module Gcloud
       ##
       # @private The Google API Client object for the Image.
       def to_gapi
-        if content?
-          { content: content }
+        if io?
+          @io.rewind
+          { content: Base64.strict_encode64(@io.read) }
         elsif url?
           { source: { gcsImageUri: @url } }
         else
@@ -371,7 +369,7 @@ module Gcloud
       ##
       # @private New Image from a source object.
       def self.from_source source, vision = nil
-        if source.is_a?(IO) || source.is_a?(StringIO)
+        if source.respond_to?(:read) && source.respond_to?(:rewind)
           return from_io(source, vision)
         end
         # Convert Storage::File objects to the URL
@@ -393,8 +391,7 @@ module Gcloud
       ##
       # @private New Image from an IO object.
       def self.from_io io, vision
-        if !io.is_a?(IO) && !io.is_a?(StringIO)
-          puts io.inspect
+        if !io.respond_to?(:read) && !io.respond_to?(:rewind)
           fail ArgumentError, "Cannot create an Image without an IO object"
         end
         new.tap do |i|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcloud
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Silvano Luciani
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -194,6 +194,20 @@ dependencies:
     - - <=
       - !ruby/object:Gem::Version
         version: 0.35.1
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.3.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.3.0.2
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement