indico 0.1.4 → 0.1.6

data/README.md

@@ -1,6 +1,6 @@
 # IndicoIo-ruby
 
-A simple Ruby Wrapper for the indico set of APIs
+A Ruby wrapper for indico's APIs.
 
 ## Installation
 
@@ -35,6 +35,10 @@ Or install it yourself as:
 
 => {"Swedish"=>0.00033330636691921914, "Vietnamese"=>0.0002686116137658802, "Romanian"=>8.133913804076592e-06, "Dutch"=>0.09380619821813883, "Korean"=>0.00272046505489883, "Danish"=>0.0012556466207667206, "Indonesian"=>6.623391878530033e-07, "Latin"=>0.8230599921384231, "Hungarian"=>0.0012793617391960567, "Persian (Farsi)"=>0.0019848504383980473, "Lithuanian"=>0.007328693814717631, "French"=>0.00016792646226101638, "Norwegian"=>0.0009179030069742254, "Russian"=>0.0002643396088456642, "Thai"=>7.746466749651003e-05, "Finnish"=>0.0026367338676522643, "Hebrew"=>3.70933525938127e-05, "Bulgarian"=>3.746416283126873e-05, "Turkish"=>0.0004606965429738638, "Greek"=>0.027456554742563633, "Tagalog"=>0.0005143018200605518, "English"=>0.00013517846159760138, "Arabic"=>0.00013589586110619373, "Italian"=>2.650711180999111e-06, "Portuguese"=>0.013193681336032896, "Chinese"=>0.008818957727120736, "German"=>0.00011732494215411359, "Japanese"=>0.0005885208894664065, "Czech"=>9.916434007248934e-05, "Slovak"=>8.869445598583308e-05, "Spanish"=>0.011844579596827902, "Polish"=>9.900290296255447e-05, "Esperanto"=>0.0002599482830232367}
 
