indico 0.4.0 → 0.5.0

data/README.md

@@ -72,7 +72,7 @@ Each `Indico` method has a corresponding batch method for analyzing many example
 
 => "YOUR_API_KEY"
 
-> Indico.batch_sentiment(['Best day ever', 'Worst day ever'])
+> Indico.sentiment(['Best day ever', 'Worst day ever'])
 
 => [0.9899001220871786, 0.005709885173415242]
 ```
@@ -99,7 +99,7 @@ Accepted image API names: `fer, facial_features, image_features`
 
 => {"sentiment"=>0.9899001220871786, "language"=>{"Swedish"=>0.0022464881013042294, "Vietnamese"=>9.887170914498351e-05, ...}}
 
-> Indico.batch_predict_text(["Best day ever", "Worst day ever"], ["sentiment", "language"])
+> Indico.predict_text(["Best day ever", "Worst day ever"], ["sentiment", "language"])
 
 => {"sentiment"=>[0.9899001220871786, 0.005709885173415242], "language"=>[{"Swedish"=>0.0022464881013042294, "Vietnamese"=>9.887170914498351e-05, "Romanian"=>0.00010661175919993216, ...}, {"Swedish"=>0.4924352805804646, "Vietnamese"=>0.028574824174911372, "Romanian"=>0.004185623723173551, "Dutch"=>0.000717033819689362, "Korean"=>0.0030093489153785826, ...}]}
 
@@ -111,7 +111,7 @@ Accepted image API names: `fer, facial_features, image_features`
 
 => {"facial_features"=>[0.0, -0.026176479280200796, 0.20707644777495776, ...], "fer"=>{"Angry"=>0.08877494466353497, "Sad"=>0.3933999409104264, "Neutral"=>0.1910612654566151, "Surprise"=>0.0346146405941845, "Fear"=>0.17682159820518667, "Happy"=>0.11532761017005204}}
 
-> Indico.batch_predict_image([test_face, test_face], ["fer", "facial_features"])
+> Indico.predict_image([test_face, test_face], ["fer", "facial_features"])
 
 => {"facial_features"=>[[0.0, -0.026176479280200796, 0.20707644777495776, ...], [0.0, -0.026176479280200796, 0.20707644777495776, ...]], "fer"=>[{"Angry"=>0.08877494466353497, "Sad"=>0.3933999409104264, "Neutral"=>0.1910612654566151, "Surprise"=>0.0346146405941845, "Fear"=>0.17682159820518667, "Happy"=>0.11532761017005204}, {"Angry"=>0.08877494466353497, "Sad"=>0.3933999409104264, "Neutral"=>0.1910612654566151, "Surprise"=>0.0346146405941845, "Fear"=>0.17682159820518667, "Happy"=>0.11532761017005204}]}
 ```

data/lib/indico/helper.rb

@@ -18,6 +18,10 @@ module Indico
     d = {}
     d['data'] = data
 
+    if data.class == Array
+        api += "/batch"
+    end
+
     unless config.nil?
       server = config[:cloud]
       api_key = config[:api_key]

data/lib/indico/image.rb

@@ -2,30 +2,50 @@ require 'oily_png'
 require 'base64'
 
 module Indico
-  def self.preprocess(image, size, batch)
-    # image is [[f,f,f,f, ...], ..] or [[[f,f,f],[f,f,f],[f,f,f]], ...]
-    if batch
+  def self.preprocess(image, size, min_axis)
+    
+    if image.class == String
+      decoded_image = handle_string_input(image)
+    elsif image.class == Array
       # Batch Request
       im_array = Array.new
 
       # process each image
       image.each do |_image|
-        im_array.push(preprocess(_image, size, false))
+        im_array.push(preprocess(_image, size, min_axis))
       end
 
       return im_array
+    else
+      raise Exception.new("Image input must be filename or base64 string")
     end
 
-    if image.class == String
-      decoded_image = handle_string_input(image)
-    elsif image.class == Array
-      decoded_image = handle_array_input(image)
+    if size
+      if min_axis
+        image = self.min_resize(decoded_image, size)
+      else
+        image = decoded_image.resize(size, size) 
+      end
     else
-      raise Exception.new("Image input must be nested array of pixels, filename, or base64 string")
+      image = decoded_image
     end
 
     # Resize and export base64 encoded string
