gcloud 0.1.1 → 0.2.0

data/lib/gcloud/pubsub/topic/list.rb

@@ -0,0 +1,46 @@
+#--
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Gcloud
+  module Pubsub
+    class Topic
+      ##
+      # Topic::List is a special case Array with additional values.
+      class List < DelegateClass(::Array)
+        ##
+        # If not empty, indicates that there are more topics
+        # that match the request and this value should be passed to
+        # the next Gcloud::PubSub::Project#topics to continue.
+        attr_accessor :token
+
+        ##
+        # Create a new Topic::List with an array of values.
+        def initialize arr = [], token = nil
+          super arr
+          @token = token
+        end
+
+        ##
+        # New Topic::List from a response object.
+        def self.from_resp resp, conn #:nodoc:
+          topics = Array(resp.data["topics"]).map do |gapi_object|
+            Topic.from_gapi gapi_object, conn
+          end
+          new topics, resp.data["nextPageToken"]
+        end
+      end
+    end
+  end
+end

data/lib/gcloud/storage.rb

@@ -38,13 +38,13 @@ module Gcloud
   #
   # === Example
   #
-  #   require "glcoud/storage"
+  #   require "gcloud/storage"
   #
   #   storage = Gcloud.storage "my-todo-project",
   #                            "/path/to/keyfile.json"
   #
-  #   bucket = storage.find_bucket "my-bucket"
-  #   file = bucket.find_file "path/to/my-file.ext"
+  #   bucket = storage.bucket "my-bucket"
+  #   file = bucket.file "path/to/my-file.ext"
   #
   def self.storage project = nil, keyfile = nil
     project ||= Gcloud::Storage::Project.default_project
@@ -65,23 +65,24 @@ module Gcloud
   # infrastructure to perform data operations in a cost effective manner.
   #
   # Gcloud's goal is to provide a API that is familiar and comfortable to
-  # Rubyists. Authentication is handled by Gcloud.storage. You can provide the
+  # Rubyists. Authentication is handled by Gcloud#storage. You can provide the
   # project and credential information to connect to the Storage service, or if
   # you are running on Google Compute Engine this configuration is taken care
   # of for you.
   #
-  #   require "glcoud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage "my-todo-project",
-  #                            "/path/to/keyfile.json"
+  #   gcloud = Gcloud.new "my-todo-project",
+  #                       "/path/to/keyfile.json"
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-bucket"
-  #   file = bucket.find_file "path/to/my-file.ext"
+  #   bucket = storage.bucket "my-bucket"
+  #   file = bucket.file "path/to/my-file.ext"
   #
   # You can learn more about various options for connection on the
   # {Authentication Guide}[link:AUTHENTICATION.md].
   #
-  # To learn more about Datastore, read the
+  # To learn more about Cloud Storage, read the
   # {Google Cloud Storage Overview
   # }[https://cloud.google.com/storage/docs/overview].
   #
@@ -90,28 +91,31 @@ module Gcloud
   # A Bucket is the container for your data. There is no limit on the number of
   # buckets that you can create in a project. You can use buckets to organize
   # and control access to your data. Each bucket has a unique name, which is how
-  # they are retrieved: (See Project#find_bucket)
+  # they are retrieved: (See Project#bucket)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
+  #   bucket = storage.bucket "my-todo-app"
   #
   # You can also retrieve all buckets on a project: (See Project#buckets)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
   #   all_buckets = storage.buckets
   #
   # If you have a significant number of buckets, you may need to paginate
   # through them: (See Bucket::List#token)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
   #   all_buckets = []
   #   tmp_buckets = storage.buckets
@@ -130,9 +134,10 @@ module Gcloud
   # A unique name is all that is needed to create a new bucket:
   # (See Project#create_bucket)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
   #   bucket = storage.create_bucket "my-todo-app-attachments"
   #
@@ -144,41 +149,45 @@ module Gcloud
   # no limit on the number of objects that you can create in a bucket.
   #
   # Files are retrieved by their name, which is the path of the file in the
-  # bucket: (See Bucket#find_file)
+  # bucket: (See Bucket#file)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
-  #   file = bucket.find_file "avatars/heidi/400x400.png"
+  #   bucket = storage.bucket "my-todo-app"
+  #   file = bucket.file "avatars/heidi/400x400.png"
   #
   # You can also retrieve all files in a bucket: (See Bucket#files)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
