rest-graph 1.3.0 → 1.4.0

data/CHANGES

@@ -1,5 +1,20 @@
 = rest-graph changes history
 
+== rest-graph 1.4.0 -- ?
+
+Changes only for RailsUtil, the core (rest-graph.rb) is pretty stable for now.
+
+* Internal code rearrangement.
+* Removed url_for helper, it's too hard to do it right.
+* Removed @fb_sig_in_canvas hack.
+* Added rest_graph method in helper.
+* Fixed a bug that logging redirect but not really do direct.
+* Now passing :auto_authorize_scope implies :auto_authorize => true.
+* Now :canvas option takes the name of canvas, instead of a boolean.
+* Now :auto_authorize default to false.
+* Now :auto_authorize_scope default to nothing.
+* Now there's :write_session option to save fbs in session, default to false.
+
 == rest-graph 1.3.0 -- 2010-06-11
 * Now rest-graph is rescuing all exceptions from rest-client.
 * Added RestGraph#exchange_sessions to exchange old sessions to access tokens.

data/README

@@ -0,0 +1,252 @@
+= rest-graph 1.3.0
+by Cardinal Blue ( http://cardinalblue.com )
+
+== LINKS:
+
+* {github}[http://github.com/cardinalblue/rest-graph]
+* {rubygems}[http://rubygems.org/gems/rest-graph]
+* {rdoc}[http://rdoc.info/projects/cardinalblue/rest-graph]
+* {mailing list}[http://groups.google.com/group/rest-graph/topics]
+
+== DESCRIPTION:
+
+ A super simple Facebook Open Graph API client
+
+== FEATURES:
+
+* Simple Graph API call
+* Simple FQL call
+* Utility to extract access_token and check sig in cookies
+
+== QUICK START:
+
+ # In typical use, here's how you use RestGraph. Note that the syntax follows
+ # closely to the Graph API URL syntax, making it easy to use. First, suppose
+ # that you already have an access_token, represented by TOKEN:
+
+ require 'rest-graph'
+ rg = RestGraph.new(:access_token => TOKEN)
+
+ # GET https://graph.facebook.com/me?access_token=TOKEN
+ rg.get('me')
+
+ # GET https://graph.facebook.com/me/likes?access_token=TOKEN
+ rg.get('me/likes')
+
+ # GET https://graph.facebook.com/search?q=taiwan&access_token=TOKEN
+ rg.get('search', :q => 'taiwan')
+
+
+ # Next, we explain how to use RestGraph to obtain the access token
+
+ # If you are using Rails, we recommend that you include a module
+ # called RailsUtil into your controllers, which will configure RestGraph.
+ # (Your code contributions for other Ruby frameworks would be appreciated!)
+ # There is an option in RailsUtil called "auto_authorize" which will cause
+ # RestGraph to automatically redirect the user to the authorization page if
+ # the access token is unavailable or has expired. (This way, you don't have
+ # to check if the token is expired or not.)
+
+ # Here is an example:
+
+ class UserController < ApplicationController
+   include RestGraph::RailsUtil
+   before_filter :filter_rest_graph_setup
+
+   def index
+     # rest_graph_setup provides rest_graph as a RestGraph instance
+     @profile = rest_graph.get('me')
+   end
+
+   # your code
+
+   private
+   def filter_rest_graph_setup
+     # Please see RestGraph::RailsUtil#rest_graph_options for all options.
+     rest_graph_setup(:auto_authorize_scope => 'publish_stream,email',
+                      :app_id               => '123',
+                      :canvas               => RestGraph.default_canvas)
+   end
+ end
+
+
+ # You might wonder how do we setup app_id, secret, and other stuffs?
+ # You could pass them in rest_graph_setup(:app_id => 1234), or setup
+ # in a config YAML file. Here's a config example:
+{rest-graph.yaml}[http://github.com/cardinalblue/rest-graph/blob/master/test/config/rest-graph.yaml]
+ # For a QUICK START, we recommend that put this config file under
+ # config/rest-graph.yaml and require 'rest-graph/auto_load' to automatically
+ # load the config to setup default values for RestGraph in your application.
+ # in Rails 2.x, you might want to add this line into config/environment.rb:
+
+ config.gem 'rest-graph', :lib => 'rest-graph/auto_load'
+
+ # While for bundler, you might want to add this line into Gemfile:
+
+ gem 'rest-graph', :require => 'rest-graph/auto_load'
+
+== SYNOPSIS:
+
+ # Here are ALL the available options for new instance of RestGraph.
+ # All options are optional:
+
+ rg = RestGraph.new(:access_token => TOKEN,
+                    :graph_server => 'https://graph.facebook.com/',
+                    :old_server   => 'https://api.facebook.com/',
+                    :accept       => 'text/javascript',
+                    :lang         => 'en-us', # this affect search
+                    :auto_decode  =>  true  , # decode by json
+                    :app_id       => '123'  ,
+                    :secret       => '1829' ,
+
+ # This handler callback is only called if auto_decode is set to true,
+ # otherwise, it's ignored.
+                    :error_handler =>
+                      lambda{ |hash| raise ::RestGraph::Error.new(hash) },
+
+ # You might want to do this in Rails to do debug logging:
+                    :log_handler =>
+                      lambda{ |duration, url|
+                        Rails.logger.debug("RestGraph "         \
+                                           "spent #{duration} " \
+                                           "requesting #{url}")
+                      })
+
+
+ # API calls:
+
+ # GET https://graph.facebook.com/me?access_token=TOKEN
+ rg.get('me')
+
+ # GET https://graph.facebook.com/me?metadata=1&access_token=TOKEN
+ rg.get('me', :metadata => '1')
+
+ # POST https://graph.facebook.com/me/feed?message=bread%21&access_token=tok
+ rg.post('me/feed', :message => 'bread!')
+
+== UTILITY FUNCTIONS:
+
+ # If you have the session in the cookies,
+ # then RestGraph can parse the cookies:
+ rg.parse_cookies!(cookies) # auto save access_token if sig is correct
+ rg.data['uid']             # => facebook uid
+
+ # If you're writing a Rack application, you might want to parse
+ # the session directly from Rack env:
+ rg.parse_rack_env!(env)    # auto save access_token if sig is correct
+ rg.data['uid']             # => facebook uid
+
+ # The following method yields the redirect URL for authorizing
+ # https://graph.facebook.com/oauth/authorize?client_id=123&
+ #         redirect_uri=http%3A%2F%2Fw3.org%2F
+ rg.authorize_url(:redirect_uri => 'http://w3.org/', :scope => 'email')
+
+ # The following method makes a call to Facebook to convert
+ # the authorization "code" into an access token:
+ # https://graph.facebook.com/oauth/access_token?code=CODE&
+ #         client_id=123&redirect_uri=http%3A%2F%2Fw3.org%2F&
+ #         client_secret=1829
+ rg.authorize!(:redirect_uri => 'http://w3.org/', :code => 'CODE')
+ rg.access_token    # your access_token is now available
+ rg.data['expires'] # other values are available in data
+
+ # The following method takes a session key from the old REST API
+ # (non-Graph API) and converts to an access token:
+ # https://graph.facebook.com/oauth/exchange_sessions?sessions=SESSION
+ params[:fb_sig_session_key] # => SESSION
+ rg.exchange_sessions(:sessions => params[:fb_sig_session_key])
+
+ # The following method allows for an arbitrary FQL query to made
+ # GET https://api.facebook.com/method/fql.query?query=
+ #             SELECT+name+FROM+page+WHERE+page_id%3D%22123%22&
+ #             format=json&access_token=tok
+ rg.fql('SELECT name FROM page WHERE page_id="123"')
+
+ # The following method allows for multiple FQL query to made
+ # http://developers.facebook.com/docs/reference/rest/fql.multiquery
+ # GET https://api.facebook.com/method/fql.multiquery?query=
+ #            %7BSELECT+name+FROM+page+WHERE+page_id%3D%22123%22&%2C
+ #            SELECT+name+FROM+page+WHERE+page_id%3D%22456%22&%7D
+ #            format=json&access_token=tok
+ rg.fql_multi(:q1 => 'SELECT name FROM page WHERE page_id="123"',
+              :q2 => 'SELECT name FROM page WHERE page_id="456"')
+
+ # The following method makes it possible to call functionality
+ # from Facebook's old REST API:
+ rg.old_rest(
+   'stream.publish',
+   { :message    => 'Greetings',
+     :attachment => {:name => 'Wikipedia',
+                     :href => 'http://wikipedia.org/',
+                     :caption => 'Wikipedia says hi.',
+                     :media => [{:type => 'image',
+                                 :src  => 'http://wikipedia.org/favicon.ico',
+                                 :href => 'http://wikipedia.org/'}]
+                    }.to_json,
+     :action_links => [{:text => 'Go to Wikipedia',
+                        :href => 'http://wikipedia.org/'}
+                      ].to_json
+   },
+   :suppress_decode => true) # You'll need to set suppress_decode to true
+                             # if Facebook is not returning a proper JSON
+                             # response. Otherwise, this could be omitted.
+
+ # Here are 3 possible ways to set up the default settings:
+
+ # (1) set it directly
+ module MyDefaults
+   def default_app_id
+     '456'
+   end
+
+   def default_secret
+     'category theory'
+   end
+ end
+ RestGraph.send(:extend, MyDefaults)
+
+ # or (2) Load defaults from a YAML config file:
+ require 'rest-graph/load_config'
+ RestGraph::LoadConfig.load_config!('path/to/rest-graph.yaml', 'development')
+
+ RestGraph.new                   # app_id would be 456
+ RestGraph.new(:app_id => '123') # defaults could be overridden
+
+ # or (3) Load config automatically
+ require 'rest-graph/auto_load'  # under Rails, load config/rest-graph.yaml
+
+ # Please read:
+{rest-graph.yaml}[http://github.com/cardinalblue/rest-graph/blob/master/test/config/rest-graph.yaml]
+ # for an example of config file.
+
+== REQUIREMENTS:
+
+* Tested with MRI 1.8.7 and 1.9.1
+* gem install rest-client
+* gem install json      (optional)
+* gem install json_pure (optional)
+* gem install rack      (optional, to parse access_token in HTTP_COOKIE)
+
+== INSTALL:
+
+ > gem install rest-graph
+ # or if you want rails plugin and bleeding edge
+ > script/plugin install git://github.com/cardinalblue/rest-graph.git
+
+== LICENSE:
+
+  Apache License 2.0
+
+  Copyright (c) 2010, Cardinal Blue
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.

data/README.rdoc

@@ -18,15 +18,79 @@ by Cardinal Blue ( http://cardinalblue.com )
 * Simple FQL call
 * Utility to extract access_token and check sig in cookies
 
-== SYNOPSIS:
+== QUICK START:
 
-# If you feel SYNOPSIS is so hard to understand, please read
-# {examples}[http://github.com/cardinalblue/rest-graph/tree/master/example].
+ # In typical use, here's how you use RestGraph. Note that the syntax follows
+ # closely to the Graph API URL syntax, making it easy to use. First, suppose
+ # that you already have an access_token, represented by TOKEN:
 
  require 'rest-graph'
+ rg = RestGraph.new(:access_token => TOKEN)
+
+ # GET https://graph.facebook.com/me?access_token=TOKEN
+ rg.get('me')
+
+ # GET https://graph.facebook.com/me/likes?access_token=TOKEN
+ rg.get('me/likes')
+
+ # GET https://graph.facebook.com/search?q=taiwan&access_token=TOKEN
+ rg.get('search', :q => 'taiwan')
+
+
+ # Next, we explain how to use RestGraph to obtain the access token
+
+ # If you are using Rails, we recommend that you include a module
+ # called RailsUtil into your controllers, which will configure RestGraph.
+ # (Your code contributions for other Ruby frameworks would be appreciated!)
+ # There is an option in RailsUtil called "auto_authorize" which will cause
+ # RestGraph to automatically redirect the user to the authorization page if
+ # the access token is unavailable or has expired. (This way, you don't have
+ # to check if the token is expired or not.)
+
+ # Here is an example:
+
+ class UserController < ApplicationController
+   include RestGraph::RailsUtil
+   before_filter :filter_rest_graph_setup
+
+   def index
+     # rest_graph_setup provides rest_graph as a RestGraph instance
+     @profile = rest_graph.get('me')
+   end
+
+   # your code
+
+   private
+   def filter_rest_graph_setup
+     # Please see RestGraph::RailsUtil#rest_graph_options for all options.
+     rest_graph_setup(:auto_authorize_scope => 'publish_stream,email',
+                      :app_id               => '123',
+                      :canvas               => RestGraph.default_canvas)
+   end
+ end
+
+
+ # You might wonder how do we setup app_id, secret, and other stuffs?
+ # You could pass them in rest_graph_setup(:app_id => 1234), or setup
+ # in a config YAML file. Here's a config example:
+{rest-graph.yaml}[http://github.com/cardinalblue/rest-graph/blob/master/test/config/rest-graph.yaml]
+ # For a QUICK START, we recommend that put this config file under
+ # config/rest-graph.yaml and require 'rest-graph/auto_load' to automatically
+ # load the config to setup default values for RestGraph in your application.
+ # in Rails 2.x, you might want to add this line into config/environment.rb:
 
- # Every option is optional.
- rg = RestGraph.new(:access_token => 'tok',
+ config.gem 'rest-graph', :lib => 'rest-graph/auto_load'
+
+ # While for bundler, you might want to add this line into Gemfile:
+
+ gem 'rest-graph', :require => 'rest-graph/auto_load'
+
+== SYNOPSIS:
+
+ # Here are ALL the available options for new instance of RestGraph.
+ # All options are optional:
+
+ rg = RestGraph.new(:access_token => TOKEN,
                     :graph_server => 'https://graph.facebook.com/',
                     :old_server   => 'https://api.facebook.com/',
                     :accept       => 'text/javascript',
@@ -35,12 +99,12 @@ by Cardinal Blue ( http://cardinalblue.com )
                     :app_id       => '123'  ,
                     :secret       => '1829' ,
 
-  # This handler callback is only called if auto_decode is set to true,
-  # otherwise, it's ignored.
+ # This handler callback is only called if auto_decode is set to true,
+ # otherwise, it's ignored.
                     :error_handler =>
                       lambda{ |hash| raise ::RestGraph::Error.new(hash) },
 
-  # You might want to do this in Rails to do debug logging:
+ # You might want to do this in Rails to do debug logging:
                     :log_handler =>
                       lambda{ |duration, url|
                         Rails.logger.debug("RestGraph "         \
@@ -48,54 +112,88 @@ by Cardinal Blue ( http://cardinalblue.com )
                                            "requesting #{url}")
                       })
 
- # You might want to do redirect instead of raising an exception,
- # that is automatically redirect the user to authorization page
- # if the access token is unavailable. This way, you don't have to
- # check if the token is expired or not. If the token is expired,
- # it will automatically do authorization again. For that purpose,
- # you might want to include RestGraph::RailsUtil in your Rails'
- # controller. For example:
- class UserController < ApplicationController
-   include RestGraph::RailsUtil
-   before_filter :rest_graph_setup
- end
- # Please read:
- # {examples}[http://github.com/cardinalblue/rest-graph/tree/master/example].
- # for more detail, and other frameworks utils wanted!
 
- # Other simple API call:
- rg.get('me')       # GET https://graph.facebook.com/me?access_token=tok
- rg.get('4/likes')  # GET https://graph.facebook.com/4/likes?access_token=tok
+ # API calls:
 
- # GET https://graph.facebook.com/search?q=taiwan&access_token=tok
- rg.get('search', :q => 'taiwan')
+ # GET https://graph.facebook.com/me?access_token=TOKEN
+ rg.get('me')
 
- # GET https://graph.facebook.com/me?metadata=1&access_token=tok
+ # GET https://graph.facebook.com/me?metadata=1&access_token=TOKEN
  rg.get('me', :metadata => '1')
 
  # POST https://graph.facebook.com/me/feed?message=bread%21&access_token=tok
  rg.post('me/feed', :message => 'bread!')
 
- # For fully blown cookies hash
- rg = RestGraph.new(:app_id => '123', :secret => '1829')
- rg.parse_cookies!(cookies) # auto save access_token if sig checked
+== UTILITY FUNCTIONS:
+
+ # If you have the session in the cookies,
+ # then RestGraph can parse the cookies:
+ rg.parse_cookies!(cookies) # auto save access_token if sig is correct
  rg.data['uid']             # => facebook uid
 
- # FQL query, same as:
+ # If you're writing a Rack application, you might want to parse
+ # the session directly from Rack env:
+ rg.parse_rack_env!(env)    # auto save access_token if sig is correct
+ rg.data['uid']             # => facebook uid
+
+ # The following method yields the redirect URL for authorizing
+ # https://graph.facebook.com/oauth/authorize?client_id=123&
+ #         redirect_uri=http%3A%2F%2Fw3.org%2F
+ rg.authorize_url(:redirect_uri => 'http://w3.org/', :scope => 'email')
+
+ # The following method makes a call to Facebook to convert
+ # the authorization "code" into an access token:
+ # https://graph.facebook.com/oauth/access_token?code=CODE&
+ #         client_id=123&redirect_uri=http%3A%2F%2Fw3.org%2F&
+ #         client_secret=1829
+ rg.authorize!(:redirect_uri => 'http://w3.org/', :code => 'CODE')
+ rg.access_token    # your access_token is now available
+ rg.data['expires'] # other values are available in data
+
+ # The following method takes a session key from the old REST API
+ # (non-Graph API) and converts to an access token:
+ # https://graph.facebook.com/oauth/exchange_sessions?sessions=SESSION
+ params[:fb_sig_session_key] # => SESSION
+ rg.exchange_sessions(:sessions => params[:fb_sig_session_key])
+
+ # The following method allows for an arbitrary FQL query to made
  # GET https://api.facebook.com/method/fql.query?query=
- #     SELECT+name+FROM+page+WHERE+page_id%3D%22123%22&
- #     format=json&access_token=...
+ #             SELECT+name+FROM+page+WHERE+page_id%3D%22123%22&
+ #             format=json&access_token=tok
  rg.fql('SELECT name FROM page WHERE page_id="123"')
 
- # FQL multiquery, same as:
+ # The following method allows for multiple FQL query to made
+ # http://developers.facebook.com/docs/reference/rest/fql.multiquery
  # GET https://api.facebook.com/method/fql.multiquery?query=
- #     %7BSELECT+name+FROM+page+WHERE+page_id%3D%22123%22&%2C
- #        SELECT+name+FROM+page+WHERE+page_id%3D%22456%22&%7D
- #     format=json&access_token=...
+ #            %7BSELECT+name+FROM+page+WHERE+page_id%3D%22123%22&%2C
+ #            SELECT+name+FROM+page+WHERE+page_id%3D%22456%22&%7D
+ #            format=json&access_token=tok
  rg.fql_multi(:q1 => 'SELECT name FROM page WHERE page_id="123"',
               :q2 => 'SELECT name FROM page WHERE page_id="456"')
 
- # Setup default settings:
+ # The following method makes it possible to call functionality
+ # from Facebook's old REST API:
+ rg.old_rest(
+   'stream.publish',
+   { :message    => 'Greetings',
+     :attachment => {:name => 'Wikipedia',
+                     :href => 'http://wikipedia.org/',
+                     :caption => 'Wikipedia says hi.',
+                     :media => [{:type => 'image',
+                                 :src  => 'http://wikipedia.org/favicon.ico',
+                                 :href => 'http://wikipedia.org/'}]
+                    }.to_json,
+     :action_links => [{:text => 'Go to Wikipedia',
+                        :href => 'http://wikipedia.org/'}
+                      ].to_json
+   },
+   :suppress_decode => true) # You'll need to set suppress_decode to true
+                             # if Facebook is not returning a proper JSON
+                             # response. Otherwise, this could be omitted.
+
+ # Here are 3 possible ways to set up the default settings:
+
+ # (1) set it directly
  module MyDefaults
    def default_app_id
      '456'
@@ -107,48 +205,19 @@ by Cardinal Blue ( http://cardinalblue.com )
  end
  RestGraph.send(:extend, MyDefaults)
 
- # Automatically load config:
- require 'rest-graph/auto_load'  # under Rails, load config/rest-graph.yaml
- RestGraph.new                   # all default options would honor config
- RestGraph.new(:app_id => '123') # default could be override as well
-
- # Manually load config:
+ # or (2) Load defaults from a YAML config file:
  require 'rest-graph/load_config'
- RestGraph::LoadConfig.load_config!('path/to/rest-graph.yaml', 'env')
+ RestGraph::LoadConfig.load_config!('path/to/rest-graph.yaml', 'development')
 
- # See test/config/rest-graph.yaml for an example for config.
-
- # OAuth utilites:
- # https://graph.facebook.com/oauth/authorize?client_id=123&
- RestGraph.new.authorize_url(:redirect_uri => 'http://w3.org/')
+ RestGraph.new                   # app_id would be 456
+ RestGraph.new(:app_id => '123') # defaults could be overridden
 
- # Get access token by:
- # https://graph.facebook.com/oauth/access_token?code=edoc&
- rg = RestGraph.new
- rg.authorize!(:redirect_uri => 'http://w3.org/', :code => 'edoc')
- rg.access_token    # your access_token is now available
- rg.data['expires'] # other values as well
-
- # Exchange old session key for access token:
- # https://graph.facebook.com/oauth/exchange_sessions?sessions=...
- rg.exchange_sessions(:sessions => params[:fb_sig_session_key])
+ # or (3) Load config automatically
+ require 'rest-graph/auto_load'  # under Rails, load config/rest-graph.yaml
 
- # Call Facebook's old REST API:
- rg.old_rest(
-   'stream.publish',
-   { :message    => 'Greetings',
-     :attachment => {:name => 'Wikipedia',
-                     :href => 'http://wikipedia.org/',
-                     :caption => 'Wikipedia says hi.',
-                     :media => [{:type => 'image',
-                                 :src  => 'http://wikipedia.org/favicon.ico',
-                                 :href => 'http://wikipedia.org/'}]
-                    }.to_json,
-     :action_links => [{:text => 'Go to Wikipedia',
-                        :href => 'http://wikipedia.org/'}
-                      ].to_json
-   },
-   :suppress_decode => true)
+ # Please read:
+{rest-graph.yaml}[http://github.com/cardinalblue/rest-graph/blob/master/test/config/rest-graph.yaml]
+ # for an example of config file.
 
 == REQUIREMENTS:
 

data/TODO

@@ -1,4 +1,6 @@
 = rest-graph todo list
 
+* test for rails util for writing cookie
+
 * more docs?
 * more examples?

data/example/rails/README

@@ -2,3 +2,5 @@
 Please fill config/rest-graph.yaml with your app_id, secret, and canvas to
 see if this example is working or not. This is supposed to be used in an
 iframe canvas page.
+
+The default setup is designed for standalone site with Facebook JavaScript SDK.

data/example/rails/app/controllers/application_controller.rb

@@ -10,23 +10,19 @@ class ApplicationController < ActionController::Base
 
   include RestGraph::RailsUtil
 
-  before_filter :rest_graph_setup,   :only => [:index,  :url_for_standalone,
-                                                        :url_for_view_stand,
-                                                        :link_to_stand,
-                                                        :redirect_stand]
-  before_filter :filter_canvas,      :only => [:canvas, :url_for_canvas,
-                                                        :url_for_view_canvas,
-                                                        :link_to_canvas,
-                                                        :redirect_canvas]
+  before_filter :filter_common,      :only => [:index]
+  before_filter :filter_canvas,      :only => [:canvas]
   before_filter :filter_options,     :only => [:options]
   before_filter :filter_no_auto,     :only => [:no_auto]
-  before_filter :filter_diff_app_id, :only => [:app_id]
+  before_filter :filter_diff_app_id, :only => [:diff_app_id]
+  before_filter :filter_diff_canvas, :only => [:diff_canvas]
 
   def index
     render :text => rest_graph.get('me').to_json
   end
-  alias_method :canvas,  :index
-  alias_method :options, :index
+  alias_method :canvas     , :index
+  alias_method :options    , :index
+  alias_method :diff_canvas, :index
 
   def no_auto
     rest_graph.get('me')
@@ -34,42 +30,32 @@ class ApplicationController < ActionController::Base
     render :text => 'XD'
   end
 
-  def app_id
+  def diff_app_id
     render :text => rest_graph.app_id
   end
 
-  def url_for_standalone
-    render :text => url_for(:action => 'index')
-  end
-  alias_method :url_for_canvas, :url_for_standalone
-
-  def url_for_view_stand
-    render :inline => '<%= url_for(:action => "index") %>'
-  end
-  alias_method :url_for_view_canvas, :url_for_view_stand
-
-  def link_to_stand
-    render :inline => '<%= link_to("test", :action => "index") %>'
-  end
-  alias_method :link_to_canvas, :link_to_stand
-
-  def redirect_stand
-    redirect_to :action => 'index'
+  private
+  def filter_common
+    rest_graph_setup(:auto_authorize => true)
   end
-  alias_method :redirect_canvas, :redirect_stand
 
-  private
   def filter_canvas
-    rest_graph_setup(:canvas => true,
+    rest_graph_setup(:canvas               => RestGraph.default_canvas,
                      :auto_authorize_scope => 'publish_stream')
   end
 
+  def filter_diff_canvas
+    rest_graph_setup(:canvas               => 'ToT',
+                     :auto_authorize_scope => 'email')
+  end
+
   def filter_no_auto
     rest_graph_setup(:auto_authorize => false)
   end
 
   def filter_diff_app_id
-    rest_graph_setup(:app_id => 'zzz')
+    rest_graph_setup(:app_id => 'zzz',
+                     :auto_authorize => true)
   end
 
   def filter_options

data/example/rails/config/environment.rb

@@ -39,4 +39,4 @@ Rails::Initializer.run do |config|
   # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
   # config.i18n.default_locale = :de
-end
+end

data/example/rails/config/environments/development.rb

@@ -14,4 +14,4 @@ config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
 
 # Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
+config.action_mailer.raise_delivery_errors = false

data/example/rails/config/environments/production.rb

@@ -25,4 +25,4 @@ config.action_view.cache_template_loading            = true
 # config.action_mailer.raise_delivery_errors = false
 
 # Enable threaded mode
-# config.threadsafe!
+# config.threadsafe!

data/example/rails/config/environments/test.rb

@@ -25,4 +25,4 @@ config.action_mailer.delivery_method = :test
 # Use SQL instead of Active Record's schema dumper when creating the test database.
 # This is necessary if your schema can't be completely dumped by the schema dumper,
 # like if you have constraints or database-specific column types
-# config.active_record.schema_format = :sql
+# config.active_record.schema_format = :sql

data/example/rails/config/initializers/cookie_verification_secret.rb

@@ -2,6 +2,6 @@
 
 # Your secret key for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
+# Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 ActionController::Base.cookie_verifier_secret = '095e8e5c0b6b901901efb23fab50005b68d9d6a9d41f4ec780946cff34b26603762bc0ea1baf204613b252e5ae499d38b232d5b75edac513a723e450e76548a3';

data/example/rails/config/initializers/new_rails_defaults.rb

@@ -18,4 +18,4 @@ ActiveSupport.use_standard_json_time_format = true
 
 # Don't escape HTML entities in JSON, leave that for the #json_escape helper.
 # if you're including raw json in an HTML page.
-ActiveSupport.escape_html_entities_in_json = false
+ActiveSupport.escape_html_entities_in_json = false

data/example/rails/config/initializers/session_store.rb

@@ -2,7 +2,7 @@
 
 # Your secret key for verifying cookie session data integrity.
 # If you change this key, all old sessions will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
+# Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 ActionController::Base.session = {
   :key         => '_rails_session',

data/example/rails/config/routes.rb

@@ -17,7 +17,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # Sample resource route with sub-resources:
   #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
-  
+
   # Sample resource route with more complex sub-resources
   #   map.resources :products do |products|
   #     products.resources :comments

data/example/rails/test/functional/application_controller_test.rb

@@ -22,7 +22,7 @@ class ApplicationControllerTest < ActionController::TestCase
     assert_equal(
       normalize_url(
         'https://graph.facebook.com/oauth/authorize?client_id=123&' \
-        'scope=offline_access%2Cpublish_stream%2Cread_friendlists&' \
+        'scope=&' \
         'redirect_uri=http%3A%2F%2Ftest.host%2F'),
       normalize_url(assigns(:rest_graph_authorize_url)))
   end
@@ -38,6 +38,17 @@ class ApplicationControllerTest < ActionController::TestCase
       normalize_url((assigns(:rest_graph_authorize_url))))
   end
 
+  def test_diff_canvas
+    get(:diff_canvas)
+    assert_response :success
+    assert_equal(
+      normalize_url(
+        'https://graph.facebook.com/oauth/authorize?client_id=123&' \
+        'scope=email&'                                              \
+        'redirect_uri=http%3A%2F%2Fapps.facebook.com%2FToT%2Fdiff_canvas'),
+      normalize_url((assigns(:rest_graph_authorize_url))))
+  end
+
   def test_options
     get(:options)
     assert_response :redirect
@@ -56,59 +67,8 @@ class ApplicationControllerTest < ActionController::TestCase
   end
 
   def test_app_id
-    get(:app_id)
+    get(:diff_app_id)
     assert_response :success
     assert_equal 'zzz', @response.body
   end
-
-  def test_url_for_standalone
-    get(:url_for_standalone)
-    assert_response :success
-    assert_equal 'http://test.host/', @response.body
-  end
-
-  def test_url_for_canvas
-    get(:url_for_canvas)
-    assert_response :success
-    assert_equal 'http://apps.facebook.com/can/',
-      @response.body
-  end
-
-  def test_url_for_view_stand
-    get(:url_for_view_stand)
-    assert_response :success
-    assert_equal '/', @response.body
-  end
-
-  def test_url_for_view_canvas
-    get(:url_for_view_canvas)
-    assert_response :success
-    assert_equal 'http://apps.facebook.com/can/',
-      @response.body
-  end
-
-  def test_link_to_stand
-    get(:link_to_stand)
-    assert_response :success
-    assert_equal '<a href="/">test</a>', @response.body
-  end
-
-  def test_link_to_canvas
-    get(:link_to_canvas)
-    assert_response :success
-    assert_equal '<a href="http://apps.facebook.com/can/">test</a>',
-      @response.body
-  end
-
-  def test_redirect_stand
-    get(:redirect_stand)
-    assert_response :redirect
-    assert_redirected_to '/'
-  end
-
-  def test_redirect_canvas
-    get(:redirect_canvas)
-    assert_response :redirect
-    assert_redirected_to 'http://apps.facebook.com/can/'
-  end
 end

data/lib/rest-graph/facebook_util.rb

@@ -0,0 +1,27 @@
+
+require 'rest-graph'
+
+module RestGraph::FacebookUtil
+  module_function
+  def ext_perm
+    %w[publish_stream create_event rsvp_event sms offline_access manage_pages
+       email read_insights read_stream read_mailbox ads_management xmpp_login
+       user_about_me user_activities user_birthday user_education_history
+       user_events user_groups user_hometown user_interests user_likes
+       user_location user_notes user_online_presence user_photo_video_tags
+       user_photos user_relationships user_religion_politics user_status
+       user_videos user_videos user_work_history read_friendlists read_requests
+       friends_about_me friends_activities friends_birthday
+       friends_education_history friends_events friends_groups friends_hometown
+       friends_interests friends_likes friends_location friends_notes
+       friends_online_presence friends_photo_video_tags friends_photos
+       friends_relationships friends_religion_politics friends_status
+       friends_videos friends_website friends_work_history]
+  end
+
+  def method_name
+
+  end
+end
+
+RestGraph.send(:include, RestGraph::FacebookUtil)

data/lib/rest-graph/rails_util.rb

@@ -1,16 +1,16 @@
 
 require 'rest-graph'
 
+module RestGraph::DefaultAttributes
+  def default_canvas
+    ''
+  end
+end
+
 module RestGraph::RailsUtil
   module Helper
-    def url_for options
-      caller = respond_to?(:controller) ? controller : self
-      if caller.rest_graph_in_canvas? && options.kind_of?(Hash)
-        super({:host => "apps.facebook.com/#{RestGraph.default_canvas}"}.
-              merge(options))
-      else
-        super(options)
-      end
+    def rest_graph
+      controller.rest_graph
     end
   end
 
@@ -18,17 +18,16 @@ module RestGraph::RailsUtil
     controller.rescue_from(::RestGraph::Error){ |exception|
       logger.debug("DEBUG: RestGraph: action halt")
     }
-    controller.send(:include, ::RestGraph::RailsUtil::Helper)
     controller.helper(::RestGraph::RailsUtil::Helper)
   end
 
   def rest_graph_options
     @rest_graph_options ||=
-      {:canvas                 => false,
-       :auto_authorize         => true,
+      {:canvas                 => '',
+       :auto_authorize         => false,
        :auto_authorize_options => {},
-       :auto_authorize_scope   =>
-         'offline_access,publish_stream,read_friendlists'}
+       :auto_authorize_scope   => '',
+       :write_session          => false}
   end
 
   def rest_graph_options_new
@@ -41,43 +40,17 @@ module RestGraph::RailsUtil
     rest_graph_options    .merge!(rest_graph_extract_options(options, :reject))
     rest_graph_options_new.merge!(rest_graph_extract_options(options, :select))
 
-    # exchange the code with access_token
-    if params[:code]
-      rest_graph.authorize!(:code => params[:code],
-                            :redirect_uri => rest_graph_normalized_request_uri)
-      logger.debug(
-        "DEBUG: RestGraph: detected code with "  \
-        "#{rest_graph_normalized_request_uri}, " \
-        "parsed: #{rest_graph.data.inspect}")
-    end
-
-    # if the code is bad or not existed,
-    # check if there's one in session,
-    # meanwhile, there the sig and access_token is correct,
-    # that means we're in the context of canvas
-    if !rest_graph.authorized? && params[:session]
-      rest_graph.parse_json!(params[:session])
-      logger.debug("DEBUG: RestGraph: detected session, parsed:" \
-                   " #{rest_graph.data.inspect}")
-
-      if rest_graph.authorized?
-        @fb_sig_in_canvas = true
-      else
-        logger.warn("WARN: RestGraph: bad session: #{params[:session]}")
-      end
-    end
-
-    # if we're not in canvas nor code passed,
-    # we could check out cookies as well.
-    if !rest_graph.authorized?
-      rest_graph.parse_cookies!(cookies)
-      logger.debug("DEBUG: RestGraph: detected cookies, parsed:" \
-                   " #{rest_graph.data.inspect}")
-    end
+    rest_graph_check_cookie
+    rest_graph_check_params_session
+    rest_graph_check_code
 
     # there are above 3 ways to check the user identity!
     # if nor of them passed, then we can suppose the user
-    # didn't authorize for us
+    # didn't authorize for us, but we can check if user has authorized
+    # before, in that case, the fbs would be inside session,
+    # as we just saved it there
+
+    rest_graph_check_rails_session
   end
 
   # override this if you need different app_id and secret
@@ -85,17 +58,20 @@ module RestGraph::RailsUtil
     @rest_graph ||= RestGraph.new(rest_graph_options_new)
   end
 
-  def rest_graph_authorize error
+  def rest_graph_authorize error=nil, redirect=false
     logger.warn("WARN: RestGraph: #{error.inspect}")
 
-    @rest_graph_authorize_url = rest_graph.authorize_url(
-      {:redirect_uri => rest_graph_normalized_request_uri,
-       :scope        => rest_graph_options[:auto_authorize_scope]}.
-      merge(            rest_graph_options[:auto_authorize_options]))
+    if redirect || rest_graph_auto_authorize?
+      @rest_graph_authorize_url = rest_graph.authorize_url(
+        {:redirect_uri => rest_graph_normalized_request_uri,
+         :scope        => rest_graph_options[:auto_authorize_scope]}.
+        merge(            rest_graph_options[:auto_authorize_options]))
+
+      logger.debug("DEBUG: RestGraph: redirect to #{@rest_graph_authorize_url}")
 
-    logger.debug("DEBUG: RestGraph: redirect to #{@rest_graph_authorize_url}")
+      rest_graph_authorize_redirect
+    end
 
-    rest_graph_authorize_redirect if rest_graph_options[:auto_authorize]
     raise ::RestGraph::Error.new(error)
   end
 
@@ -126,6 +102,73 @@ module RestGraph::RailsUtil
     end
   end
 
+  module_function
+
+  # ==================== checking utility ====================
+
+  # if we're not in canvas nor code passed,
+  # we could check out cookies as well.
+  def rest_graph_check_cookie
+    return if rest_graph.authorized? ||
+              !cookies["fbs_#{rest_graph.app_id}"]
+
+    rest_graph.parse_cookies!(cookies)
+    logger.debug("DEBUG: RestGraph: detected cookies, parsed:" \
+                 " #{rest_graph.data.inspect}")
+  end
+
+  # if the code is bad or not existed,
+  # check if there's one in session,
+  # meanwhile, there the sig and access_token is correct,
+  # that means we're in the context of canvas
+  def rest_graph_check_params_session
+     return if rest_graph.authorized? || !params[:session]
+
+    rest_graph.parse_json!(params[:session])
+    logger.debug("DEBUG: RestGraph: detected session, parsed:" \
+                 " #{rest_graph.data.inspect}")
+
+    if rest_graph.authorized?
+      @fb_sig_in_canvas = true
+    else
+      logger.warn("WARN: RestGraph: bad session: #{params[:session]}")
+    end
+
+    rest_graph_write_session
+  end
+
+  # exchange the code with access_token
+  def rest_graph_check_code
+    return if rest_graph.authorized? || !params[:code]
+
+    rest_graph.authorize!(:code => params[:code],
+                          :redirect_uri => rest_graph_normalized_request_uri)
+    logger.debug(
+      "DEBUG: RestGraph: detected code with "  \
+      "#{rest_graph_normalized_request_uri}, " \
+      "parsed: #{rest_graph.data.inspect}")
+
+    rest_graph_write_session
+  end
+
+  def rest_graph_check_rails_session
+    return if rest_graph.authorized? || !session['fbs']
+
+    rest_graph.parse_fbs!(session['fbs'])
+    logger.debug("DEBUG: RestGraph: detected session, parsed:" \
+                 " #{rest_graph.data.inspect}")
+  end
+
+  # ==================== others ====================
+
+  def rest_graph_write_session
+    return if !rest_graph.authorized? || !rest_graph_options[:write_session]
+
+    fbs = rest_graph.data.to_a.map{ |k_v| k_v.join('=') }.join('&')
+    session['fbs'] = fbs
+    logger.debug("DEBUG: RestGraph: wrote session: fbs => #{fbs}")
+  end
+
   def rest_graph_log duration, url
     logger.debug("DEBUG: RestGraph: spent #{duration} requesting #{url}")
   end
@@ -133,7 +176,7 @@ module RestGraph::RailsUtil
   def rest_graph_normalized_request_uri
     if rest_graph_in_canvas?
       "http://apps.facebook.com/" \
-      "#{RestGraph.default_canvas}#{request.request_uri}"
+      "#{rest_graph_canvas}#{request.request_uri}"
     else
       request.url
     end.sub(/[\&\?]session=[^\&]+/, '').
@@ -141,7 +184,21 @@ module RestGraph::RailsUtil
   end
 
   def rest_graph_in_canvas?
-    rest_graph_options[:canvas] || @fb_sig_in_canvas
+    !rest_graph_options[:canvas].empty?
+  end
+
+  def rest_graph_canvas
+    if rest_graph_options[:canvas].empty?
+      RestGraph.default_canvas
+    else
+      rest_graph_options[:canvas]
+    end
+  end
+
+  def rest_graph_auto_authorize?
+    !rest_graph_options[:auto_authorize_scope  ].empty? ||
+    !rest_graph_options[:auto_authorize_options].empty? ||
+     rest_graph_options[:auto_authorize]
   end
 
   def rest_graph_extract_options options, method

data/lib/rest-graph/version.rb

@@ -1,4 +1,4 @@
 
 require 'rest-graph'
 
-RestGraph::VERSION = '1.3.0'
+RestGraph::VERSION = '1.4.0'

data/rest-graph.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest-graph}
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cardinal Blue", "Lin Jen-Shin (aka godfat 真常)"]
-  s.date = %q{2010-06-10}
+  s.date = %q{2010-07-15}
   s.description = %q{ A super simple Facebook Open Graph API client}
   s.email = %q{dev (XD) cardinalblue.com}
-  s.extra_rdoc_files = ["CHANGES", "LICENSE", "TODO", "example/rails/README", "example/rails/config/rest-graph.yaml", "example/rails/log", "example/rails/script/console", "example/rails/script/server", "rest-graph.gemspec"]
-  s.files = ["CHANGES", "LICENSE", "README.rdoc", "Rakefile", "TODO", "example/rails/README", "example/rails/Rakefile", "example/rails/app/controllers/application_controller.rb", "example/rails/config/boot.rb", "example/rails/config/environment.rb", "example/rails/config/environments/development.rb", "example/rails/config/environments/production.rb", "example/rails/config/environments/test.rb", "example/rails/config/initializers/cookie_verification_secret.rb", "example/rails/config/initializers/new_rails_defaults.rb", "example/rails/config/initializers/session_store.rb", "example/rails/config/rest-graph.yaml", "example/rails/config/routes.rb", "example/rails/log", "example/rails/script/console", "example/rails/script/server", "example/rails/test/functional/application_controller_test.rb", "example/rails/test/test_helper.rb", "init.rb", "lib/rest-graph.rb", "lib/rest-graph/auto_load.rb", "lib/rest-graph/load_config.rb", "lib/rest-graph/rails_util.rb", "lib/rest-graph/version.rb", "rest-graph.gemspec", "test/common.rb", "test/config/rest-graph.yaml", "test/test_default.rb", "test/test_handler.rb", "test/test_load_config.rb", "test/test_oauth.rb", "test/test_old.rb", "test/test_parse.rb", "test/test_rest-graph.rb"]
+  s.extra_rdoc_files = ["CHANGES", "LICENSE", "README", "TODO", "example/rails/README", "example/rails/config/rest-graph.yaml", "example/rails/log", "example/rails/script/console", "example/rails/script/server", "rest-graph.gemspec"]
+  s.files = ["CHANGES", "LICENSE", "README", "README.rdoc", "Rakefile", "TODO", "example/rails/README", "example/rails/Rakefile", "example/rails/app/controllers/application_controller.rb", "example/rails/config/boot.rb", "example/rails/config/environment.rb", "example/rails/config/environments/development.rb", "example/rails/config/environments/production.rb", "example/rails/config/environments/test.rb", "example/rails/config/initializers/cookie_verification_secret.rb", "example/rails/config/initializers/new_rails_defaults.rb", "example/rails/config/initializers/session_store.rb", "example/rails/config/rest-graph.yaml", "example/rails/config/routes.rb", "example/rails/log", "example/rails/script/console", "example/rails/script/server", "example/rails/test/functional/application_controller_test.rb", "example/rails/test/test_helper.rb", "init.rb", "lib/rest-graph.rb", "lib/rest-graph/auto_load.rb", "lib/rest-graph/facebook_util.rb", "lib/rest-graph/load_config.rb", "lib/rest-graph/rails_util.rb", "lib/rest-graph/version.rb", "rest-graph.gemspec", "test/common.rb", "test/config/rest-graph.yaml", "test/test_default.rb", "test/test_handler.rb", "test/test_load_config.rb", "test/test_oauth.rb", "test/test_old.rb", "test/test_parse.rb", "test/test_rest-graph.rb"]
   s.homepage = %q{http://github.com/cardinalblue/rest-graph}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -24,29 +24,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.5.1"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 1.6.0"])
       s.add_development_dependency(%q<json>, [">= 1.4.3"])
-      s.add_development_dependency(%q<rack>, [">= 1.1.0"])
+      s.add_development_dependency(%q<rack>, [">= 1.2.1"])
       s.add_development_dependency(%q<rr>, [">= 0.10.11"])
-      s.add_development_dependency(%q<webmock>, [">= 1.2.2"])
+      s.add_development_dependency(%q<webmock>, [">= 1.3.1"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_development_dependency(%q<bones>, [">= 3.4.6"])
+      s.add_development_dependency(%q<bones>, [">= 3.4.7"])
     else
-      s.add_dependency(%q<rest-client>, [">= 1.5.1"])
+      s.add_dependency(%q<rest-client>, [">= 1.6.0"])
       s.add_dependency(%q<json>, [">= 1.4.3"])
-      s.add_dependency(%q<rack>, [">= 1.1.0"])
+      s.add_dependency(%q<rack>, [">= 1.2.1"])
       s.add_dependency(%q<rr>, [">= 0.10.11"])
-      s.add_dependency(%q<webmock>, [">= 1.2.2"])
+      s.add_dependency(%q<webmock>, [">= 1.3.1"])
       s.add_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_dependency(%q<bones>, [">= 3.4.6"])
+      s.add_dependency(%q<bones>, [">= 3.4.7"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 1.5.1"])
+    s.add_dependency(%q<rest-client>, [">= 1.6.0"])
     s.add_dependency(%q<json>, [">= 1.4.3"])
-    s.add_dependency(%q<rack>, [">= 1.1.0"])
+    s.add_dependency(%q<rack>, [">= 1.2.1"])
     s.add_dependency(%q<rr>, [">= 0.10.11"])
-    s.add_dependency(%q<webmock>, [">= 1.2.2"])
+    s.add_dependency(%q<webmock>, [">= 1.3.1"])
     s.add_dependency(%q<bacon>, [">= 1.1.0"])
-    s.add_dependency(%q<bones>, [">= 3.4.6"])
+    s.add_dependency(%q<bones>, [">= 3.4.7"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest-graph
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Cardinal Blue
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +08:00
+date: 2010-07-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 6
+        - 0
+        version: 1.6.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 29
         segments: 
         - 1
+        - 2
         - 1
-        - 0
-        version: 1.1.0
+        version: 1.2.1
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -91,12 +91,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 1
-        - 2
-        - 2
-        version: 1.2.2
+        - 3
+        - 1
+        version: 1.3.1
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -123,12 +123,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 3
         - 4
-        - 6
-        version: 3.4.6
+        - 7
+        version: 3.4.7
   type: :development
   version_requirements: *id007
 description: " A super simple Facebook Open Graph API client"
@@ -140,6 +140,7 @@ extensions: []
 extra_rdoc_files: 
 - CHANGES
 - LICENSE
+- README
 - TODO
 - example/rails/README
 - example/rails/config/rest-graph.yaml
@@ -150,6 +151,7 @@ extra_rdoc_files:
 files: 
 - CHANGES
 - LICENSE
+- README
 - README.rdoc
 - Rakefile
 - TODO
@@ -174,6 +176,7 @@ files:
 - init.rb
 - lib/rest-graph.rb
 - lib/rest-graph/auto_load.rb
+- lib/rest-graph/facebook_util.rb
 - lib/rest-graph/load_config.rb
 - lib/rest-graph/rails_util.rb
 - lib/rest-graph/version.rb