-    return decoded_image.resize(size, size).to_data_url.gsub("data:image/png;base64," ,"")
+    return image.to_data_url.gsub("data:image/png;base64," ,"")
+  end
+
+  def self.min_resize(decoded_image, size)
+    img_size = [decoded_image.width, decoded_image.height]
+    min_idx, max_idx = img_size[0] < img_size[1] ? [0, 1] : [1, 0]
+    aspect = img_size[max_idx] / Float(img_size[min_idx])
+    if aspect > 10
+      warn("An aspect ratio greater than 10:1 is not recommended")
+    end
+    size_arr = [0, 0]
+    size_arr[min_idx] = size
+    size_arr[max_idx] = Integer(size * aspect)
+    image = decoded_image.resize(size_arr[0], size_arr[1])
+    return image
   end
 
   def self.handle_string_input(str)
@@ -44,42 +64,6 @@ module Indico
     end
   end
 
-  def self.handle_array_input(image)
-    # Handles properly formatting and loading array of pixels
-    # Single Request
-    warn "Warning! Array input as image will be deprecated in the next major release.\n Consider using filepaths or base64 encoded strings"
-    
-    dimens = get_dimension(image)
-    isFloat = array_contains_float(image, dimens)
-
-    if dimens.size > 3
-      raise Exception.new("Nested array of image must be [[p, p, ...]] or [[[r,g,b], [r,g,b], ...]]")
-    end
-
-    decoded_image = ChunkyPNG::Image.new(dimens[0], dimens[1])
-
-    # Manually loading the pixels into the ChunkyImage object
-    (0..dimens[0] - 1).each do |x|
-      (0..dimens[1] - 1).each do |y|
-        pixel = image[x][y]
-        if pixel.is_a?(Array)
-          if isFloat
-            pixel.map! {|a| (255 * a).to_i}
-          end
-          decoded_image.set_pixel(x,y, ChunkyPNG::Color.rgb(pixel[0], pixel[1], pixel[2]))
-        else
-          if isFloat
-            pixel = (pixel * 255).to_i
-          end
-          decoded_image.set_pixel(x,y, ChunkyPNG::Color.rgb(pixel, pixel, pixel))
-        end
-      end
-    end
-
-    return decoded_image
-  end
-
-
   def self.get_dimension(array)
     return [] unless array.is_a?(Array)
     return [array.size] + get_dimension(array[0])

data/lib/indico/multi.rb

@@ -8,9 +8,12 @@ module Indico
     "language" => "language",
     "text_tags" => "texttags",
     "fer" => "fer",
+    "named_entities" => "named_entities",
+    "keywords" => "keywords",
     "facial_features" => "facialfeatures",
     "image_features" => "imagefeatures",
-    "content_filtering" => "contentfiltering"
+    "content_filtering" => "contentfiltering",
+    "twitter_engagement" => "twitterengagement"
   }
 
   SERVER_TO_CLIENT = CLIENT_TO_SERVER.invert

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/indico.rb

@@ -29,15 +29,23 @@ module Indico
   end
 
   def self.batch_political(text, config = nil)
-    api_handler(text, 'political/batch', config)
+    warn(
+      "The `batch_political` function will be deprecated in the next major upgrade. " + 
+      "Please call `political` instead with the same arguments"
+    )
+    self.political(text, config)
   end
 
   def self.posneg(*args)
     sentiment(*args)
   end
 
-  def self.batch_posneg(*args)
-    batch_sentiment(*args)
+  def self.batch_posneg(text, config = nil)
+    warn(
+      "The `batch_posneg` function will be deprecated in the next major upgrade. " + 
+      "Please call `posneg` instead with the same arguments"
+    )
+    self.posneg(text, config)
   end
 
   def self.sentiment(text, config = nil)
@@ -45,7 +53,24 @@ module Indico
   end
 
   def self.batch_sentiment(text, config = nil)
-    api_handler(text, 'sentiment/batch', config)
+    warn(
+      "The `batch_sentiment` function will be deprecated in the next major upgrade. " + 
+      "Please call `sentiment` instead with the same arguments"
+    )
+    self.sentiment(text, config)
+  end
+
+
+  def self.twitter_engagement(text, config = nil)
+    api_handler(text, 'twitterengagement', config)
+  end
+
+  def self.batch_twitter_engagement(text, config = nil)
+    warn(
+      "The `batch_twitter_engagement` function will be deprecated in the next major upgrade. " + 
+      "Please call `twitter_engagement` instead with the same arguments"
+    )
+    self.twitter_engagement(text, config)
   end
 
   def self.sentiment_hq(text, config = nil)
