cognitive_vision 0.3.1 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDZjNjEzMmIyMDI0Y2M3OWY3ODAyMGZiZGFiMzVlYTdkMTk1ZGRhOQ==
+    ZDJhN2Y1MzljZTBjYWEwMmY0Njc5MjNhM2EwM2FlYjYxNzU1MTdhNw==
   data.tar.gz: !binary |-
-    N2U1YTY0M2NmOTNmNTllNTM5MjBiZjA2OTljYzc3MDRhMGFhMjg0Zg==
+    NmEzNmNjZGYxNTQzMWRkMmE3OTgzNjc2NDFjY2VjYzRlNTFhMTA5ZA==
 SHA512:
   metadata.gz: !binary |-
-    NWVkZWFlN2M3YTMzMTFkMWU2ODZlMmQyMmEwMDRmNjFlOWRhNjEzMDhlMTcy
-    NWJkNDM1MmZiMTVhZmEzODU4YTRjMzFiZTI1NmI5MWM4ODlmNmFjNDkzZTE1
-    NmIyYWU5NTE1YmJkNmQ5NTQ4Mjc2YmQ0MDBlM2M1ODhlMjJhYmU=
+    MzU0MmI5NDE2MDI1Mjc1M2ZkYTcwMjYyZmUzMmE0OTcxNjAxZWI1ZTgzZjcw
+    YWYwNDdmNmRhNDI1MjBjN2QyMzdkMGMyMDUxNGViZThlNWVhMjVmMDgzNTcx
+    ZTVhZDBlNWE3YTQ5MGRhMDU0OWMxMTIzZWQ4OTI1YWI2ZmU5ZmM=
   data.tar.gz: !binary |-
-    YTk3MGIxZThlMTIxYzBhZDVhY2E3ZDkwZjQ0ZWQ3MjU3ODE4YmFlMjQxZTg0
-    MzI1OWE2ZGJkOWI2ZWYyMjA2MWE5OGE5YzMyN2RmMmIzOTFhNWVlZGVhOTU3
-    ODY0ODkwMzA2MzhmMWM4MTFlOTQzODNkMjIwYjJiZTkyNmQzZmQ=
+    NTE0ODRkZmUyODIwMTM2ZWE5Yjc4MjY1NmZmYmQyZWJiYmQ2NDQ1ZDkwNGEx
+    MzhmMTgxMTRlYWRiYTlmMjM4Njg2YjRkZjI2YWFmYTE1MmU1M2ZmZWFkY2Jl
+    NTIxY2JkZmFlZTUzOWMxYjU4MjkzNzZjMzBlMTgwYzk4OTkwMzM=

data/lib/cognitive_vision/analyze_image.rb

@@ -8,13 +8,13 @@ module CognitiveVision
     class UnknownError          < StandardError; end
 
     def self.analyze_image(image_url, types = [:faces])
-      types    = [types] unless types.is_a?(Array)
+      features = ImageFeatures.new(types)
       body     = { 'url' => image_url }
-      params   = { 'visualFeatures' => types.join(',') }
+      params   = { 'visualFeatures' => features.features_string }
       response = Connection.new.post('/analyze', params, body)
 
       treat_errors(response) if response.code != 200
-      AnalyzeResponse.parse(response.body)
+      AnalyzeResponse.parse(response.body, features)
     end
 
     def self.treat_errors(response)

data/lib/cognitive_vision/analyze_response.rb

@@ -1,21 +1,20 @@
 module CognitiveVision
   class AnalyzeResponse
-    attr_reader :adult, :faces
+    attr_reader :adult, :categories, :description, :faces, :tags
 
     def initialize(options = {})
-      @adult = options.fetch(:adult, nil)
-      @faces = options.fetch(:faces, [])
+      @adult       = options.fetch(:adult, nil)
+      @categories  = options.fetch(:categories, [])
+      @description = options.fetch(:description, nil)
+      @faces       = options.fetch(:faces, [])
+      @tags        = options.fetch(:tags, [])
     end
 
-    def self.parse(response_hash)
-      faces = (response_hash['faces'] || []).map { |face| Face.new(gender: face['gender'], age: face['age']) }
-      adult = if response_hash['adult']
-                adult_response = response_hash['adult']
-                Adult.new(adult_content: adult_response['isAdultContent'],
-                          racy_content: adult_response['isRacyContent'], adult_score: adult_response['adultScore'],
-                          racy_score: adult_response['racyScore'])
-              end
-      new(faces: faces, adult: adult)
+    def self.parse(response_hash, features)
+      parsed = features.analyzers.map do |analyzer|
+                 [analyzer.key.to_sym, analyzer.parse(response_hash)]
+               end
+      new(Hash[parsed])
     end
   end
 end

data/lib/cognitive_vision/category.rb

@@ -0,0 +1,10 @@
+module CognitiveVision
+  class Category
+    attr_reader :name, :score
+
+    def initialize(options = {})
+      @name   = options.fetch(:name)
+      @score  = options.fetch(:score)
+    end
+  end
+end

data/lib/cognitive_vision/description.rb

@@ -0,0 +1,10 @@
+module CognitiveVision
+  class Description
+    attr_reader :captions, :tags
+
+    def initialize(options = {})
+      @captions = options.fetch(:captions, [])
+      @tags     = options.fetch(:tags, [])
+    end
+  end
+end

data/lib/cognitive_vision/description_caption.rb

