indico 0.2.5 → 0.3.0

data/README.md

@@ -24,7 +24,7 @@ For API key registration and setup, checkout our [quickstart guide](http://docs.
 
 Full Documentation
 ------------
-Detailed documentation and further code examples are available at [indico.reame.io](http://indico.readme.io/v2.0/docs/ruby)
+Detailed documentation and further code examples are available at [indico.readme.io](http://indico.readme.io/v2.0/docs/ruby)
 
 Examples
 ---------
@@ -72,6 +72,46 @@ Each `Indico` method has a corresponding batch method for analyzing many example
 => [0.9899001220871786, 0.005709885173415242]
 ```
 
+
+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`.
+
+Accepted text API names: `text_tags, political, sentiment, language`
+
+Accepted image API names: `fer, facial_features, image_features`
+
+```ruby
+> require 'indico'
+
+=> true
+
+> Indico.api_key = "YOUR_API_KEY"
+
+=> "YOUR_API_KEY"
+
+> Indico.predict_text("Best day ever", ["sentiment", "language"])
+
+=> {"sentiment"=>0.9899001220871786, "language"=>{"Swedish"=>0.0022464881013042294, "Vietnamese"=>9.887170914498351e-05, ...}}
+
+> Indico.batch_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, ...}]}
+
+> test_face = Array.new(48){Array.new(48){Array.new(3){rand(100)/100.0}}}
+
+=> [[[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"])
+
+=> {"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"])
+
+=> {"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}]}
+```
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/indico/fork )

data/indico.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'inifile', '~> 3.0.0'
+  spec.add_runtime_dependency 'oily_png', '~> 1.2.0'
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/indico/errors.rb

@@ -0,0 +1,3 @@
+class IndicoError < StandardError
+
+end

data/lib/indico/helper.rb

@@ -1,4 +1,4 @@
-require 'base64'
+require_relative './errors'
 
 module Indico
   private
@@ -14,24 +14,22 @@ module Indico
   def self.api_handler(data, api, config)
     server = nil
     api_key = nil
-    unless config.nil?
-      server = config[:cloud]
-      api_key = config[:api_key]
-    end
+
     d = {}
     d['data'] = data
-    data_dict = JSON.dump(d)
 
-    if api_key.nil?
-      api_key = Indico.config['auth']
+    unless config.nil?
+      server = config[:cloud]
+      api_key = config[:api_key]
+      apis = config["apis"]
+      d = d.merge(config)
     end
 
-    if server.nil?
-      server = Indico.config['cloud']
-    end
+    url = url_join((server or Indico.config['cloud']), api) +
+          (apis ? "?apis=" + apis.join(",") : "")
 
-    response = make_request(url_join(server, api), data_dict,
-                            add_api_key_to_header(api_key))
+    response = make_request(url, JSON.dump(d),
+                            add_api_key_to_header((api_key or Indico.config['auth'])))
 
 
     results = JSON.parse(response.body)
@@ -65,7 +63,7 @@ module Indico
     if api_key.nil?
       raise ArgumentError, 'api key is required'
     end
-    headers = { 'Content-Type' => 'application/json', 'Accept' => 'text/plain' }
+    headers = HEADERS
     headers['X-ApiKey'] = api_key
     headers
   end

data/lib/indico/image.rb

@@ -0,0 +1,109 @@
+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
+      # Batch Request
+      im_array = Array.new
+
+      # process each image
+      image.each do |_image|
+        im_array.push(preprocess(_image, size, false))
+      end
+
+      return im_array
+    end
+
+    if image.class == String
+      decoded_image = handle_string_input(image)
+    elsif image.class == Array
+      decoded_image = handle_array_input(image)
+    else
+      raise Exception.new("Image input must be nested array of pixels, filename, or base64 string")
+    end
+
+    # Resize and export base64 encoded string
+    return decoded_image.resize(size, size).to_data_url.gsub("data:image/png;base64," ,"")
+  end
+
+  def self.handle_string_input(str)
+    # Handles string input
+    if File.file?(str)
+      # Handling File Inputs
+      return ChunkyPNG::Image.from_file(str)
+    end
+
+    regex = %r{^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)$}.match(str)
+    # Base 64 handling
+    if regex == nil
+      raise Exception.new("String is not a valid absolute filepath or base64 string")
+    else
+      return ChunkyPNG::Image.from_data_url("data:image/png;base64," + str.gsub("data:image/png;base64," ,""))
+    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])
+  end
+
+  def self.array_contains_float(array, dimens)
+    # Determines whether or not the array contains floats
+    if not array.is_a?(Array)
+      return array.class == Float
+    end
+    elem = array[0]
+    (0..dimens.size - 2).each do |i|
+      elem = elem[0]
+    end
+
+    return elem.class == Float
+  end
+
+  def self.get_rgb(value)
+    # Returns Integer encoding of RGB value used by ChunkyPNG
+    return [
+      ChunkyPNG::Color.r(value),
+      ChunkyPNG::Color.g(value),
+      ChunkyPNG::Color.b(value)
+    ]
+  end
+end

