omnicontacts 0.3.7 → 0.3.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: f04a2a074a319b00ef72e6ad8a66aa6f36df36d80dd4287858e7f69afda4ee07
+  data.tar.gz: 7f42b858981c8b127d3fedbaff922fc118ff36f7b99d96131419bf7266b0382b
+SHA512:
+  metadata.gz: b870ef5a5e649857aadd7f470a64ab521667e78b58d3c2c88d55b7e00b4c4f61876f8883ad5e81cfaac3b582d769f017b27add5d0feef81516636f4a69fb32bb
+  data.tar.gz: a61f7a7d58d0d67df5a7ee118720e830435c5705ba953934c26b88086e24c512cb3e35d49fb84d7cf50e143599b5178de89aa387a18b67dc22faf69146fc82f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omnicontacts (0.3.5)
+    omnicontacts (0.3.9)
       json
       rack
 
@@ -9,7 +9,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    json (1.8.1)
+    json (1.8.3)
     multi_json (1.1.0)
     rack (1.4.1)
     rack-test (0.6.1)
@@ -37,3 +37,6 @@ DEPENDENCIES
   rake
   rspec
   simplecov
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -32,9 +32,10 @@ require "omnicontacts"
 
 Rails.application.middleware.use OmniContacts::Builder do
   importer :gmail, "client_id", "client_secret", {:redirect_path => "/oauth2callback", :ssl_ca_file => "/etc/ssl/certs/curl-ca-bundle.crt"}
-  importer :yahoo, "consumer_id", "consumer_secret", {:callback_path => '/callback'}
+  importer :yahoo, "consumer_id", "consumer_secret", {:callback_path => "/callback"}
   importer :linkedin, "consumer_id", "consumer_secret", {:redirect_path => "/oauth2callback", :state => '<long_unique_string_value>'}
   importer :hotmail, "client_id", "client_secret"
+  importer :outlook, "app_id", "app_secret"
   importer :facebook, "client_id", "client_secret"
 end
 
@@ -49,17 +50,20 @@ On the other hand it makes things much easier to leave the default value for `:r
 
 * For Gmail : [Google API Console](https://code.google.com/apis/console/)
 
-* For Yahoo : [Yahoo Developer Network](https://developer.apps.yahoo.com/projects)
+* For Yahoo : [Yahoo Developer Network](https://developer.yahoo.com/social/contacts/)
 
 * For Hotmail : [Microsoft Developer Network](https://account.live.com/developers/applications/index)
 
+* For Outlook : [Microsoft Application Registration Portal](https://apps.dev.microsoft.com/)
+
 * For Facebook : [Facebook Developers](https://developers.facebook.com/apps)
 
-* For Linkedin : [Linkedin Developer Network](https://www.linkedin.com/secure/developer) 
+* For Linkedin : [Linkedin Developer Network](https://www.linkedin.com/secure/developer)
 
 
 ##### Note:
-Please go through [MSDN](http://msdn.microsoft.com/en-us/library/cc287659.aspx) if above Hotmail link will not work.
+Please go through [MSDN](http://msdn.microsoft.com/en-us/library/cc287659.aspx) if above Hotmail link will not work.  
+Outlook is a newer Microsoft API which allows to retrieve real email address instead of `email_hashes` when using Hotmail, it also works with all kinds of MS accounts (Office 365, Hotmail.com, Live.com, MSN.com, Outlook.com, and Passport.com).
 
 ## Integrating with your Application
 
@@ -172,7 +176,26 @@ The following table shows which fields are supported by which provider:
 		<td></td>
 	</tr>
 	<tr>
-	    <td>Linkedin</td>
+		<td>Outlook</td>
+		<td>X</td>
+		<td>X</td>
+		<td></td>
+		<td>X</td>
+		<td>X</td>
+		<td>X</td>
+		<td>X</td>
+		<td></td>
+		<td>X</td>
+		<td>X</td>
+		<td>X</td>
+		<td>X</td>
+		<td></td>
+		<td>X</td>
+		<td></td>
+		<td></td>
+	</tr>
+	<tr>
+	<td>Linkedin</td>
 		<td></td>
 		<td>X</td>
 		<td>X</td>
@@ -214,7 +237,7 @@ If the user does not authorize your application to access his/her contacts list,
 
 OmniContacts supports OAuth 1.0 and OAuth 2.0 token refresh, but for both it needs to persist data between requests. OmniContacts stores access tokens in the session. If you hit the 4KB cookie storage limit you better opt for the Memcache or the Active Record storage.
 
-Gmail requires you to register the redirect_path on their website along with your application. Make sure to use the same value present in the configuration file, or `/contacts/gmail/callback` if using the default.
+Gmail requires you to register the redirect_path on their website along with your application. Make sure to use the same value present in the configuration file, or `/contacts/gmail/callback` if using the default. Also make sure that your full url is used including "www" if your site redirects from the root domain.
 
 To configure the max number of contacts to download from Gmail, just add a max results parameter in your initializer:
 
@@ -246,6 +269,11 @@ The `mock` method allows to configure per-provider the result to return:
 
 You can either pass a single hash or an array of hashes. If you pass a string, an error will be triggered with subsequent redirect to `/contacts/failure?error_message=internal_error`
 
+You can also pass a user to fill `omnicontacts.user` (optional)
+```ruby
+  OmniContacts.integration_test.mock(:provider_name, {:email => "contact@example.com"}, {:email => "user@example.com"})
+```
+
 Follows a full example of an integration test:
 
 ```ruby

data/lib/omnicontacts.rb

@@ -1,6 +1,6 @@
 module OmniContacts
   
-  VERSION = "0.3.7"
+  VERSION = "0.3.10"
 
   MOUNT_PATH = "/contacts/"
 

data/lib/omnicontacts/builder.rb

@@ -12,7 +12,8 @@ module OmniContacts
     end
 
     def rack14?
-      Rack.release.split('.')[1].to_i >= 4
+      v = Rack.release.split('.')
+      v[0].to_i >= 1 || v[1].to_i >= 4
     end
 
     def importer importer, *args

data/lib/omnicontacts/importer.rb

