gcloud 0.11.0 → 0.12.0

data/lib/gcloud/vision/annotation/entity.rb

@@ -89,7 +89,7 @@ module Gcloud
         # @return [String] The opaque entity ID.
         #
         def mid
-          @gapi["mid"]
+          @gapi.mid
         end
 
         ##
@@ -101,7 +101,7 @@ module Gcloud
         #   language code.
         #
         def locale
-          @gapi["locale"]
+          @gapi.locale
         end
 
         ##
@@ -110,7 +110,7 @@ module Gcloud
         # @return [String] A description of the entity.
         #
         def description
-          @gapi["description"]
+          @gapi.description
         end
 
         ##
@@ -119,7 +119,7 @@ module Gcloud
         # @return [Float] A value in the range [0, 1].
         #
         def score
-          @gapi["score"]
+          @gapi.score
         end
 
         ##
@@ -130,7 +130,7 @@ module Gcloud
         # @return [Float] A value in the range [0, 1].
         #
         def confidence
-          @gapi["confidence"]
+          @gapi.confidence
         end
 
         ##
@@ -143,7 +143,7 @@ module Gcloud
         # @return [Float] A value in the range [0, 1].
         #
         def topicality
-          @gapi["topicality"]
+          @gapi.topicality
         end
 
         ##
@@ -153,8 +153,8 @@ module Gcloud
         # @return [Array<Vertex>] An array of vertices.
         #
         def bounds
-          return [] unless @gapi["boundingPoly"]
-          @bounds ||= Array(@gapi["boundingPoly"]["vertices"]).map do |v|
+          return [] unless @gapi.bounding_poly
+          @bounds ||= Array(@gapi.bounding_poly.vertices).map do |v|
             Vertex.from_gapi v
           end
         end
@@ -170,8 +170,8 @@ module Gcloud
         #   and longitude.
         #
         def locations
-          @locations ||= Array(@gapi["locations"]).map do |l|
-            Location.from_gapi l["latLng"]
+          @locations ||= Array(@gapi.locations).map do |l|
+            Location.from_gapi l.lat_lng
           end
         end
 
@@ -184,7 +184,7 @@ module Gcloud
         #
         def properties
           @properties ||=
-            Hash[Array(@gapi["properties"]).map { |p| [p["name"], p["value"]] }]
+            Hash[Array(@gapi.properties).map { |p| [p.name, p.value] }]
         end
 
         ##

data/lib/gcloud/vision/annotation/face.rb

@@ -91,7 +91,7 @@ module Gcloud
         # @return [Float] A value in the range [0, 1].
         #
         def confidence
-          @gapi["detectionConfidence"]
+          @gapi.detection_confidence
         end
 
         ##
@@ -169,7 +169,7 @@ module Gcloud
           # @return [Float] A value in the range [-180,180].
           #
           def roll
-            @gapi["rollAngle"]
+            @gapi.roll_angle
           end
 
           ##
@@ -180,7 +180,7 @@ module Gcloud
           # @return [Float] A value in the range [-180,180].
           #
           def yaw
-            @gapi["panAngle"]
+            @gapi.pan_angle
           end
           alias_method :pan, :yaw
 
@@ -191,7 +191,7 @@ module Gcloud
           # @return [Float] A value in the range [-180,180].
           #
           def pitch
-            @gapi["tiltAngle"]
+            @gapi.tilt_angle
           end
           alias_method :tilt, :pitch
 
@@ -289,8 +289,8 @@ module Gcloud
           # generated in the BoundingPoly (the polygon will be unbounded) if
           # only a partial face appears in the image to be annotated.
           def head
-            return [] unless @gapi["boundingPoly"]
-            @head ||= Array(@gapi["boundingPoly"]["vertices"]).map do |v|
+            return [] unless @gapi.bounding_poly
+            @head ||= Array(@gapi.bounding_poly.vertices).map do |v|
               Vertex.from_gapi v
             end
           end
@@ -302,8 +302,8 @@ module Gcloud
           # visible in an image. It is not based on the landmarks, only on the
           # initial face detection.
           def face
-            return [] unless @gapi["fdBoundingPoly"]
-            @face ||= Array(@gapi["fdBoundingPoly"]["vertices"]).map do |v|
+            return [] unless @gapi.fd_bounding_poly
+            @face ||= Array(@gapi.fd_bounding_poly.vertices).map do |v|
               Vertex.from_gapi v
             end
           end
@@ -407,7 +407,7 @@ module Gcloud
           # @return [Float] A value in the range [0,1].
           #
           def confidence
-            @gapi["landmarkingConfidence"]
+            @gapi.landmarking_confidence
           end
 
           ##
@@ -435,8 +435,8 @@ module Gcloud
           #   #=> #<Landmark (x: 303.81198, y: 88.5782, z: 77.719193)>
           #
           def [] landmark_type
-            landmark = Array(@gapi["landmarks"]).detect do |l|
-              l["type"] == landmark_type
+            landmark = Array(@gapi.landmarks).detect do |l|
+              l.type == landmark_type
             end
             return nil if landmark.nil?
             Landmark.from_gapi landmark
