fb_graph 0.3.0 → 0.4.0

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.add_dependency 'json'
     gem.add_dependency 'activesupport'
     gem.add_dependency 'rest-client', '>= 1.4'
+    gem.add_dependency 'oauth2', '>= 0.0.10'
     gem.add_development_dependency 'rspec'
     gem.add_development_dependency 'rcov'
     gem.add_development_dependency 'fakeweb'

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/fb_graph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2010-08-04}
+  s.date = %q{2010-08-05}
   s.description = %q{A Ruby wrapper for Facebook Graph API}
   s.email = %q{nov@matake.jp}
   s.extra_rdoc_files = [
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
      "fb_graph.gemspec",
      "lib/fb_graph.rb",
      "lib/fb_graph/album.rb",
+     "lib/fb_graph/auth.rb",
+     "lib/fb_graph/auth/cookie.rb",
      "lib/fb_graph/collection.rb",
      "lib/fb_graph/comment.rb",
      "lib/fb_graph/comparison.rb",
@@ -262,6 +264,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 1.4"])
+      s.add_runtime_dependency(%q<oauth2>, [">= 0.0.10"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
@@ -269,6 +272,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rest-client>, [">= 1.4"])
+      s.add_dependency(%q<oauth2>, [">= 0.0.10"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
@@ -277,6 +281,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rest-client>, [">= 1.4"])
+    s.add_dependency(%q<oauth2>, [">= 0.0.10"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])

data/lib/fb_graph.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'json'
 require 'restclient'
+require 'oauth2'
 
 # NOTE:
 # For some reason, ActiveSupport 3.0.0 doesn'tj load whole code.
@@ -37,6 +38,7 @@ module FbGraph
 
 end
 
+require 'fb_graph/auth'
 require 'fb_graph/comparison'
 require 'fb_graph/collection'
 require 'fb_graph/connections'

data/lib/fb_graph/auth.rb

@@ -0,0 +1,32 @@
+module FbGraph
+  class Auth
+    class VerificationFailed < FbGraph::Exception; end
+
+    attr_accessor :client, :access_token, :user
+
+    def initialize(client_id, client_secret, options = {})
+      @client = OAuth2::Client.new(client_id, client_secret, options.merge(
+        :site => FbGraph::ROOT_URL
+      ))
+      if options[:cookie].present?
+        from_cookie(options[:cookie])
+      end
+    end
+
+    def from_cookie(cookie)
+      cookie = FbGraph::Auth::Cookie.parse(self.client, cookie)
+      self.access_token = OAuth2::AccessToken.new(
+        self.client,
+        cookie[:access_token],
+        cookie[:refresh_token],
+        cookie[:expires]
+      )
+      self.user = FbGraph::User.new(cookie[:uid], :access_token => self.access_token)
+      self
+    end
+  end
+end
+
+Dir[File.dirname(__FILE__) + '/auth/*.rb'].each do |file| 
+  require file
+end

data/lib/fb_graph/auth/cookie.rb

@@ -0,0 +1,41 @@
+require 'digest/md5'
+
+module FbGraph
+  class Auth
+    class Cookie
+      def self.parse(client, cookie)
+        fb_cookie_string = if cookie.is_a?(Hash)
+          cookie["fbs_#{client.id}"]
+        else
+          cookie
+        end
+
+        raise VerificationFailed.new(401, 'Facebook cookie not found') if fb_cookie_string.blank?
+
+        fb_cookie_string.gsub!(/[\\"]/, '')
+        signature, fb_cookie = '', {}
+        fb_cookie_string.split('&').each do |kv|
+          k, v = kv.split('=')
+          if k == 'sig'
+            signature = v
+          else
+            v = v.to_i if ['uid', 'expires'].include?(k)
+            fb_cookie[k] = v
+          end
+        end
+
+        signature_base_string = fb_cookie.to_a.sort do |a, b|
+          a[0] <=> b[0] || a[1] <=> b[1]
+        end.map do |(k, v)|
+          "#{k}=#{v}"
+        end.join
+
+        unless Digest::MD5.hexdigest("#{signature_base_string}#{client.secret}") == signature
+          raise VerificationFailed.new(401, 'Facebook cookie signature invalid')
+        end
+
+        fb_cookie.with_indifferent_access
+      end
+    end
+  end
+end

data/lib/fb_graph/node.rb

@@ -13,7 +13,7 @@ module FbGraph
     def fetch(options = {})
       options[:access_token] ||= self.access_token if self.access_token
       _fetched_ = get(options)
-      self.class.new(_fetched_.delete(:id), _fetched_)
+      self.class.new(_fetched_.delete(:id), _fetched_.merge(:access_token => options[:access_token]))
     end
 
     def self.fetch(identifier, options = {})
@@ -59,7 +59,12 @@ module FbGraph
       else
         self.endpoint
       end
+
       params[:access_token] ||= self.access_token
+      if params[:access_token].is_a?(OAuth2::AccessToken)
+        params[:access_token] = params[:access_token].token
+      end
+
       params.delete_if do |k, v|
         v.blank?
       end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - nov matake
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +09:00
+date: 2010-08-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: oauth2
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -63,11 +63,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 0
+        - 10
+        version: 0.0.10
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -79,7 +81,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: rcov
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -90,6 +92,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: A Ruby wrapper for Facebook Graph API
 email: nov@matake.jp
 executables: []
@@ -111,6 +125,8 @@ files:
 - fb_graph.gemspec
 - lib/fb_graph.rb
 - lib/fb_graph/album.rb
+- lib/fb_graph/auth.rb
+- lib/fb_graph/auth/cookie.rb
 - lib/fb_graph/collection.rb
 - lib/fb_graph/comment.rb
 - lib/fb_graph/comparison.rb