@@ -4,6 +4,7 @@ module OmniContacts
     autoload :Gmail, "omnicontacts/importer/gmail"
     autoload :Yahoo, "omnicontacts/importer/yahoo"
     autoload :Hotmail, "omnicontacts/importer/hotmail"
+    autoload :Outlook, "omnicontacts/importer/outlook"
     autoload :Facebook, "omnicontacts/importer/facebook"
     autoload :Linkedin, "omnicontacts/importer/linkedin"
 

data/lib/omnicontacts/importer/facebook.rb

@@ -13,12 +13,12 @@ module OmniContacts
         super *args
         @auth_host = 'graph.facebook.com'
         @authorize_path = '/oauth/authorize'
-        @scope = 'email,user_relationships,user_birthday'
+        @scope = 'email,user_relationships,user_birthday,user_friends'
         @auth_token_path = '/oauth/access_token'
         @contacts_host = 'graph.facebook.com'
-        @friends_path = '/me/friends'
-        @family_path = '/me/family'
-        @self_path = '/me'
+        @friends_path = '/v2.5/me/friends'
+        @family_path = '/v2.5/me/family'
+        @self_path = '/v2.5/me'
       end
 
       def fetch_contacts_using_access_token access_token, access_token_secret

data/lib/omnicontacts/importer/gmail.rb

@@ -13,18 +13,18 @@ module OmniContacts
         @auth_host = "accounts.google.com"
         @authorize_path = "/o/oauth2/auth"
         @auth_token_path = "/o/oauth2/token"
-        @scope = (args[3] && args[3][:scope]) || "https://www.google.com/m8/feeds https://www.googleapis.com/auth/userinfo#email https://www.googleapis.com/auth/userinfo.profile"
+        @scope = (args[3] && args[3][:scope]) || "https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/userinfo#email https://www.googleapis.com/auth/userinfo.profile"
         @contacts_host = "www.google.com"
         @contacts_path = "/m8/feeds/contacts/default/full"
         @max_results =  (args[3] && args[3][:max_results]) || 100
         @self_host = "www.googleapis.com"
-        @profile_path = "/oauth2/v1/userinfo"
+        @profile_path = "/oauth2/v3/userinfo"
       end
 
       def fetch_contacts_using_access_token access_token, token_type
         fetch_current_user(access_token, token_type)
         contacts_response = https_get(@contacts_host, @contacts_path, contacts_req_params, contacts_req_headers(access_token, token_type))
-        contacts_from_response contacts_response
+        contacts_from_response(contacts_response, access_token)
       end
 
       def fetch_current_user access_token, token_type
@@ -43,7 +43,7 @@ module OmniContacts
         {"GData-Version" => "3.0", "Authorization" => "#{token_type} #{token}"}
       end
 
-      def contacts_from_response response_as_json
+      def contacts_from_response(response_as_json, access_token)
         response = JSON.parse(response_as_json)
 
         return [] if response['feed'].nil? || response['feed']['entry'].nil?
@@ -115,7 +115,7 @@ module OmniContacts
 
             new_address[:address_1] = address['gd$street']['$t'] if address['gd$street']
             new_address[:address_1] = address['gd$formattedAddress']['$t'] if new_address[:address_1].nil? && address['gd$formattedAddress']
-            if new_address[:address_1].index("\n")
+            if !new_address[:address_1].nil? && new_address[:address_1].index("\n")
               parts = new_address[:address_1].split("\n")
               new_address[:address_1] = parts.first
               # this may contain city/state/zip if user jammed it all into one string.... :-(
@@ -151,11 +151,13 @@ module OmniContacts
           # Support older versions of the gem by keeping singular entries around
           contact[:phone_number] = contact[:phone_numbers][0][:number] if contact[:phone_numbers][0]
 
-          if entry['gContact$website'] && entry['gContact$website'][0]["rel"] == "profile"
-            contact[:id] = contact_id(entry['gContact$website'][0]["href"])
-            contact[:profile_picture] = image_url(contact[:id])
-          else
-            contact[:profile_picture] = image_url_from_email(contact[:email])
+          if entry["link"] && entry["link"].is_a?(Array)
+            entry["link"].each do |link|
+              if link["type"] == 'image/*' && link["gd$etag"]
+                contact[:profile_picture] = link["href"] + "?&access_token=" + access_token
+                break
+              end
+            end
           end
 
           if entry['gContact$event']
@@ -180,15 +182,11 @@ module OmniContacts
         contacts
       end
 
-      def image_url gmail_id
-        return "https://profiles.google.com/s2/photos/profile/" + gmail_id if gmail_id
-      end
-
       def current_user me, access_token, token_type
         return nil if me.nil?
         me = JSON.parse(me)
         user = {:id => me['id'], :email => me['email'], :name => me['name'], :first_name => me['given_name'],
-                :last_name => me['family_name'], :gender => me['gender'], :birthday => birthday(me['birthday']), :profile_picture => image_url(me['id']),
+                :last_name => me['family_name'], :gender => me['gender'], :birthday => birthday(me['birthday']), :profile_picture => me["picture"],
                 :access_token => access_token, :token_type => token_type
         }
         user

data/lib/omnicontacts/importer/hotmail.rb

@@ -13,7 +13,7 @@ module OmniContacts
         super app, client_id, client_secret, options
         @auth_host = "login.live.com"
         @authorize_path = "/oauth20_authorize.srf"
-        @scope = options[:permissions] || "wl.signin, wl.basic, wl.birthday , wl.emails ,wl.contacts_birthday , wl.contacts_photos"
+        @scope = options[:permissions] || "wl.signin, wl.basic, wl.birthday , wl.emails ,wl.contacts_birthday , wl.contacts_photos, wl.contacts_emails"
         @auth_token_path = "/oauth20_token.srf"
         @contacts_host = "apis.live.net"
         @contacts_path = "/v5.0/me/contacts"
@@ -41,14 +41,10 @@ module OmniContacts
           # creating nil fields to keep the fields consistent across other networks
           contact = {:id => nil, :first_name => nil, :last_name => nil, :name => nil, :email => nil, :gender => nil, :birthday => nil, :profile_picture=> nil, :relation => nil, :email_hashes => []}
           contact[:id] = entry['user_id'] ? entry['user_id'] : entry['id']