@@ -635,7 +635,7 @@ module Gcloud
             #   face.features.forehead.type #=> "FOREHEAD_GLABELLA"
             #
             def type
-              @gapi["type"]
+              @gapi.type
             end
 
             ##
@@ -644,8 +644,8 @@ module Gcloud
             # @return [Float]
             #
             def x
-              return nil unless @gapi["position"]
-              @gapi["position"]["x"]
+              return nil unless @gapi.position
+              @gapi.position.x
             end
 
             ##
@@ -654,8 +654,8 @@ module Gcloud
             # @return [Float]
             #
             def y
-              return nil unless @gapi["position"]
-              @gapi["position"]["y"]
+              return nil unless @gapi.position
+              @gapi.position.y
             end
 
             ##
@@ -664,8 +664,8 @@ module Gcloud
             # @return [Float]
             #
             def z
-              return nil unless @gapi["position"]
-              @gapi["position"]["z"]
+              return nil unless @gapi.position
+              @gapi.position.z
             end
 
             ##
@@ -1586,7 +1586,7 @@ module Gcloud
           # Joy likelihood rating. Possible values are `VERY_UNLIKELY`,
           # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
           def joy
-            @gapi["joyLikelihood"]
+            @gapi.joy_likelihood
           end
 
           ##
@@ -1603,7 +1603,7 @@ module Gcloud
           # Sorrow likelihood rating. Possible values are `VERY_UNLIKELY`,
           # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
           def sorrow
-            @gapi["sorrowLikelihood"]
+            @gapi.sorrow_likelihood
           end
 
           ##
@@ -1620,7 +1620,7 @@ module Gcloud
           # Joy likelihood rating. Possible values are `VERY_UNLIKELY`,
           # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
           def anger
-            @gapi["angerLikelihood"]
+            @gapi.anger_likelihood
           end
 
           ##
@@ -1637,7 +1637,7 @@ module Gcloud
           # Surprise likelihood rating. Possible values are `VERY_UNLIKELY`,
           # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
           def surprise
-            @gapi["surpriseLikelihood"]
+            @gapi.surprise_likelihood
           end
 
           ##
@@ -1655,7 +1655,7 @@ module Gcloud
           # `VERY_UNLIKELY`, `UNLIKELY`, `POSSIBLE`, `LIKELY`, and
           # `VERY_LIKELY`.
           def under_exposed
-            @gapi["underExposedLikelihood"]
+            @gapi.under_exposed_likelihood
           end
 
           ##
@@ -1672,7 +1672,7 @@ module Gcloud
           # Blurred likelihood rating. Possible values are `VERY_UNLIKELY`,
           # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
           def blurred
-            @gapi["blurredLikelihood"]
+            @gapi.blurred_likelihood
           end
 
           ##
@@ -1689,7 +1689,7 @@ module Gcloud
           # Headwear likelihood rating. Possible values are `VERY_UNLIKELY`,
           # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
           def headwear
-            @gapi["headwearLikelihood"]
+            @gapi.headwear_likelihood
           end
 
           ##

data/lib/gcloud/vision/annotation/properties.rb

@@ -51,8 +51,8 @@ module Gcloud
         # @return [Array<Color>] An array of the image's dominant colors.
         #
         def colors
-          return [] unless @gapi["dominantColors"]
-          @colors ||= Array(@gapi["dominantColors"]["colors"]).map do |c|
+          return [] unless @gapi.dominant_colors
+          @colors ||= Array(@gapi.dominant_colors.colors).map do |c|
             Color.from_gapi c
           end
         end
@@ -150,7 +150,7 @@ module Gcloud
           # @return [Float] A value in the interval [0, 255].
           #
           def red
-            @gapi["color"]["red"]
+            @gapi.color.red
           end
 
           ##
@@ -159,7 +159,7 @@ module Gcloud
           # @return [Float] A value in the interval [0, 255].
           #
           def green
-            @gapi["color"]["green"]
+            @gapi.color.green
           end
 
           ##
@@ -168,7 +168,7 @@ module Gcloud
           # @return [Float] A value in the interval [0, 255].
           #
           def blue
-            @gapi["color"]["blue"]
+            @gapi.color.blue
           end
 
           ##
@@ -179,7 +179,7 @@ module Gcloud
           # @return [Float] A value in the range [0, 1].
           #
           def alpha
-            @gapi["color"]["alpha"] || 1.0
+            @gapi.color.alpha || 1.0
           end
 
           def rgb
@@ -194,7 +194,7 @@ module Gcloud
           # @return [Float] A value in the range [0, 1].
           #
           def score
-            @gapi["score"]
+            @gapi.score
           end
 
           ##
@@ -203,7 +203,7 @@ module Gcloud
           # @return [Float] A value in the range [0, 1].
           #
           def pixel_fraction
-            @gapi["pixelFraction"]
+            @gapi.pixel_fraction
           end
 
           ##