+  #   bucket = storage.bucket "my-todo-app"
   #   all_files = bucket.files
   #
   # Or you can retrieve all files in a specified path:
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
+  #   bucket = storage.bucket "my-todo-app"
   #   avatar_files = bucket.files prefix: "avatars/"
   #
   # If you have a significant number of files, you may need to paginate through
   # them: (See File::List#token)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
+  #   bucket = storage.bucket "my-todo-app"
   #
   #   all_files = []
   #   tmp_files = bucket.files
@@ -198,11 +207,12 @@ module Gcloud
   # file system, and the name/path that the file should be stored in the bucket.
   # (See Bucket#create_file)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
+  #   bucket = storage.bucket "my-todo-app"
   #   bucket.create_file "/var/todo-app/avatars/heidi/400x400.png",
   #                      "avatars/heidi/400x400.png"
   #
@@ -210,12 +220,13 @@ module Gcloud
   #
   # Files can be downloaded to the local file system. (See File#download)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
-  #   file = bucket.find_file "avatars/heidi/400x400.png"
+  #   bucket = storage.bucket "my-todo-app"
+  #   file = bucket.file "avatars/heidi/400x400.png"
   #   file.download "/var/todo-app/avatars/heidi/400x400.png"
   #
   # == Using Signed URLs
@@ -224,12 +235,13 @@ module Gcloud
   # period of time. This URL uses a cryptographic signature
   # of your credentials to access the file. (See File#signed_url)
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
-  #   file = bucket.find_file "avatars/heidi/400x400.png"
+  #   bucket = storage.bucket "my-todo-app"
+  #   file = bucket.file "avatars/heidi/400x400.png"
   #   shared_url = file.signed_url method: "GET",
   #                                expires: 300 # 5 minutes from now
   #
@@ -245,11 +257,12 @@ module Gcloud
   # Access to a bucket can be granted to a user by appending +"user-"+ to the
   # email address:
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
+  #   bucket = storage.bucket "my-todo-app"
   #
   #   email = "heidi@example.net"
   #   bucket.acl.add_reader "user-#{email}"
@@ -257,22 +270,24 @@ module Gcloud
   # Access to a bucket can be granted to a group by appending +"group-"+ to the
   # email address:
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
+  #   bucket = storage.bucket "my-todo-app"
   #
   #   email = "authors@example.net"
   #   bucket.acl.add_reader "group-#{email}"
   #
   # Access to a bucket can also be granted to a predefined list of permissions:
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
+  #   bucket = storage.bucket "my-todo-app"
   #
   #   bucket.acl.public!
   #
@@ -285,12 +300,13 @@ module Gcloud
   # Access to a file can be granted to a user by appending +"user-"+ to the
   # email address:
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
-  #   file = bucket.find_file "avatars/heidi/400x400.png"
+  #   bucket = storage.bucket "my-todo-app"
+  #   file = bucket.file "avatars/heidi/400x400.png"
   #
   #   email = "heidi@example.net"
   #   file.acl.add_reader "user-#{email}"
@@ -298,24 +314,26 @@ module Gcloud
   # Access to a file can be granted to a group by appending +"group-"+ to the
   # email address:
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
-  #   file = bucket.find_file "avatars/heidi/400x400.png"
+  #   bucket = storage.bucket "my-todo-app"
+  #   file = bucket.file "avatars/heidi/400x400.png"
   #
   #   email = "authors@example.net"
   #   file.acl.add_reader "group-#{email}"
   #
   # Access to a file can also be granted to a predefined list of permissions:
   #
-  #   require "gcloud/storage"
+  #   require "gcloud"
   #
-  #   storage = Gcloud.storage
+  #   gcloud = Gcloud.new
+  #   storage = gcloud.storage
   #
-  #   bucket = storage.find_bucket "my-todo-app"
-  #   file = bucket.find_file "avatars/heidi/400x400.png"
+  #   bucket = storage.bucket "my-todo-app"
+  #   file = bucket.file "avatars/heidi/400x400.png"
   #
   #   file.acl.public!
   #

data/lib/gcloud/storage/bucket.rb

@@ -24,12 +24,13 @@ module Gcloud
     #
     # Represents a Storage bucket. Belongs to a Project and has many Files.
     #
-    #   require "glcoud/storage"
+    #   require "gcloud"
     #
-    #   storage = Gcloud.storage
+    #   gcloud = Gcloud.new
+    #   storage = gcloud.storage
     #
-    #   bucket = storage.find_bucket "my-bucket"
-    #   file = bucket.find_file "path/to/my-file.ext"
+    #   bucket = storage.bucket "my-bucket"
+    #   file = bucket.file "path/to/my-file.ext"
     #
     class Bucket
       ##
