google-cloud-datastore 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e09eda35bf315f2e0770ba68fe5e4cf20627620
-  data.tar.gz: defca69aebef85ab77ced5f07ecbbf112c1029c3
+  metadata.gz: 007a60b36f840de3463b248b7eac389ca43d6dc1
+  data.tar.gz: d53a54ae030e78ae23bb8452565f86230be64720
 SHA512:
-  metadata.gz: 8ae9e6f5e9fd02c0b0e99bffd7a0fce54bf4f3c3516be73218936a50c1b26659ae6ba628e5e97d20a6cdbd8284a53e0e1b26ea9dc11c3f89781d621d249853c9
-  data.tar.gz: 03cb2770d32794438819844ec56f0264e44b006b71c4df126c02e5076493f26c3deb70fd1930d6343345da4bb1e714d67e256f376465f328c75d5c3633ec086a
+  metadata.gz: 7ec35a2806d9b5c437c963d8028e9222b5c9ceeed9ed2a455e7c6e6deb24aed24db09b102e29e89d6dc59bd0133cb0088cfd1fbe051766a2e5f6a9cb7d697731
+  data.tar.gz: 2459ba10bf82755451235dee9470ce3afef8ea5a56d09316812fd98f87af0667c3aaa9b7848ad82f212911239cc82e9d8967750ca236527630564473a41cac74

data/.yardopts

@@ -1,5 +1,6 @@
 --no-private
 --title=Google Cloud Datastore
+--exclude lib/google/datastore/v1
 --markup markdown
 
 ./lib/**/*.rb

data/lib/google/cloud/datastore.rb

@@ -545,6 +545,8 @@ module Google
       # @param [Integer] timeout Default timeout to use in requests. Optional.
       # @param [Hash] client_config A hash of values to override the default
       #   behavior of the API client. See Google::Gax::CallSettings. Optional.
+      # @param [String] emulator_host Datastore emulator host. Optional.
+      #   If the param is nil, ENV["DATASTORE_EMULATOR_HOST"] will be used.
       #
       # @return [Google::Cloud::Datastore::Dataset]
       #
@@ -566,16 +568,17 @@ module Google
       #   datastore.save task
       #
       def self.new project: nil, keyfile: nil, scope: nil, timeout: nil,
-                   client_config: nil
+                   client_config: nil, emulator_host: nil
         project ||= Google::Cloud::Datastore::Dataset.default_project
         project = project.to_s # Always cast to a string
         fail ArgumentError, "project is missing" if project.empty?
 
-        if ENV["DATASTORE_EMULATOR_HOST"]
+        emulator_host ||= ENV["DATASTORE_EMULATOR_HOST"]
+        if emulator_host
           return Google::Cloud::Datastore::Dataset.new(
             Google::Cloud::Datastore::Service.new(
               project, :this_channel_is_insecure,
-              host: ENV["DATASTORE_EMULATOR_HOST"],
+              host: emulator_host,
               client_config: client_config))
         end
         credentials = credentials_with_scope keyfile, scope

data/lib/google/cloud/datastore/{grpc_utils.rb → convert.rb}

@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# 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.
@@ -13,19 +13,56 @@
 # limitations under the License.
 
 
-require "google/cloud/core/grpc_utils"
 require "google/cloud/datastore/errors"
 require "stringio"
 require "base64"
 
 module Google
   module Cloud
-    module Core
+    module Datastore
+      # rubocop:disable all
+
       ##
       # @private Conversion to/from Datastore GRPC objects.
-      # This file adds Datastore methods to Core::GRPCUtils.
-      module GRPCUtils
-        # rubocop:disable all
+      module Convert
+        ##
+        # @private Convert a Google::Protobuf::Struct to a Hash.
+        def self.struct_to_hash struct
+          # TODO: ArgumentError if struct is not a Google::Protobuf::Struct
+          Hash[struct.fields.map { |k, v| [k, value_to_object(v)] }]
+        end
+
+        ##
+        # @private Convert a Google::Protobuf::Value to an Object.
+        def self.value_to_object value
+          # TODO: ArgumentError if struct is not a Google::Protobuf::Value
+          if value.kind == :null_value
+            nil
+          elsif value.kind == :number_value
+            value.number_value
+          elsif value.kind == :string_value
+            value.string_value
+          elsif value.kind == :bool_value
+            value.bool_value
+          elsif value.kind == :struct_value
+            struct_to_hash value.struct_value
+          elsif value.kind == :list_value
+            value.list_value.values.map { |v| value_to_object(v) }
+          else
+            nil # just in case
+          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
 
         PROP_FILTER_OPS = { "<"            => :LESS_THAN,
                             "lt"           => :LESS_THAN,
@@ -133,8 +170,9 @@ module Google
         def self.decode_bytes bytes
           Base64.decode64(bytes.to_s).force_encoding Encoding::ASCII_8BIT
         end
-        # rubocop:enable all
       end
+
+      # rubocop:enable all
     end
   end
 end

data/lib/google/cloud/datastore/cursor.rb

@@ -63,14 +63,14 @@ module Google
 
         # @private byte array as a string
         def to_grpc
-          Core::GRPCUtils.decode_bytes(@cursor)
+          Convert.decode_bytes(@cursor)
         end
 
         # @private byte array as a string
         def self.from_grpc grpc
           grpc = String grpc
           return nil if grpc.empty?
-          new Core::GRPCUtils.encode_bytes(grpc)
+          new Convert.encode_bytes(grpc)
         end
       end
     end

data/lib/google/cloud/datastore/dataset.rb

@@ -14,7 +14,7 @@
 
 
 require "google/cloud/core/environment"
-require "google/cloud/datastore/grpc_utils"
+require "google/cloud/datastore/convert"
 require "google/cloud/datastore/credentials"
 require "google/cloud/datastore/service"
 require "google/cloud/datastore/commit"

data/lib/google/cloud/datastore/gql_query.rb

@@ -131,7 +131,7 @@ module Google
             if gql_query_param.parameter_type == :cursor
               [name, Cursor.from_grpc(gql_query_param.cursor)]
             else
-              [name, Core::GRPCUtils.from_value(gql_query_param.value)]
+              [name, Convert.from_value(gql_query_param.value)]
             end
           end]
           bindings.freeze
@@ -164,7 +164,7 @@ module Google
             else
               @grpc.named_bindings[name.to_s] = \
                 Google::Datastore::V1::GqlQueryParameter.new(
-                  value: Core::GRPCUtils.to_value(value))
+                  value: Convert.to_value(value))
             end
           end
         end
@@ -181,7 +181,7 @@ module Google
             if gql_query_param.parameter_type == :cursor
               Cursor.from_grpc gql_query_param.cursor
             else
-              Core::GRPCUtils.from_value gql_query_param.value
+              Convert.from_value gql_query_param.value
             end
           end
           bindings.freeze
@@ -213,7 +213,7 @@ module Google
             else
               @grpc.positional_bindings << \
                 Google::Datastore::V1::GqlQueryParameter.new(
-                  value: Core::GRPCUtils.to_value(value))
+                  value: Convert.to_value(value))
             end
           end
         end

data/lib/google/cloud/datastore/properties.rb

@@ -73,15 +73,15 @@ module Google
         alias_method :to_hash, :to_h
 
         def to_grpc
-          Hash[@hash.map { |(k, v)| [k.to_s, Core::GRPCUtils.to_value(v)] }]
+          Hash[@hash.map { |(k, v)| [k.to_s, Convert.to_value(v)] }]
         end
 
         def self.from_grpc grpc_map
           # For some reason Google::Protobuf::Map#map isn't returning the value.
           # It returns nil every time. COnvert to Hash to get actual objects.
-          grpc_hash = Core::GRPCUtils.map_to_hash grpc_map
+          grpc_hash = Convert.map_to_hash grpc_map
           grpc_array = grpc_hash.map do |(k, v)|
-            [k.to_s, Core::GRPCUtils.from_value(v)]
+            [k.to_s, Convert.from_value(v)]
           end
           new Hash[grpc_array]
         end
@@ -97,7 +97,7 @@ module Google
         end
 
         # rubocop:disable all
-        # Disabled rubocop because this needs to match Core::GRPCUtils.to_value
+        # Disabled rubocop because this needs to match Convert.to_value
 
         ##
         # Ensures the value is a type that can be persisted,

data/lib/google/cloud/datastore/query.rb

@@ -177,8 +177,8 @@ module Google
               property_filter: Google::Datastore::V1::PropertyFilter.new(
                 property: Google::Datastore::V1::PropertyReference.new(
                   name: name),
-                op: Core::GRPCUtils.to_prop_filter_op(operator),
-                value: Core::GRPCUtils.to_value(value)
+                op: Convert.to_prop_filter_op(operator),
+                value: Convert.to_value(value)
               )
             )
 
@@ -331,7 +331,7 @@ module Google
           if cursor.is_a? Cursor
             @grpc.start_cursor = cursor.to_grpc
           elsif cursor.is_a? String
-            @grpc.start_cursor = Core::GRPCUtils.decode_bytes cursor
+            @grpc.start_cursor = Convert.decode_bytes cursor
           else
             fail ArgumentError, "Can't set a cursor using a #{cursor.class}."
           end

data/lib/google/cloud/datastore/v1/datastore_client_config.json

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

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Datastore
-      VERSION = "0.23.0"
+      VERSION = "0.24.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-datastore
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -25,76 +25,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.0
-- !ruby/object:Gem::Dependency
-  name: grpc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.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'
 - !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
+        version: 0.8.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
@@ -197,14 +155,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
 description: google-cloud-datastore is the official library for Google Cloud Datastore.
@@ -221,6 +179,7 @@ files:
 - lib/google-cloud-datastore.rb
 - lib/google/cloud/datastore.rb
 - lib/google/cloud/datastore/commit.rb
+- lib/google/cloud/datastore/convert.rb
 - lib/google/cloud/datastore/credentials.rb
 - lib/google/cloud/datastore/cursor.rb
 - lib/google/cloud/datastore/dataset.rb
@@ -229,7 +188,6 @@ files:
 - lib/google/cloud/datastore/entity.rb
 - lib/google/cloud/datastore/errors.rb
 - lib/google/cloud/datastore/gql_query.rb
-- lib/google/cloud/datastore/grpc_utils.rb
 - lib/google/cloud/datastore/key.rb
 - lib/google/cloud/datastore/properties.rb
 - lib/google/cloud/datastore/query.rb
@@ -267,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Datastore