data/lib/indico/multi.rb

@@ -0,0 +1,47 @@
+require_relative './errors'
+
+module Indico
+  CLIENT_TO_SERVER = {
+    "political" => "political",
+    "sentiment" => "sentiment",
+    "language" => "language",
+    "text_tags" => "texttags",
+    "fer" => "fer",
+    "facial_features" => "facialfeatures",
+    "image_features" => "imagefeatures"
+  }
+
+  SERVER_TO_CLIENT = CLIENT_TO_SERVER.invert
+  def self.multi(data, type, apis, allowed, batch = false, config)
+    converted_apis = Array.new
+    apis.each { |api|
+      if not allowed.include? api
+        fail  api + " is not a valid api for " + type + " requests. Please use: " + allowed.join(", ")
+      else
+        converted_apis.push(CLIENT_TO_SERVER[api])
+      end
+    }
+
+    if config.nil?
+      config = {}
+    end
+
+    config["apis"] = converted_apis
+    response = api_handler(data, batch ? "apis/batch" : "apis", config)
+    results = handle_multi(response)
+
+    results
+  end
+
+  def self.handle_multi(results)
+    converted_results = Hash.new
+    results.each do |key, value|
+      if value.is_a?(Hash) && value.has_key?("results")
+        converted_results[SERVER_TO_CLIENT[key]] = value["results"]
+      else
+        raise IndicoError, 'unexpected result from ' + key + '\n\t' + value.fetch("error", "")
+      end
+    end
+    converted_results
+  end
+end

data/lib/indico/settings.rb

@@ -1,4 +1,13 @@
 require 'inifile'
+require_relative 'version'
+
+HEADERS = { 'Content-Type' => 'application/json',
+            'Accept' => 'application/json',
+            'client-lib' => 'ruby',
+            'version-number' => Indico::VERSION }
+# APIS
+TEXT_APIS = ["political", "sentiment", "language", "text_tags"]
+IMAGE_APIS = ["fer", "facial_features", "image_features"]
 
 module Indico
   private

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = '0.2.5'
+  VERSION = '0.3.0'
 end

data/lib/indico.rb

@@ -1,16 +1,13 @@
 require 'indico/version'
 require 'indico/helper'
+require 'indico/image'
+require 'indico/multi'
 require 'indico/settings'
 require 'uri'
 require 'json'
 require 'net/https'
 
 module Indico
-  HEADERS = { 'Content-Type' => 'application/json',
-              'Accept' => 'application/json', 
-              'client-lib' => 'ruby',
-              'version-number' => '0.2.5' }
-
   def self.api_key
     config['auth']
   end
@@ -67,27 +64,47 @@ module Indico
     api_handler(test_text, 'texttags/batch', config)
   end
 
-  def self.fer(face, config = nil)
-    api_handler(face, 'fer', config)
+  def self.fer(test_image, config = nil)
+    api_handler(preprocess(test_image, 48, false), 'fer', config)
+  end
+
+  def self.batch_fer(test_image, config = nil)
+    api_handler(preprocess(test_image, 48, true), 'fer/batch', config)
+  end
+
+  def self.facial_features(test_image, config = nil)
+    api_handler(preprocess(test_image, 48, false), 'facialfeatures', config)
+  end
+
+  def self.batch_facial_features(test_image, config = nil)
+    api_handler(preprocess(test_image, 48, true), 'facialfeatures/batch', config)
+  end
+
+  def self.image_features(test_image, config = nil)
+    api_handler(preprocess(test_image, 64, false), 'imagefeatures', config)
   end
 
