indico 0.9.4 → 0.9.5

data/lib/indico.rb

@@ -102,15 +102,24 @@ module Indico
     return api_handler(text, 'textfeatures', config)
   end
 
-  def self.people(text, config = nil)
+  def self.people(text, config = {})
+    if not (config.key?('v') or config.key?('version'))
+      config['version'] = "2"
+    end
     api_handler(text, "people", config)
   end
 
-  def self.organizations(text, config = nil)
+  def self.organizations(text, config = {})
+    if not (config.key?('v') or config.key?('version'))
+      config['version'] = "2"
+    end
     api_handler(text, "organizations", config)
   end
 
-  def self.places(text, config = nil)
+  def self.places(text, config = {})
+    if not (config.key?('v') or config.key?('version'))
+      config['version'] = "2"
+    end
     api_handler(text, "places", config)
   end
 
@@ -182,8 +191,10 @@ module Indico
         if config.nil?
           config = Hash.new()
         end
+        if @domain
+          config[:domain] = @domain
+        end
         config[:collection] = @collection
-        config[:domain] = @domain || config["domain"]
         Indico.api_handler(data, 'custom', config, 'add_data')
       end
 
@@ -222,7 +233,9 @@ module Indico
           config = Hash.new()
         end
         config[:collection] = @collection
-        config[:domain] = @domain || config["domain"]
+        if @domain
+          config[:domain] = @domain
+        end
         Indico.api_handler(data, 'custom', config, 'predict')
       end
 

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/spec/indico_batch_spec.rb

@@ -57,11 +57,11 @@ describe Indico do
   end
 
   it 'should return people found in the text provided' do
-    text = ["Chef Michael Solomonov's gorgeous cookbook \"Zahav\" is taking up too much space on my dining room table, but his family stories, recipes and photography keep me from shelving it."]
+    text = ["Bill Gates, founder of Microsoft, can jump over a chair from standing position"]
     text += text
     result = Indico.people(text)
     result[0] = result[0].sort_by { |k| -k["confidence"] }
-    expect result[0][0]["text"].include? "Michael Solomonov"
+    expect result[0][0]["text"].include? "Bill Gates"
     expect result.length == 2
   end
 

data/spec/indico_spec.rb

@@ -150,21 +150,27 @@ describe Indico do
   end
 
   it 'should return people found in the text provided' do
-    text = "Chef Michael Solomonov's gorgeous cookbook \"Zahav\" is taking up too much space on my dining room table, but his family stories, recipes and photography keep me from shelving it."
+    text = "Bill Gates, founder of Microsoft, can jump over a chair from standing position"
     result = Indico.people(text).sort_by { |k| -k["confidence"] }
-    expect result[0]["text"].include? "Michael Solomonov"
+    v1_result = Indico.people(text, config={version: "2"}).sort_by { |k| -k["confidence"] }
+    expect result[0]["text"].include? "Bill Gates"
+    expect result[0]["confidence"] != v1_result[0]["confidence"]
   end
 
   it 'should return organizations found in the text provided' do
     text = "Chinese internet giant Alibaba is to buy Hong Kong-based newspaper the South China Morning Post (SCMP)."
     result = Indico.organizations(text).sort_by { |k| -k["confidence"] }
     expect result[0]["text"].include? "Alibaba"
+    v1_result = Indico.organizations(text, config={version: "2"}).sort_by { |k| -k["confidence"] }
+    expect result[0]["confidence"] != v1_result[0]["confidence"]
   end
 
   it 'should return places found in the text provided' do
     text = "Alibaba to buy Hong Kong's South China Morning Post"
     result = Indico.places(text).sort_by { |k| -k["confidence"] }
     expect result[0]["text"].include? "China"
+    v1_result = Indico.places(text, config={version: "2"}).sort_by { |k| -k["confidence"] }
+    expect result[0]["confidence"] != v1_result[0]["confidence"]
   end
 
   it 'should tag face with correct facial expression' do

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
+  prerelease: 
 platform: ruby
 authors:
 - Slater Victoroff
@@ -11,11 +12,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-29 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.
@@ -125,25 +136,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.1
+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: a07e355897fb68aed8c2fc6b2cf73a52a315360a
-  data.tar.gz: 5dc85c207c80641e80fdad1aa9ce4f02500a52d3
-SHA512:
-  metadata.gz: a8f30adba9ff040c18ea09f6078a5a39b4b6e3711ac585af7fc0eea701762623c16f192d0f4aec6472328cffb1987c3f5ca540f8d69c24c85ce40aabae80293c
-  data.tar.gz: afa96e01d407b2a7f6d32fa22816b1282394e31be44e3684b474a949116534d90cd2600a6bfa0a2165b8dcc645382e36232bb208a6db07647bd6a986078f4b39