google-cloud-vision 0.20.2 → 0.21.0

data/lib/google/cloud/vision/location.rb

@@ -28,10 +28,9 @@ module Google
       #   standard](http://www.unoosa.org/pdf/icg/2012/template/WGS_84.pdf).
       #
       # @example
-      #   require "google/cloud"
+      #   require "google/cloud/vision"
       #
-      #   gcloud = Google::Cloud.new
-      #   vision = gcloud.vision
+      #   vision = Google::Cloud::Vision.new
       #
       #   image = vision.image "path/to/landmark.jpg"
       #   entity = image.landmark
@@ -80,18 +79,18 @@ module Google
         end
 
         ##
-        # @private New Google API Client LatLng object.
-        def to_gapi
-          Google::Apis::VisionV1::LatLng.new(
+        # @private New GRPC LatLng object.
+        def to_grpc
+          Google::Type::LatLng.new(
             latitude: latitude,
             longitude: longitude
           )
         end
 
         ##
-        # @private New Location from a Google API Client LatLng object.
-        def self.from_gapi gapi
-          new gapi.latitude, gapi.longitude
+        # @private New Location from a GRPC LatLng object.
+        def self.from_grpc grpc
+          new grpc.latitude, grpc.longitude
         end
       end
     end

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

@@ -14,7 +14,7 @@
 
 
 require "google/cloud/errors"
-require "google/cloud/core/gce"
+require "google/cloud/core/environment"
 require "google/cloud/vision/service"
 require "google/cloud/vision/credentials"
 require "google/cloud/vision/annotate"
@@ -27,16 +27,15 @@ module Google
       ##
       # # Project
       #
-      # Google Cloud Vision allows easy integration of vision detection features
-      # within developer applications, including image labeling, face and
-      # landmark detection, optical character recognition (OCR), and tagging of
-      # explicit content.
+      # Google Cloud Vision allows developers to easily integrate vision
+      # detection features within applications, including image labeling, face
+      # and landmark detection, optical character recognition (OCR), and tagging
+      # of explicit content.
       #
       # @example
-      #   require "google/cloud"
+      #   require "google/cloud/vision"
       #
-      #   gcloud = Google::Cloud.new
-      #   vision = gcloud.vision
+      #   vision = Google::Cloud::Vision.new
       #
       #   image = vision.image "path/to/landmark.jpg"
       #
@@ -61,11 +60,12 @@ module Google
         # The Vision project connected to.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/vision"
         #
-        #   gcloud = Google::Cloud.new "my-todo-project",
-        #                       "/path/to/keyfile.json"
-        #   vision = gcloud.vision
+        #   vision = Google::Cloud::Vision.new(
+        #     project: "my-todo-project",
+        #     keyfile: "/path/to/keyfile.json"
+        #   )
         #
         #   vision.project #=> "my-todo-project"
         #
@@ -79,7 +79,7 @@ module Google
           ENV["VISION_PROJECT"] ||
             ENV["GOOGLE_CLOUD_PROJECT"] ||
             ENV["GCLOUD_PROJECT"] ||
-            Google::Cloud::Core::GCE.project_id
+            Google::Cloud::Core::Environment.project_id
         end
 
         ##
@@ -89,7 +89,7 @@ module Google
         # combined size of all images in a request. Reducing your file size can
         # significantly improve throughput; however, be careful not to reduce
         # image quality in the process. See [Best Practices - Image
-        # Sizing](https://cloud.google.com/vision/docs/image-best-practices#image_sizing)
+        # Sizing](https://cloud.google.com/vision/docs/best-practices#image_sizing)
         # for current file size limits.
         #
         # Note that an object in Google Cloud Storage is a single entity;
@@ -97,7 +97,7 @@ module Google
         # exist (though default bucket permissions do exist). Make sure the code
         # which performs your request has access to that image.
         #
-        # @see https://cloud.google.com/vision/docs/image-best-practices Best
+        # @see https://cloud.google.com/vision/docs/best-practices Best
         #   Practices
         #
         # @param [String, IO, StringIO, Tempfile, Google::Cloud::Storage::File]
@@ -109,18 +109,16 @@ module Google
         # @return [Image] An image for the Vision service.
         #
         # @example With a Google Cloud Storage URI:
-        #   require "google/cloud"
+        #   require "google/cloud/vision"
         #
-        #   gcloud = Google::Cloud.new
-        #   vision = gcloud.vision
+        #   vision = Google::Cloud::Vision.new
         #
         #   image = vision.image "gs://bucket-name/path_to_image_object"
         #
         # @example With a local file path:
-        #   require "google/cloud"
+        #   require "google/cloud/vision"
         #
-        #   gcloud = Google::Cloud.new
-        #   vision = gcloud.vision
+        #   vision = Google::Cloud::Vision.new
         #
         #   image = vision.image "path/to/landmark.jpg"
         #
@@ -144,7 +142,7 @@ module Google
         # combined size of all images in a request. Reducing your file size can
         # significantly improve throughput; however, be careful not to reduce
         # image quality in the process. See [Best Practices - Image
-        # Sizing](https://cloud.google.com/vision/docs/image-best-practices#image_sizing)
+        # Sizing](https://cloud.google.com/vision/docs/best-practices#image_sizing)
         # for current file size limits.
         #
         # @see https://cloud.google.com/vision/docs/requests-and-responses Cloud
@@ -189,10 +187,9 @@ module Google
         #   multiple images.
         #
         # @example With a single image:
-        #   require "google/cloud"
+        #   require "google/cloud/vision"
         #
-        #   gcloud = Google::Cloud.new
-        #   vision = gcloud.vision
+        #   vision = Google::Cloud::Vision.new
         #
         #   image = vision.image "path/to/landmark.jpg"
         #
@@ -203,10 +200,9 @@ module Google
         #   #=>  "monument", "landmark"]
         #
         # @example With multiple images:
-        #   require "google/cloud"
+        #   require "google/cloud/vision"
         #
-        #   gcloud = Google::Cloud.new
-        #   vision = gcloud.vision
+        #   vision = Google::Cloud::Vision.new
         #
         #   face_img = vision.image "path/to/face.jpg"
         #   landmark_img = vision.image "path/to/landmark.jpg"
@@ -217,10 +213,9 @@ module Google
         #   annotations[1].labels.count #=> 6
         #
         # @example With multiple images and configurations passed in a block:
-        #   require "google/cloud"
+        #   require "google/cloud/vision"
         #
-        #   gcloud = Google::Cloud.new
-        #   vision = gcloud.vision
+        #   vision = Google::Cloud::Vision.new
         #
         #   face_img = vision.image "path/to/face.jpg"
         #   landmark_img = vision.image "path/to/landmark.jpg"
@@ -238,10 +233,9 @@ module Google
         #   annotations[2].text.words.count #=> 28
         #
         # @example Maximum result values can also be provided:
-        #   require "google/cloud"
+        #   require "google/cloud/vision"
         #
-        #   gcloud = Google::Cloud.new
-        #   vision = gcloud.vision
+        #   vision = Google::Cloud::Vision.new
         #
         #   image = vision.image "path/to/landmark.jpg"
         #
@@ -260,10 +254,10 @@ module Google
 
           yield a if block_given?
 
-          gapi = service.annotate a.requests
-          annotations = Array(gapi.responses).map do |g|
+          grpc = service.annotate a.requests
+          annotations = Array(grpc.responses).map do |g|
             fail Error.from_error(g.error) if g.error
-            Annotation.from_gapi g
+            Annotation.from_grpc g
           end
           return annotations.first if annotations.count == 1
           annotations

data/lib/google/cloud/vision/service.rb

@@ -15,7 +15,8 @@
 
 require "google/cloud/errors"
 require "google/cloud/vision/version"
-require "google/apis/vision_v1"
+require "google/cloud/vision/v1"
+require "google/gax/errors"
 
 module Google
   module Cloud
@@ -24,39 +25,54 @@ module Google
       # @private
       # Represents the service to Vision, exposing the API calls.
       class Service
-        ##
-        # Alias to the Google Client API module
-        API = Google::Apis::VisionV1
-
-        attr_accessor :project
-        attr_accessor :credentials
+        attr_accessor :project, :credentials, :host, :timeout, :client_config
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, retries: nil, timeout: nil
+        def initialize project, credentials, host: nil, timeout: nil,
+                       client_config: nil
           @project = project
           @credentials = credentials
-          @service = API::VisionService.new
-          @service.client_options.application_name    = "google-cloud-vision"
-          @service.client_options.application_version = \
-            Google::Cloud::Vision::VERSION
-          @service.request_options.retries = retries || 3
-          @service.request_options.timeout_sec      = timeout
-          @service.request_options.open_timeout_sec = timeout
-          @service.authorization = @credentials.client
+          @host = host || V1::ImageAnnotatorApi::SERVICE_ADDRESS
+          @timeout = timeout
+          @client_config = client_config || {}
+        end
+
+        def channel
+          require "grpc"
+          GRPC::Core::Channel.new host, nil, chan_creds
+        end
+
+        def chan_creds
+          return credentials if insecure?
+          require "grpc"
+          GRPC::Core::ChannelCredentials.new.compose \
+            GRPC::Core::CallCredentials.new credentials.client.updater_proc
         end
 
         def service
           return mocked_service if mocked_service
-          @service
+          @service ||= \
+            V1::ImageAnnotatorApi.new(
+              service_path: host,
+              channel: channel,
+              timeout: timeout,
+              client_config: client_config,
+              app_name: "gcloud-ruby",
+              app_version: Google::Cloud::Vision::VERSION)
         end
         attr_accessor :mocked_service
 
+        def insecure?
+          credentials == :this_channel_is_insecure
+        end
+
         ##
         # Returns API::BatchAnnotateImagesResponse
         def annotate requests
-          request = API::BatchAnnotateImagesRequest.new(requests: requests)
-          execute { service.annotate_image request }
+          execute do
+            service.batch_annotate_images requests, options: default_options
+          end
         end
 
         def inspect
@@ -65,10 +81,19 @@ module Google
 
         protected
 
+        def default_headers
+          { "google-cloud-resource-prefix" => "projects/#{@project}" }
+        end
+
+        def default_options
+          Google::Gax::CallOptions.new kwargs: default_headers
+        end
+
         def execute
           yield
-        rescue Google::Apis::Error => e
-          raise Google::Cloud::Error.from_error(e)
+        rescue Google::Gax::GaxError => e
+          # GaxError wraps BadStatus, but exposes it as #cause
+          raise Google::Cloud::Error.from_error(e.cause)
         end
       end
     end

data/lib/google/cloud/vision/v1/image_annotator_api.rb

@@ -26,7 +26,7 @@ require "json"
 require "pathname"
 
 require "google/gax"
-require "google/cloud/vision/v1/image_annotator_services_pb"
+require "google/cloud/vision/v1/image_annotator_pb"
 
 module Google
   module Cloud
@@ -36,10 +36,10 @@ module Google
         # landmark, logo, label, and text detection, over client images, and returns
         # detected entities from the images.
         #
-        # @!attribute [r] stub
+        # @!attribute [r] image_annotator_stub
         #   @return [Google::Cloud::Vision::V1::ImageAnnotator::Stub]
         class ImageAnnotatorApi
-          attr_reader :stub
+          attr_reader :image_annotator_stub
 
           # The default address of the service.
           SERVICE_ADDRESS = "vision.googleapis.com".freeze
@@ -86,8 +86,15 @@ module Google
               timeout: DEFAULT_TIMEOUT,
               app_name: "gax",
               app_version: Google::Gax::VERSION
+            # These require statements are intentionally placed here to initialize
+            # the gRPC module only when it's required.
+            # See https://github.com/googleapis/toolkit/issues/446
+            require "google/gax/grpc"
+            require "google/cloud/vision/v1/image_annotator_services_pb"
+
             google_api_client = "#{app_name}/#{app_version} " \
-              "#{CODE_GEN_NAME_VERSION} ruby/#{RUBY_VERSION}".freeze
+              "#{CODE_GEN_NAME_VERSION} gax/#{Google::Gax::VERSION} " \
+              "ruby/#{RUBY_VERSION}".freeze
             headers = { :"x-goog-api-client" => google_api_client }
             client_config_file = Pathname.new(__dir__).join(
               "image_annotator_client_config.json"
@@ -103,7 +110,7 @@ module Google
                 kwargs: headers
               )
             end
-            @stub = Google::Gax::Grpc.create_stub(
+            @image_annotator_stub = Google::Gax::Grpc.create_stub(
               service_path,
               port,
               chan_creds: chan_creds,
@@ -113,7 +120,7 @@ module Google
             )
 
             @batch_annotate_images = Google::Gax.create_api_call(
-              @stub.method(:batch_annotate_images),
+              @image_annotator_stub.method(:batch_annotate_images),
               defaults["batch_annotate_images"]
             )
           end
@@ -129,6 +136,15 @@ module Google
           #   retries, etc.
           # @return [Google::Cloud::Vision::V1::BatchAnnotateImagesResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
+          # @example
+          #   require "google/cloud/vision/v1/image_annotator_api"
+          #
+          #   ImageAnnotatorApi = Google::Cloud::Vision::V1::ImageAnnotatorApi
+          #
+          #   image_annotator_api = ImageAnnotatorApi.new
+          #   requests = []
+          #   response = image_annotator_api.batch_annotate_images(requests)
+
           def batch_annotate_images \
               requests,
               options: nil

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Vision
-      VERSION = "0.20.2"
+      VERSION = "0.21.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-vision
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,28 +17,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        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-gax
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.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: 0.9.11
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +193,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: yard-doctest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 description: google-cloud-vision is the official library for Google Cloud Vision API.
 email:
 - mike@blowmage.com