fbgraph 0.1.4 → 0.1.6

data/Manifest

@@ -3,9 +3,11 @@ README
 README.textile
 Rakefile
 TODO.list
+fbgraph.gemspec
 lib/fbgraph.rb
 lib/fbgraph/authorization.rb
 lib/fbgraph/base.rb
+lib/fbgraph/canvas.rb
 lib/fbgraph/client.rb
 lib/fbgraph/realtime.rb
 lib/fbgraph/search.rb

data/README.textile

@@ -1,4 +1,4 @@
-h2. FBGRaph (0.1.1)
+h2. FBGRaph (0.1.4)
 
 p. Facebook Open Graph API Gem.
 
@@ -53,6 +53,10 @@ notextile. <code>client.selection.user('id').videos.offset(10).info</code>
 
 notextile. <code>client.search.query('q').on('users').limit(20).info</code>
 
+h3. Rails config file
+
+h2. TODO
+
 h3. Authorization
 
 h4. client.authorization.authorize_url
@@ -67,6 +71,15 @@ p. process the callback and returns the access token
 
 notextile. <code> access_token = client.authorization.process_callback(params[:code], :redirect_uri => callback_url)</code>
 
+h3. Exchange Sessions
+
+h2. TODO
+
+h3. Canvas
+
+
+h2. TODO
+
 
 h3. Selection
 
@@ -224,7 +237,7 @@ h2. Contributions
 p. Just do a pull request with the repo in sync.
 
 
-h2. Contributors
+h2. Contributors List
 
 "Victor Costan":http://github.com/costan
 
@@ -232,3 +245,7 @@ h2. Contributors
 
 "Florent Guilleux":http://github.com/Florent2
 
+"Jan De Poorter":http://github.com/DefV
+
+"Thilo-Alexander Ginkel":http://github.com/ginkel
+

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fbgraph', '0.1.4') do |p|
+Echoe.new('fbgraph', '0.1.6') do |p|
   p.description    = "A Gem for Facebook Open Graph API"
   p.url            = "http://github.com/nsanta/fbgraph"
   p.author         = "Nicolas Santa"

data/fbgraph.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fbgraph}
-  s.version = "0.1.4"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nicolas Santa"]
   s.cert_chain = ["/home/nicolas/certs/gem-public_cert.pem"]
-  s.date = %q{2010-08-20}
+  s.date = %q{2010-09-07}
   s.description = %q{A Gem for Facebook Open Graph API}
   s.email = %q{nicolas55ar@gmail.com}
-  s.extra_rdoc_files = ["README", "README.textile", "TODO.list", "lib/fbgraph.rb", "lib/fbgraph/authorization.rb", "lib/fbgraph/base.rb", "lib/fbgraph/client.rb", "lib/fbgraph/realtime.rb", "lib/fbgraph/search.rb", "lib/fbgraph/selection.rb"]
-  s.files = ["Manifest", "README", "README.textile", "Rakefile", "TODO.list", "lib/fbgraph.rb", "lib/fbgraph/authorization.rb", "lib/fbgraph/base.rb", "lib/fbgraph/client.rb", "lib/fbgraph/realtime.rb", "lib/fbgraph/search.rb", "lib/fbgraph/selection.rb", "specs/lib/fbauth/authorization_spec.rb", "specs/lib/fbauth/base_spec.rb", "specs/lib/fbauth/client_spec.rb", "specs/lib/fbauth/realtime_spec.rb", "specs/lib/fbauth/search_spec.rb", "specs/lib/fbauth/selection_spec.rb", "specs/spec_helper.rb", "fbgraph.gemspec"]
+  s.extra_rdoc_files = ["README", "README.textile", "TODO.list", "lib/fbgraph.rb", "lib/fbgraph/authorization.rb", "lib/fbgraph/base.rb", "lib/fbgraph/canvas.rb", "lib/fbgraph/client.rb", "lib/fbgraph/realtime.rb", "lib/fbgraph/search.rb", "lib/fbgraph/selection.rb"]
+  s.files = ["Manifest", "README", "README.textile", "Rakefile", "TODO.list", "fbgraph.gemspec", "lib/fbgraph.rb", "lib/fbgraph/authorization.rb", "lib/fbgraph/base.rb", "lib/fbgraph/canvas.rb", "lib/fbgraph/client.rb", "lib/fbgraph/realtime.rb", "lib/fbgraph/search.rb", "lib/fbgraph/selection.rb", "specs/lib/fbauth/authorization_spec.rb", "specs/lib/fbauth/base_spec.rb", "specs/lib/fbauth/client_spec.rb", "specs/lib/fbauth/realtime_spec.rb", "specs/lib/fbauth/search_spec.rb", "specs/lib/fbauth/selection_spec.rb", "specs/spec_helper.rb"]
   s.homepage = %q{http://github.com/nsanta/fbgraph}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fbgraph", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fbgraph}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.signing_key = %q{/home/nicolas/certs/gem-private_key.pem}
   s.summary = %q{A Gem for Facebook Open Graph API}
 
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oauth2>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])

data/lib/fbgraph.rb

@@ -3,7 +3,8 @@ require 'json'
 require 'hashie'
 require 'rest_client'
 require 'uri'
-
+require "base64"
+require "openssl"
 
 require 'fbgraph/client'
 require 'fbgraph/base'
@@ -11,3 +12,25 @@ require 'fbgraph/authorization'
 require 'fbgraph/selection'
 require 'fbgraph/search'
 require 'fbgraph/realtime'
+require 'fbgraph/canvas'
+
+module FBGraph
+  @config = {}
+
+  class << self
+    
+    def load_config(yaml_file)
+      return false unless File.exist?(yaml_file)
+      cfg = YAML::load(File.open(yaml_file))
+      if defined? Rails
+        cfg = cfg[Rails.env]
+      end
+      cfg
+    end
+
+    def config
+      @config ||= load_config(File.join(Rails.root , 'config' , 'facebook.yml')).freeze
+    end
+    
+  end
+end

data/lib/fbgraph/authorization.rb

@@ -7,14 +7,48 @@ module FBGraph
     end
     
     def authorize_url(params = {})
+      params = { :redirect_uri => FBGraph.config[:canvas_url] }.merge(params)
       @client.oauth_client.web_server.authorize_url(params)
     end
     
 
     def process_callback(code, options = {})
+      options = { :redirect_uri => FBGraph.config[:canvas_url] }.merge(options)
       @client.auth = @client.oauth_client.web_server.get_access_token(code, options)
       @client.access_token = @client.auth.token
     end
+    
+    def upgrade_session!(key)
+      token = upgrade_session_keys(key).first
+      @client.access_token = token
+    end
+
+    def upgrade_session_keys(*keys)
+      tokens = @client.oauth_client.request(:get, '/oauth/exchange_sessions', {
+        :client_id     => @client.client_id,
+        :client_secret => @client.secret_id,
+        :type          => 'client_cred',
+        :sessions      => keys.flatten.join(',')
+      })
+      JSON.parse(tokens).map { |hash| hash['access_token'] if hash}
+    end
+
+    def upgrade_session(key)
+      token = upgrade_session_keys(key).first
+      @client.access_token = token['access_token']
+      token
+    end
+
+
+    def exchange_sessions(*keys)
+      tokens = @client.oauth_client.request(:get, '/oauth/exchange_sessions', {
+        :client_id     => @client.client_id,
+        :client_secret => @client.secret_id,
+        :type          => 'client_cred',
+        :sessions      => keys.flatten.join(',')
+      })
+      JSON.parse(tokens)
+    end
 
   end  
 end

data/lib/fbgraph/base.rb

@@ -3,6 +3,7 @@ module FBGraph
   class Base
     
     attr_reader :objects , :connection_type , :logger
+
     
     def initialize(client)
       @client = client

data/lib/fbgraph/canvas.rb

@@ -0,0 +1,34 @@
+module Fbgraph
+  
+  class Canvas
+    
+    class << self
+      def parse_signed_request(secret_id,request)
+        encoded_sig, payload = request.split('.', 2)
+        sig = ""
+        urldecode64(encoded_sig).each_byte { |b|
+          sig << "%02x" % b
+        }
+        data = JSON.parse(urldecode64(payload))
+          if data['algorithm'].to_s.upcase != 'HMAC-SHA256'
+          raise "Bad signature algorithm: %s" % data['algorithm']
+        end
+        expected_sig = OpenSSL::HMAC.hexdigest('sha256', secret_id, payload)
+        if expected_sig != sig
+          raise "Bad signature"
+        end
+        data
+      end
+      
+      private
+      
+      def urldecode64(str)
+        encoded_str = str.gsub('-','+').gsub('_','/')
+        encoded_str += '=' while !(encoded_str.size % 4).zero?
+        Base64.decode64(encoded_str)
+      end
+    end  
+    
+  end
+  
+end