@@ -96,8 +97,8 @@ module Gcloud
       # === Parameters
       #
       # +options+::
-      #   An optional Hash for controlling additional behavor. (+Hash+)
-      # +options [:retries]+::
+      #   An optional Hash for controlling additional behavior. (+Hash+)
+      # <code>options[:retries]</code>::
       #   The number of times the API call should be retried.
       #   Default is Gcloud::Backoff.retries. (+Integer+)
       #
@@ -107,22 +108,24 @@ module Gcloud
       #
       # === Examples
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-bucket"
+      #   bucket = storage.bucket "my-bucket"
       #   bucket.delete
       #
       # The API call to delete the bucket may be retried under certain
       # conditions. See Gcloud::Backoff to control this behavior, or
       # specify the wanted behavior in the call:
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-bucket"
+      #   bucket = storage.bucket "my-bucket"
       #   bucket.delete retries: 5
       #
       def delete options = {}
@@ -131,7 +134,7 @@ module Gcloud
         if resp.success?
           true
         else
-          ApiError.from_response(resp)
+          fail ApiError.from_response(resp)
         end
       end
 
@@ -141,37 +144,38 @@ module Gcloud
       # === Parameters
       #
       # +options+::
-      #   An optional Hash for controlling additional behavor. (+Hash+)
-      # +options [:prefix]+::
+      #   An optional Hash for controlling additional behavior. (+Hash+)
+      # <code>options[:prefix]</code>::
       #   Filter results to files whose names begin with this prefix.
       #   (+String+)
-      # +options [:token]+::
+      # <code>options[:token]</code>::
       #   A previously-returned page token representing part of the larger set
       #   of results to view. (+String+)
-      # +options [:max]+::
+      # <code>options[:max]</code>::
       #   Maximum number of items plus prefixes to return. As duplicate prefixes
       #   are omitted, fewer total results may be returned than requested.
       #   The default value of this parameter is 1,000 items. (+Integer+)
-      # +options [:versions]+::
+      # <code>options[:versions]</code>::
       #   If +true+, lists all versions of an object as distinct results.
       #   The default is +false+. For more information, see
       #   {Object Versioning
       #   }[https://cloud.google.com/storage/docs/object-versioning].
       #   (+Boolean+)
-      # +options [:max]+::
+      # <code>options[:max]</code>::
       #   Maximum number of buckets to return. (+Integer+)
       #
       # === Returns
       #
-      # Array of Gcloud::Datastore::File (Gcloud::Datastore::File::List)
+      # Array of Gcloud::Storage::File (Gcloud::Storage::File::List)
       #
       # === Examples
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-bucket"
+      #   bucket = storage.bucket "my-bucket"
       #   files = bucket.files
       #   files.each do |file|
       #     puts file.name
@@ -180,11 +184,12 @@ module Gcloud
       # If you have a significant number of files, you may need to paginate
       # through them: (See File::List#token)
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-bucket"
+      #   bucket = storage.bucket "my-bucket"
       #
       #   all_files = []
       #   tmp_files = bucket.files
@@ -207,6 +212,7 @@ module Gcloud
           fail ApiError.from_response(resp)
         end
       end
+      alias_method :find_files, :files
 
       ##
       # Retrieves a file matching the path.
@@ -218,20 +224,21 @@ module Gcloud
       #
       # === Returns
       #
-      # Gcloud::Datastore::File or nil if file does not exist
+      # Gcloud::Storage::File or nil if file does not exist
       #
       # === Example
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-bucket"
+      #   bucket = storage.bucket "my-bucket"
       #
-      #   file = bucket.find_file "path/to/my-file.ext"
+      #   file = bucket.file "path/to/my-file.ext"
       #   puts file.name
       #
-      def find_file path, options = {}
+      def file path, options = {}
         ensure_connection!
         resp = connection.get_file name, path, options
         if resp.success?
@@ -240,6 +247,7 @@ module Gcloud
           fail ApiError.from_response(resp)
         end
       end
+      alias_method :find_file, :file
 
       ##
       # Create a new File object by providing a path to a local file to upload
@@ -252,46 +260,48 @@ module Gcloud
       # +path+::
       #   Path to store the file in Google Cloud Storage. (+String+)
       # +options+::
-      #   An optional Hash for controlling additional behavor. (+Hash+)
-      # +options [:acl]+::
+      #   An optional Hash for controlling additional behavior. (+Hash+)
+      # <code>options[:acl]</code>::
       #   A predefined set of access controls to apply to this file.
       #   (+String+)
       #
       #   Acceptable values are:
       #   * +auth+, +auth_read+, +authenticated+, +authenticated_read+,