@@ -53,55 +78,101 @@ module Indico
   end
 
   def self.batch_sentiment_hq(text, config = nil)
-    api_handler(text, 'sentimenthq/batch', config)
+    warn(
+      "The `batch_sentiment_hq` function will be deprecated in the next major upgrade. " + 
+      "Please call `sentiment_hq` instead with the same arguments"
+    )
+    self.sentiment_hq(text, config)
   end
 
+
   def self.language(text, config = nil)
     api_handler(text, 'language', config)
   end
 
   def self.batch_language(text, config = nil)
-    api_handler(text, 'language/batch', config)
+    warn(
+      "The `batch_language` function will be deprecated in the next major upgrade. " + 
+      "Please call `language` instead with the same arguments"
+    )
+    self.language(text, config)
   end
 
+
   def self.text_tags(text, config = nil)
     api_handler(text, 'texttags', config)
   end
 
   def self.batch_text_tags(text, config = nil)
-    api_handler(text, 'texttags/batch', config)
+    warn(
+      "The `batch_text_tags` function will be deprecated in the next major upgrade. " + 
+      "Please call `text_tags` instead with the same arguments"
+    )
+    self.text_tags(text, config)
   end
 
+
   def self.keywords(text, config = nil)
     api_handler(text, 'keywords', config)
   end
 
   def self.batch_keywords(text, config = nil)
-    api_handler(text, 'keywords/batch', config)
+    warn(
+      "The `batch_keywords` function will be deprecated in the next major upgrade. " + 
+      "Please call `keywords` instead with the same arguments"
+    )
+    self.keywords(text, config)
   end
 
+
   def self.named_entities(test_text, config = nil)
     api_handler(test_text, 'namedentities', config)
   end
 
-  def self.batch_named_entities(test_text, config = nil)
-    api_handler(test_text, 'namedentities/batch', config)
+  def self.batch_named_entities(text, config = nil)
+    warn(
+      "The `batch_named_entities` function will be deprecated in the next major upgrade. " + 
+      "Please call `named_entities` instead with the same arguments"
+    )
+    self.named_entities(text, config)
   end
 
-  def self.fer(test_image, config = nil)
-    api_handler(preprocess(test_image, 48, false), 'fer', config)
+  def self.fer(image, config = nil)
+    size = (config != nil and config["detect"] == true) ? false : 48
+    api_handler(preprocess(image, size, false), 'fer', config)
   end
 
   def self.batch_fer(image, config = nil)
-    api_handler(preprocess(image, 48, true), 'fer/batch', config)
+    warn(
+      "The `batch_fer` function will be deprecated in the next major upgrade. " + 
+      "Please call `fer` instead with the same arguments"
+    )
+    self.fer(image, config)
   end
 
+
   def self.facial_features(image, config = nil)
     api_handler(preprocess(image, 48, false), 'facialfeatures', config)
   end
 
   def self.batch_facial_features(image, config = nil)
-    api_handler(preprocess(image, 48, true), 'facialfeatures/batch', config)
+    warn(
+      "The `batch_facial_features` function will be deprecated in the next major upgrade. " + 
+      "Please call `facial_features` instead with the same arguments"
+    )
+    self.facial_features(image, config)
+  end
+
+  def self.facial_localization(image, config = nil)
+    api_handler(preprocess(image, 128, false), 'faciallocalization', config)
+  end
+
+  def self.batch_facial_localization(image, config = nil)
+    warn(
+      "The `batch_facial_localization` function will be deprecated in the next major upgrade. " + 
+      "Please call `facial_localization` instead with the same arguments"
+    )
+    self.facial_localization(image, config)
   end
 
   def self.image_features(image, config = nil)
@@ -109,15 +180,23 @@ module Indico
   end
 
   def self.batch_image_features(image, config = nil)
-    api_handler(preprocess(image, 64, true), 'imagefeatures/batch', config)
+    warn(
+      "The `batch_image_features` function will be deprecated in the next major upgrade. " + 
+      "Please call `image_features` instead with the same arguments"
+    )
+    self.image_features(image, config)
   end
 
   def self.content_filtering(image, config = nil)
