rest-graph 1.2.0 → 1.2.1

data/CHANGES

@@ -1,6 +1,14 @@
 = rest-graph changes history
 
-== rest-graph 1.2.0 -- ?
+== rest-graph 1.2.1 -- 2010-06-02
+* Deprecated RailsController, use RailsUtil instead.
+* Fixed a bug that passing access_token in query string
+  in RestGraph#authorize_url
+* Fixed a bug that Facebook changed the format (I think) of fbs_ in cookies.
+  Thanks betelgeuse, closes #1
+  http://github.com/cardinalblue/rest-graph/issues/issue/1
+
+== rest-graph 1.2.0 -- 2010-05-27
 * Add RestGraph#parse_json!
 * Add RailsController to help you integrate into Rails.
 * Simplify arguments checking and require dependency.

data/README.rdoc

@@ -1,4 +1,4 @@
-= rest-graph 1.2.0
+= rest-graph 1.2.1
 by Cardinal Blue ( http://cardinalblue.com )
 
 == LINKS:

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

@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
   # Scrub sensitive parameters from your log
   # filter_parameter_logging :password
 
-  include RestGraph::RailsController
+  include RestGraph::RailsUtil
   before_filter :setup_iframe
   before_filter :setup_rest_graph
 

data/lib/rest-graph.rb

@@ -117,12 +117,12 @@ class RestGraph < RestGraphStruct
 
   if RUBY_VERSION >= '1.9.1'
     def parse_rack_env! env
-      self.data = env['HTTP_COOKIE'] =~ /fbs_#{app_id}="(.+?)"/ &&
+      self.data = env['HTTP_COOKIE'] =~ /fbs_#{app_id}=([^\;]+)/ &&
         check_sig_and_return_data(Rack::Utils.parse_query($1))
     end
   else
     def parse_rack_env! env
-      self.data = (env['HTTP_COOKIE'] || '') =~ /fbs_#{app_id}="(.+?)"/ &&
+      self.data = (env['HTTP_COOKIE'] || '') =~ /fbs_#{app_id}=([^\;]+)/ &&
         check_sig_and_return_data(Rack::Utils.parse_query($1))
     end
   end
@@ -133,7 +133,7 @@ class RestGraph < RestGraphStruct
 
   def parse_fbs! fbs
     self.data = fbs &&
-      check_sig_and_return_data(Rack::Utils.parse_query(fbs[1..-2]))
+      check_sig_and_return_data(Rack::Utils.parse_query(fbs))
   end
 
   def parse_json! json
@@ -145,7 +145,7 @@ class RestGraph < RestGraphStruct
   # oauth related
 
   def authorize_url opts={}
-    query = {:client_id => app_id}.merge(opts)
+    query = {:client_id => app_id, :access_token => nil}.merge(opts)
     "#{graph_server}oauth/authorize#{build_query_string(query)}"
   end
 
@@ -168,7 +168,8 @@ class RestGraph < RestGraphStruct
   end
 
   def build_query_string query={}
-    q = query.merge(access_token ? {:access_token => access_token} : {})
+    qq = access_token ? {:access_token => access_token}.merge(query) : query
+    q  = qq.select{ |k, v| v }
     return '' if q.empty?
     return '?' + q.map{ |(k, v)| "#{k}=#{CGI.escape(v.to_s)}" }.join('&')
   end

data/lib/rest-graph/load_config.rb

@@ -3,7 +3,7 @@ require 'erb'
 require 'yaml'
 
 require 'rest-graph'
-require 'rest-graph/rails_controller' if Object.const_defined?(:Rails)
+require 'rest-graph/rails_util' if Object.const_defined?(:Rails)
 
 module RestGraph::LoadConfig
   module_function

data/lib/rest-graph/{rails_controller.rb → rails_util.rb}

@@ -1,7 +1,7 @@
 
 require 'rest-graph'
 
-module RestGraph::RailsController
+module RestGraph::RailsUtil
   module_function
   # filters for you
   def setup_iframe
@@ -98,3 +98,5 @@ module RestGraph::RailsController
         sub(/[\&\?]code=[^\&]+/, '')
   end
 end
+
+RestGraph::RailsController = RestGraph::RailsUtil

data/lib/rest-graph/version.rb

@@ -1,4 +1,4 @@
 
 require 'rest-graph'
 
-RestGraph::VERSION = '1.2.0'
+RestGraph::VERSION = '1.2.1'

data/rest-graph.gemspec

@@ -2,23 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest-graph}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   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-05-28}
-  s.description = %q{ A super simple Facebook Open Graph API client
- If you feel SYNOPSIS is so hard to understand, please read
- {examples}[http://github.com/cardinalblue/rest-graph/tree/master/example].}
+  s.date = %q{2010-06-02}
+  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/app/views/rest-graph.erb", "example/rails/config/rest-graph.yaml", "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/app/views/rest-graph.erb", "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/script/console", "example/rails/script/server", "init.rb", "lib/rest-graph.rb", "lib/rest-graph/auto_load.rb", "lib/rest-graph/load_config.rb", "lib/rest-graph/rails_controller.rb", "lib/rest-graph/version.rb", "rest-graph.gemspec", "test/common.rb", "test/config/rest-graph.yaml", "test/test_default.rb", "test/test_fql.rb", "test/test_handler.rb", "test/test_load_config.rb", "test/test_oauth.rb", "test/test_parse.rb", "test/test_rest-graph.rb"]
+  s.extra_rdoc_files = ["CHANGES", "LICENSE", "TODO", "example/rails/README", "example/rails/app/views/rest-graph/authorization.erb", "example/rails/config/rest-graph.yaml", "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/app/views/rest-graph/authorization.erb", "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/script/console", "example/rails/script/server", "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_fql.rb", "test/test_handler.rb", "test/test_load_config.rb", "test/test_oauth.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"]
   s.rubyforge_project = %q{rest-graph}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A super simple Facebook Open Graph API client If you feel SYNOPSIS is so hard to understand, please read {examples}[http://github}
+  s.summary = %q{A super simple Facebook Open Graph API client}
   s.test_files = ["test/test_default.rb", "test/test_fql.rb", "test/test_handler.rb", "test/test_load_config.rb", "test/test_oauth.rb", "test/test_parse.rb", "test/test_rest-graph.rb"]
 
   if s.respond_to? :specification_version then

data/test/test_oauth.rb

@@ -31,4 +31,9 @@ describe RestGraph do
     @rg.data.should == result
   end
 
+  it 'would not append access_token in authorize_url even presented' do
+    RestGraph.new(:access_token => 'do not use me').authorize_url.
+      should == 'https://graph.facebook.com/oauth/authorize'
+  end
+
 end

data/test/test_parse.rb

@@ -18,8 +18,8 @@ describe RestGraph do
     app_id       = '1829'
     secret       = app_id.reverse
     sig          = '398262caea8442bd8801e8fba7c55c8a'
-    fbs          = "\"access_token=#{CGI.escape(access_token)}&expires=0&" \
-                   "secret=abc&session_key=def-456&sig=#{sig}&uid=3\""
+    fbs          = "access_token=#{CGI.escape(access_token)}&expires=0&" \
+                   "secret=abc&session_key=def-456&sig=#{sig}&uid=3"
 
     check = lambda{ |token|
       http_cookie =

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest-graph
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Cardinal Blue
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 +08:00
+date: 2010-06-02 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,7 +142,7 @@ extra_rdoc_files:
 - LICENSE
 - TODO
 - example/rails/README
-- example/rails/app/views/rest-graph.erb
+- example/rails/app/views/rest-graph/authorization.erb
 - example/rails/config/rest-graph.yaml
 - example/rails/script/console
 - example/rails/script/server
@@ -156,7 +156,7 @@ files:
 - example/rails/README
 - example/rails/Rakefile
 - example/rails/app/controllers/application_controller.rb
-- example/rails/app/views/rest-graph.erb
+- example/rails/app/views/rest-graph/authorization.erb
 - example/rails/config/boot.rb
 - example/rails/config/environment.rb
 - example/rails/config/environments/development.rb
@@ -173,7 +173,7 @@ files:
 - lib/rest-graph.rb
 - lib/rest-graph/auto_load.rb
 - lib/rest-graph/load_config.rb
-- lib/rest-graph/rails_controller.rb
+- lib/rest-graph/rails_util.rb
 - lib/rest-graph/version.rb
 - rest-graph.gemspec
 - test/common.rb