mogli 0.0.38 → 0.0.39

data/lib/mogli/authenticator.rb

@@ -20,6 +20,17 @@ module Mogli
       "https://graph.facebook.com/oauth/access_token?client_id=#{client_id}&redirect_uri=#{CGI.escape(callback_url) unless callback_url.nil? || callback_url.empty?}&client_secret=#{secret}&code=#{CGI.escape(code)}"
     end
 
+    def extend_access_token(oauth_token)
+      response = Mogli::Client.get("https://graph.facebook.com/oauth/access_token",
+        :query=>{
+          :client_id=>@client_id,
+          :client_secret => @secret,
+          :grant_type => "fb_exchange_token",
+          :fb_exchange_token=>oauth_token})
+      raise_exception_if_required(response)
+      Hash[response.parsed_response.split("&").map {|a| a.split("=")}]
+    end
+
     def get_access_token_for_session_key(session_keys)
       keystr = session_keys.is_a?(Array) ?
                  session_keys.join(',') : session_keys

data/lib/mogli/client.rb

@@ -111,6 +111,17 @@ module Mogli
       client
     end
 
+    def extended?
+      (expiration.to_i - Time.now.to_i) > 24*60*60
+
+    end
+
+    def exchange_access_token(client_id, secret)
+      authenticator = Mogli::Authenticator.new(client_id, secret, nil)
+      results = authenticator.extend_access_token(@access_token)
+      self.class.new(results["access_token"],Time.now.to_i+results["expires"].to_i)
+    end
+
     def post(path,klass,body_args)
       data = self.class.post(api_path(path),:body=>default_params.merge(body_args))
       map_data(data,klass)

data/lib/mogli/test_user.rb

@@ -34,7 +34,7 @@ module Mogli
     end
 
     def self.all(app_client)
-      app_client.get_and_map("accounts/test-users", self, {})
+      app_client.get_and_map("#{app_client.application_id}/accounts/test-users", self, {})
     end
 
     def to_s

data/spec/client_spec.rb

@@ -121,6 +121,30 @@ describe Mogli::Client do
 
   end
 
+  describe "Extending" do
+    it "knows if it is an extended session" do
+      Mogli::Client.new("1234",(Time.now.to_i + 48*60*60)).should be_extended
+    end
+    it "knows if it is not an extended session" do
+      Mogli::Client.new("1234",(Time.now.to_i + 2*60*60)).should_not be_extended
+    end
+
+    it "can get an extended session" do
+      response = stub(:parsed_response=>"access_token=new_token&expires=#{30*60*60*24}",:code=>200)
+      client = Mogli::Client.new("auth_key",Time.now.to_i)
+      Mogli::Client.should_receive(:get).with("https://graph.facebook.com/oauth/access_token",
+        :query=>{
+          :client_id=>"12345",
+          :client_secret => "secret",
+          :grant_type => "fb_exchange_token",
+          :fb_exchange_token=>"auth_key"}).and_return(response)
+      new_client = client.exchange_access_token("12345","secret")
+      new_client.access_token.should == "new_token"
+      new_client.should be_extended
+
+    end
+  end
+
 
   describe "Making requests" do
     it "posts with the parameters in the body" do

data/spec/user_spec.rb

@@ -44,13 +44,10 @@ describe Mogli::User do
   describe "checking extended permissions" do
     before :each do
       # construct a response that will avoid errors: we're just testing query
-      @dummy_response = 'dummy response'
-      @dummy_response.stub!(:parsed_response).and_return [{}]
+      @dummy_response = [{}]
 
       # this HTTParty parsed response is taken directly from an actual fql response
-      @valid_response = 'valid response'
-      @valid_response.stub!(:parsed_response).and_return [{"publish_stream"=>1, "create_event"=>0, "rsvp_event"=>0, "sms"=>0, "offline_access"=>1, "publish_checkins"=>0, "user_about_me"=>0, "user_activities"=>0, "user_birthday"=>0, "user_education_history"=>0, "user_events"=>0, "user_groups"=>0, "user_hometown"=>0, "user_interests"=>0, "user_likes"=>0, "user_location"=>0, "user_notes"=>0, "user_online_presence"=>0, "user_photo_video_tags"=>0, "user_photos"=>0, "user_relationships"=>0, "user_relationship_details"=>0, "user_religion_politics"=>0, "user_status"=>0, "user_videos"=>0, "user_website"=>0, "user_work_history"=>0, "email"=>1, "read_friendlists"=>0, "read_insights"=>0, "read_mailbox"=>0, "read_requests"=>0, "read_stream"=>0, "xmpp_login"=>0, "ads_management"=>0, "user_checkins"=>0, "manage_pages"=>0}]
-
+      @valid_response = [{"publish_stream"=>1, "create_event"=>0, "rsvp_event"=>0, "sms"=>0, "offline_access"=>1, "publish_checkins"=>0, "user_about_me"=>0, "user_activities"=>0, "user_birthday"=>0, "user_education_history"=>0, "user_events"=>0, "user_groups"=>0, "user_hometown"=>0, "user_interests"=>0, "user_likes"=>0, "user_location"=>0, "user_notes"=>0, "user_online_presence"=>0, "user_photo_video_tags"=>0, "user_photos"=>0, "user_relationships"=>0, "user_relationship_details"=>0, "user_religion_politics"=>0, "user_status"=>0, "user_videos"=>0, "user_website"=>0, "user_work_history"=>0, "email"=>1, "read_friendlists"=>0, "read_insights"=>0, "read_mailbox"=>0, "read_requests"=>0, "read_stream"=>0, "xmpp_login"=>0, "ads_management"=>0, "user_checkins"=>0, "manage_pages"=>0}]
       @request_regexp = /^SELECT ([\w,]*) FROM permissions WHERE uid = \d*$/
     end
 

metadata

@@ -1,129 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mogli
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 38
-  version: 0.0.38
+version: !ruby/object:Gem::Version
+  version: 0.0.39
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Mike Mangino
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-12 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hashie
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: httmultiparty
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 6
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: httmultiparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.3
     - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple library for accessing the Facebook Open Graph API
 email: mmangino@elevatedrails.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/mogli/action.rb
 - lib/mogli/activity.rb
 - lib/mogli/address.rb
@@ -166,37 +177,43 @@ files:
 - lib/mogli/video.rb
 - lib/mogli/work.rb
 - lib/mogli.rb
-has_rdoc: true
+- spec/app_client_spec.rb
+- spec/authenticator_spec.rb
+- spec/client/client_event_spec.rb
+- spec/client/client_user_spec.rb
+- spec/client_spec.rb
+- spec/fetching_array_spec.rb
+- spec/model_spec.rb
+- spec/page_spec.rb
+- spec/profile_spec.rb
+- spec/spec_helper.rb
+- spec/test_user_spec.rb
+- spec/user_spec.rb
 homepage: http://developers.facebook.com/docs/api
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Open Graph Library for Ruby
-test_files: 
+test_files:
 - spec/app_client_spec.rb
 - spec/authenticator_spec.rb
 - spec/client/client_event_spec.rb