Adds return url to configuration to make it easier to config.

lib/contacts/oauth_consumer.rb

@@ -4,6 +4,7 @@ module Contacts
   class OAuthConsumer < Consumer
     configuration_attribute :consumer_key
     configuration_attribute :consumer_secret
+    configuration_attribute :return_url
 
     def initialize(consumer_options, request_token_params)
       @consumer_options = consumer_options
@@ -27,7 +28,7 @@ def serializable_data
     attr_accessor :request_token
     attr_accessor :access_token
 
-    def authentication_url(target)
+    def authentication_url(target = self.return_url)
       @request_token = consumer.get_request_token({:oauth_callback => target}, @request_token_params)
       @request_token.authorize_url
     end

lib/contacts/windows_live.rb

@@ -6,6 +6,7 @@ class WindowsLive < Consumer
     configuration_attribute :application_id
     configuration_attribute :secret_key
     configuration_attribute :privacy_policy_url
+    configuration_attribute :return_url
 
     #
     # If this is set, then #authentication_url will force the given
@@ -69,7 +70,7 @@ def serializable_data
       data
     end
 
-    def authentication_url(target, options={})
+    def authentication_url(target=self.return_url, options={})
       if force_origin
         context = target
         target = force_origin + URI.parse(target).path

spec/config/contacts.yml

@@ -3,11 +3,13 @@ test:
       application_id: app_id
       secret_key: your_secret
       privacy_policy_url: http://yourserver.com/you_policy_url
-
+      return_url: 'http://phaseiii.mine.nu:3000/friends/load_contacts'
     yahoo:
         consumer_key: your_key
         consumer_secret: your_secret_key
-
+        return_url: 'http://phaseiii.mine.nu:3000/friends/load_contacts'
     google:
         consumer_key: your_key
-        consumer_secret: your_secret_key
+        consumer_secret: your_secret_key
+        return_url: 'http://phaseiii.mine.nu:3000/friends/load_contacts'
+

spec/gmail/google_spec.rb

@@ -9,11 +9,21 @@
     @google = Contacts::Google.new
     fake_responses
   end
+
+  context "return_url" do
+    it "should allow the return url to be set in the config" do
+      @google.return_url.should_not == nil
+    end
+  end
 
   context "authentication_url" do
     it "should return an authentication url" do
       @google.authentication_url("http://browser.zen.turingstudio.com/test").length.should_not == 0
     end
+
+    it "should return the return url from configuration if the return url is not set" do
+      @google.authentication_url().length.should_not == 0
+    end
   end
 
   context "authorize" do

spec/spec_helper.rb

@@ -8,7 +8,7 @@
 def fake_responses
   FakeWeb.register_uri(:post, 'https://www.google.com/accounts/OAuthGetRequestToken', :body => 'oauth_token=faketoken&oauth_token_secret=faketokensecret')
   FakeWeb.register_uri(:post, 'https://www.google.com/accounts/OAuthGetAccessToken', :body => 'oauth_token=fake&oauth_token_secret=fake')
-  FakeWeb.register_uri(:get, 'http://www.google.com/m8/feeds/contacts/default/thin?max-results=200', :body => feeds('google-many.xml'))
+  FakeWeb.register_uri(:get, 'https://www.google.com/m8/feeds/contacts/default/thin?max-results=200', :body => feeds('google-many.xml'))
   FakeWeb.register_uri(:post, 'https://api.login.yahoo.com/oauth/v2/get_request_token', :body => 'oauth_token=faketoken&oauth_token_secret=faketokensecret')
   FakeWeb.register_uri(:post, 'https://api.login.yahoo.com/oauth/v2/get_token', :body => 'oauth_token=fake&oauth_token_secret=fake&xoauth_yahoo_guid=tester')
   FakeWeb.register_uri(:get, 'http://social.yahooapis.com/v1/user/tester/contacts?count=200&sort=asc&sort-fields=email&format=json', :body => feeds('yh_contacts.txt'))

spec/windows_live/windows_live_spec.rb

@@ -11,6 +11,18 @@
     @wl.token_expires_at = Time.now+1
   end
 
+
+  context "return_url" do
+    it "should allow the return url to be set in the config" do
+      @wl.return_url.should_not == nil
+    end
+
+    it "should return the return url from configuration if the return url is not set" do
+      @wl.authentication_url().length.should_not == 0
+    end
+
+  end
+
   context "authentication_url" do
     it "should return an authentication url" do
       @wl.authentication_url("http://browser.zen.turingstudio.com/test").length.should_not == 0
@@ -23,5 +35,10 @@
        contacts.should_not == nil
        contacts.length.should == 3
      end
+
+     it "should contain a single name which is a join of the first and last name fields" do
+       contacts = @wl.contacts
+       contacts[1].name.should == "Rafael Timbo"
+     end
    end
 end

spec/yahoo/yahoo_spec.rb

@@ -9,10 +9,20 @@
     fake_responses
   end
 
+  context "return_url" do
+    it "should allow the return url to be set in the config" do
+      @yahoo.return_url.should_not == nil
+    end
+  end
+
   context "authentication_url" do
     it "should return an authentication url" do
       @yahoo.authentication_url("http://browser.zen.turingstudio.com/test").length.should_not == 0
     end
+
+    it "should return the return url from configuration if the return url is not set" do
+      @yahoo.authentication_url().length.should_not == 0
+    end
   end
 
   context "authorize" do