gcloud 0.8.2 → 0.9.0

data/lib/gcloud/logging/metric/list.rb

@@ -76,11 +76,10 @@ module Gcloud
           metrics = new(Array(grpc_list.metrics).map do |grpc_metric|
             Metric.from_grpc grpc_metric, service
           end)
-          metrics.instance_eval do
-            @token = grpc_list.next_page_token
-            @token = nil if @token == ""
-            @service = service
-          end
+          token = grpc_list.next_page_token
+          token = nil if token == ""
+          metrics.instance_variable_set "@token", token
+          metrics.instance_variable_set "@service", service
           metrics
         end
 

data/lib/gcloud/logging/resource.rb

@@ -76,18 +76,7 @@ module Gcloud
         return new if grpc.nil?
         new.tap do |r|
           r.type = grpc.type
-          r.labels = map_to_hash(grpc.labels)
-        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]
+          r.labels = GRPCUtils.map_to_hash(grpc.labels)
         end
       end
     end

data/lib/gcloud/logging/resource_descriptor.rb

@@ -74,14 +74,13 @@ module Gcloud
       # Google::Api::MonitoredResourceDescriptor object.
       def self.from_grpc grpc
         r = new
-        r.instance_eval do
-          @type        = grpc.type
-          @name        = grpc.display_name
-          @description = grpc.description
-          @labels      = Array(grpc.labels).map do |g|
-            LabelDescriptor.from_grpc g
-          end
+        r.instance_variable_set "@type", grpc.type
+        r.instance_variable_set "@name", grpc.display_name
+        r.instance_variable_set "@description", grpc.description
+        labels = Array(grpc.labels).map do |g|
+          LabelDescriptor.from_grpc g
         end
+        r.instance_variable_set "@labels", labels
         r
       end
 
@@ -127,11 +126,9 @@ module Gcloud
                        BOOL:   :boolean,
                        INT64:  :integer }[grpc.value_type]
           l = new
-          l.instance_eval do
-            @key         = grpc.key
-            @type        = type_sym
-            @description = grpc.description
-          end
+          l.instance_variable_set "@key", grpc.key
+          l.instance_variable_set "@type", type_sym
+          l.instance_variable_set "@description", grpc.description
           l
         end
       end

data/lib/gcloud/logging/resource_descriptor/list.rb

@@ -57,11 +57,10 @@ module Gcloud
           sinks = new(Array(grpc_list.resource_descriptors).map do |grpc|
             ResourceDescriptor.from_grpc grpc
           end)
-          sinks.instance_eval do
-            @token = grpc_list.next_page_token
-            @token = nil if @token == ""
-            @service = service
-          end
+          token = grpc_list.next_page_token
+          token = nil if token == ""
+          sinks.instance_variable_set "@token", token
+          sinks.instance_variable_set "@service", service
           sinks
         end
 

data/lib/gcloud/logging/sink/list.rb

@@ -76,11 +76,10 @@ module Gcloud
           sinks = new(Array(grpc_list.sinks).map do |grpc|
             Sink.from_grpc grpc, service
           end)
-          sinks.instance_eval do
-            @token = grpc_list.next_page_token
-            @token = nil if @token == ""
-            @service = service
-          end
+          token = grpc_list.next_page_token
+          token = nil if token == ""
+          sinks.instance_variable_set "@token", token
+          sinks.instance_variable_set "@service", service
           sinks
         end
 

data/lib/gcloud/pubsub/message.rb

@@ -86,9 +86,7 @@ module Gcloud
       # @private New Message from a Google::Pubsub::V1::PubsubMessage object.
       def self.from_grpc grpc
         new.tap do |m|
-          m.instance_eval do
-            @grpc = grpc
-          end
+          m.instance_variable_set "@grpc", grpc
         end
       end
     end

data/lib/gcloud/pubsub/subscription.rb

@@ -56,14 +56,12 @@ module Gcloud
       ##
       # @private New lazy {Topic} object without making an HTTP request.
       def self.new_lazy name, service, options = {}