-          if valid_email? entry["name"]
-            contact[:email] = entry["name"]
-            contact[:first_name], contact[:last_name], contact[:name] = email_to_name(contact[:email])
-          else
-            contact[:first_name] = normalize_name(entry['first_name'])
-            contact[:last_name] = normalize_name(entry['last_name'])
-            contact[:name] = normalize_name(entry['name'])
-          end
+	        contact[:email] = parse_email(entry['emails']) if valid_email? parse_email(entry['emails'])
+	        contact[:first_name] = normalize_name(entry['first_name'])
+	        contact[:last_name] = normalize_name(entry['last_name'])
+	        contact[:name] = normalize_name(entry['name'])
           contact[:birthday] = birthday_format(entry['birth_month'], entry['birth_day'], entry['birth_year'])
           contact[:gender] = entry['gender']
           contact[:profile_picture] = image_url(entry['user_id'])
@@ -60,7 +56,7 @@ module OmniContacts
 
       def parse_email(emails)
         return nil if emails.nil?
-        emails['account']
+        emails['account'] || emails['preferred'] || emails['personal'] || emails['business'] || emails['other']
       end
 
       def current_user me

data/lib/omnicontacts/importer/outlook.rb

@@ -0,0 +1,112 @@
+require "omnicontacts/middleware/oauth2"
+require "omnicontacts/parse_utils"
+require "json"
+
+# API Docs: https://msdn.microsoft.com/en-us/office/office365/api/api-catalog#Outlookcontacts
+module OmniContacts
+  module Importer
+    class Outlook < Middleware::OAuth2
+      include ParseUtils
+
+      attr_reader :auth_host, :authorize_path, :auth_token_path, :scope
+
+      def initialize app, client_id, client_secret, options ={}
+        super app, client_id, client_secret, options
+        @auth_host = "login.microsoftonline.com"
+        @authorize_path = "/common/oauth2/v2.0/authorize"
+        @scope = options[:permissions] || "https://outlook.office.com/contacts.read"
+        @auth_token_path = "/common/oauth2/v2.0/token"
+        @contacts_host = "outlook.office.com"
+        @contacts_path = "/api/v2.0/me/contacts"
+        @self_path = "/api/v2.0/me"
+      end
+
+      def fetch_contacts_using_access_token access_token, token_type
+        fetch_current_user(access_token, token_type)
+        contacts_response = https_get(@contacts_host, @contacts_path, {}, contacts_req_headers(access_token, token_type))
+        contacts_from_response contacts_response
+      end
+
+      def fetch_current_user access_token, token_type
+        self_response = https_get(@contacts_host, @self_path, {}, contacts_req_headers(access_token, token_type))
+        user = current_user self_response
+        set_current_user user
+      end
+
+      private
+
+      def contacts_req_headers token, token_type
+        { "Authorization" => "#{token_type} #{token}" }
+      end
+
+      def current_user me
+        return nil if me.nil?
+        me = JSON.parse(me)
+
+        name_splitted = me["DisplayName"].split(" ")
+        first_name = name_splitted.first
+        last_name = name_splitted.last if name_splitted.size > 1
+
+        user = empty_contact
+        user[:id]         = me["Id"]
+        user[:email]      = me["EmailAddress"]
+        user[:name]       = me["DisplayName"]
+        user[:first_name] = normalize_name(first_name)
+        user[:last_name]  = normalize_name(last_name)
+        user
+      end
+
+      def contacts_from_response response_as_json
+        response = JSON.parse(response_as_json)
+        contacts = []
+        response["value"].each do |entry|
+          contact = empty_contact
+          # Full fields reference:
+          # https://msdn.microsoft.com/office/office365/api/complex-types-for-mail-contacts-calendar#RESTAPIResourcesContact
+          contact[:id]         = entry["Id"]
+          contact[:first_name] = entry["GivenName"]
+          contact[:last_name]  = entry["Surname"]
+          contact[:name]       = entry["DisplayName"]
+          contact[:email]      = parse_email(entry["EmailAddresses"])
+          contact[:birthday]   = birthday(entry["Birthday"])
+
+          address = [entry["HomeAddress"], entry["BusinessAddress"], entry["OtherAddress"]].reject(&:empty?).first
+          if address
+            contact[:address_1] = address["Street"]
+            contact[:city]      = address["City"]
+            contact[:region]    = address["State"]
+            contact[:postcode]  = address["PostalCode"]
+            contact[:country]   = address["CountryOrRegion"]
+          end
+
+          contacts << contact if contact[:name] || contact[:first_name]
+        end
+        contacts
+      end
+
+      def empty_contact
+        { :id => nil, :first_name => nil, :last_name => nil, :name => nil, :email => nil,
+          :gender => nil, :birthday => nil, :profile_picture => nil, :address_1 => nil,
+          :address_2 => nil, :city => nil, :region => nil, :postcode => nil, :relation => nil }
+      end
+
+      def parse_email emails
+        return nil if emails.nil?
+        emails.map! { |email| email["Address"] }
+        emails.select! { |email| valid_email? email }
+        emails.first
+      end
+
+      def birthday dob
+        return nil if dob.nil?
+        birthday = dob[0..9].split("-")
+        birthday[0] = nil if birthday[0].to_i < 1900 # if year is not set it returns 1604
+        return birthday_format(birthday[1], birthday[2], birthday[0])
+      end
+
+      def valid_email? value
+        /\A[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]+\z/.match(value)
+      end
+    end
+  end
+end

data/lib/omnicontacts/integration_test.rb

@@ -2,28 +2,30 @@ require 'singleton'
 
 class IntegrationTest
   include Singleton
-  
+
   attr_accessor :enabled
-  
+
   def initialize
     enabled = false
     clear_mocks
   end
-  
+
   def clear_mocks
-    @mock = {}
+    @user_mocks = {}
+    @contact_mocks = {}
   end
-  
-  def mock provider, mock
-    @mock[provider.to_sym] = mock
+
+  def mock provider, contacts, user = {}
+    @contact_mocks[provider.to_sym] = contacts
+    @user_mocks[provider.to_sym] = user
   end
-  
+
   def mock_authorization_from_user provider
     [302, {"Content-Type" => "application/x-www-form-urlencoded", "location" => provider.redirect_path}, []]
   end