+> Indico.text_tags('This coconut green tea is amazing!');
+
+=> { "food"=>0.3713687833244494, "cars"=>0.0037924017632370586, ...}
+
 ```
 
 ###Local

data/lib/indico/helper.rb

@@ -5,16 +5,21 @@ module Indico
     if root == 'local'
       "http://localhost:9438/%s" % api
     else
-      "http://api.indico.io/%s" % api
+      "http://apiv1.indico.io/%s" % api
     end
   end
 
-  def self.api_handler(name, data, server, api)
+  def self.api_handler(data, server, api)
     d = {}
-    d[name] = data
+    d['data'] = data
     data_dict = JSON.dump(d)
     response = make_request(url_join(server, api), data_dict, HEADERS)
-    JSON.parse(response.body)
+    results = JSON.parse(response.body)
+    if results.key?("error")
+      results = results["error"]
+    else
+      results = results["results"]
+    end
   end
 
   def self.make_request(url, data_dict, headers)
@@ -23,15 +28,12 @@ module Indico
     http = Net::HTTP.new(uri.host, uri.port)
 
     request = Net::HTTP::Post.new(uri.request_uri)
-    # request.set_form_data({})
     request.body = data_dict
 
     headers.each do |key, val|
       request[key] = val
     end
 
-    response = http.request(request)
-
-    response
+    http.request(request)
   end
 end

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/lib/indico.rb

@@ -9,11 +9,11 @@ module Indico
   HEADERS = { "Content-Type" => "application/json", "Accept" => "text/plain" }
 
   def self.political(test_text, api="remote")
-    api_handler('text', test_text, api, "political")
+    api_handler(test_text, api, "political")
   end
 
   def self.posneg(test_text, api="remote")
-    api_handler('text', test_text, api, "sentiment")
+    api_handler(test_text, api, "sentiment")
   end
 
   def self.sentiment(*args)
@@ -21,15 +21,24 @@ module Indico
   end
 
   def self.language(test_text, api="remote")
-    api_handler('text', test_text, api, "language")
+    api_handler(test_text, api, "language")
   end
 
+  def self.text_tags(test_text, api="remote")
+    api_handler(test_text, api, "texttags")
+  end
+  
   def self.fer(face, api="remote")
-    api_handler('face', face, api, "fer")
+    api_handler(face, api, "fer")
   end
 
   def self.facial_features(face, api="remote")
-    api_handler('face', face, api, "facialfeatures")['response']
+    api_handler(face, api, "facialfeatures")
+  end
+
+  def self.image_features(face, api="remote")
+    api_handler(face, api, "imagefeatures")
   end
 
+
 end

data/lib/indico_local.rb

@@ -18,6 +18,10 @@ module IndicoLocal
     Indico.language(test_text, "local")
   end
 
+  def self.text_tags(test_text)
+    Indico.text_tags(test_text, "local")
+  end
+
   def self.fer(face)
     Indico.fer(face, "local")
   end
@@ -26,4 +30,8 @@ module IndicoLocal
     Indico.facial_features(face, "local")
   end
 
+  def self.image_features(image)
+    Indico.image_features(image, "local")
+  end
+
 end

data/spec/indico_local_spec.rb

@@ -5,18 +5,24 @@ describe Indico do
 
   it "should tag text with correct political tags" do
     expected_keys = Set.new(["Conservative", "Green", "Liberal", "Libertarian"])
-    response = IndicoLocal.political("Guns don't kill people. People kill people.") # Guns don't kill people. People kill people.
+    response = Indico.political("Guns don't kill people. People kill people.") # Guns don't kill people. People kill people.
 
     expect(Set.new(response.keys)).to eql(expected_keys)
   end
 
-  it "should tag text with correct sentiment tags" do
-    expected_keys = Set.new(["Sentiment"])
-    response = IndicoLocal.sentiment("Worst movie ever.")
+  it "should tag text with correct text tags" do
+    expected_keys = Set.new(["political", "arts", "products", "news"])
+    response = Indico.text_tags("Guns don't kill people. People kill people.") # Guns don't kill people. People kill people.
 
     expect(Set.new(response.keys)).to eql(expected_keys)
   end
 
+  it "should tag text with correct sentiment tags" do
+    response = Indico.sentiment("Worst movie ever.")
+
+    expect(response).to be < 0.5
+  end
+
   it "should tag text with correct language tags" do
     expected_keys = Set.new([
       'English',
@@ -54,24 +60,48 @@ describe Indico do
       'Norwegian',
       'Lithuanian'
     ])
-    response = IndicoLocal.language('Quis custodiet ipsos custodes')
+    response = Indico.language('Quis custodiet ipsos custodes')
+
+    expect(Set.new(response.keys)).to eql(expected_keys)
+  end
+
+  it "should tag text with correct text tags" do
+    expected_keys = Set.new(['fashion', 'art', 'energy', 'economics', 'entrepreneur', 
+                             'books', 'politics', 'gardening', 'nba', 'conservative', 
+                             'technology', 'startups', 'relationships', 'education',
+                             'humor', 'psychology', 'bicycling', 'investing', 'travel',
+                             'cooking', 'christianity', 'environment', 'religion', 'health', 
+                             'hockey', 'pets', 'music', 'soccer', 'guns', 'gaming', 'jobs',
+                             'business', 'nature', 'food', 'cars', 'photography', 'philosophy',
+                             'geek', 'sports', 'baseball', 'news', 'television', 'entertainment',
+                             'parenting', 'comics', 'science', 'nfl','programming',
+                             'personalfinance', 'atheism', 'movies', 'anime', 'fitness',
+                             'military', 'realestate', 'history'])
+    response = Indico.text_tags("Guns don't kill people. People kill people.") # Guns don't kill people. People kill people.
 
     expect(Set.new(response.keys)).to eql(expected_keys)
   end
 
   it "should tag face with correct facial expression" do
     expected_keys = Set.new(["Angry", "Sad", "Neutral", "Surprise", "Fear", "Happy"])
-    test_face = 0.step(50, 50.0/(48.0*48.0)).to_a[0..-2].each_slice(48).to_a
-    response = IndicoLocal.fer(test_face)
+    test_face = 0.step(1, 1.0/(48.0*48.0)).to_a[0..-2].each_slice(48).to_a
+    response = Indico.fer(test_face)
 
     expect(Set.new(response.keys)).to eql(expected_keys)
   end
 
-  it "should tag face with correct facial features" do
-    test_face = 0.step(50, 50.0/(48.0*48.0)).to_a[0..-2].each_slice(48).to_a
-    response = IndicoLocal.facial_features(test_face)
+  it "should return a facial feature vector" do
+    test_face = 0.step(1, 1.0/(48.0*48.0)).to_a[0..-2].each_slice(48).to_a
+    response = Indico.facial_features(test_face)
 
     expect(response.length).to eql(48)
   end
 
+  it "should return an image features vector" do
+    test_image = 0.step(1, 1.0/(48.0*48.0)).to_a[0..-2].each_slice(48).to_a
+    response = Indico.image_features(test_image)
+
+    expect(response.length).to eql(2048)
+  end
+
 end

data/spec/indico_spec.rb

@@ -11,10 +11,9 @@ describe Indico do
   end
 
   it "should tag text with correct sentiment tags" do
-    expected_keys = Set.new(["Sentiment"])
     response = Indico.sentiment("Worst movie ever.")
 
-    expect(Set.new(response.keys)).to eql(expected_keys)
+    expect(response < 0.5).to eql(true)
   end
 
   it "should tag text with correct language tags" do
@@ -59,7 +58,24 @@ describe Indico do
     expect(Set.new(response.keys)).to eql(expected_keys)
   end
 
-  it "should tag face with correct faciel expression" do
+  it "should tag text with correct text tags" do
+    expected_keys = Set.new(['fashion', 'art', 'energy', 'economics', 'entrepreneur', 
+                             'books', 'politics', 'gardening', 'nba', 'conservative', 
+                             'technology', 'startups', 'relationships', 'education',
+                             'humor', 'psychology', 'bicycling', 'investing', 'travel',
+                             'cooking', 'christianity', 'environment', 'religion', 'health', 
+                             'hockey', 'pets', 'music', 'soccer', 'guns', 'gaming', 'jobs',
+                             'business', 'nature', 'food', 'cars', 'photography', 'philosophy',
+                             'geek', 'sports', 'baseball', 'news', 'television', 'entertainment',
+                             'parenting', 'comics', 'science', 'nfl','programming',
+                             'personalfinance', 'atheism', 'movies', 'anime', 'fitness',
+                             'military', 'realestate', 'history'])
+    response = Indico.text_tags("Guns don't kill people. People kill people.") # Guns don't kill people. People kill people.
+
+    expect(Set.new(response.keys)).to eql(expected_keys)
+  end
+
+  it "should tag face with correct facial expression" do
     expected_keys = Set.new(["Angry", "Sad", "Neutral", "Surprise", "Fear", "Happy"])
     test_face = 0.step(50, 50.0/(48.0*48.0)).to_a[0..-2].each_slice(48).to_a
     response = Indico.fer(test_face)
@@ -67,7 +83,7 @@ describe Indico do
     expect(Set.new(response.keys)).to eql(expected_keys)
   end
 
-  it "should tag face with correct faciel features" do
+  it "should tag face with correct facial features" do
     test_face = 0.step(50, 50.0/(48.0*48.0)).to_a[0..-2].each_slice(48).to_a
     response = Indico.facial_features(test_face)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler