mogli 0.0.9 → 0.0.10

data/lib/mogli/authenticator.rb

@@ -1,22 +1,35 @@
 require "cgi"
+require 'mogli/client'
+
 module Mogli
   class Authenticator
     attr_reader :client_id, :secret, :callback_url
-    
+
     def initialize(client_id,secret,callback_url)
       @client_id = client_id
       @secret = secret
       @callback_url = callback_url
     end
-    
+
     def authorize_url(options = {})
       options_part = "&" + options.map {|k,v| "#{k}=#{v.kind_of?(Array) ? v.join(',') : v}" }.join('&') unless options.empty?
       "https://graph.facebook.com/oauth/authorize?client_id=#{client_id}&redirect_uri=#{CGI.escape(callback_url)}#{options_part}"
     end
-    
+
     def access_token_url(code)
       "https://graph.facebook.com/oauth/access_token?client_id=#{client_id}&redirect_uri=#{CGI.escape(callback_url)}&client_secret=#{secret}&code=#{CGI.escape(code)}"
     end
-    
+
+    def get_access_token_for_session_key(session_keys)
+      keystr = session_keys.is_a?(Array) ?
+                 session_keys.join(',') : session_keys
+      client = Mogli::Client.new
+      client.post("oauth/exchange_sessions", nil,
+                  {:type => 'client_cred',
+                   :client_id => client_id,
+                   :client_secret => secret,
+                   :sessions => keystr})
+    end
+
   end
 end

data/lib/mogli/client.rb

@@ -6,16 +6,16 @@ module Mogli
     attr_reader :access_token
     attr_reader :default_params
     attr_reader :expiration
-    
+
     include HTTParty
     include Mogli::Client::Event
-    include Mogli::Client::User   
+    include Mogli::Client::User
     class UnrecognizeableClassError < Exception; end
-    
+
     def api_path(path)
       "https://graph.facebook.com/#{path}"
     end
-    
+
     def initialize(access_token = nil,expiration=nil)
       @access_token = access_token
       # nil expiration means extended access
@@ -23,11 +23,11 @@ module Mogli
       @expiration = Time.at(expiration)
       @default_params = @access_token ? {:access_token=>access_token} : {}
     end
-    
+
     def expired?
       expiration and expiration < Time.now
     end
-        
+
     def self.create_from_code_and_authenticator(code,authenticator)
       post_data = get(authenticator.access_token_url(code))
       parts = post_data.split("&")
@@ -37,42 +37,49 @@ module Mogli
       end
       new(hash["access_token"],hash["expires"].to_s.to_i)
     end
-    
+
+    def self.create_from_session_key(session_key, client_id, secret)
+      authenticator = Mogli::Authenticator.new(client_id, secret, nil)
+      access_data = authenticator.get_access_token_for_session_key(session_key)
+      new(access_data['access_token'],
+          Time.now.to_i + access_data['expires'].to_i)
+    end
+
     def post(path,klass,body_args)
-      data = self.class.post(api_path(path),:body=>default_params.merge(body_args))      
+      data = self.class.post(api_path(path),:body=>default_params.merge(body_args))
       map_data(data,klass)
     end
-    
+
     def delete(path)
       self.class.delete(api_path(path),:query=>default_params)
     end
-    
+
     def get_and_map(path,klass=nil,body_args = {})
       data = self.class.get(api_path(path),:query=>default_params.merge(body_args))
       map_data(data,klass)
     end
-    
+
     def get_and_map_url(url,klass=nil)
       data = self.class.get(url)
       map_data(data,klass)
     end
-    
+
     def map_data(data,klass=nil)
       raise_error_if_necessary(data)
       hash_or_array = extract_hash_or_array(data,klass)
       hash_or_array = map_to_class(hash_or_array,klass) if klass
       hash_or_array
     end
-    
+
     #protected
-    
+
     def extract_hash_or_array(hash_or_array,klass)
       return nil if hash_or_array == false
       return hash_or_array if hash_or_array.nil? or hash_or_array.kind_of?(Array)
       return extract_fetching_array(hash_or_array,klass) if hash_or_array.has_key?("data")
       return hash_or_array
     end
-    
+
     def extract_fetching_array(hash,klass)
       f = Mogli::FetchingArray.new
       f.concat(hash["data"])
@@ -84,7 +91,7 @@ module Mogli
       end
       f
     end
-    
+
     def map_to_class(hash_or_array,klass)
       return nil if hash_or_array.nil?
       if hash_or_array.kind_of?(Array)
@@ -93,7 +100,7 @@ module Mogli
         hash_or_array = create_instance(klass,hash_or_array)
       end
     end
-    
+
     def create_instance(klass,data)
       klass = determine_class(klass,data)
       if klass.nil?
@@ -101,16 +108,16 @@ module Mogli
       end
       klass.new(data,self)
     end
