google-cloud-logging 0.23.2 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb8784e1fbc741309311311b15651df19b532754
-  data.tar.gz: 0f1b0d5083403e2b1b9fd33835bafede49994afd
+  metadata.gz: b21d81a8dd0345896f6d8614d0fe7cdfe13eb1d4
+  data.tar.gz: 376e833691d63e7f868b959c21ac8907ea872d4a
 SHA512:
-  metadata.gz: c86a24215d51b9187724572be6f508ae5456f43338e64cde425eef115128763929ba67a7db2bca6eb16a8af8f4ea96e8be2b6acb395cc27f826d840400e946a9
-  data.tar.gz: aadb70bbe1c9e72728feb947dad30bee4713fe9ac2173d98e9bda4ddd086e7c7c390ac26205588bf7e06abed0d41af52444d0310dc4674565d48977d510e4e59
+  metadata.gz: 7c76269efa35b6ac9dcb63e9020bde529907a0c01b894016e9c315dea259d30eae2310b1e402b4f77175898ae9b38aa0139ec92d82bf2c5d966d46d28fc3c83e
+  data.tar.gz: 44157406a87996ac911cc0b1fb22a1e41d2ba9aa06b8ed642c015b4cc8aa22dbfb3752b7299c8146b87522f00d94b20e44620b8e0ab4b2a19d011222ddd96f08

data/.yardopts

@@ -1,5 +1,6 @@
 --no-private
 --title=Stackdriver Logging
+--exclude lib/google/logging/v2
 --markup markdown
 
 ./lib/**/*.rb

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

@@ -0,0 +1,64 @@
+# Copyright 2017 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 Google
+  module Cloud
+    module Logging
+      ##
+      # @private Conversion to/from Logging GRPC objects.
+      module Convert
+        ##
+        # @private Convert a Hash to a Google::Protobuf::Struct.
+        def self.hash_to_struct hash
+          # TODO: ArgumentError if hash is not a Hash
+          Google::Protobuf::Struct.new fields:
+            Hash[hash.map { |k, v| [String(k), object_to_value(v)] }]
+        end
+
+        ##
+        # @private Convert an Object to a Google::Protobuf::Value.
+        def self.object_to_value obj
+          case obj
+          when NilClass then Google::Protobuf::Value.new null_value:
+            :NULL_VALUE
+          when Numeric then Google::Protobuf::Value.new number_value: obj
+          when String then Google::Protobuf::Value.new string_value: obj
+          when TrueClass then Google::Protobuf::Value.new bool_value: true
+          when FalseClass then Google::Protobuf::Value.new bool_value: false
+          when Hash then Google::Protobuf::Value.new struct_value:
+            hash_to_struct(obj)
+          when Array then Google::Protobuf::Value.new list_value:
+            Google::Protobuf::ListValue.new(values:
+              obj.map { |o| object_to_value(o) })
+          else
+            # TODO: Could raise ArgumentError here, or convert to a string
+            Google::Protobuf::Value.new string_value: obj.to_s
+          end
+        end
+
+        ##
+        # @private Convert a Google::Protobuf::Map to a Hash
+        def self.map_to_hash map
+          if map.respond_to? :to_h
+            map.to_h
+          else
+            # Enumerable doesn't have to_h on ruby 2.0...
+            Hash[map.to_a]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/logging/entry.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-require "google/cloud/core/grpc_utils"
+require "google/cloud/logging/convert"
 require "google/cloud/logging/resource"
 require "google/cloud/logging/entry/http_request"
 require "google/cloud/logging/entry/operation"
@@ -390,7 +390,7 @@ module Google
             e.timestamp = extract_timestamp(grpc)
             e.severity = grpc.severity
             e.insert_id = grpc.insert_id
-            e.labels = Core::GRPCUtils.map_to_hash(grpc.labels)
+            e.labels = Convert.map_to_hash(grpc.labels)
             e.payload = extract_payload(grpc)
             e.instance_variable_set "@resource",
                                     Resource.from_grpc(grpc.resource)
@@ -435,7 +435,7 @@ module Google
           if payload.is_a? Google::Protobuf::Any
             grpc.proto_payload = payload
           elsif payload.respond_to? :to_hash
-            grpc.json_payload = Core::GRPCUtils.hash_to_struct payload.to_hash
+            grpc.json_payload = Convert.hash_to_struct payload.to_hash
           else
             grpc.text_payload = payload.to_s
           end

data/lib/google/cloud/logging/resource.rb

@@ -76,7 +76,7 @@ module Google
           return new if grpc.nil?
           new.tap do |r|
             r.type = grpc.type
-            r.labels = Core::GRPCUtils.map_to_hash(grpc.labels)
+            r.labels = Convert.map_to_hash(grpc.labels)
           end
         end
       end

data/lib/google/cloud/logging/v2/config_service_v2_client_config.json

@@ -2,13 +2,11 @@
   "interfaces": {
     "google.logging.v2.ConfigServiceV2": {
       "retry_codes": {
-        "retry_codes_def": {
           "idempotent": [
             "DEADLINE_EXCEEDED",
             "UNAVAILABLE"
           ],
           "non_idempotent": []
-        }
       },
       "retry_params": {
         "default": {

data/lib/google/cloud/logging/v2/logging_service_v2_client_config.json

@@ -2,13 +2,11 @@
   "interfaces": {
     "google.logging.v2.LoggingServiceV2": {
       "retry_codes": {
-        "retry_codes_def": {
           "idempotent": [
             "DEADLINE_EXCEEDED",
             "UNAVAILABLE"
           ],
           "non_idempotent": []
-        }
       },
       "retry_params": {
         "default": {

data/lib/google/cloud/logging/v2/metrics_service_v2_client_config.json

@@ -2,13 +2,11 @@
   "interfaces": {
     "google.logging.v2.MetricsServiceV2": {
       "retry_codes": {
-        "retry_codes_def": {
           "idempotent": [
             "DEADLINE_EXCEEDED",
             "UNAVAILABLE"
           ],
           "non_idempotent": []
-        }
       },
       "retry_params": {
         "default": {

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Logging
-      VERSION = "0.23.2"
+      VERSION = "0.24.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-logging
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.24.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -26,61 +26,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.21.1
 - !ruby/object:Gem::Dependency
-  name: grpc
+  name: stackdriver-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: google-gax
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: google-protobuf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: googleapis-common-protos
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: orderedhash
   requirement: !ruby/object:Gem::Requirement
@@ -95,34 +67,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.6
-- !ruby/object:Gem::Dependency
-  name: stackdriver-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
@@ -225,14 +183,14 @@ dependencies:
   name: yard-doctest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
@@ -277,6 +235,7 @@ files:
 - lib/google-cloud-logging.rb
 - lib/google/cloud/logging.rb
 - lib/google/cloud/logging/async_writer.rb
+- lib/google/cloud/logging/convert.rb
 - lib/google/cloud/logging/credentials.rb
 - lib/google/cloud/logging/entry.rb
 - lib/google/cloud/logging/entry/http_request.rb
@@ -339,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: API Client library for Stackdriver Logging