mogli 0.0.25 → 0.0.26

data/lib/mogli.rb

@@ -1,5 +1,4 @@
 module Mogli
-
 end
 
 require "httparty"
@@ -39,3 +38,4 @@ require "mogli/work"
 require "mogli/user"
 require "mogli/client"
 require "mogli/app_client"
+require "mogli/fql_multiquery"

data/lib/mogli/authenticator.rb

@@ -24,28 +24,31 @@ module Mogli
       keystr = session_keys.is_a?(Array) ?
                  session_keys.join(',') : session_keys
       client = Mogli::Client.new
-      client.post("oauth/exchange_sessions", nil,
+      response = client.post("oauth/exchange_sessions", nil,
                   {:type => 'client_cred',
                    :client_id => client_id,
                    :client_secret => secret,
                    :sessions => keystr})
+      raise_exception_if_required(response)
+      response
     end
     
     def get_access_token_for_application
       client = Mogli::Client.new
-      request = client.class.post(client.api_path('oauth/access_token'),
+      response = client.class.post(client.api_path('oauth/access_token'),
         :body=> {
           :grant_type => 'client_credentials',
           :client_id => client_id,
           :client_secret => secret
         }
       )
-      if (request.respond_to?(:parsed_response))
-        request.parsed_response.split('=').last
-      else
-        request.to_s.split("=").last
-      end
-  end
+      raise_exception_if_required(response)
+      response.to_s.split("=").last
+    end
+    
+    def raise_exception_if_required(response)
+      raise Mogli::Client::HTTPException if response.code != 200
+    end
 
   end
 end

data/lib/mogli/client.rb

@@ -10,7 +10,7 @@ module Mogli
     include HTTParty
     include Mogli::Client::Event
     include Mogli::Client::User
-
+    
     class ClientException < Exception; end
     class UnrecognizeableClassError < ClientException; end
     class QueryParseException < ClientException; end
@@ -19,6 +19,7 @@ module Mogli
     class OAuthException < ClientException; end
     # represents case that the facebook limit on posts to a feed has been exceeded
     class FeedActionRequestLimitExceeded < ClientException; end
+    class HTTPException < ClientException; end
 
     def api_path(path)
       "https://graph.facebook.com/#{path}"
@@ -28,6 +29,10 @@ module Mogli
       "https://api.facebook.com/method/fql.query"
     end
 
+    def fql_multiquery_path
+      "https://api.facebook.com/method/fql.multiquery"
+    end
+    
     def initialize(access_token = nil,expiration=nil)
       @access_token = access_token
       # nil expiration means extended access
@@ -107,6 +112,11 @@ module Mogli
       map_data(data,klass)
     end
 
+    def fql_multiquery(queries)
+      data = self.class.post(fql_multiquery_path,:body=>default_params.merge({:queries=>queries.to_json,:format=>"json"}))
+      map_data(data)
+    end
+    
     def get_and_map(path,klass=nil,body_args = {})
       data = self.class.get(api_path(path),:query=>default_params.merge(body_args))
       data = data.values if body_args.key?(:ids) && !data.key?('error')
@@ -183,6 +193,7 @@ module Mogli
     end
 
     def raise_error_if_necessary(data)
+      raise HTTPException if data.respond_to?(:code) and data.code != 200
       if data.kind_of?(Hash)
         if data.keys.size == 1 and data["error"]
           self.class.raise_error_by_type_and_message(data["error"]["type"], data["error"]["message"])

data/lib/mogli/fql_multiquery.rb

@@ -0,0 +1,43 @@
+module Mogli
+  class FqlMultiquery
+    attr_reader :client, :queries, :raw_response
+    
+    # Takes Mogli::Client object
+    def initialize(client)
+      @client   = client
+      @queries  = {}
+    end
+    
+    # Adds single query to multiquery with class used to populate results
+    def add_named_query_for_class(query_name, query, klass)
+      @queries[query_name] = [query, klass]
+    end
+    
+    # Fetch and parse results.
+    # Returns hash with the query names as keys, class objects as values.
+    # An empty or missing subquery value is returned as an empty array.
+    def results
+      parse_response @raw_response = @client.fql_multiquery(query_map)
+    end
+    
+    protected
+    
+    def query_map
+      @queries.each_key.inject({}) { |res,k| res[k] = @queries[k][0]; res }
+    end
+    
+    def parse_response(response)
+      # Fetch each subquery and map its results to the desired class,
+      @queries.each_key.inject({}) do |res, query|
+        # Default value is empty array
+        res[query] = []
+        # Find subquery by name in response
+        vals = response.find{|r| r['name'] == query.to_s}
+        if vals && vals.has_key?('fql_result_set')
+          res[query] = @client.map_to_class(vals['fql_result_set'], @queries[query][1])
+        end
+        res
+      end
+    end
+  end
+end

data/lib/mogli/user.rb

@@ -3,7 +3,7 @@ module Mogli
     set_search_type
 
     define_properties :first_name, :last_name, :link, :about, :birthday, :gender,
-          :email, :website, :timezone, :updated_time, :verified, :political, 
+          :email, :website, :timezone, :updated_time, :verified, :political, :bio,
           :relationship_status, :locale, :religion, :quotes, :third_party_id
 
     def self.recognize?(hash)
@@ -16,6 +16,7 @@ module Mogli
     hash_populating_accessor :location, "Page"
     hash_populating_accessor :hometown, "Page"
     hash_populating_accessor :languages, "Page"
+    hash_populating_accessor :significant_other, "User"
 
     has_association :activities, "Activity"
     has_association :friends, "User"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mogli
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 0
-  - 25
-  version: 0.0.25
+  - 26
+  version: 0.0.26
 platform: ruby
 authors: 
 - Mike Mangino
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -05:00
+date: 2011-03-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - lib/mogli/education.rb
 - lib/mogli/event.rb
 - lib/mogli/fetching_array.rb
+- lib/mogli/fql_multiquery.rb
 - lib/mogli/group.rb
 - lib/mogli/insight.rb
 - lib/mogli/insight_value.rb