lperichon-contacts 1.0.2 → 1.0.3

data/contacts.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{lperichon-contacts}
+  s.version = "1.0.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.date = %q{2010-07-12}
+  s.files = [".gitmodules", "LICENSE", "README.markdown", "Rakefile", "contacts.gemspec", "lib/contacts.rb", "lib/contacts/consumer.rb", "lib/contacts/google.rb", "lib/contacts/oauth_consumer.rb", "lib/contacts/util.rb", "lib/contacts/version.rb", "lib/contacts/windows_live.rb", "lib/contacts/yahoo.rb", "rails/init.rb", "spec/contact_spec.rb", "spec/feeds/contacts.yml", "spec/feeds/flickr/auth.getFrob.xml", "spec/feeds/flickr/auth.getToken.xml", "spec/feeds/google-many.xml", "spec/feeds/google-single.xml", "spec/feeds/wl_contacts.xml", "spec/feeds/yh_contacts.txt", "spec/feeds/yh_credential.xml", "spec/flickr/auth_spec.rb", "spec/gmail/auth_spec.rb", "spec/gmail/fetching_spec.rb", "spec/rcov.opts", "spec/spec.opts", "spec/spec_helper.rb", "spec/windows_live/windows_live_spec.rb", "spec/yahoo/yahoo_spec.rb"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Fetch users' contact lists without asking them to provide their passwords, as painlessly as possible.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/lib/contacts/windows_live.rb

@@ -46,7 +46,10 @@ module Contacts
     #
     configuration_attribute :force_origin
 
+    attr_accessor :wll
+
     def initialize(options={})
+      self.wll = WindowsLiveLogin.new
       @token_expires_at = nil
       @location_id = nil
       @delegation_token = nil
@@ -67,20 +70,12 @@ module Contacts
     end
 
     def authentication_url(target, options={})
-      if force_origin
-        context = target
-        target = force_origin + URI.parse(target).path
-      end
-
-      url = "https://consent.live.com/Delegation.aspx"
-      query = {
-        'ps' => 'Contacts.View',
-        'ru' => target,
-        'pl' => privacy_policy_url,
-        'app' => app_verifier,
-      }
-      query['appctx'] = context if context
-      "#{url}?#{params_to_query(query)}"
+      wll.appid = self.application_id
+      wll.secret = self.secret_key
+      wll.securityalgorithm = 'wsignin1.0'
+      wll.policyurl = self.privacy_policy_url
+      wll.returnurl = target
+      wll.getConsentUrl('Contacts.Invite')
     end
 
     def forced_redirect_url(params)
@@ -107,9 +102,14 @@ module Contacts
     end
 
     def contacts(options={})
-      return nil if @delegation_token.nil? || @token_expires_at < Time.now
+      @wll.secret = self.secret_key
+      token = @wll.processConsentToken(options['ConsentToken'])
+      location_id = token.locationid
+      delegation_token = token.delegationtoken
+      token_expires_at = token.expiry
+      return nil if delegation_token.nil? || token_expires_at < Time.now
       # TODO: Handle expired token.
-      xml = request_contacts
+      xml = request_contacts(location_id, delegation_token)
       parse_xml(xml)
     end
 
@@ -164,11 +164,11 @@ module Contacts
       params
     end
 
-    def request_contacts
+    def request_contacts(location_id, delegation_token)
       http = Net::HTTP.new('livecontacts.services.live.com', 443)
       http.use_ssl = true
-      url = "/users/@L@#{@location_id}/rest/invitationsbyemail"
-      authorization = "DelegatedToken dt=\"#{@delegation_token}\""
+      url = "/users/@L@#{location_id}/rest/invitationsbyemail"
+      authorization = "DelegatedToken dt=\"#{delegation_token}\""
       http.get(url, {"Authorization" => authorization}).body
     end
 

data/lib/contacts.rb

@@ -82,4 +82,6 @@ module Contacts
   autoload :Google, 'contacts/google'
   autoload :Yahoo, 'contacts/yahoo'
   autoload :WindowsLive, 'contacts/windows_live'
+  autoload :WindowsLiveLogin, 'contacts/windowslivelogin'
+  autoload :WindowsLiveLogin, 'contacts/windowslivelogin'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: []
 
@@ -31,6 +31,7 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- contacts.gemspec
 - lib/contacts.rb
 - lib/contacts/consumer.rb
 - lib/contacts/google.rb