-    api_handler(preprocess(image, 128, false), 'contentfiltering', config)
+    api_handler(preprocess(image, 128, true), 'contentfiltering', config)
   end
 
   def self.batch_content_filtering(image, config = nil)
-    api_handler(preprocess(image, 128, true), 'contentfiltering/batch', config)
+    warn(
+      "The `batch_content_filtering` function will be deprecated in the next major upgrade. " + 
+      "Please call `content_filtering` instead with the same arguments"
+    )
+    self.content_filtering(image, config)
   end
 
   def self.predict_image(face, apis = IMAGE_APIS, config = nil)
@@ -125,20 +204,25 @@ module Indico
     multi(preprocess(face, 48, false), "image", apis, IMAGE_APIS, config ? config.update(api_hash) : api_hash)
   end
 
-  # FIXME - use settings TEXT_APIS when sentimenthq is released
-  def self.predict_text(text, apis = ['political', 'sentiment', 'language', 'text_tags'], config = nil)
-    api_hash = {apis:apis}
-    multi(text, "text", apis, TEXT_APIS, config ? config.update(api_hash) : api_hash)
+  def self.batch_predict_image(image, config = nil)
+    warn(
+      "The `batch_predict_image` function will be deprecated in the next major upgrade. " + 
+      "Please call `predict_image` instead with the same arguments"
+    )
+    self.predict_image(image, config)
   end
 
-  def self.batch_predict_image(face, apis, config = nil)
+  def self.predict_text(text, apis = TEXT_APIS, config = nil)
     api_hash = {apis:apis}
-    multi(preprocess(face, 48, true), "image", apis, IMAGE_APIS, true, config ? config.update(api_hash) : api_hash)
+    multi(text, "text", apis, TEXT_APIS, config ? config.update(api_hash) : api_hash)
   end
 
-  # FIXME - use settings TEXT_APIS when sentimenthq is released
-  def self.batch_predict_text(text, apis = ['political', 'sentiment', 'language', 'text_tags'], config = nil)
-    api_hash = {apis:apis}
-    multi(text, "text", apis, TEXT_APIS, true, config ? config.update(api_hash) : api_hash)
+  def self.batch_predict_text(text, config = nil)
+    warn(
+      "The `batch_predict_text` function will be deprecated in the next major upgrade. " + 
+      "Please call `predict_text` instead with the same arguments"
+    )
+    self.predict_text(text, config)
   end
+
 end

data/spec/indico_batch_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'set'
 
+
 describe Indico do
   before do
     api_key = ENV['INDICO_API_KEY']
@@ -14,7 +15,7 @@ describe Indico do
   it 'should tag text with correct political tags' do
     expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
     data = ['Guns don\'t kill people.', ' People kill people.']
-    response = Indico.batch_political(data, @config)
+    response = Indico.political(data, @config)
 
     expect(Set.new(response[0].keys)).to eql(expected_keys)
     expect(Set.new(response[1].keys)).to eql(expected_keys)
@@ -26,7 +27,7 @@ describe Indico do
 
     # for mocking: use http instead of https to route requests to our public cloud
     Indico.cloud_protocol = 'http://'
-    response = Indico.batch_political(data, @config_private_cloud)
+    response = Indico.political(data, @config_private_cloud)
     Indico.cloud_protocol = 'https://'
 
     expect(Set.new(response[0].keys)).to eql(expected_keys)
@@ -34,15 +35,22 @@ describe Indico do
   end
 
   it 'should tag text with correct sentiment tags' do
-    response = Indico.batch_sentiment(['Worst movie ever.'], @config)
+    response = Indico.sentiment(['Worst movie ever.'], @config)
     expect(response[0] < 0.5).to eql(true)
   end
 
   it 'should tag text with correct sentiment_hq tags' do
-    response = Indico.batch_sentiment_hq(['Worst movie ever.'], @config)
+    response = Indico.sentiment_hq(['Worst movie ever.'], @config)
     expect(response[0] < 0.5).to eql(true)
   end
 