-  
+
   def mock_fetch_contacts provider
-    result = @mock[provider.class_name.to_sym] || []
+    result = @contact_mocks[provider.class_name.to_sym] || []
     if result.is_a? Array
       result
     elsif result.is_a? Hash
@@ -32,5 +34,8 @@ class IntegrationTest
       raise result.to_s
     end
   end
-  
-end
+
+  def mock_fetch_user provider
+    @user_mocks[provider.class_name.to_sym] || {}
+  end
+end

data/lib/omnicontacts/middleware/base_oauth.rb

@@ -3,7 +3,7 @@
 #
 # Extending classes are required to implement
 # the following methods:
-# * request_authorization_from_user 
+# * request_authorization_from_user
 # * fetch_contatcs
 module OmniContacts
   module Middleware
@@ -22,9 +22,9 @@ module OmniContacts
       end
 
       # Rack callback. It handles three cases:
-      # * user visit middleware entry point. 
+      # * user visit middleware entry point.
       #   In this case request_authorization_from_user is called
-      # * user is redirected back to the application 
+      # * user is redirected back to the application
       #   from the authorization site. In this case the list
       #   of contacts is fetched and stored in the variables
       #   omnicontacts.contacts within the Rack env variable.
@@ -34,8 +34,10 @@ module OmniContacts
       def call env
         @env = env
         if env["PATH_INFO"] =~ /^#{@listening_path}\/?$/
+          session['omnicontacts.params'] = Rack::Request.new(env).params
           handle_initial_request
         elsif env["PATH_INFO"] =~ /^#{redirect_path}/
+          env['omnicontacts.params'] = session.delete('omnicontacts.params')
           handle_callback
         else
           @app.call(env)
@@ -43,7 +45,7 @@ module OmniContacts
       end
 
       private
-      
+
       def test_mode?
         IntegrationTest.instance.enabled
       end
@@ -65,6 +67,7 @@ module OmniContacts
           else
             fetch_contacts
           end
+          set_current_user IntegrationTest.instance.mock_fetch_user(self) if test_mode?
           @app.call(@env)
         end
       end
@@ -74,7 +77,7 @@ module OmniContacts
       end
 
       #  This method rescues executes a block of code and
-      #  rescue all exceptions. In case of an exception the 
+      #  rescue all exceptions. In case of an exception the
       #  user is redirected to the failure endpoint.
       def execute_and_rescue_exceptions
         yield
@@ -89,7 +92,8 @@ module OmniContacts
       def handle_error error_type, exception
         logger.puts("Error #{error_type} while processing #{@env["PATH_INFO"]}: #{exception.message}") if logger
         failure_url = "#{ MOUNT_PATH }failure?error_message=#{error_type}&importer=#{class_name}"
-        target_url = append_state_query(failure_url)
+        params_url = append_request_params(failure_url)
+        target_url = append_state_query(params_url)
         [302, {"Content-Type" => "text/html", "location" => target_url}, []]
       end
 
@@ -106,9 +110,17 @@ module OmniContacts
         "omnicontacts." + class_name
       end
 
+      def append_request_params(target_url)
+        return target_url unless @env['omnicontacts.params']
+        params = Rack::Utils.build_query(@env['omnicontacts.params'])
+        unless params.nil? or params.empty?
+          target_url = target_url + (target_url.include?("?")?"&":"?") + params
+        end
+        return target_url
+      end
+
       def append_state_query(target_url)
         state = Rack::Utils.parse_query(@env['QUERY_STRING'])['state']
-
         unless state.nil?
           target_url = target_url + (target_url.include?("?")?"&":"?") + 'state=' + state
         end

data/omnicontacts.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/omnicontacts', __FILE__)
 Gem::Specification.new do |gem|
   gem.name = 'omnicontacts'
   gem.description = %q{A generalized Rack middleware for importing contacts from major email providers.}
-  gem.authors = ['Diego Castorina', 'Jordan Lance']
+  gem.authors = ['Diego Castorina', 'Jordan Lance', 'Asma Tameem', 'Randy Villanueva']
   gem.email = ['diegocastorina@gmail.com', 'voorruby@gmail.com']
 
   gem.add_runtime_dependency 'rack'

data/spec/omnicontacts/importer/gmail_spec.rb

@@ -2,11 +2,23 @@ require "spec_helper"
 require "omnicontacts/importer/gmail"
 
 describe OmniContacts::Importer::Gmail do
-
   let(:gmail) { OmniContacts::Importer::Gmail.new({}, "client_id", "client_secret") }
 