-      #     +authenticatedRead+:: File owner gets OWNER access, and
+      #     +authenticatedRead+ - File owner gets OWNER access, and
       #     allAuthenticatedUsers get READER access.
-      #   * +owner_full+, +bucketOwnerFullControl+:: File owner gets OWNER
+      #   * +owner_full+, +bucketOwnerFullControl+ - File owner gets OWNER
       #     access, and project team owners get OWNER access.
-      #   * +owner_read+, +bucketOwnerRead+:: File owner gets OWNER access, and
+      #   * +owner_read+, +bucketOwnerRead+ - File owner gets OWNER access, and
       #     project team owners get READER access.
-      #   * +private+:: File owner gets OWNER access.
-      #   * +project_private+, +projectPrivate+:: File owner gets OWNER access,
+      #   * +private+ - File owner gets OWNER access.
+      #   * +project_private+, +projectPrivate+ - File owner gets OWNER access,
       #     and project team members get access according to their roles.
-      #   * +public+, +public_read+, +publicRead+:: File owner gets OWNER
+      #   * +public+, +public_read+, +publicRead+ - File owner gets OWNER
       #     access, and allUsers get READER access.
       #
       # === Returns
       #
-      # Gcloud::Datastore::File
+      # Gcloud::Storage::File
       #
       # === Examples
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-bucket"
+      #   bucket = storage.bucket "my-bucket"
       #
       #   bucket.create_file "path/to/local.file.ext"
       #
       # Additionally, a destination path can be specified.
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-bucket"
+      #   bucket = storage.bucket "my-bucket"
       #
       #   bucket.create_file "path/to/local.file.ext",
       #                      "destination/path/file.ext"
@@ -302,11 +312,12 @@ module Gcloud
       # by 265KB then it will be lowered to the nearest acceptible
       # value.
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-bucket"
+      #   bucket = storage.bucket "my-bucket"
       #
       #   bucket.create_file "path/to/local.file.ext",
       #                      "destination/path/file.ext",
@@ -326,6 +337,8 @@ module Gcloud
           upload_multipart file, path, options
         end
       end
+      alias_method :upload_file, :create_file
+      alias_method :new_file, :create_file
 
       ##
       # The Bucket::Acl instance used to control access to the bucket.
@@ -342,11 +355,12 @@ module Gcloud
       # Access to a bucket can be granted to a user by appending +"user-"+ to
       # the email address:
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-todo-app"
+      #   bucket = storage.bucket "my-todo-app"
       #
       #   email = "heidi@example.net"
       #   bucket.acl.add_reader "user-#{email}"
@@ -354,11 +368,12 @@ module Gcloud
       # Access to a bucket can be granted to a group by appending +"group-"+ to
       # the email address:
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-todo-app"
+      #   bucket = storage.bucket "my-todo-app"
       #
       #   email = "authors@example.net"
       #   bucket.acl.add_reader "group-#{email}"
@@ -366,11 +381,12 @@ module Gcloud
       # Access to a bucket can also be granted to a predefined list of
       # permissions:
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-todo-app"
+      #   bucket = storage.bucket "my-todo-app"
       #
       #   bucket.acl.public!
       #
@@ -394,11 +410,12 @@ module Gcloud
       # Access to a bucket's files can be granted to a user by appending
       # +"user-"+ to the email address:
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-todo-app"
+      #   bucket = storage.bucket "my-todo-app"
       #
       #   email = "heidi@example.net"
       #   bucket.default_acl.add_reader "user-#{email}"
@@ -406,11 +423,12 @@ module Gcloud
       # Access to a bucket's files can be granted to a group by appending
       # +"group-"+ to the email address:
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-todo-app"
+      #   bucket = storage.bucket "my-todo-app"
       #
       #   email = "authors@example.net"
       #   bucket.default_acl.add_reader "group-#{email}"
@@ -418,11 +436,12 @@ module Gcloud
       # Access to a bucket's files can also be granted to a predefined list of
       # permissions:
       #
-      #   require "gcloud/storage"
+      #   require "gcloud"
       #
-      #   storage = Gcloud.storage
+      #   gcloud = Gcloud.new
+      #   storage = gcloud.storage
       #
-      #   bucket = storage.find_bucket "my-todo-app"
+      #   bucket = storage.bucket "my-todo-app"
       #
       #   bucket.default_acl.public!
       def default_acl