facebook-graphclient 0.2 → 0.3

data/facebook-graphclient.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = 'facebook-graphclient'
-  s.version = '0.2'
-  s.date = '2010-05-24'
+  s.version = '0.3'
+  s.date = '2010-12-12'
   s.summary = "A simple library for Facebook's new Graph API"
   s.description = "A bare-bones implementation of Facebook's new Graph API"
 

data/lib/facebook-graphclient.rb

@@ -9,6 +9,7 @@ require 'rack'
 
 module Facebook
   GRAPH_URL = 'https://graph.facebook.com'
+  API_URL   = 'https://api.facebook.com/method/'
 
   class GraphClient
 
@@ -21,14 +22,13 @@ module Facebook
       @secret       = facebook_settings[:secret]
 
       @cookie = get_user_cookie facebook_settings[:cookies]
-
       @access_token = facebook_settings[:access_token] || @cookie['access_token']
-
       @session = Patron::Session.new
     end
 
     def get_user_cookie cookies
       if cookies and cookie = cookies["fbs_#{@app_id}"]
+        cookie = cookie[1..-2] if cookie[0..0] == '"'
         Rack::Utils.parse_nested_query(cookie)
       else
         {}
@@ -43,10 +43,10 @@ module Facebook
       ]
     end
 
-    def api action, method, query_params = nil
+    def api action, method, query_params = {}
       query_params[:access_token] ||= @access_token
-
       query_string = '?' + query_params.map { |k,v| "#{k}=#{v}" }.join("&") unless query_params.empty?
+      query_string ||= ''
 
       tries = 0
       begin
@@ -105,7 +105,7 @@ module Facebook
     def valid?
       return false if @cookie.nil?
 
-      unless @is_valid
+      if @is_valid.nil?
         vars = @cookie.dup
 
         good_sig = vars.delete 'sig'
@@ -128,5 +128,65 @@ module Facebook
     def params
       valid? ? @params : {}
     end
+
+    def rest(method, opts = {})
+      if method == 'photos.upload'
+        image = opts.delete :image
+      end
+
+      opts = { :api_key => self.api_key,
+               :call_id => Time.now.to_f,
+               :format => 'JSON',
+               :v => '1.0',
+               :access_token => @access_token,
+               :session_key => %w[ photos.upload ].include?(method) ? nil : params[:session_key],
+               :method => method }.merge(opts)
+
+      args = opts.map{ |k,v|
+                       next nil unless v
+
+                       "#{k}=" + case v
+                                 when Hash
+                                   Yajl::Encoder.encode(v)
+                                 when Array
+                                   if k == :tags
+                                     Yajl::Encoder.encode(v)
+                                   else
+                                     v.join(',')
+                                   end
+                                 else
+                                   v.to_s
+                                 end
+                     }.compact.sort
+
+      sig = Digest::MD5.hexdigest(args.join+self.secret)
+
+      if method == 'photos.upload'
+        data = MimeBoundary
+        data += opts.merge(:sig => sig).inject('') do |buf, (key, val)|
+          if val
+            buf << (MimePart % [key, val])
+          else
+            buf
+          end
+        end
+        data += MimeImage % ['upload.jpg', 'jpg', image.respond_to?(:read) ? image.read : image]
+      else
+        data = Array["sig=#{sig}", *args.map{|a| a.gsub('&','%26').gsub('+','%2B') }].join('&')
+      end
+
+      raw_response = @session.post(API_URL + method, data)
+
+      json = ["false", '', nil].include?(raw_response.body) ? '{}' : raw_response.body
+      response = Yajl::Parser.parse(json)
+
+      if response.is_a?(Hash) and response.has_key?('error_code')
+        error = FacebookError.new(response['error_msg'])
+        error.data = response
+        raise error
+      else
+        response
+      end
+    end
   end
 end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: facebook-graphclient
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Jesse Farmer
@@ -13,16 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -07:00
+date: 2010-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -32,9 +35,11 @@ dependencies:
   name: patron
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -44,9 +49,11 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -75,23 +82,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple library for Facebook's new Graph API