@@ -0,0 +1,10 @@
+module CognitiveVision
+  class DescriptionCaption
+    attr_reader :confidence, :text
+
+    def initialize(options = {})
+      @confidence = options.fetch(:confidence)
+      @text       = options.fetch(:text)
+    end
+  end
+end

data/lib/cognitive_vision/image_feature/adult.rb

@@ -0,0 +1,16 @@
+module CognitiveVision
+  module ImageFeature
+    class Adult
+      def key
+        'adult'
+      end
+
+      def parse(response)
+        adult_response = response[key]
+        CognitiveVision::Adult.new(adult_content: adult_response['isAdultContent'],
+                                   adult_score: adult_response['adultScore'], racy_score: adult_response['racyScore'],
+                                   racy_content: adult_response['isRacyContent'])
+      end
+    end
+  end
+end

data/lib/cognitive_vision/image_feature/category.rb

@@ -0,0 +1,13 @@
+module CognitiveVision
+  module ImageFeature
+    class Category
+      def key
+        'categories'
+      end
+
+      def parse(response)
+        response[key].map { |category| CognitiveVision::Category.new(name: category['name'], score: category['score']) }
+      end
+    end
+  end
+end

data/lib/cognitive_vision/image_feature/description.rb

@@ -0,0 +1,17 @@
+module CognitiveVision
+  module ImageFeature
+    class Description
+      def key
+        'description'
+      end
+
+      def parse(response)
+        description_response = response[key]
+        captions = description_response['captions'].map do |caption|
+          CognitiveVision::DescriptionCaption.new(text: caption['text'], confidence: caption['confidence'])
+        end
+        CognitiveVision::Description.new(tags: description_response['tags'], captions: captions)
+      end
+    end
+  end
+end

data/lib/cognitive_vision/image_feature/face.rb

@@ -0,0 +1,13 @@
+module CognitiveVision
+  module ImageFeature
+    class Face
+      def key
+        'faces'
+      end
+
+      def parse(response)
+        response[key].map { |face| CognitiveVision::Face.new(gender: face['gender'], age: face['age']) }
+      end
+    end
+  end
+end

data/lib/cognitive_vision/image_feature/tag.rb

@@ -0,0 +1,13 @@
+module CognitiveVision
+  module ImageFeature
+    class Tag
+      def key
+        'tags'
+      end
+
+      def parse(response)
+        response[key].map { |tag| CognitiveVision::Tag.new(name: tag['name'], confidence: tag['confidence']) }
+      end
+    end
+  end
+end

data/lib/cognitive_vision/image_features.rb

@@ -0,0 +1,23 @@
+module CognitiveVision
+  class ImageFeatures
+    ANALYZERS = {
+      adult:       ImageFeature::Adult.new,
+      categories:  ImageFeature::Category.new,
+      description: ImageFeature::Description.new,
+      faces:       ImageFeature::Face.new,
+      tags:        ImageFeature::Tag.new
+    }
+
+    def initialize(features)
+      @features = [features].flatten
+    end
+
+    def features_string
+      @features.join(',')
+    end
+
+    def analyzers
+      ANALYZERS.map{ |feature, analyzer| analyzer if @features.include?(feature) }.reject(&:nil?)
+    end
+  end
+end

data/lib/cognitive_vision/tag.rb

@@ -0,0 +1,10 @@
+module CognitiveVision
+  class Tag
+    attr_reader :confidence, :name
+
+    def initialize(options = {})
+      @confidence = options.fetch(:confidence)
+      @name       = options.fetch(:name)
+    end
+  end
+end

data/lib/cognitive_vision/version.rb

@@ -1,3 +1,3 @@
 module CognitiveVision
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/cognitive_vision.rb

@@ -1,8 +1,18 @@
 require 'cognitive_vision/version'
 require 'cognitive_vision/configuration'
 require 'cognitive_vision/connection'
+require 'cognitive_vision/image_feature/adult'
+require 'cognitive_vision/image_feature/category'
+require 'cognitive_vision/image_feature/description'
+require 'cognitive_vision/image_feature/face'
+require 'cognitive_vision/image_feature/tag'
+require 'cognitive_vision/image_features'
 require 'cognitive_vision/adult'
+require 'cognitive_vision/category'
+require 'cognitive_vision/description'
+require 'cognitive_vision/description_caption'
 require 'cognitive_vision/face'
+require 'cognitive_vision/tag'
 require 'cognitive_vision/analyze_response'
 require 'cognitive_vision/analyze_image'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cognitive_vision
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Carlos Ribeiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,9 +173,19 @@ files:
 - lib/cognitive_vision/adult.rb
 - lib/cognitive_vision/analyze_image.rb
 - lib/cognitive_vision/analyze_response.rb
+- lib/cognitive_vision/category.rb
 - lib/cognitive_vision/configuration.rb
 - lib/cognitive_vision/connection.rb
+- lib/cognitive_vision/description.rb
+- lib/cognitive_vision/description_caption.rb
 - lib/cognitive_vision/face.rb
+- lib/cognitive_vision/image_feature/adult.rb
+- lib/cognitive_vision/image_feature/category.rb
+- lib/cognitive_vision/image_feature/description.rb
+- lib/cognitive_vision/image_feature/face.rb
+- lib/cognitive_vision/image_feature/tag.rb
+- lib/cognitive_vision/image_features.rb
+- lib/cognitive_vision/tag.rb
 - lib/cognitive_vision/version.rb
 homepage: https://github.com/mattr/cognitive_vision
 licenses: