fgraph 0.1.4 → 0.1.5

data/History

@@ -1,3 +1,6 @@
+v0.1.5 - May 25, 2010
+  * Fix FGraph::Client not passing default :access_token options properly
+  
 v0.1.4 - May 22, 2010
   * Update rdoc, client_id should refer to Application ID instead of 
     API Key (as of OAuth v2)

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 4
+:patch: 5
 :major: 0
 :build: 
 :minor: 1

data/lib/fgraph.rb

@@ -8,6 +8,14 @@ module FGraph
   base_uri 'https://graph.facebook.com'
   format :json
   
+  def self.config
+    @@config
+  end
+  
+  def self.config=(config)
+    @@config = config
+  end
+  
   # Facebook Error
   class FacebookError < StandardError
     attr_reader :data

data/lib/fgraph/client.rb

@@ -50,21 +50,15 @@ module FGraph
     end
     
     def objects(*args)
-      return if args.blank?
       options = args.last.is_a?(Hash) ? args.pop : {}
-      options[:access_token] = self.options[:access_token]
-      args << options
-      
-      FGraph.objects(args)
+      args << {:access_token => self.options[:access_token]}.merge(options)
+      FGraph.objects(*args)
     end
     
     def me(*args)
-      return if args.blank?
       options = args.last.is_a?(Hash) ? args.pop : {}
-      options[:access_token] = self.options[:access_token]
-      args << options
-      
-      FGraph.me(args)
+      args << {:access_token => self.options[:access_token]}.merge(options)
+      FGraph.me(*args)
     end
     
     def publish(id, options={})

data/lib/fgraph/rails/fgraph_helper.rb

@@ -0,0 +1,75 @@
+module FGraph
+  module Rails
+	  module FGraphHelper
+	    def fgraph_config
+  		  FGraph.config || {}
+  		end
+		
+  		def fgraph_session(app_id = fgraph_config['app_id'], 
+  		  app_secret = fgraph_config['app_secret'])
+  			
+  			return @fgraph_session if @fgraph_session
+  			@fgraph_session = fgraph_session_cookies(app_id, app_secret)
+  		end
+		
+  		def fgraph_session_cookies(app_id = fgraph_config['app_id'], 
+  			app_secret = fgraph_config['app_secret'])
+			
+  			return @fgraph_session_cookies if @fgraph_session_cookies
+  			return if @fgraph_session_cookies == false
+			
+  			 # retrieve session from cookies
+  			fbs_cookies = request.cookies["fbs_#{app_id}"]
+  			if app_id.blank? or app_secret.blank? or fbs_cookies.blank?
+  				return @fgraph_session_cookies = false
+  			end
+
+  			# Parse facebook cookies
+  			fbs_cookies = CGI.parse(fbs_cookies.gsub!(/(^\"|\"$)/, ''))
+  			session_cookies = {}
+  			fbs_cookies.each do |key, value|
+  				session_cookies[key] = value[0]
+  			end
+  			
+  			# Validate session cookies
+  			cookie_message = ''
+  			session_cookies_list = session_cookies.sort
+  			session_cookies_list.each do |cookie|
+  				cookie_message += "#{cookie[0]}=#{cookie[1]}" if cookie[0] != 'sig'
+  			end
+
+  			# Message digest does not match
+  			if Digest::MD5.hexdigest(cookie_message + app_secret) != session_cookies['sig']
+  				@fgraph_session_cookies = false
+  			end
+
+  			@fgraph_session_cookies = session_cookies
+  		end
+		
+  		def fgraph_access_token
+  			return unless fgraph_session
+  			fgraph_session['access_token']
+  		end
+  		
+  		def fgraph_logged_in?
+  		  return true if fgraph_session and fgraph_access_token
+  		end
+		
+  		def fgraph_current_user
+  		  return @fgraph_current_user if @fgraph_current_user
+  		  @fgraph_current_user = fgraph_client.me 
+  		end
+  		
+  		def fgraph_client
+  		  return @fgraph_client if @fgraph_client
+  		  session = fgraph_session || {}
+			
+  		  @fgraph_client = FGraph::Client.new(
+  			 :client_id => fgraph_config['app_id'],
+  			 :client_secret => fgraph_config['app_secret'],
+  			 :access_token => fgraph_access_token
+  		  )
+  		end
+    end
+  end
+end

data/test/fgraph/client_test.rb

@@ -54,10 +54,10 @@ class ClientTest < Test::Unit::TestCase
 
   context "FGraph::Client#objects" do
     should "call FGraph.objects with :access_token option" do
-      FGraph.expects(:objects).with(['1', '2', {
+      FGraph.expects(:objects).with('1', '2', {
         :access_token => FACEBOOK_OAUTH_ACCESS_TOKEN, 
         :fields => 'publish_stream'
-      }])
+      })
       
       fb_client.objects('1', '2', :fields => 'publish_stream')
     end
@@ -65,10 +65,10 @@ class ClientTest < Test::Unit::TestCase
   
   context "FGraph::Client#me" do
     should "call FGraph.me with :access_token option" do
-      FGraph.expects(:me).with([{
+      FGraph.expects(:me).with({
         :access_token => FACEBOOK_OAUTH_ACCESS_TOKEN, 
         :fields => 'publish_stream'
-      }])
+      })
       
       fb_client.me(:fields => 'publish_stream')
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Herryanto Siatono
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-22 00:00:00 +08:00
+date: 2010-05-25 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,7 +105,8 @@ files:
 - examples/publish_feed.rb
 - lib/fgraph.rb
 - lib/fgraph/client.rb
-- lib/tasks/fgraph.rake
+- lib/fgraph/rails/fgraph_helper.rb
+- lib/fgraph/rails/fgraph_tag_helper.rb
 - test/fgraph/client_test.rb
 - test/fgraph_test.rb
 - test/fixtures/access_token.txt

data/lib/tasks/fgraph.rake

@@ -1,14 +0,0 @@
-require 'fileutils'
-
-namespace :fgraph do
-  desc "Create fgraph.yml configuration file in Rails config folder"
-    task :setup => :environment do
-      fgraph_config = File.join(RAILS_ROOT, "config", "fgraph.yml")
-      unless File.exist?(fgraph_config)
-        
-      else
-        puts "#{RAILS_ROOT}/config/fgraph.yml already exists."
-      end
-    end
-  end
-end