-  let(:gmail_with_scope_args) { OmniContacts::Importer::Gmail.new({}, "client_id", "client_secret", {scope: "https://www.google.com/m8/feeds https://www.googleapis.com/auth/userinfo#email https://www.googleapis.com/auth/contacts.readonly"}) }
-  
+  let(:gmail_with_scope_args) {
+    OmniContacts::Importer::Gmail.new(
+      {},
+      "client_id",
+      "client_secret",
+      {
+        scope: %w(
+          https://www.googleapis.com/auth/contacts.readonly
+          https://www.googleapis.com/auth/userinfo#email
+          https://www.googleapis.com/auth/userinfo.profile
+        ).join(" ")
+      }
+    )
+  }
+
   let(:self_response) {
     '{
       "id":"16482944006464829443",
@@ -39,6 +51,8 @@ describe OmniContacts::Importer::Gmail do
 
           "title":{"$t":"Users\'s Contacts"},
           "link":[
+            {"rel":"http://schemas.google.com/contacts/2008/rel#photo","type":"image/*",
+             "href":"https://www.google.com/m8/feeds/photos/media/logged_in_user%40gmail.com/6b41d030b05abc","gd$etag":"\"VSxuN0cISit7I2A1UVUSdy12KHwgBFkE333.\""},
             {"rel":"alternate","type":"text/html","href":"http://www.google.com/"},
             {"rel":"http://schemas.google.com/g/2005#feed","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full"},
             {"rel":"http://schemas.google.com/g/2005#post","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full"},
@@ -60,7 +74,8 @@ describe OmniContacts::Importer::Gmail do
             "category":[{"scheme":"http://schemas.google.com/g/2005#kind","term":"http://schemas.google.com/contact/2008#contact"}],
             "title":{"$t":"Edward Bennet"},
             "link":[
-              {"rel":"http://schemas.google.com/contacts/2008/rel#photo","type":"image/*","href":"https://www.google.com/m8/feeds/photos/media/logged_in_user%40gmail.com/1"},
+              {"rel":"http://schemas.google.com/contacts/2008/rel#photo","type":"image/*",
+               "href":"https://www.google.com/m8/feeds/photos/media/logged_in_user%40gmail.com/6b41d030b05abc", "gd$etag":"\"VSxuN0cISit7I2A1UVUSdy12KHwgBFkE333.\""},
               {"rel":"self","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full/1"},
               {"rel":"edit","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full/1"}
             ],
@@ -127,9 +142,9 @@ describe OmniContacts::Importer::Gmail do
         contacts_as_json
       end
       gmail.fetch_contacts_using_access_token token, token_type
-      
-      gmail.scope.should eq "https://www.google.com/m8/feeds https://www.googleapis.com/auth/userinfo#email https://www.googleapis.com/auth/userinfo.profile"
-      gmail_with_scope_args.scope.should eq "https://www.google.com/m8/feeds https://www.googleapis.com/auth/userinfo#email https://www.googleapis.com/auth/contacts.readonly"
+
+      gmail.scope.should eq "https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/userinfo#email https://www.googleapis.com/auth/userinfo.profile"
+      gmail_with_scope_args.scope.should eq "https://www.googleapis.com/auth/contacts.readonly https://www.googleapis.com/auth/userinfo#email https://www.googleapis.com/auth/userinfo.profile"
     end
 
     it "should correctly parse id, name, email, gender, birthday, profile picture and relation for 1st contact" do
@@ -144,9 +159,9 @@ describe OmniContacts::Importer::Gmail do
       result.first[:name].should eq("Edward Bennet")
       result.first[:email].should eq("bennet@gmail.com")
       result.first[:gender].should eq("male")
-      result.first[:birthday].should eq({:day=>02, :month=>07, :year=>1954})
+      result.first[:birthday].should eq({ :day => 02, :month => 07, :year => 1954 })
       result.first[:relation].should eq('father')
-      result.first[:profile_picture].should eq("https://profiles.google.com/s2/photos/profile/bennet")
+      result.first[:profile_picture].should eq("https://www.google.com/m8/feeds/photos/media/logged_in_user%40gmail.com/6b41d030b05abc?&access_token=token")
       result.first[:dates][0][:name].should eq("anniversary")
     end
 
@@ -161,8 +176,8 @@ describe OmniContacts::Importer::Gmail do
       result.last[:name].should eq("Emilia Fox")
       result.last[:email].should eq("emilia.fox@gmail.com")
       result.last[:gender].should eq("female")
-      result.last[:birthday].should eq({:day=>10, :month=>02, :year=>1974})
-      result.last[:profile_picture].should eq("https://profiles.google.com/s2/photos/profile/emilia.fox")
+      result.last[:birthday].should eq({ :day => 10, :month => 02, :year => 1974 })
+      result.last[:profile_picture].should be_nil
       result.last[:relation].should eq('spouse')
       result.first[:address_1].should eq('1313 Trashview Court')
       result.first[:address_2].should eq('Apt. 13')
@@ -187,8 +202,122 @@ describe OmniContacts::Importer::Gmail do
       user[:name].should eq("Chris Johnson")
       user[:email].should eq("chrisjohnson@gmail.com")
       user[:gender].should eq("male")
-      user[:birthday].should eq({:day=>21, :month=>06, :year=>1982})
-      user[:profile_picture].should eq("https://profiles.google.com/s2/photos/profile/16482944006464829443")
+      user[:birthday].should eq({ :day => 21, :month => 06, :year => 1982 })
+      user[:profile_picture].should eq("https://lh3.googleusercontent.com/-b8aFbTBM/AAAAAAI/IWA/vsek/photo.jpg")
+    end
+
+    context "when address_1 is nil" do
+      let(:contacts_as_json) {
+        '{"version":"1.0","encoding":"UTF-8",
+        "feed":{
+          "xmlns":"http://www.w3.org/2005/Atom",
+          "xmlns$openSearch":"http://a9.com/-/spec/opensearch/1.1/",
+          "xmlns$gContact":"http://schemas.google.com/contact/2008",
+          "xmlns$batch":"http://schemas.google.com/gdata/batch",
+          "xmlns$gd":"http://schemas.google.com/g/2005",
+          "gd$etag":"W/\"C0YHRno7fSt7I2A9WhBSQ0Q.\"",
+
+          "id":{"$t":"logged_in_user@gmail.com"},
+          "updated":{"$t":"2013-02-20T20:12:17.405Z"},
+          "category":[{
+            "scheme":"http://schemas.google.com/g/2005#kind",
+            "term":"http://schemas.google.com/contact/2008#contact"
+           }],
+
+          "title":{"$t":"Users\'s Contacts"},
+          "link":[
+            {"rel":"http://schemas.google.com/contacts/2008/rel#photo","type":"image/*",
+             "href":"https://www.google.com/m8/feeds/photos/media/logged_in_user%40gmail.com/6b41d030b05abc","gd$etag":"\"VSxuN0cISit7I2A1UVUSdy12KHwgBFkE333.\""},
+            {"rel":"alternate","type":"text/html","href":"http://www.google.com/"},
+            {"rel":"http://schemas.google.com/g/2005#feed","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full"},
+            {"rel":"http://schemas.google.com/g/2005#post","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full"},
+            {"rel":"http://schemas.google.com/g/2005#batch","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full/batch"},
+            {"rel":"self","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full?alt\u003djson\u0026max-results\u003d1"},
+            {"rel":"next","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full?alt\u003djson\u0026start-index\u003d2\u0026max-results\u003d1"}
+          ],
+          "author":[{"name":{"$t":"Edward"},"email":{"$t":"logged_in_user@gmail.com"}}],
+          "generator":{"version":"1.0","uri":"http://www.google.com/m8/feeds","$t":"Contacts"},
+          "openSearch$totalResults":{"$t":"1007"},
+          "openSearch$startIndex":{"$t":"1"},
+          "openSearch$itemsPerPage":{"$t":"1"},
+          "entry":[
+            {
+            "gd$etag":"\"R3oyfDVSLyt7I2A9WhBTSEULRA0.\"",
+            "id":{"$t":"http://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/base/1"},
+            "updated":{"$t":"2013-02-14T22:36:36.494Z"},
+            "app$edited":{"xmlns$app":"http://www.w3.org/2007/app","$t":"2013-02-14T22:36:36.494Z"},
+            "category":[{"scheme":"http://schemas.google.com/g/2005#kind","term":"http://schemas.google.com/contact/2008#contact"}],
+            "title":{"$t":"Edward Bennet"},
+            "link":[
+              {"rel":"http://schemas.google.com/contacts/2008/rel#photo","type":"image/*",
+               "href":"https://www.google.com/m8/feeds/photos/media/logged_in_user%40gmail.com/6b41d030b05abc", "gd$etag":"\"VSxuN0cISit7I2A1UVUSdy12KHwgBFkE333.\""},
+              {"rel":"self","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full/1"},
+              {"rel":"edit","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full/1"}
+            ],
+            "gd$name":{
+              "gd$fullName":{"$t":"Edward Bennet"},
+              "gd$givenName":{"$t":"Edward"},
+              "gd$familyName":{"$t":"Bennet"}
+            },
+            "gd$organization":[{"rel":"http://schemas.google.com/g/2005#other","gd$orgName":{"$t":"Google"},"gd$orgTitle":{"$t":"Master Developer"}}],
+            "gContact$birthday":{"when":"1954-07-02"},
+            "gContact$relation":{"rel":"father"},
+            "gContact$gender":{"value":"male"},
+            "gContact$event":[{"rel":"anniversary","gd$when":{"startTime":"1983-04-21"}},{"label":"New Job","gd$when":{"startTime":"2014-12-01"}}],
+            "gd$email":[{"rel":"http://schemas.google.com/g/2005#other","address":"bennet@gmail.com","primary":"true"}],
+            "gContact$groupMembershipInfo":[{"deleted":"false","href":"http://www.google.com/m8/feeds/groups/logged_in_user%40gmail.com/base/6"}],
+            "gd$structuredPostalAddress":[{"rel":"http://schemas.google.com/g/2005#home","gd$formattedAddress":{},"gd$street":{},"gd$postcode":{"$t":"66666"},"gd$country":{"code":"VA","$t":"Valoran"},"gd$city":{"$t":"Nowheresville"},"gd$region":{"$t":"OK"}}],
+            "gd$phoneNumber":[{"rel":"http://schemas.google.com/g/2005#mobile","uri":"tel:+34-653-15-76-88","$t":"653157688"}]
+          },
+          {
+            "gd$etag":"\"R3oyfDVSLyt7I2A9WhBTSEULRA0.\"",
+            "id":{"$t":"http://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/base/1"},
+            "updated":{"$t":"2013-02-15T22:36:36.494Z"},
+            "app$edited":{"xmlns$app":"http://www.w3.org/2007/app","$t":"2013-02-15T22:36:36.494Z"},
+            "category":[{"scheme":"http://schemas.google.com/g/2005#kind","term":"http://schemas.google.com/contact/2008#contact"}],
+            "title":{"$t":"Emilia Fox"},
+            "link":[
+              {"rel":"http://schemas.google.com/contacts/2008/rel#photo","type":"image/*","href":"https://www.google.com/m8/feeds/photos/media/logged_in_user%40gmail.com/1"},
+              {"rel":"self","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full/1"},
+              {"rel":"edit","type":"application/atom+xml","href":"https://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/full/1"}
+            ],
+            "gd$name":{
+              "gd$fullName":{"$t":"Emilia Fox"},
+              "gd$givenName":{"$t":"Emilia"},
+              "gd$familyName":{"$t":"Fox"}
+            },
+            "gContact$birthday":{"when":"1974-02-10"},
+            "gContact$relation":[{"rel":"spouse"}],
+            "gContact$gender":{"value":"female"},
+            "gd$email":[{"rel":"http://schemas.google.com/g/2005#other","address":"emilia.fox@gmail.com","primary":"true"}],
+            "gContact$groupMembershipInfo":[{"deleted":"false","href":"http://www.google.com/m8/feeds/groups/logged_in_user%40gmail.com/base/6"}]
+          }]
+        }
+      }'
+      }
+
+      it "should correctly parse id, name, email, gender, birthday, profile picture, snailmail address, phone and relation for 2nd contact" do
+        gmail.should_receive(:https_get)
+        gmail.should_receive(:https_get).and_return(contacts_as_json)
+        result = gmail.fetch_contacts_using_access_token token, token_type
+        result.size.should be(2)
+        result.last[:id].should eq('http://www.google.com/m8/feeds/contacts/logged_in_user%40gmail.com/base/1')
+        result.last[:first_name].should eq('Emilia')
+        result.last[:last_name].should eq('Fox')
+        result.last[:name].should eq("Emilia Fox")
+        result.last[:email].should eq("emilia.fox@gmail.com")
+        result.last[:gender].should eq("female")
+        result.last[:birthday].should eq({ :day => 10, :month => 02, :year => 1974 })
+        result.last[:profile_picture].should be_nil
+        result.last[:relation].should eq('spouse')
+        result.first[:address_1].should eq(nil)
+        result.first[:address_2].should eq(nil)
+        result.first[:city].should eq('Nowheresville')
+        result.first[:region].should eq('OK')
+        result.first[:country].should eq('VA')
+        result.first[:postcode].should eq('66666')
+        result.first[:phone_number].should eq('653157688')
+      end
     end
   end
-end
+end

data/spec/omnicontacts/importer/outlook_spec.rb

@@ -0,0 +1,150 @@
+require "spec_helper"
+require "omnicontacts/importer/outlook"
+
+describe OmniContacts::Importer::Outlook do
+
+  let(:permissions) { "Contacts.Read" }
+  let(:outlook) { OmniContacts::Importer::Outlook.new({}, "app_id", "app_secret", {:permissions => permissions}) }
+
+  let(:self_response) {
+    '{
+      "@odata.context": "https://outlook.office.com/api/v2.0/$metadata#Me",
+      "@odata.id": "https://outlook.office.com/api/v2.0/Users(\'00034001-df52-d3d5-0000-000000000000@84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa\')",
+      "Id": "00034001-df52-d3d5-0000-000000000000@84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa",
+      "EmailAddress": "test.user@outlook.com",
+      "DisplayName": "Test User",
+      "Alias": "puid-00034001DF52D3D5",
+      "MailboxGuid": "00034001-df52-d3d5-0000-000000000000"
+    }'
+  }
+
+  let(:contacts_as_json) {
+    '{
+      "@odata.context": "https://outlook.office.com/api/v2.0/$metadata#Me/Contacts",
+      "value": [{
+        "@odata.id": "https://outlook.office.com/api/v2.0/Users(\'00034001-df52-d3d5-0000-000000000000@84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa\')/Contacts(\'AQMkADAwATM0MDAAMS1kZjUyLWQzZDUtMDACLTAwCgBGAAADQ1hAWLJpwk6DZYyOhnclvgcAxCL3G7jnpkiRUVmiNrhjJgAAAgEOAAAAxCL3G7jnpkiRUVmiNrhjJgAAAixsAAAA\')",
+        "@odata.etag": "W/\"EQAAABYAAADEIvcbuOemSJFRWaI2uGMmAAAAlo4t\"",
+        "Id": "AQMkADAwATM0MDAAMS1kZjUyLWQzZDUtMDACLTAwCgBGAAADQ1hAWLJpwk6DZYyOhnclvgcAxCL3G7jnpkiRUVmiNrhjJgAAAgEOAAAAxCL3G7jnpkiRUVmiNrhjJgAAAixsAAAA",
+        "CreatedDateTime": "2016-04-13T21:25:24Z",
+        "LastModifiedDateTime": "2016-04-14T19:36:55Z",
+        "ChangeKey": "EQAAABYAAADEIvcbuOemSJFRWaI2uGMmAAAAlo4t",
+        "Categories": [],
+        "ParentFolderId": "AQMkADAwATM0MDAAMS1kZjUyLWQzZDUtMDACLTAwCgAuAAADQ1hAWLJpwk6DZYyOhnclvgEAxCL3G7jnpkiRUVmiNrhjJgAAAgEOAAAA",
+        "Birthday": "1604-08-14T00:00:00Z",
+        "FileAs": "Contact, First",
+        "DisplayName": "First Contact",
+        "GivenName": "First",
+        "Initials": null,
+        "MiddleName": null,
+        "NickName": null,
+        "Surname": "Contact",
+        "Title": null,
+        "YomiGivenName": null,
+        "YomiSurname": null,
+        "YomiCompanyName": null,
+        "Generation": null,
+        "EmailAddresses": [{
+          "Name": "contact.first@email.com",
+          "Address": "contact.first@email.com"
+        }, {
+          "Name": "contact.second@email.com",
+          "Address": "contact.second@email.com"
+        }],
+        "ImAddresses": [],
+        "JobTitle": null,
+        "CompanyName": null,
+        "Department": null,
+        "OfficeLocation": null,
+        "Profession": null,
+        "BusinessHomePage": null,
+        "AssistantName": null,
+        "Manager": null,
+        "HomePhones": [],
+        "MobilePhone1": null,
+        "BusinessPhones": [],
+        "HomeAddress": {
+          "Street": "address1",
+          "City": "city",
+          "State": "state",
+          "CountryOrRegion": "US",
+          "PostalCode": "89111"
+        },
+        "BusinessAddress": {},
+        "OtherAddress": {},
+        "SpouseName": null,
+        "PersonalNotes": null,
+        "Children": []
+      }]
+    }'
+  }
+
+  describe "fetch_contacts_using_access_token" do
+
+    let(:access_token) { "access_token" }
+    let(:token_type) { "token_type" }
+
+    before(:each) do
+      outlook.instance_variable_set(:@env, {"HTTP_HOST" => "http://example.com"})
+    end
+
+    it "should request the contacts by providing the authorization header with token_type and access_token" do
+      outlook.should_receive(:https_get) do |host, path, params, headers|
+        params.should eq({})
+        headers["Authorization"].should eq("token_type access_token")
+        self_response
+      end
+
+      outlook.should_receive(:https_get) do |host, path, params, headers|
+        params.should eq({})
+        headers["Authorization"].should eq("token_type access_token")
+        contacts_as_json
+      end
+      outlook.fetch_contacts_using_access_token access_token, token_type
+    end
+
+    it "should set requested permissions in the authorization url" do
+      outlook.authorization_url.should match(/scope=#{Regexp.quote(CGI.escape(permissions))}/)
+    end
+
+    it "should correctly parse id, name and email" do
+      outlook.should_receive(:https_get).and_return(self_response)
+      outlook.should_receive(:https_get).and_return(contacts_as_json)
+      result = outlook.fetch_contacts_using_access_token access_token, token_type
+
+      result.size.should be(1)
+      result.first[:id].should eq('AQMkADAwATM0MDAAMS1kZjUyLWQzZDUtMDACLTAwCgBGAAADQ1hAWLJpwk6DZYyOhnclvgcAxCL3G7jnpkiRUVmiNrhjJgAAAgEOAAAAxCL3G7jnpkiRUVmiNrhjJgAAAixsAAAA')
+      result.first[:first_name].should eq("First")
+      result.first[:last_name].should eq("Contact")
+      result.first[:name].should eq("First Contact")
+      result.first[:email].should eq("contact.first@email.com")
+      result.first[:birthday].should eq({ :day => 14, :month => 8, :year => nil })
+      result.first[:address_1].should eq("address1")
+      result.first[:address_2].should be_nil
+      result.first[:city].should eq("city")
+      result.first[:region].should eq("state")
+      result.first[:postcode].should eq("89111")
+      result.first[:country].should eq("US")
+      result.first[:gender].should be_nil
+      result.first[:profile_picture].should be_nil
+      result.first[:relation].should be_nil
+    end
+
+    it "should correctly parse and set logged in user information" do
+      outlook.should_receive(:https_get).and_return(self_response)
+      outlook.should_receive(:https_get).and_return(contacts_as_json)
+
+      outlook.fetch_contacts_using_access_token access_token, token_type
+
+      user = outlook.instance_variable_get(:@env)["omnicontacts.user"]
+      user.should_not be_nil
+      user[:id].should eq('00034001-df52-d3d5-0000-000000000000@84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa')
+      user[:first_name].should eq("Test")
+      user[:last_name].should eq("User")
+      user[:name].should eq("Test User")
+      user[:email].should eq("test.user@outlook.com")
+      user[:gender].should be_nil
+      user[:birthday].should be_nil
+    end
+  end
+
+end

data/spec/omnicontacts/integration_test_spec.rb

@@ -11,7 +11,7 @@ describe IntegrationTest do
       IntegrationTest.instance.mock_authorization_from_user(provider)[1]["location"].should eq(redirect_path)
     end
   end
-  
+
   context "mock_callback" do
 
     before(:each) {
@@ -20,11 +20,11 @@ describe IntegrationTest do
       @provider.stub(:class_name => "test")
       IntegrationTest.instance.clear_mocks
     }
-    
+
     it "should return an empty contacts list" do
       IntegrationTest.instance.mock_fetch_contacts(@provider).should be_empty
     end
-    
+
     it "should return a configured list of contacts " do
       contacts = [:name => 'John Doe', :email => 'john@doe.com']
       IntegrationTest.instance.mock('test', contacts)
@@ -42,10 +42,19 @@ describe IntegrationTest do
       result.first[:email].should eq(contact[:email])
       result.first[:name].should eq(contact[:name])
     end
-    
+
+    it "should return a user" do
+      contact = {:name => 'John Doe', :email => 'john@doe.com'}
+      user = {:name => 'Mary Smith', :email => 'mary@smith.com'}
+      IntegrationTest.instance.mock('test', contact, user)
+      result = IntegrationTest.instance.mock_fetch_user(@provider)
+      result[:email].should eq(user[:email])
+      result[:name].should eq(user[:name])
+    end
+
     it "should throw an exception" do
       IntegrationTest.instance.mock('test', :some_error)
       expect {IntegrationTest.instance.mock_fetch_contacts(@provider)}.to raise_error
     end
   end
-end
+end

data/spec/omnicontacts/middleware/base_oauth_spec.rb

@@ -13,6 +13,14 @@ describe OmniContacts::Middleware::BaseOAuth do
       def redirect_path
         "#{ MOUNT_PATH }testprovider/callback"
       end
+
+      def self.mock_session
+        @mock_session ||= {}
+      end
+
+      def session
+        TestProvider.mock_session
+      end
     end
     OmniContacts.integration_test.enabled = true
   end
@@ -31,7 +39,7 @@ describe OmniContacts::Middleware::BaseOAuth do
     last_request.env["omnicontacts.contacts"].first[:email].should eq("user@example.com")
   end
 
-  it "should redurect to failure url" do
+  it "should redirect to failure url" do
     OmniContacts.integration_test.mock(:testprovider, "some_error" )
     get "#{ MOUNT_PATH }testprovider"
     get "#{MOUNT_PATH }testprovider/callback"
@@ -44,10 +52,31 @@ describe OmniContacts::Middleware::BaseOAuth do
     get "#{MOUNT_PATH }testprovider/callback?state=/parent/resource/id"
     last_response.headers["location"].should eq("#{ MOUNT_PATH }failure?error_message=internal_error&importer=testprovider&state=/parent/resource/id")
   end
+
+  it "should store request params in session" do
+    OmniContacts.integration_test.mock(:testprovider, :email => "user@example.com")
+    get "#{ MOUNT_PATH }testprovider?foo=bar"
+    app.session['omnicontacts.params'].should eq({'foo' => 'bar'})
+  end
+
+  it "should pass the params from session to callback environment " do
+    OmniContacts.integration_test.mock(:testprovider, :email => "user@example.com")
+    app.session.merge!({'omnicontacts.params' => {'foo' => 'bar'}})
+    get "#{MOUNT_PATH }testprovider/callback?state=/parent/resource/id"
+    last_request.env["omnicontacts.params"].should eq({'foo' => 'bar'})
+  end
+
+  it "should pass the params from session on failure" do
+    OmniContacts.integration_test.mock(:testprovider, "some_error" )
+    get "#{ MOUNT_PATH }testprovider"
+    app.session.merge!({'omnicontacts.params' => {'foo' => 'bar'}})
+    get "#{MOUNT_PATH }testprovider/callback"
+    last_response.should be_redirect
+    last_response.headers["location"].should be_include("foo=bar")
+  end
   
   after(:all) do 
     OmniContacts.integration_test.enabled = false
     OmniContacts.integration_test.clear_mocks
   end
-  
-end
+end

metadata

@@ -1,111 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: omnicontacts
 version: !ruby/object:Gem::Version
-  version: 0.3.7
-  prerelease: 
+  version: 0.3.10
 platform: ruby
 authors:
 - Diego Castorina
 - Jordan Lance
+- Asma Tameem
+- Randy Villanueva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: 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: rack-test
   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 generalized Rack middleware for importing contacts from major email
@@ -117,7 +106,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -132,6 +121,7 @@ files:
 - lib/omnicontacts/importer/gmail.rb
 - lib/omnicontacts/importer/hotmail.rb
 - lib/omnicontacts/importer/linkedin.rb
+- lib/omnicontacts/importer/outlook.rb
 - lib/omnicontacts/importer/yahoo.rb
 - lib/omnicontacts/integration_test.rb
 - lib/omnicontacts/middleware/base_oauth.rb
@@ -146,6 +136,7 @@ files:
 - spec/omnicontacts/importer/gmail_spec.rb
 - spec/omnicontacts/importer/hotmail_spec.rb
 - spec/omnicontacts/importer/linkedin_spec.rb
+- spec/omnicontacts/importer/outlook_spec.rb
 - spec/omnicontacts/importer/yahoo_spec.rb
 - spec/omnicontacts/integration_test_spec.rb
 - spec/omnicontacts/middleware/base_oauth_spec.rb
@@ -155,26 +146,25 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/Diego81/omnicontacts
 licenses: []
+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: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.7.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A generalized Rack middleware for importing contacts from major email providers.
 test_files: []