-  def self.batch_fer(test_text, config = nil)
-    api_handler(test_text, 'fer/batch', config)
+  def self.batch_image_features(test_image, config = nil)
+    api_handler(preprocess(test_image, 64, true), 'imagefeatures/batch', config)
   end
 
-  def self.facial_features(face, config = nil)
-    api_handler(face, 'facialfeatures', config)
+  def self.predict_image(face, apis = IMAGE_APIS, config = nil)
+    api_hash = {"apis" => apis}
+    multi(preprocess(face, 48, false), "image", apis, IMAGE_APIS, config ? config.update(api_hash) : api_hash)
   end
 
-  def self.batch_facial_features(test_text, config = nil)
-    api_handler(test_text, 'facialfeatures/batch', config)
+  def self.predict_text(test_text, apis = TEXT_APIS, config = nil)
+    api_hash = {"apis" => apis}
+    multi(test_text, "text", apis, TEXT_APIS, config ? config.update(api_hash) : api_hash)
   end
 
-  def self.image_features(face, config = nil)
-    api_handler(face, 'imagefeatures', config)
+  def self.batch_predict_image(face, apis, config = nil)
+    api_hash = {"apis" => apis}
+    multi(preprocess(face, 48, true), "image", apis, IMAGE_APIS, true, config ? config.update(api_hash) : api_hash)
   end
 
-  def self.batch_image_features(test_text, config = nil)
-    api_handler(test_text, 'imagefeatures/batch', config)
+  def self.batch_predict_text(test_text, apis, config = nil)
+    api_hash = {"apis" => apis}
+    multi(test_text, "text", apis, TEXT_APIS, true, config ? config.update(api_hash) : api_hash)
   end
 end

data/spec/data/happy64.txt

@@ -0,0 +1 @@
+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

data/spec/indico_batch_spec.rb

@@ -21,7 +21,7 @@ describe Indico do
   it 'should access a private cloud' do
     expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
     data = ['Guns don\'t kill people.', ' People kill people.']
-    
+
     # 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)
@@ -104,26 +104,63 @@ 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 } }
-    response = Indico.batch_fer([test_face, test_face], @config)
+    silent_warnings do
+      response = Indico.batch_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)
+      expect(Set.new(response[0].keys)).to eql(expected_keys)
+      expect(Set.new(response[1].keys)).to eql(expected_keys)
+    end
   end
 
   it 'should tag face with correct facial features' do
     test_face = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
-    response = Indico.batch_facial_features([test_face, test_face], @config)
-    expect(response[0].length).to eql(48)
-    expect(response[1].length).to eql(48)
+    silent_warnings do
+      response = Indico.batch_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 } }
-    response = Indico.batch_image_features([test_image, test_image], @config)
-    expect(response[0].length).to eql(2048)
-    expect(response[1].length).to eql(2048)
+    silent_warnings do
+      response = Indico.batch_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 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)
+
+    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}}}
+    expected_keys = Set.new(IMAGE_APIS)
+    silent_warnings do
+      response = Indico.batch_predict_image([test_image], IMAGE_APIS)
+
+      expect(response.class).to eql(Hash)
+      expect(Set.new(response.keys)).to eql(expected_keys)
+    end
+  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)}}}
+    expected_keys = Set.new(IMAGE_APIS)
+    silent_warnings do
+      response = Indico.batch_predict_image([test_image], IMAGE_APIS)
+
+      expect(response.class).to eql(Hash)
+      expect(Set.new(response.keys)).to eql(expected_keys)
+    end
+  end
+
+
   # Uncomment when frontend updated to accept image urls
   # it "should accept image urls" do
   #   test_image = 'http://icons.iconarchive.com/icons/oxygen-icons.org/' +

