CDB-4165

Gemfile

@@ -56,6 +56,7 @@ gem 'faraday',                 '0.9.0'
 gem 'retriable',               '1.4.1'
 gem 'google-api-client',       '0.7.0'
 gem 'dropbox-sdk',             '1.6.3'
+gem 'instagram',               '1.1.3'
 
 # Synchronizer
 gem 'eventmachine',            '1.0.3'

Gemfile.lock

@@ -112,6 +112,8 @@ GEM
       railties (>= 3.0.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.9.1)
+      faraday (>= 0.7.4, < 0.10)
     fastercsv (1.5.5)
     faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
@@ -140,6 +142,7 @@ GEM
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
+    hashie (3.3.1)
     hike (1.2.3)
     htmlentities (4.3.1)
     http_parser.rb (0.5.3)
@@ -148,6 +151,11 @@ GEM
       multi_xml
     i18n (0.6.9)
     ice_nine (0.11.0)
+    instagram (1.1.3)
+      faraday (>= 0.7, < 0.10)
+      faraday_middleware (>= 0.8, < 0.10)
+      hashie (>= 0.4.0)
+      multi_json (~> 1.0, >= 1.0.3)
     journey (1.0.4)
     json (1.8.1)
     jwt (0.1.11)
@@ -367,6 +375,7 @@ DEPENDENCIES
   guard (= 1.8.1)
   htmlentities (= 4.3.1)
   httparty (= 0.9)
+  instagram (= 1.1.3)
   mixpanel (= 4.0.2)
   mocha (= 0.10.5)
   nokogiri (= 1.6.0)

app/helpers/application_helper.rb

@@ -72,6 +72,7 @@ module ApplicationHelper
       gdrive_app_id:              Cartodb.config[:gdrive]['app_id'],
       oauth_dropbox:              Cartodb.config[:oauth]['dropbox']['app_key'],
       oauth_gdrive:               Cartodb.config[:oauth]['gdrive']['client_id'],
+      oauth_instagram:            Cartodb.config[:oauth]['instagram']['app_key'],
       datasource_search_twitter:  nil,
       tumblr_api_key:             Cartodb.config[:tumblr]['api_key'],
       max_asset_file_size:        Cartodb.config[:assets]["max_file_size"],

config/app_config.yml.sample

@@ -190,6 +190,10 @@ defaults: &defaults
       app_key:              ''
       app_secret:           ''
       callback_url:         ''
+    instagram:
+      app_key:              ''
+      app_secret:           ''
+      callback_url:         ''
   datasource_search:
     # Must be the same as CartoDB::Datasources::xxxx DATASOURCE_NAME constants
     twitter_search:

config/app_config.yml.testing

@@ -173,6 +173,10 @@ defaults: &defaults
       app_key:  ''
       app_secret: ''
       callback_url: ''
+    instagram:
+      app_key:              ''
+      app_secret:           ''
+      callback_url:         ''
   datasource_search:
     # Must be the same as CartoDB::Datasources::xxxx DATASOURCE_NAME constants
     twitter_search: