fgraph 0.1.3 → 0.1.4

data/History

@@ -1,3 +1,14 @@
+v0.1.4 - May 22, 2010
+  * Update rdoc, client_id should refer to Application ID instead of 
+    API Key (as of OAuth v2)
+  * Remove :app_id option from FGraph::Client
+  
+v0.1.3 - May 21, 2010
+  * Update rdoc
+  
+v0.1.2 - May 20, 2010
+  * Update rdoc
+  
 v0.1.1 - May 20, 2010
   * Update rdoc
   

data/README.rdoc

@@ -98,11 +98,11 @@ OAuth Application Access Token, required to access application anlytics data:
 
 === Insights
 
-  # https://graph.facebook.com/app_id/insights?access_token=...
-  FGraph.insights('[app_id]', '[app_access_token]')
+  # https://graph.facebook.com/client_id/insights?access_token=...
+  FGraph.insights('[client_id]', '[app_access_token]')
 
-  # https://graph.facebook.com/app_id/insights/application_api_call/day?access_token=...
-  FGraph.insights('[app_id]', '[app_access_token]', :metric_path => 'application_api_call/day')
+  # https://graph.facebook.com/client_id/insights/application_api_call/day?access_token=...
+  FGraph.insights('[client_id]', '[app_access_token]', :metric_path => 'application_api_call/day')
 
 === FGraph::Client
   

data/VERSION.yml

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

data/lib/fgraph.rb

@@ -88,7 +88,7 @@ module FGraph
   # user's behalf. Returns Oauth Authorization URL, redirect to this URL to allow user to authorize your
   # application from Facebook.
   #
-  # <tt>client_id</tt> - Facebook API Key
+  # <tt>client_id</tt> - Application ID
   # <tt>redirect_uri</tt> - Needs to begin with your app's Connect URL. For instance, if your Connect URL 
   # is http://www.example.com then your redirect URI could be http://www.example.com/oauth_redirect.
   # <tt>scope (optional)</tt> -
@@ -217,20 +217,20 @@ module FGraph
   
   # Download insights data for your application.
   #
-  #   # https://graph.facebook.com/app_id/insights?access_token=...
-  #   FGraph.insights('[app_id]', '[app_access_token]')
+  #   # https://graph.facebook.com/[client_id]/insights?access_token=...
+  #   FGraph.insights('[client_id]', '[app_access_token]')
   #
-  #   # https://graph.facebook.com/app_id/insights/application_api_call/day?access_token=...
-  #   FGraph.insights('[app_id]', '[app_access_token]', :metric_path => 'application_api_call/day')
+  #   # https://graph.facebook.com/[client_id]/insights/application_api_call/day?access_token=...
+  #   FGraph.insights('[client_id]', '[app_access_token]', :metric_path => 'application_api_call/day')
   # 
   # ==== Options
   # * <tt>metric_path</tt> - e.g. application_api_calls/day
   # * <tt>since</tt> - since (a unix timestamp or any date accepted by strtotime, e.g. yesterday)
   # * <tt>until</tt> - until (a unix timestamp or any date accepted by strtotime, e.g. yesterday)
-  def self.insights(app_id, app_access_token, options={})
+  def self.insights(client_id, app_access_token, options={})
     metric_path = options.delete(:metric_path)
     
-    path = "/#{app_id}/insights"
+    path = "/#{client_id}/insights"
     path += "/#{metric_path}" if metric_path
       
     self.perform_get(path, {

data/lib/fgraph/client.rb

@@ -11,9 +11,8 @@ module FGraph
     # when calling respective Facebook Graph API methods.
     # 
     # ==== Options
-    # * <tt>client_id</tt> - Application API key
+    # * <tt>client_id</tt> - Application ID
     # * <tt>client_secret</tt> - Application Secret
-    # * <tt>app_id</tt> - Application ID
     # * <tt>access_token</tt> - Access token, required to publish to Facebook Graph or access
     #   current user profile.
     # * <tt>app_access_token</tt> - Application access token, required to access Facebook insights.
@@ -89,7 +88,7 @@ module FGraph
       unless self.options[:app_access_token]
         self.options[:app_access_token] = self.oauth_app_access_token
       end
-      FGraph.insights(self.options[:app_id], self.options[:app_access_token], options)
+      FGraph.insights(self.options[:client_id], self.options[:app_access_token], options)
     end
     
     def method_missing(name, *args, &block)

data/lib/tasks/fgraph.rake

@@ -0,0 +1,14 @@
+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

data/test/fgraph/client_test.rb

@@ -1,9 +1,8 @@
 require 'test_helper'
 
 class ClientTest < Test::Unit::TestCase
-  FACEBOOK_API_KEY = '878116c4a4b79f25e4beb97ab096cc92'
-  FACEBOOK_APP_SECRET = '41f0e7ee8b6501dca1610de9926477c4'
   FACEBOOK_APP_ID = '112157085578818'
+  FACEBOOK_APP_SECRET = '41f0e7ee8b6501dca1610de9926477c4'
   FACEBOOK_OAUTH_REDIRECT_URI = 'http://www.example.com/oauth_redirect'
   FACEBOOK_OAUTH_CODE = '2.0eXhebBSDTpoe08qIaocNQ__.3600.1273748400-503153225|caqygNb5Gobz6lpj3HXjlthDxds.'
   FACEBOOK_OAUTH_ACCESS_TOKEN = "115187085478818|rDIv_5zgjCSM_fWBv5Z-lQr5gFk."
@@ -11,7 +10,7 @@ class ClientTest < Test::Unit::TestCase
   
   def fb_client
     FGraph::Client.new(
-      :client_id => FACEBOOK_API_KEY,
+      :client_id => FACEBOOK_APP_ID,
       :client_secret => FACEBOOK_APP_SECRET,
       :access_token => FACEBOOK_OAUTH_ACCESS_TOKEN
     )
@@ -19,7 +18,7 @@ class ClientTest < Test::Unit::TestCase
   
   context "FGraph::Client#oauth_authorize_url" do
     should "call FGraph.oauth_authorize_url with :client_id option" do
-      FGraph.expects(:oauth_authorize_url).with(FACEBOOK_API_KEY, FACEBOOK_OAUTH_REDIRECT_URI, {
+      FGraph.expects(:oauth_authorize_url).with(FACEBOOK_APP_ID, FACEBOOK_OAUTH_REDIRECT_URI, {
         :scope => 'publish_stream'
       })
       fb_client.oauth_authorize_url(FACEBOOK_OAUTH_REDIRECT_URI, :scope => 'publish_stream')
@@ -28,7 +27,7 @@ class ClientTest < Test::Unit::TestCase
   
   context "FGraph::Client#oauth_access_token" do
     should "call FGraph.oauth_access_token with :client_id and :client_secret options" do
-      FGraph.expects(:oauth_access_token).with(FACEBOOK_API_KEY, FACEBOOK_APP_SECRET, 
+      FGraph.expects(:oauth_access_token).with(FACEBOOK_APP_ID, FACEBOOK_APP_SECRET, 
         :redirect_uri => FACEBOOK_OAUTH_REDIRECT_URI, :code => FACEBOOK_OAUTH_CODE)
         
       fb_client.oauth_access_token(FACEBOOK_OAUTH_REDIRECT_URI, FACEBOOK_OAUTH_CODE)
@@ -135,9 +134,8 @@ class ClientTest < Test::Unit::TestCase
   end
   
   context "FGraph::Client#insights" do
-    should "auto populate :app_id and :oauth_app_access_token" do
+    should "auto populate :client_id and :oauth_app_access_token" do
       client = fb_client 
-      client.options[:app_id] = FACEBOOK_APP_ID
       client.options[:app_access_token] = FACEBOOK_OAUTH_APP_ACCESS_TOKEN
       
       FGraph.expects(:insights).with(FACEBOOK_APP_ID, FACEBOOK_OAUTH_APP_ACCESS_TOKEN, {})
@@ -146,9 +144,8 @@ class ClientTest < Test::Unit::TestCase
     
     should "auto retrieve :oauth_app_access_token option" do
       client = fb_client
-      
       client.expects(:oauth_app_access_token).returns(FACEBOOK_OAUTH_APP_ACCESS_TOKEN)
-      FGraph.expects(:insights).with(nil, FACEBOOK_OAUTH_APP_ACCESS_TOKEN, {
+      FGraph.expects(:insights).with(FACEBOOK_APP_ID, FACEBOOK_OAUTH_APP_ACCESS_TOKEN, {
         :metric_path => 'application_api_calls/day'
       })
       client.insights(:metric_path => 'application_api_calls/day')

data/test/fgraph_test.rb

@@ -1,9 +1,8 @@
 require 'test_helper'
 
 class FGraphTest < Test::Unit::TestCase
-  FACEBOOK_API_KEY = '878116c4a4b79f25e4beb97ab096cc92'
-  FACEBOOK_APP_SECRET = '41f0e7ee8b6501dca1610de9926477c4'
   FACEBOOK_APP_ID = '112157085578818'
+  FACEBOOK_APP_SECRET = '41f0e7ee8b6501dca1610de9926477c4'
   FACEBOOK_OAUTH_REDIRECT_URI = 'http://www.example.com/oauth_redirect'
   FACEBOOK_OAUTH_CODE = '2.0eXhebBSDTpoe08qIaocNQ__.3600.1273748400-503153225|caqygNb5Gobz6lpj3HXjlthDxds.'
   FACEBOOK_OAUTH_ACCESS_TOKEN = "115187085478818|rDIv_5zgjCSM_fWBv5Z-lQr5gFk."
@@ -56,21 +55,21 @@ class FGraphTest < Test::Unit::TestCase
   context "FGraph.oauth_authorize_url" do
     should "should call format_url with appropriate hash" do
       FGraph.expects(:format_url).with('/oauth/authorize', {
-        :client_id => FACEBOOK_API_KEY,
+        :client_id => FACEBOOK_APP_ID,
         :redirect_uri => FACEBOOK_OAUTH_REDIRECT_URI
       })
       
-      FGraph.oauth_authorize_url(FACEBOOK_API_KEY, FACEBOOK_OAUTH_REDIRECT_URI)
+      FGraph.oauth_authorize_url(FACEBOOK_APP_ID, FACEBOOK_OAUTH_REDIRECT_URI)
     end
     
     should "should call format_url with options" do
       FGraph.expects(:format_url).with('/oauth/authorize', {
-        :client_id => FACEBOOK_API_KEY,
+        :client_id => FACEBOOK_APP_ID,
         :redirect_uri => FACEBOOK_OAUTH_REDIRECT_URI,
         :scope => 'publish_stream'
       })
       
-      FGraph.oauth_authorize_url(FACEBOOK_API_KEY, FACEBOOK_OAUTH_REDIRECT_URI,
+      FGraph.oauth_authorize_url(FACEBOOK_APP_ID, FACEBOOK_OAUTH_REDIRECT_URI,
         :scope => 'publish_stream')
     end
   end
@@ -78,13 +77,13 @@ class FGraphTest < Test::Unit::TestCase
   context "FGraph.oauth_access_token" do
     should "return user access token and expires" do
       stub_get(FGraph.format_url('/oauth/access_token', {
-        :client_id => FACEBOOK_API_KEY,
+        :client_id => FACEBOOK_APP_ID,
         :client_secret => FACEBOOK_APP_SECRET,
         :redirect_uri => FACEBOOK_OAUTH_REDIRECT_URI,
         :code => FACEBOOK_OAUTH_CODE
       }), 'access_token.txt')
       
-      token = FGraph.oauth_access_token(FACEBOOK_API_KEY, FACEBOOK_APP_SECRET, 
+      token = FGraph.oauth_access_token(FACEBOOK_APP_ID, FACEBOOK_APP_SECRET, 
         :redirect_uri => FACEBOOK_OAUTH_REDIRECT_URI, 
         :code => FACEBOOK_OAUTH_CODE)
       
@@ -141,7 +140,7 @@ class FGraphTest < Test::Unit::TestCase
   end
   
   context "Facebook.insights" do
-    should "call perform_get('/[app_id]/insights')" do
+    should "call perform_get('/[client_id]/insights')" do
       FGraph.expects(:perform_get).with("/#{FACEBOOK_APP_ID}/insights", {
         :access_token => FACEBOOK_OAUTH_APP_ACCESS_TOKEN
       })

metadata

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