data/spec/indico_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'set'
+require 'oily_png'
 
 describe Indico do
   before do
@@ -18,7 +19,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.'
-    
+
     # for mocking: use http to redirect requests to our public cloud endpoint
     Indico.cloud_protocol = 'http://'
     response = Indico.political(data, @config)
@@ -94,33 +95,91 @@ 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 } }
-
-    response = Indico.fer(test_face)
-
-    expect(Set.new(response.keys)).to eql(expected_keys)
+    silent_warnings do
+      response = Indico.fer(test_face)
+      expect(Set.new(response.keys)).to eql(expected_keys)
+    end
   end
 
   it 'should tag face with correct facial features' do
     test_face = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
-    response = Indico.facial_features(test_face)
-
-    expect(response.length).to eql(48)
+    silent_warnings do
+      response = Indico.facial_features(test_face)
+      expect(response.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 } }
-    response = Indico.image_features(test_image)
-
-    expect(response.length).to eql(2048)
+    silent_warnings do
+      response = Indico.image_features(test_image)
+      expect(response.length).to eql(2048)
+    end
   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}}}
-    response = Indico.image_features(test_image)
+    silent_warnings do
+      response = Indico.image_features(test_image)
+      expect(response.length).to eql(2048)
+    end
+  end
+
+  it "should be able to load image from path" do
+    expected_keys = Set.new(%w(Angry Sad Neutral Surprise Fear Happy))
+    response = Indico.fer(File.dirname(__FILE__) + "/data/happy.png")
+
+    expect(Set.new(response.keys)).to eql(expected_keys)
+    expect(response["Happy"]).to be > 0.5
+  end
 
-    expect(response.length).to eql(2048)
+  it "should be able to load image from b64" do
+    expected_keys = Set.new(%w(Angry Sad Neutral Surprise Fear Happy))
+    response = Indico.fer(File.open(File.dirname(__FILE__) + "/data/happy64.txt", 'rb') { |f| f.read })
+
+    expect(Set.new(response.keys)).to eql(expected_keys)
+    expect(response["Happy"]).to be > 0.5
   end
 
+  it "should respond with all text apis called" do
+    expected_keys = Set.new(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 text apis called by default" do
+    expected_keys = Set.new(TEXT_APIS)
+    response = Indico.predict_text("Worst movie ever.")
+
+    expect(response.class).to eql(Hash)
+    expect(Set.new(response.keys)).to eql(expected_keys)
+  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}}}
+    expected_keys = Set.new(IMAGE_APIS)
+    silent_warnings do
+      response = Indico.predict_image(test_image, IMAGE_APIS)
+
+      expect(response.class).to eql(Hash)
+      expect(Set.new(response.keys)).to eql(expected_keys)
+    end
+  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)}}}
+    expected_keys = Set.new(IMAGE_APIS)
+    silent_warnings do
+      response = Indico.predict_image(test_image, IMAGE_APIS)
+
+      expect(response.class).to eql(Hash)
+      expect(Set.new(response.keys)).to eql(expected_keys)
+    end
+  end
+
+
   # Uncomment when frontend updated to accept image urls
   # it 'should accept image urls' do
   #   response = Indico.image_features('http://icons.iconarchive.com/icons/' +

data/spec/spec_helper.rb

@@ -1,4 +1,13 @@
 require 'indico'
+require 'stringio'
+
+def silent_warnings
+  old_stderr = $stderr
+  $stderr = StringIO.new
+  yield
+ensure
+  $stderr = old_stderr
+end
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -30,6 +30,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: oily_png
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,11 +112,16 @@ files:
 - Rakefile
 - indico.gemspec
 - lib/indico.rb
+- lib/indico/errors.rb
 - lib/indico/helper.rb
+- lib/indico/image.rb
+- lib/indico/multi.rb
 - lib/indico/settings.rb
 - lib/indico/version.rb
 - spec/config/.indicorc.test
 - spec/config/.indicorc.test.2
+- spec/data/happy.png
+- spec/data/happy64.txt
 - spec/indico_batch_spec.rb
 - spec/indico_spec.rb
 - spec/settings_spec.rb