+  it 'should tag text with correct twitter engagment tags' do
+    response = Indico.twitter_engagement(['#Breaking rt if you <3 pic.twitter.com @Startup'])
+
+    expect(response[0] < 1).to eql(true)
+    expect(response[0] > 0).to eql(true)
+  end
+
   it 'should tag text with correct language tags' do
     expected_keys = Set.new([
       'English',
@@ -82,7 +90,7 @@ describe Indico do
     ])
 
     data = ['Quis custodiet ipsos custodes', 'Clearly english, foo!']
-    response = Indico.batch_language(data, @config)
+    response = Indico.language(data, @config)
 
     expect(Set.new(response[0].keys)).to eql(expected_keys)
     expect(Set.new(response[1].keys)).to eql(expected_keys)
@@ -102,7 +110,7 @@ describe Indico do
                                fitness military realestate history))
 
     data = ['Guns don\'t kill people.', 'People kill people.']
-    response = Indico.batch_text_tags(data, @config)
+    response = Indico.text_tags(data, @config)
 
     expect Set.new(response[0].keys).subset?(Set.new(expected_keys))
     expect Set.new(response[1].keys).subset?(Set.new(expected_keys))
@@ -112,7 +120,7 @@ describe Indico do
     expected_keys = Set.new(%w(people kill guns))
 
     data = ['Guns don\'t kill people.', 'People kill people.']
-    response = Indico.batch_keywords(data, @config)
+    response = Indico.keywords(data, @config)
 
     expect Set.new(response[0].keys).subset?(Set.new(expected_keys))
     expect Set.new(response[1].keys).subset?(Set.new(expected_keys))
@@ -120,7 +128,7 @@ describe Indico do
 
   it 'should return all named entities with category breakdowns' do
     expected_keys = Set.new(%w(unknown organization location person))
-    response = Indico.batch_named_entities(['I want to move to New York City!'])
+    response = Indico.named_entities(['I want to move to New York City!'])
     expect(response.length).to eql(1)
     response = response[0]
 
@@ -134,7 +142,7 @@ describe Indico do
 
   it 'should return no named entities when threshold is 1' do
     config = { threshold: 1 }
-    response = Indico.batch_named_entities(['I want to move to New York City!'], config)
+    response = Indico.named_entities(['I want to move to New York City!'], config)
     expect(response.length).to eql(1)
     response = response[0]
     expect(response.keys.length).to eql(0)
@@ -142,9 +150,9 @@ describe Indico do
 
   it 'should tag face with correct facial expression' do
     expected_keys = Set.new(%w(Angry Sad Neutral Surprise Fear Happy))
-    test_face = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
+    test_face = File.dirname(__FILE__) + "/data/happy.png"
     silent_warnings do
-      response = Indico.batch_fer([test_face, test_face], @config)
+      response = Indico.fer([test_face, test_face], @config)
 
       expect(Set.new(response[0].keys)).to eql(expected_keys)
       expect(Set.new(response[1].keys)).to eql(expected_keys)
@@ -152,36 +160,46 @@ describe Indico do
   end
 
   it 'should tag face with correct facial features' do
-    test_face = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
+    test_face = File.dirname(__FILE__) + "/data/happy.png"
     silent_warnings do
-      response = Indico.batch_facial_features([test_face, test_face], @config)
+      response = Indico.facial_features([test_face, test_face], @config)
       expect(response[0].length).to eql(48)
       expect(response[1].length).to eql(48)
     end
   end
 
   it 'should tag image with correct image features' do
-    test_image = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
+    test_image = File.dirname(__FILE__) + "/data/happy.png"
     silent_warnings do
-      response = Indico.batch_image_features([test_image, test_image], @config)
+      response = Indico.image_features([test_image, test_image], @config)
       expect(response[0].length).to eql(2048)
       expect(response[1].length).to eql(2048)
     end
   end
 
+  it 'should locate a face in the image' do
+    test_image = File.dirname(__FILE__) + "/data/happy.png"
+    expected_keys = Set.new(%w(top_left_corner bottom_right_corner))
+    silent_warnings do
+      response = Indico.facial_localization([test_image, test_image], @config)
+      expect(Set.new(response[0][0].keys)).to eql(expected_keys)
+      expect(Set.new(response[1][0].keys)).to eql(expected_keys)
+    end
+  end
+
   it "should respond with all text apis called in batch" do
     expected_keys = Set.new(TEXT_APIS)