-        sub = new.tap do |f|
-          f.grpc = nil
-          f.service = service
-        end
-        sub.instance_eval do
-          @name = service.subscription_path(name, options)
+        new.tap do |s|
+          s.grpc = nil
+          s.service = service
+          s.instance_variable_set "@name",
+                                  service.subscription_path(name, options)
         end
-        sub
       end
 
       ##

data/lib/gcloud/pubsub/topic.rb

@@ -58,9 +58,7 @@ module Gcloud
         new.tap do |t|
           t.grpc = nil
           t.service = service
-          t.instance_eval do
-            @name = service.topic_path(name, options)
-          end
+          t.instance_variable_set "@name", service.topic_path(name, options)
         end
       end
 

data/lib/gcloud/resource_manager/project/list.rb

@@ -70,10 +70,8 @@ module Gcloud
           projects = new(Array(resp.data["projects"]).map do |gapi_object|
             Project.from_gapi gapi_object, manager.connection
           end)
-          projects.instance_eval do
-            @token = resp.data["nextPageToken"]
-            @manager = manager
-          end
+          projects.instance_variable_set "@token",   resp.data["nextPageToken"]
+          projects.instance_variable_set "@manager", manager
           projects
         end
 

data/lib/gcloud/translate/api.rb

@@ -148,8 +148,9 @@ module Gcloud
         to = to.to_s
         from = from.to_s if from
         format = format.to_s if format
-        resp = connection.translate(*text, to: to, from: from,
-                                           format: format, cid: cid)
+        text = Array(text).flatten
+        resp = connection.translate(text, to: to, from: from,
+                                          format: format, cid: cid)
         fail ApiError.from_response(resp) unless resp.success?
         Translation.from_response resp, text, to, from
       end
@@ -194,7 +195,8 @@ module Gcloud
       #
       def detect *text
         return nil if text.empty?
-        resp = connection.detect(*text)
+        text = Array(text).flatten
+        resp = connection.detect(text)
         fail ApiError.from_response(resp) unless resp.success?
         Detection.from_response resp, text
       end

data/lib/gcloud/translate/connection.rb

@@ -36,8 +36,8 @@ module Gcloud
         @client.key = key # set key after discovery, helps with tests
       end
 
