indico 0.1.2 → 0.1.3

data/lib/indico.rb

@@ -8,39 +8,28 @@ module Indico
 
   HEADERS = { "Content-Type" => "application/json", "Accept" => "text/plain" }
 
-  def self.political(test_text)
-    data_dict = JSON.dump({ text: test_text})
-    response = make_request(base_url("political"), data_dict, HEADERS)
-    JSON.parse(response.body)
+  def self.political(test_text, api="remote")
+    api_handler('text', test_text, api, "political")
   end
 
-  def self.posneg(test_text)
-    data_dict = JSON.dump({ text: test_text})
-    response = make_request(base_url("sentiment"), data_dict, HEADERS)
-    JSON.parse(response.body)
+  def self.posneg(test_text, api="remote")
+    api_handler('text', test_text, api, "sentiment")
   end
 
   def self.sentiment(*args)
     self.posneg(*args)
   end
 
-  def self.language(test_text)
-    data_dict = JSON.dump({ text: test_text })
-    response = make_request(base_url("language"), data_dict, HEADERS)
-    JSON.parse(response.body)
+  def self.language(test_text, api="remote")
+    api_handler('text', test_text, api, "language")
   end
 
-  def self.fer(face)
-    data_dict = JSON.dump({ face: face})
-    response = make_request(base_url("fer"), data_dict, HEADERS)
-    JSON.parse(response.body)
+  def self.fer(face, api="remote")
+    api_handler('face', face, api, "fer")
   end
 
-  def self.facial_features(face)
-    data_dict = JSON.dump({ face: face})
-    response = make_request(base_url("facialfeatures"), data_dict, HEADERS)
-    response_dict = JSON.parse(response.body)
-    response_dict['response']
+  def self.facial_features(face, api="remote")
+    api_handler('face', face, api, "facialfeatures")['response']
   end
 
 end

data/lib/indico/helper.rb

@@ -1,8 +1,20 @@
 module Indico
   private
 
-  def self.base_url(c)
-    "http://api.indico.io/%s" % c
+  def self.url_join(root, api)
+    if root == 'local'
+      "http://localhost:9438/%s" % api
+    else
+      "http://api.indico.io/%s" % api
+    end
+  end
+
+  def self.api_handler(name, data, server, api)
+    d = {}
+    d[name] = data
+    data_dict = JSON.dump(d)
+    response = make_request(url_join(server, api), data_dict, HEADERS)
+    JSON.parse(response.body)
   end
 
   def self.make_request(url, data_dict, headers)

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/indico_local.rb

@@ -0,0 +1,29 @@
+require "indico"
+
+module IndicoLocal
+
+  def self.political(test_text)
+    Indico.political(test_text, "local")
+  end
+
+  def self.posneg(test_text)
+    Indico.posneg(test_text, "local")
+  end
+
+  def self.sentiment(*args)
+    self.posneg(*args)
+  end
+
+  def self.language(test_text)
+    Indico.language(test_text, "local")
+  end
+
+  def self.fer(face)
+    Indico.fer(face, "local")
+  end
+
+  def self.facial_features(face)
+    Indico.facial_features(face, "local")
+  end
+
+end

data/spec/indico_local_spec.rb

@@ -0,0 +1,77 @@
+require 'indico_local'
+require 'set'
+
+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.
+
+    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.")
+
+    expect(Set.new(response.keys)).to eql(expected_keys)
+  end
+
+  it "should tag text with correct language tags" do
+    expected_keys = Set.new([
+      'English',
+      'Spanish',
+      'Tagalog',
+      'Esperanto',
+      'French',
+      'Chinese',
+      'French',
+      'Bulgarian',
+      'Latin',
+      'Slovak',
+      'Hebrew',
+      'Russian',
+      'German',
+      'Japanese',
+      'Korean',
+      'Portuguese',
+      'Italian',
+      'Polish',
+      'Turkish',
+      'Dutch',
+      'Arabic',
+      'Persian (Farsi)',
+      'Czech',
+      'Swedish',
+      'Indonesian',
+      'Vietnamese',
+      'Romanian',
+      'Greek',
+      'Danish',
+      'Hungarian',
+      'Thai',
+      'Finnish',
+      'Norwegian',
+      'Lithuanian'
+    ])
+    response = IndicoLocal.language('Quis custodiet ipsos custodes')
+
+    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)
+
+    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)
+
+    expect(response.length).to eql(48)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,8 @@ files:
 - lib/indico.rb
 - lib/indico/helper.rb
 - lib/indico/version.rb
+- lib/indico_local.rb
+- spec/indico_local_spec.rb
 - spec/indico_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/IndicoDataSolutions/IndicoIo-ruby
@@ -106,5 +108,6 @@ signing_key:
 specification_version: 3
 summary: A simple Ruby Wrapper for the indico set of APIs.
 test_files:
+- spec/indico_local_spec.rb
 - spec/indico_spec.rb
 - spec/spec_helper.rb