-    response = Indico.batch_predict_text(["Worst movie ever."], TEXT_APIS)
+    response = Indico.predict_text(["Worst movie ever."], TEXT_APIS)
 
     expect(response.class).to eql(Hash)
     expect(Set.new(response.keys)).to eql(expected_keys)
   end
 
   it "should respond with all image apis called in batch" do
-    test_image = Array.new(48){Array.new(48){Array.new(3){rand(100)/100.0}}}
+    test_image = File.dirname(__FILE__) + "/data/happy.png"
     expected_keys = Set.new(IMAGE_APIS)
     silent_warnings do
-      response = Indico.batch_predict_image([test_image], IMAGE_APIS)
+      response = Indico.predict_image([test_image], IMAGE_APIS)
 
       expect(response.class).to eql(Hash)
       expect(Set.new(response.keys)).to eql(expected_keys)
@@ -189,10 +207,10 @@ describe Indico do
   end
 
   it "should respond with all image apis called on int array in batch" do
-    test_image = Array.new(48){Array.new(48){Array.new(3){rand(100)}}}
+    test_image = File.dirname(__FILE__) + "/data/happy.png"
     expected_keys = Set.new(IMAGE_APIS)
     silent_warnings do
-      response = Indico.batch_predict_image([test_image], IMAGE_APIS)
+      response = Indico.predict_image([test_image], IMAGE_APIS)
 
       expect(response.class).to eql(Hash)
       expect(Set.new(response.keys)).to eql(expected_keys)
@@ -204,7 +222,7 @@ describe Indico do
   # it "should accept image urls" do
   #   test_image = 'http://icons.iconarchive.com/icons/oxygen-icons.org/' +
   #                'oxygen/48/Emotes-face-smile-icon.png'
-  #   response = Indico.batch_image_features([test_image, test_image],
+  #   response = Indico.image_features([test_image, test_image],
   #                                          @config)
 
   #   expect(response[0].length).to eql(2048)

data/spec/indico_spec.rb

@@ -41,6 +41,13 @@ describe Indico do
     expect(response < 0.5).to eql(true)
   end
 