-      def translate *text, to: nil, from: nil, format: nil, cid: nil
-        params = { q:           text,
+      def translate text, to: nil, from: nil, format: nil, cid: nil
+        params = { q:           Array(text),
                    target:      to,
                    source:      from,
                    format:      format,
@@ -51,10 +51,10 @@ module Gcloud
         )
       end
 
-      def detect *text
+      def detect text
         @client.execute(
           api_method: @translate.detections.list,
-          parameters: { q: text, prettyprint: false }
+          parameters: { q: Array(text), prettyprint: false }
         )
       end
 

data/lib/gcloud/version.rb

@@ -14,5 +14,5 @@
 
 
 module Gcloud
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcloud
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Silvano Luciani
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -27,19 +27,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.13.1
 - !ruby/object:Gem::Dependency
-  name: beefcake
+  name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.0.0.alpha.5.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.0.0.alpha.5.0.5
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -291,17 +291,19 @@ files:
 - lib/gcloud/credentials.rb
 - lib/gcloud/datastore.rb
 - lib/gcloud/datastore/commit.rb
-- lib/gcloud/datastore/connection.rb
 - lib/gcloud/datastore/credentials.rb
+- lib/gcloud/datastore/cursor.rb
 - lib/gcloud/datastore/dataset.rb
 - lib/gcloud/datastore/dataset/lookup_results.rb
 - lib/gcloud/datastore/dataset/query_results.rb
 - lib/gcloud/datastore/entity.rb
 - lib/gcloud/datastore/errors.rb
+- lib/gcloud/datastore/gql_query.rb
+- lib/gcloud/datastore/grpc_utils.rb
 - lib/gcloud/datastore/key.rb
 - lib/gcloud/datastore/properties.rb
-- lib/gcloud/datastore/proto.rb
 - lib/gcloud/datastore/query.rb
+- lib/gcloud/datastore/service.rb
 - lib/gcloud/datastore/transaction.rb
 - lib/gcloud/dns.rb
 - lib/gcloud/dns/change.rb
@@ -335,7 +337,6 @@ files:
 - lib/gcloud/logging/service.rb
 - lib/gcloud/logging/sink.rb
 - lib/gcloud/logging/sink/list.rb
-- lib/gcloud/proto/datastore_v1.pb.rb
 - lib/gcloud/pubsub.rb
 - lib/gcloud/pubsub/credentials.rb
 - lib/gcloud/pubsub/message.rb
@@ -403,17 +404,7 @@ files:
 - lib/google/logging/v2/logging_services.rb
 - lib/google/longrunning/operations.rb
 - lib/google/longrunning/operations_services.rb
-- lib/google/protobuf/any.rb
-- lib/google/protobuf/api.rb
 - lib/google/protobuf/descriptor.rb
-- lib/google/protobuf/duration.rb
-- lib/google/protobuf/empty.rb
-- lib/google/protobuf/field_mask.rb
-- lib/google/protobuf/source_context.rb
-- lib/google/protobuf/struct.rb
-- lib/google/protobuf/timestamp.rb
-- lib/google/protobuf/type.rb
-- lib/google/protobuf/wrappers.rb
 - lib/google/pubsub/v1/pubsub.rb
 - lib/google/pubsub/v1/pubsub_services.rb
 - lib/google/pubsub/v1beta2/pubsub.rb
@@ -436,8 +427,6 @@ rdoc_options:
 - --main
 - OVERVIEW.md
 - --exclude
-- lib/gcloud/proto/
-- --exclude
 - lib/google/
 require_paths:
 - lib

data/lib/gcloud/datastore/connection.rb

@@ -1,203 +0,0 @@
-# Copyright 2014 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.
-
-
-require "faraday"
-
-module Gcloud
-  module Datastore
-    ##
-    # @private
-    #
-    # Represent the HTTP connection to the Datastore,
-    # as well as the Datastore API calls.
-    #
-    # This class only deals with Protocol Buffer objects,
-    # and is not part of the public API.
-    class Connection
-      API_VERSION = "v1beta2"
-      API_URL = "https://www.googleapis.com"
-
-      ##
-      # The project/dataset_id connected to.
-      attr_accessor :dataset_id
-
-      ##
-      # The Credentials object for signing HTTP requests.
-      attr_accessor :credentials
-
-      ##
-      # Create a new Connection instance.
-      #
-      # @example
-      #   conn = Gcloud::Datastore.Connection.new "my-todo-project",
-      #     Gcloud::Datastore::Credentials.new("/path/to/keyfile.json")
-      #
-      def initialize dataset_id, credentials
-        @dataset_id = dataset_id
-        @credentials = credentials
-      end
-
-      ##
-      # Allocate IDs for incomplete keys.
-      # (This is useful for referencing an entity before it is inserted.)
-      def allocate_ids *incomplete_keys
-        allocate_ids = Proto::AllocateIdsRequest.new.tap do |ai|
-          ai.key = incomplete_keys
-        end
-
-        rpc_response = rpc("allocateIds", allocate_ids)
-        Proto::AllocateIdsResponse.decode rpc_response
-      end
-
-      ##
-      # Look up entities by keys.
-      def lookup *keys, consistency: nil, transaction: nil
-        lookup = Proto::LookupRequest.new key: keys
-        if consistency == :eventual
-          lookup.read_options = Proto::ReadOptions.new(read_consistency: 2)
-        elsif consistency == :strong
-          lookup.read_options = Proto::ReadOptions.new(read_consistency: 1)
-        elsif transaction
-          lookup.read_options = Proto::ReadOptions.new(
-            transaction: transaction)
-        end
-
-        Proto::LookupResponse.decode rpc("lookup", lookup)
-      end
-
-      # Query for entities.
-      def run_query query, partition = nil, consistency: nil, transaction: nil
-        run_query = Proto::RunQueryRequest.new.tap do |rq|
-          rq.query = query
-          rq.partition_id = partition if partition
-        end
-        if consistency == :eventual
-          run_query.read_options = Proto::ReadOptions.new(read_consistency: 2)
-        elsif consistency == :strong
-          run_query.read_options = Proto::ReadOptions.new(read_consistency: 1)
-        elsif transaction
-          run_query.read_options = Proto::ReadOptions.new(
-            transaction: transaction)
-        end
-
-        Proto::RunQueryResponse.decode rpc("runQuery", run_query)
-      end
-
-      ##
-      # Begin a new transaction.
-      def begin_transaction
-        tx_request = Proto::BeginTransactionRequest.new
-
-        response_rpc = rpc "beginTransaction", tx_request
-        Proto::BeginTransactionResponse.decode response_rpc
-      end
-
-      ##
-      # Commit a transaction, optionally creating, deleting or modifying
-      # some entities.
-      def commit mutation, transaction = nil
-        mode = Proto::CommitRequest::Mode::NON_TRANSACTIONAL
-        mode = Proto::CommitRequest::Mode::TRANSACTIONAL if transaction
-
-        commit = Proto::CommitRequest.new.tap do |c|
-          c.mutation = mutation
-          c.mode = mode
-          c.transaction = transaction
-        end
-
-        Proto::CommitResponse.decode rpc("commit", commit)
-      end
-
-      ##
-      # Roll back a transaction.
-      def rollback transaction
-        rollback = Proto::RollbackRequest.new.tap do |r|
-          r.transaction = transaction
-        end
-
-        Proto::RollbackResponse.decode rpc("rollback", rollback)
-      end
-
-      ##
-      # The default HTTP headers to be sent on all API calls.
-      def default_http_headers
-        @default_http_headers ||= {
-          "User-Agent"   => "gcloud-node/#{Gcloud::VERSION}",
-          "Content-Type" => "application/x-protobuf" }
-      end
-      ##
-      # Update the default HTTP headers.
-      attr_writer :default_http_headers
-
-      ##
-      # The HTTP object that makes calls to Datastore.
-      # This must be a Faraday object.
-      def http
-        @http ||= Faraday.new url: http_host
-      end
-      ##
-      # Update the HTTP object.
-      attr_writer :http
-
-      ##
-      # The Datastore API URL.
-      def http_host
-        @http_host || ENV["DATASTORE_HOST"] || API_URL
-      end
-
-      ##
-      # Update the Datastore API URL.
-      def http_host= new_http_host
-        @http = nil # Reset the HTTP connection when host is set
-        @http_host = new_http_host
-      end
-
-      def inspect
-        "#{self.class}(#{@dataset_id})"
-      end
-
-      protected
-
-      ##
-      # Convenience method for making an API call to Datastore.
-      # Requests will be signed with the credentials object.
-      def rpc proto_method, proto_request
-        response = http.post(rpc_path proto_method) do |req|
-          req.headers.merge! default_http_headers
-          req.body = get_proto_request_body proto_request
-
-          @credentials.sign_http_request req
-        end
-
-        fail ApiError.new(proto_method, response) unless response.success?
-
-        response.body
-      end
-
-      ## Generates the HTTP Path value for the API call.
-      def rpc_path proto_method
-        "/datastore/#{API_VERSION}/datasets/#{dataset_id}/#{proto_method}"
-      end
-
-      ##
-      # Convenience method for encoding a Beefcake object to a string.
-      def get_proto_request_body proto_request
-        proto_request_body = ""
-        proto_request.encode proto_request_body
-        proto_request_body
-      end
-    end
-  end
-end