data/lib/fbgraph/client.rb

@@ -1,39 +1,36 @@
 module FBGraph
   
   class Client
-      attr_accessor :client_id , :secret_id , :facebook_uri , :access_token , :consumer , :auth
-      
-    
-      def initialize(options)
-        @client_id , @secret_id = options[:client_id] , options[:secret_id]
-        @facebook_uri = 'https://graph.facebook.com'
-        @access_token = options[:token]
-        @consumer = RestClient::Resource.new(@facebook_uri)
-        @auth = OAuth2::AccessToken.new(oauth_client , @access_token)
-        return true
-      end
-  
-      
-      def authorization
-        FBGraph::Authorization.new(self)
-      end
-      
-      def selection
-        FBGraph::Selection.new(self)
-      end
-      
-      def search
-        FBGraph::Search.new(self)
-      end
 
-      def realtime
-        FBGraph::Realtime.new(self)
-      end
-      
-      
-      def oauth_client
-        OAuth2::Client.new(client_id, secret_id, :site => facebook_uri)
-      end
+    attr_accessor :client_id , :secret_id , :facebook_uri , :access_token , :consumer , :auth
       
+    def initialize(options = {})
+      @client_id, @secret_id = options[:client_id] || FBGraph.config[:client_id], options[:secret_id] || FBGraph.config[:secret_id]
+      @facebook_uri = 'https://graph.facebook.com'
+      @consumer = RestClient::Resource.new(@facebook_uri)
+      @auth = OAuth2::AccessToken.new(oauth_client , @access_token)
+      return true
+    end
+    
+    def authorization
+      FBGraph::Authorization.new(self)
+    end
+    
+    def selection
+      FBGraph::Selection.new(self)
+    end
+    
+    def search
+      FBGraph::Search.new(self)
+    end
+    
+    def realtime
+      FBGraph::Realtime.new(self)
+    end
+    
+    def oauth_client
+      OAuth2::Client.new(client_id, secret_id, :site => facebook_uri)
+    end
+    
   end  
 end

data/lib/fbgraph/selection.rb

@@ -41,7 +41,7 @@ module FBGraph
     def picture
       uri = @client.facebook_uri + build_open_graph_path(@objects , 'picture')
       return uri unless @client.consumer
-      uri + '?access_token=' + @client.consumer.token
+      uri + '?access_token=' + @client.access_token
     end
 
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fbgraph
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Nicolas Santa
@@ -35,16 +36,18 @@ cert_chain:
   urUszHKBS/vEBMuC
   -----END CERTIFICATE-----
 
-date: 2010-08-20 00:00:00 -03:00
+date: 2010-09-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth2
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,9 +57,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -66,9 +71,11 @@ dependencies:
   name: hashie
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -78,9 +85,11 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -90,9 +99,11 @@ dependencies:
   name: echoe
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -102,9 +113,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -123,6 +136,7 @@ extra_rdoc_files:
 - lib/fbgraph.rb
 - lib/fbgraph/authorization.rb
 - lib/fbgraph/base.rb
+- lib/fbgraph/canvas.rb
 - lib/fbgraph/client.rb
 - lib/fbgraph/realtime.rb
 - lib/fbgraph/search.rb
@@ -133,9 +147,11 @@ files:
 - README.textile
 - Rakefile
 - TODO.list
+- fbgraph.gemspec
 - lib/fbgraph.rb
 - lib/fbgraph/authorization.rb
 - lib/fbgraph/base.rb
+- lib/fbgraph/canvas.rb
 - lib/fbgraph/client.rb
 - lib/fbgraph/realtime.rb
 - lib/fbgraph/search.rb
@@ -147,7 +163,6 @@ files:
 - specs/lib/fbauth/search_spec.rb
 - specs/lib/fbauth/selection_spec.rb
 - specs/spec_helper.rb
-- fbgraph.gemspec
 has_rdoc: true
 homepage: http://github.com/nsanta/fbgraph
 licenses: []
@@ -163,16 +178,20 @@ 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: 11
       segments: 
       - 1
       - 2
@@ -180,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fbgraph
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Gem for Facebook Open Graph API