+  it 'should tag text with correct twitter engagment tags' do
+    response = Indico.twitter_engagement('#Breaking rt if you <3 pic.twitter.com @Startup')
+
+    expect(response < 1).to eql(true)
+    expect(response > 0).to eql(true)
+  end
+
   it 'should tag text with correct language tags' do
     expected_keys = Set.new([
       'English',
@@ -107,6 +114,21 @@ describe Indico do
     expect Set.new(response.keys).subset?(Set.new(expected_keys))
   end
 
+  it 'should tag text with correct keywords for auto detect language' do
+    text = "La semaine suivante, il remporte sa premiere victoire, dans la descente de Val Gardena en Italie, près de cinq ans après la dernière victoire en Coupe du monde d'un Français dans cette discipline, avec le succès de Nicolas Burtin à Kvitfjell."
+    config = { "language" => "detect" }
+    response = Indico.keywords(text)
+
+    expect Set.new(response.keys).subset?(Set.new(text.gsub(/\s+/m, ' ').strip.split(" ")))
+  end
+  it 'should tag text with correct keywords for specified language' do
+    text = "La semaine suivante, il remporte sa premiere victoire, dans la descente de Val Gardena en Italie, près de cinq ans après la dernière victoire en Coupe du monde d'un Français dans cette discipline, avec le succès de Nicolas Burtin à Kvitfjell."
+    config = { "language" => "French" }
+    response = Indico.keywords(text)
+
+    expect Set.new(response.keys).subset?(Set.new(text.gsub(/\s+/m, ' ').strip.split(" ")))
+  end
+
   it 'should return all named entities with category breakdowns' do
     expected_keys = Set.new(%w(unknown organization location person))
     response = Indico.named_entities('I want to move to New York City!')
@@ -120,14 +142,14 @@ describe Indico do
   end
 
   it 'should return no named entities when threshold is 1' do
-    config = { threshold: 1 }
+    config = { "threshold" => 1 }
     response = Indico.named_entities('I want to move to New York City!', config)
     expect(response.keys.length).to eql(0)
   end
 
   it 'should tag face with correct facial expression' do
     expected_keys = Set.new(%w(Angry Sad Neutral Surprise Fear Happy))
-    test_face = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
+    test_face= File.dirname(__FILE__) + "/data/happy.png"
     silent_warnings do
       response = Indico.fer(test_face)
       expect(Set.new(response.keys)).to eql(expected_keys)
@@ -135,15 +157,21 @@ describe Indico do
   end
 
   it 'should tag face with correct facial features' do
-    test_face = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
+    test_face= File.dirname(__FILE__) + "/data/happy.png"
     silent_warnings do
       response = Indico.facial_features(test_face)
       expect(response.length).to eql(48)
     end
   end
 
+  it 'should locate a face in the image' do
+    expected_keys = Set.new(%w(top_left_corner bottom_right_corner))
+    response = Indico.facial_localization(File.dirname(__FILE__) + "/data/happy.png")[0]
+    expect(Set.new(response.keys)).to eql(expected_keys)
+  end
+
   it 'should tag noise as sfw' do
-    test_image = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
+    test_image= File.dirname(__FILE__) + "/data/happy.png"
     silent_warnings do
       response = Indico.content_filtering(test_image)
       expect(response).to be < 0.5
@@ -151,7 +179,7 @@ describe Indico do
   end
 
   it 'should tag image with correct image features' do
-    test_image = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
+    test_image= File.dirname(__FILE__) + "/data/happy.png"
     silent_warnings do
       response = Indico.image_features(test_image)
       expect(response.length).to eql(2048)
@@ -159,7 +187,7 @@ describe Indico do
   end
 
   it "should tag rgb image with correct image features" do
-    test_image = Array.new(48){Array.new(48){Array.new(3){rand(100)/100.0}}}
+    test_image = File.open(File.dirname(__FILE__) + "/data/happy64.txt", 'rb') { |f| f.read }
     silent_warnings do
       response = Indico.image_features(test_image)
       expect(response.length).to eql(2048)
@@ -199,7 +227,7 @@ describe Indico do
   end
 
   it "should respond with all image apis called" do
-    test_image = Array.new(48){Array.new(48){Array.new(3){rand(100)/100.0}}}
+    test_image = File.open(File.dirname(__FILE__) + "/data/happy64.txt", 'rb') { |f| f.read }
     expected_keys = Set.new(IMAGE_APIS)
     silent_warnings do
       response = Indico.predict_image(test_image, IMAGE_APIS)
@@ -210,7 +238,7 @@ describe Indico do
   end
 
   it "should respond with all image apis called on int array" do
-    test_image = Array.new(48){Array.new(48){Array.new(3){rand(100)}}}
+    test_image = File.open(File.dirname(__FILE__) + "/data/happy64.txt", 'rb') { |f| f.read }
     expected_keys = Set.new(IMAGE_APIS)
     silent_warnings do
       response = Indico.predict_image(test_image, IMAGE_APIS)
@@ -220,6 +248,14 @@ describe Indico do
     end
   end
 
+  it 'should properly resize an image with min_axis set' do
+    test_image = File.open(File.dirname(__FILE__) + "/data/happy64.txt", 'rb') { |f| f.read }
+    silent_warnings do
+      image = Indico.preprocess(test_image, 128, true)
+      image = ChunkyPNG::Image.from_data_url("data:image/png;base64," + image.gsub("data:image/png;base64," ,""))
+      expect(image.width).to eql(128)
+    end
+  end
 
   # Uncomment when frontend updated to accept image urls
   # it 'should accept image urls' do

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Slater Victoroff
@@ -11,11 +12,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,6 +33,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,6 +49,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -51,6 +57,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,29 +65,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple Ruby Wrapper for the indico set of APIs.
@@ -118,25 +129,26 @@ files:
 homepage: https://github.com/IndicoDataSolutions/IndicoIo-ruby
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A simple Ruby Wrapper for the indico set of APIs.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5c9c674de4496664e06caa095548544c6c9a9ee5
-  data.tar.gz: dc041b9ee95a7179d8879d89f84e9951c06cbf92
-SHA512:
-  metadata.gz: d044d992744aa72502c645840eb7ec9c8848228e994cb71ab008715c265f206cd8af35b45b3636cf3cb2b6384d85f1b97f0c06a7f6adbf67259337b15ed4ff1e
-  data.tar.gz: 4e8f6f03198c4ceedc56c6fd72894e7a4679df19359bec18c7f8b0aae95289757c5dafcd7f3e84616c048d224ed8e1f110ad4ec3d2fe97f61e38556fb2c73e22