mini_fb 1.0.2 → 1.0.3

data/README.markdown

@@ -71,7 +71,8 @@ Also pretty simple:
 FQL
 ---
 
-FQL is 
+    my_query = "select uid,a,b,c from users where ...."
+    @res = MiniFB.fql(@access_token, my_query)
 
 Logging
 -------
@@ -96,6 +97,26 @@ The most general case is to use MiniFB.call method:
 
 Which simply returns the parsed json response from Facebook.
 
+
+Oauth 2.0 Authentication and Original Rest Api
+-------------
+
+You can use the Graph api Oauth 2.0 token with original api methods. BEWARE: This has only been tested against stream.publish at present.
+
+	MiniFB.rest(@access_token, "rest.api.method", options)
+
+	eg:
+
+ 	response = MiniFB.rest(@access_token, "stream.publish", {
+			:uid => @user_id, 
+  			:to  =>  @to_user_id,  
+  			:message => "....message.....",
+			:method => :post
+		})
+		
+the :method will default to :get if no value is supplied and all responses will be json. In the instance of 'bad json' methods, the response will formatted {'response': '#{bad_response_string}'}
+
+
 Some Higher Level Objects for Common Uses
 ----------------------
 

data/lib/mini_fb.rb

@@ -56,8 +56,8 @@ module MiniFB
             return MiniFB.call(api_key, secret_key, method, params.update("session_key"=>session_key))
         end
 
-
     end
+
     class User
         FIELDS = [:uid, :status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :birthday_date, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email, :email, :email_hashes, :allowed_restrictions, :pic_with_logo, :pic_big_with_logo, :pic_small_with_logo, :pic_square_with_logo]
         STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url, :proxied_email, :email]
@@ -175,16 +175,14 @@ module MiniFB
                 response = Net::HTTP.post_form( URI.parse(FB_URL), post_params(kwargs))
             rescue SocketError => err
                 # why are we catching this and throwing as different error?  hmmm..
-#                raise IOError.new( "Cannot connect to the facebook server: " + err )
+                # raise IOError.new( "Cannot connect to the facebook server: " + err )
                 raise err
             end
         end
 
-
         # Handle response
         return response.body if custom_format
 
-
         body = response.body
 
         puts 'response=' + body.inspect if @@logging
@@ -331,6 +329,7 @@ module MiniFB
         return params
     end
 
+    # Gets data from the Facebook Graph API
     # options:
     #   - type: eg: feed, home, etc
     #   - metadata: to include metadata in response. true/false
@@ -339,20 +338,28 @@ module MiniFB
         url << "/#{options[:type]}" if options[:type]
         url << "?access_token=#{URI.escape(access_token)}"
         url << "&metadata=1" if options[:metadata]
-        return fetch url
+        return fetch(url)
     end
 
     def self.fetch(url, options={})
         puts 'url=' + url if @@logging
-        begin
-            if options[:type] == :post
+        begin            
+            if options[:method] == :post              
                 resp = RestClient.post url, options[:params]
             else
                 resp = RestClient.get url
             end
+  
             puts 'resp=' + resp.body.to_s if @@logging
-            res_hash = JSON.parse(resp.body)
-            if res_hash.is_a? Array # fql queries return this
+            
+            begin          
+              res_hash = JSON.parse(resp.body)
+            rescue
+              # quick fix for things like stream.publish that don't return json
+              res_hash = JSON.parse("{\"response\": #{resp.body.to_s}}")
+            end  
+            
+            if res_hash.is_a? Array  # fql  return this
                 res_hash.collect! {|x| Hashie::Mash.new(x) }
             else
                 res_hash = Hashie::Mash.new(res_hash)
@@ -367,25 +374,41 @@ module MiniFB
 
     end
 
+    # Posts data to the Facebook Graph API
     # options:
     #   - type: eg: feed, home, etc
     #   - metadata: to include metadata in response. true/false
     def self.post(access_token, id, options={})
         url = "#{graph_base}#{id}"
         url << "/#{options[:type]}" if options[:type]
+        options.delete(:type)
         params = {}
+        options.each do |key,value|
+          params[key] = "#{value}"
+        end  
         params["access_token"] = "#{(access_token)}"
         params["metadata"] = "1" if options[:metadata]
-        return fetch url, :params=>params, :method=>:post
+        return fetch(url, :params => params, :method => :post)
 
     end
 
+    # Executes an FQL query
     def self.fql(access_token, fql_query, options={})
         url = "https://api.facebook.com/method/fql.query"
         url << "?access_token=#{URI.escape(access_token)}"
         url << "&query=#{URI.escape(fql_query)}"
         url << "&format=JSON"
-        return fetch url
+        return fetch(url)
+    end
+
+    # Uses new Oauth 2 authentication against old Facebook REST API
+    def self.rest(access_token, api_method, options={})
+        url = "https://api.facebook.com/method/#{api_method}"  
+        options[:token] = access_token
+        options[:format] = "json"        
+        method = (options[:method]) ? options[:method]: :get
+        options.delete(:method) if options[:method]
+        return fetch(url, :params => options, :method => method)
     end
 
     # Returns all available scopes.

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: 
 - Travis Reeder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 -07:00
+date: 2010-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency