google-cloud-storage 1.13.1 → 1.14.0

data/lib/google/cloud/storage/convert.rb

@@ -0,0 +1,40 @@
+# Copyright 2018 Google LLC
+#
+# 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
+#
+#     https://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 Google
+  module Cloud
+    module Storage
+      ##
+      # @private
+      #
+      # Internal conversion of raw data values to/from Storage values
+      module Convert
+        # @param [String,Symbol,Array<String,Symbol>] str
+        def storage_class_for str
+          return nil if str.nil?
+          return str.map { |s| storage_class_for s } if str.is_a? Array
+          { "durable_reduced_availability" => "DURABLE_REDUCED_AVAILABILITY",
+            "dra" => "DURABLE_REDUCED_AVAILABILITY",
+            "durable" => "DURABLE_REDUCED_AVAILABILITY",
+            "nearline" => "NEARLINE",
+            "coldline" => "COLDLINE",
+            "multi_regional" => "MULTI_REGIONAL",
+            "regional" => "REGIONAL",
+            "standard" => "STANDARD" }[str.to_s.downcase] || str.to_s
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/storage/file.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 
+require "google/cloud/storage/convert"
 require "google/cloud/storage/file/acl"
 require "google/cloud/storage/file/list"
 require "google/cloud/storage/file/verifier"
@@ -62,6 +63,7 @@ module Google
       #   downloaded.read #=> "Hello world!"
       #
       class File
+        include Convert
         ##
         # @private The Connection object.
         attr_accessor :service
@@ -1486,18 +1488,6 @@ module Google
           end
         end
 
-        def storage_class_for str
-          return nil if str.nil?
-          { "durable_reduced_availability" => "DURABLE_REDUCED_AVAILABILITY",
-            "dra" => "DURABLE_REDUCED_AVAILABILITY",
-            "durable" => "DURABLE_REDUCED_AVAILABILITY",
-            "nearline" => "NEARLINE",
-            "coldline" => "COLDLINE",
-            "multi_regional" => "MULTI_REGIONAL",
-            "regional" => "REGIONAL",
-            "standard" => "STANDARD" }[str.to_s.downcase] || str.to_s
-        end
-
         ##
         # Yielded to a block to accumulate changes for a patch request.
         class Updater < File

data/lib/google/cloud/storage/notification.rb

@@ -38,14 +38,14 @@ module Google
       #   require "google/cloud/storage"
       #
       #   pubsub = Google::Cloud::Pubsub.new
+      #   storage = Google::Cloud::Storage.new
+      #
       #   topic = pubsub.create_topic "my-topic"
       #   topic.policy do |p|
       #     p.add "roles/pubsub.publisher",
-      #           "serviceAccount:my-project" \
-      #           "@gs-project-accounts.iam.gserviceaccount.com"
+      #           "serviceAccount:#{storage.service_account_email}"
       #   end
       #
-      #   storage = Google::Cloud::Storage.new
       #   bucket = storage.bucket "my-bucket"
       #
       #   notification = bucket.create_notification topic.name

data/lib/google/cloud/storage/project.rb

@@ -15,9 +15,11 @@
 
 require "google/cloud/storage/errors"
 require "google/cloud/storage/service"
+require "google/cloud/storage/convert"
 require "google/cloud/storage/credentials"
 require "google/cloud/storage/bucket"
 require "google/cloud/storage/bucket/cors"
+require "google/cloud/storage/bucket/lifecycle"
 require "google/cloud/storage/file"
 
 module Google
@@ -46,6 +48,7 @@ module Google
       #   file = bucket.file "path/to/my-file.ext"
       #
       class Project
+        include Convert
         ##
         # @private The Service object.
         attr_accessor :service
@@ -318,7 +321,7 @@ module Google
         #
         # @yield [bucket] a block for configuring the bucket before it is
         #   created
-        # @yieldparam [Bucket] cors the bucket object to be configured
+        # @yieldparam [Bucket] bucket the bucket object to be configured
         #
         # @return [Google::Cloud::Storage::Bucket]
         #
@@ -342,6 +345,8 @@ module Google
         #                      "*",
         #                      headers: ["X-My-Custom-Header"],
         #                      max_age: 300
+        #
+        #     b.lifecycle.add_set_storage_class_rule "COLDLINE", age: 10
         #   end
         #
         def create_bucket bucket_name, acl: nil, default_acl: nil,
@@ -366,6 +371,7 @@ module Google
           yield updater if block_given?
           updater.check_for_changed_labels!
           updater.check_for_mutable_cors!
+          updater.check_for_mutable_lifecycle!
           gapi = service.insert_bucket \
             new_bucket, acl: acl_rule(acl), default_acl: acl_rule(default_acl),
                         user_project: user_project
@@ -492,18 +498,6 @@ module Google
         def acl_rule option_name
           Bucket::Acl.predefined_rule_for option_name
         end
-
-        def storage_class_for str
-          return nil if str.nil?
-          { "durable_reduced_availability" => "DURABLE_REDUCED_AVAILABILITY",
-            "dra" => "DURABLE_REDUCED_AVAILABILITY",
-            "durable" => "DURABLE_REDUCED_AVAILABILITY",
-            "nearline" => "NEARLINE",
-            "coldline" => "COLDLINE",
-            "multi_regional" => "MULTI_REGIONAL",
-            "regional" => "REGIONAL",
-            "standard" => "STANDARD" }[str.to_s.downcase] || str.to_s
-        end
       end
     end
   end

data/lib/google/cloud/storage/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Storage
-      VERSION = "1.13.1".freeze
+      VERSION = "1.14.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -197,16 +197,16 @@ dependencies:
   name: yard-doctest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.13
 description: google-cloud-storage is the official library for Google Cloud Storage.
 email:
 - mike@blowmage.com
@@ -223,7 +223,9 @@ files:
 - lib/google/cloud/storage/bucket.rb
 - lib/google/cloud/storage/bucket/acl.rb
 - lib/google/cloud/storage/bucket/cors.rb
+- lib/google/cloud/storage/bucket/lifecycle.rb
 - lib/google/cloud/storage/bucket/list.rb
+- lib/google/cloud/storage/convert.rb
 - lib/google/cloud/storage/credentials.rb
 - lib/google/cloud/storage/errors.rb
 - lib/google/cloud/storage/file.rb