data/lib/gcloud/vision/annotation/safe_search.rb

@@ -54,7 +54,7 @@ module Gcloud
         # Adult likelihood rating. Possible values are `VERY_UNLIKELY`,
         # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
         def adult
-          @gapi["adult"]
+          @gapi.adult
         end
 
         ##
@@ -71,7 +71,7 @@ module Gcloud
         # Spoof likelihood rating. Possible values are `VERY_UNLIKELY`,
         # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
         def spoof
-          @gapi["spoof"]
+          @gapi.spoof
         end
 
         ##
@@ -88,7 +88,7 @@ module Gcloud
         # Medical likelihood rating. Possible values are `VERY_UNLIKELY`,
         # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
         def medical
-          @gapi["medical"]
+          @gapi.medical
         end
 
         ##
@@ -105,7 +105,7 @@ module Gcloud
         # Violence likelihood rating. Possible values are `VERY_UNLIKELY`,
         # `UNLIKELY`, `POSSIBLE`, `LIKELY`, and `VERY_LIKELY`.
         def violence
-          @gapi["violence"]
+          @gapi.violence
         end
 
         ##

data/lib/gcloud/vision/annotation/text.rb

@@ -55,7 +55,7 @@ module Gcloud
         # @return [String] The entire text including newline characters.
         #
         def text
-          @gapi["description"]
+          @gapi.description
         end
 
         ##
@@ -66,7 +66,7 @@ module Gcloud
         #   language code.
         #
         def locale
-          @gapi["locale"]
+          @gapi.locale
         end
 
         ##
@@ -75,8 +75,8 @@ module Gcloud
         # @return [Array<Vertex>]
         #
         def bounds
-          return [] unless @gapi["boundingPoly"]
-          @bounds ||= Array(@gapi["boundingPoly"]["vertices"]).map do |v|
+          return [] unless @gapi.bounding_poly
+          @bounds ||= Array(@gapi.bounding_poly.vertices).map do |v|
             Vertex.from_gapi v
           end
         end
@@ -176,7 +176,7 @@ module Gcloud
           # @return [String]
           #
           def text
-            @gapi["description"]
+            @gapi.description
           end
 
           ##
@@ -185,8 +185,8 @@ module Gcloud
           # @return [Array<Vertex>]
           #
           def bounds
-            return [] unless @gapi["boundingPoly"]
-            @bounds ||= Array(@gapi["boundingPoly"]["vertices"]).map do |v|
+            return [] unless @gapi.bounding_poly
+            @bounds ||= Array(@gapi.bounding_poly.vertices).map do |v|
               Vertex.from_gapi v
             end
           end

data/lib/gcloud/vision/annotation/vertex.rb

@@ -100,7 +100,7 @@ module Gcloud
         # @private New Annotation::Entity::Bounds::Vertex from a Google API
         # Client object.
         def self.from_gapi gapi
-          new gapi["x"], gapi["y"]
+          new gapi.x, gapi.y
         end
       end
     end

data/lib/gcloud/vision/image.rb

@@ -14,6 +14,7 @@
 
 
 require "gcloud/vision/location"
+require "google/apis/vision_v1"
 require "stringio"
 require "base64"
 
@@ -70,8 +71,6 @@ module Gcloud
       ##
       # @private Whether the Image has content.
       #
-      # @see {#url?}
-      #
       def io?
         !@io.nil?
       end
@@ -79,8 +78,6 @@ module Gcloud
       ##
       # @private Whether the Image is a URL.
       #
-      # @see {#io?}
-      #
       def url?
         !@url.nil?
       end
@@ -358,9 +355,9 @@ module Gcloud
       def to_gapi
         if io?
           @io.rewind
-          { content: Base64.strict_encode64(@io.read) }
+          Google::Apis::VisionV1::Image.new content: @io.read
         elsif url?
-          { source: { gcsImageUri: @url } }
+          Google::Apis::VisionV1::Image.new source: { gcsImageUri: @url }
         else
           fail ArgumentError, "Unable to use Image with Vision service."
         end
@@ -477,9 +474,9 @@ module Gcloud
         # @private
         def to_gapi
           return nil if empty?
-          gapi = {}
-          gapi[:latLongRect] = area.to_hash unless area.empty?
-          gapi[:languageHints] = languages unless languages.empty?
+          gapi = Google::Apis::VisionV1::ImageContext.new
+          gapi.lat_long_rect = area.to_gapi unless area.empty?
+          gapi.language_hints = languages unless languages.empty?
           gapi
         end
 
@@ -576,12 +573,15 @@ module Gcloud
           # @return [Hash]
           #
           def to_hash
-            { minLatLng: min.to_hash, maxLatLng: max.to_hash }
+            { min_lat_lng: min.to_hash, max_lat_lng: max.to_hash }
           end
 
           def to_gapi
             return nil if empty?
-            to_hash
+            Google::Apis::VisionV1::LatLongRect.new(
+              min_lat_lng: min.to_gapi,
+              max_lat_lng: max.to_gapi
+            )
           end
         end
       end