-    
+
     def constantize_string(klass)
       klass.is_a?(String) ? Mogli.const_get(klass) : klass
     end
-    
+
     def determine_class(klass_or_klasses,data)
       klasses = Array(klass_or_klasses).map { |k| constantize_string(k)}
       klasses.detect {|klass| klass.recognize?(data)} || klasses.first
     end
-    
+
     def raise_error_if_necessary(data)
       if data.kind_of?(Hash)
         if data.keys.size == 1 and data["error"]
@@ -120,22 +127,22 @@ module Mogli
         end
       end
     end
-    
+
     def fields_to_serialize
       [:access_token,:default_params,:expiration]
     end
-    
+
     # Only serialize the bare minimum to recreate the session.
     def marshal_load(variables)#:nodoc:
       fields_to_serialize.each_with_index{|field, index| instance_variable_set("@#{field}", variables[index])}
     end
 
-    # Only serialize the bare minimum to recreate the session.    
+    # Only serialize the bare minimum to recreate the session.
     def marshal_dump#:nodoc:
       fields_to_serialize.map{|field| send(field)}
     end
 
-    # Only serialize the bare minimum to recreate the session. 
+    # Only serialize the bare minimum to recreate the session.
     def to_yaml( opts = {} )#nodoc
       YAML::quick_emit(self.object_id, opts) do |out|
         out.map(taguri) do |map|
@@ -145,6 +152,6 @@ module Mogli
         end
       end
     end
-    
+
   end
 end

data/lib/mogli/model.rb

@@ -3,7 +3,7 @@ module Mogli
     def client=(val)
       @client=val
     end
-    
+
     def client
       @client || Mogli::Client.new
     end
@@ -12,7 +12,7 @@ module Mogli
       self.client=client
       super(hash||{})
     end
-    
+
     def post_params
       post_params = {}
       self.class.creation_keys.each do |key|
@@ -20,12 +20,12 @@ module Mogli
       end
       post_params
     end
-    
+
     def destroy
       client.delete(id)
       freeze
     end
-    
+
     def self.included(other)
       other.extend(ClassMethods)
     end
@@ -34,28 +34,28 @@ module Mogli
       method_as_s = method.to_s
       if method_as_s.to_s[-1].chr == "="
         warn_about_invalid_property(method_as_s.chop)
-      else 
+      else
         super
       end
     end
     def warn_about_invalid_property(property)
       puts "Warning: property #{property} doesn't exist for class #{self.class.name}"
     end
-          
+
     def self.define_properties(*args)
       args.each do |arg|
         property arg
       end
     end
-    
+
     def self.creation_properties(*args)
       @creation_properties = args
     end
-    
+
     def self.creation_keys
       @creation_properties || []
     end
-    
+
     def self.hash_populating_accessor(method_name,*klass)
       define_method "#{method_name}=" do |hash|
         instance_variable_set("@#{method_name}",client.map_data(hash,klass))
@@ -63,19 +63,20 @@ module Mogli
       define_method "#{method_name}" do
         instance_variable_get "@#{method_name}"
       end
-      
+
       add_creation_method(method_name,klass)
-      
+
     end
-    
+
     def self.add_creation_method(name,klass)
-      define_method "#{name}_create" do |arg|
+      define_method "#{name}_create" do |*args|
+        arg = args.first
         params = arg.nil? ? {} : arg.post_params
         klass_to_send = arg.nil? ? nil : klass
         client.post("#{id}/#{name}", klass_to_send, params)
       end
     end
-    
+
     def self.has_association(name,klass)
       define_method name do |*fields|
         body_args = fields.empty? ? {} : {:fields => fields}
@@ -85,23 +86,23 @@ module Mogli
         end
         return ret
       end
-      
+
       add_creation_method(name,klass)
     end
-    
+
     def fetch()
       raise ArgumentError.new("You cannot fetch models without a populated id attribute") if id.nil?
-      other = self.class.find(id,client)
-      merge!(other)
+      other = self.class.find(id,client) 
+      merge!(other) if other
     end
-    
+
     def self.recognize?(data)
       true
     end
-    
+
     def self.find(id,client=nil, *fields)
       body_args = fields.empty? ? {} : {:fields => fields}
       (client||Mogli::Client.new).get_and_map(id,self, body_args)
     end
   end
-end
+end

data/lib/mogli/user.rb

@@ -3,7 +3,7 @@ module Mogli
   class User < Profile
     
     define_properties :first_name, :last_name, :link, :about, :birthday, :gender,
-          :email, :website, :timezone, :updated_time, :verified
+          :email, :website, :timezone, :updated_time, :verified, :political, :relationship_status
     
     def self.recognize?(hash)
       !hash.has_key?("category")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mogli
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Mike Mangino
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2010-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency