ruby_desk 0.8.3 → 0.9.0

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.9.0

data/lib/ruby_desk/connector.rb

@@ -128,13 +128,24 @@ module RubyDesk
       return parsed_data
     end
 
-    # Returns the URL that authenticates the application for the current user
+    # Returns the URL that authenticates the application for the current user.
+    # This is used for web applications only
     def auth_url
       auth_call = prepare_api_call("", :params=>{:api_key=>@api_key},
         :base_url=>ODESK_AUTH_URL, :format=>nil, :method=>:get, :auth=>false)
       data = auth_call[:params].to_a.map{|pair| pair.join '='}.join('&')
       return auth_call[:url]+"?"+data
     end
+    
+    # Returns a URL that the desktop user should visit to activate current frob.
+    # This method should not be called before a frob has been requested
+    def desktop_auth_url
+      raise "Frob should be requested first. Use RubyDesk::Controller#get_frob()" unless @frob
+      auth_call = prepare_api_call("", :params=>{:api_key=>@api_key, :frob=>@frob},
+        :base_url=>ODESK_AUTH_URL, :format=>nil, :method=>:get, :auth=>false)
+      data = auth_call[:params].to_a.map{|pair| pair.join '='}.join('&')
+      return auth_call[:url]+"?"+data
+    end
 
     # return the URL that logs user out of odesk applications
     def logout_url

data/test/frob.json

@@ -0,0 +1 @@
+{"server_time":1279785374,"frob":"954461d16a2b843f259f3c059acdd81d"}

data/test/test_ruby_desk.rb

@@ -12,6 +12,18 @@ class TestRubyDesk < Test::Unit::TestCase
     end if result_filename
     return connector
   end
+  
+  def test_desktop_auth_url
+    connector = dummy_connector('frob.json')
+    frob = connector.get_frob
+    assert_equal "954461d16a2b843f259f3c059acdd81d", frob
+    
+    desktop_auth_url = connector.desktop_auth_url
+    assert desktop_auth_url =~ /frob=/
+    assert desktop_auth_url =~ /api_key=/
+    assert desktop_auth_url =~ /api_sig=/
+  end
+
 
   def test_sign
     connector  = RubyDesk::Connector.new('824d225a889aca186c55ac49a6b23957',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_desk
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 3
-  version: 0.8.3
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Ahmed ElDawy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 +03:00
+date: 2010-07-22 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ files:
 - lib/ruby_desk/team_room.rb
 - lib/ruby_desk/time_report.rb
 - test/empty_timereport.json
+- test/frob.json
 - test/helper.rb
 - test/jobs.json
 - test/profile.json