indico 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24341b66e960ef4cdd9e36ecf862b2b710948797
-  data.tar.gz: 0425f72fb76f39185f36e15d9b41c975d31dc8a5
+  metadata.gz: 12321afac104c51a250901849e6d497bb2ebaf36
+  data.tar.gz: 0c7eb47b1ff1aead6d87a79291d50d641095d165
 SHA512:
-  metadata.gz: db04ca7b5c47e177d5fe4deea09c08e6be93dab650e78eb056926928e8f09d940dbf7870243299eaa5fdc00d42ae83ec5fab6261c7f0c2c28def0769bc763b94
-  data.tar.gz: 04e0f72440cb63422a8f4c847593a99fa666d11b3156893b7977063483e554419a49e288881ec59b88a48efdd3795fda4c36b8b91eb9250441520c68d798c34f
+  metadata.gz: 1cc6667c5a7c9fcff695037c00c3352debf9390fef7be5402ff77c977bb80006ceefb96203ed78b0d851a8af25ba7b15f5a244c40fb7512486a63e3bdb7b891c
+  data.tar.gz: 3c248d2a456984c1ca6c1f368320c1f52cd2387af92f8b759f43683d0cfcdf629abfa84341ee3ac675b2627a3f22e0702ee822ea3eee109a85db50d2a7d1ef6e

data/README.md

@@ -80,7 +80,7 @@ Each `Indico` method has a corresponding batch method for analyzing many example
 
 Calling multiple APIs with a single function
 ---------
-There are two multiple API functions `predict_text` and `predict_image` (and their batch counterparts). These functions are similar to the existing api functions, but take in an additional `apis` argument as an array of strings of API names (defaults to all existing apis). `predict_text` accepts a list of existing text APIs and vice versa for `predict_image`.
+There are two multiple API functions `analyze_text` and `analyze_image` (and their batch counterparts). These functions are similar to the existing api functions, but take in an additional `apis` argument as an array of strings of API names (defaults to all existing apis). `analyze_text` accepts a list of existing text APIs and vice versa for `analyze_image`.
 
 Accepted text API names: `text_tags, political, sentiment, language`
 
@@ -95,11 +95,11 @@ Accepted image API names: `fer, facial_features, image_features`
 
 => "YOUR_API_KEY"
 
-> Indico.predict_text("Best day ever", ["sentiment", "language"])
+> Indico.analyze_text("Best day ever", ["sentiment", "language"])
 
 => {"sentiment"=>0.9899001220871786, "language"=>{"Swedish"=>0.0022464881013042294, "Vietnamese"=>9.887170914498351e-05, ...}}
 
-> Indico.predict_text(["Best day ever", "Worst day ever"], ["sentiment", "language"])
+> Indico.analyze_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, ...}]}
 
@@ -107,11 +107,11 @@ Accepted image API names: `fer, facial_features, image_features`
 
 => [[[0.66, 0.99, 0.03], [0.42, 0.72, 0.86], [0.95, 0.44, 0.61], [0.39, 0.57, 0.4], [0.06, 0.52, 0.43], [0.11, 0.09, 0.78], [0.35, 0.69, 0.32], [0.44, 0.5, 0.26], [0.71, 0.75, 0.64], [0.91, 0.92, 0.14], [0.71, 0.98, 0.02], ..]]
 
-> Indico.predict_image(test_face, ["fer", "facial_features"])
+> Indico.analyze_image(test_face, ["fer", "facial_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.predict_image([test_face, test_face], ["fer", "facial_features"])
+> Indico.analyze_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/image.rb

@@ -1,5 +1,6 @@
 require 'oily_png'
 require 'base64'
+require 'uri'
 
 module Indico
     def self.preprocess(image, size, min_axis)
@@ -52,6 +53,8 @@ module Indico
                     image = Base64.encode64(file.read)
                 end
             end
+        elsif str =~ /\A#{URI::regexp}\z/
+            image = str
         else
             begin
                 image = ChunkyPNG::Image.from_data_url("data:image/png;base64," + str.gsub("data:image/png;base64," ,""))

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/spec/indico_spec.rb

@@ -278,12 +278,11 @@ describe Indico do
     expect(Set.new(response.keys)).to eql(Set.new(['sentiment']))
   end
 
-  # Uncomment when frontend updated to accept image urls
-  # it 'should accept image urls' do
-  #   response = Indico.image_features('http://icons.iconarchive.com/icons/' +
-  #                                    'oxygen-icons.org/oxygen/48/' +
-  #                                    'Emotes-face-smile-icon.png')
-  #
-  #   expect(response.length).to eql(2048)
-  # end
+  it 'should accept image urls' do
+    response = Indico.image_features('http://icons.iconarchive.com/icons/' +
+                                     'oxygen-icons.org/oxygen/48/' +
+                                     'Emotes-face-smile-icon.png')
+  
+    expect(response.length).to eql(2048)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Slater Victoroff
@@ -11,76 +11,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple Ruby Wrapper for the indico set of APIs.
@@ -93,8 +93,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -128,17 +128,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A simple Ruby Wrapper for the indico set of APIs.