rest-graph 1.4.2 → 1.4.3

data/CHANGES

@@ -1,5 +1,18 @@
 = rest-graph changes history
 
+== rest-graph 1.4.3 -- 2010-08-06
+
+* [RestGraph] Fixed a bug in RestGraph#fbs, which didn't join '&'.
+              Thanks, Andrew.
+
+* [RailsUtil] Fixed a bug that wrongly rewrites request URI.
+              Previously it is processed by regular expressions,
+              now we're using URI.parse to handle this. Closed #4.
+              Thanks, Justin.
+
+* [RailsUtil] Favor Request#fullpath over Request#request_uri,
+              which came from newer Rack and thus for Rails 3.
+
 == rest-graph 1.4.2 -- 2010-08-05
 
 * [RestGraph] Added RestGraph#fbs to generate fbs with correct sig,
@@ -9,7 +22,7 @@
 * [RailsUtil] Fixed a bug that write_session didn't parse because parse_fbs!
               reject the fbs due to missing sig.
 * [RailsUtil] Fixed a bug that in Rails 3, must call safe_html to prevent
-              unintended HTML escaping.
+              unintended HTML escaping. Thanks, Justin.
 
 * Thanks a lot, Andrew.
 

data/README

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

data/README.rdoc

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

data/example/rails/test/test_helper.rb

@@ -1,3 +1,4 @@
+
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'

data/example/rails/test/unit/rails_util_test.rb

@@ -0,0 +1,32 @@
+
+require 'test_helper'
+require 'rr'
+
+class RailsUtilTest < ActiveSupport::TestCase
+  include RR::Adapters::TestUnit
+
+  def setup_mock url
+    mock(RestGraph::RailsUtil).rest_graph_in_canvas?{ false }
+    mock(RestGraph::RailsUtil).request{
+      mock(Object.new).url{ url }
+    }
+  end
+
+  def test_rest_graph_normalized_request_uri_0
+    setup_mock(  'http://test.com/?code=123&lang=en')
+    assert_equal('http://test.com/?lang=en',
+                 RestGraph::RailsUtil.rest_graph_normalized_request_uri)
+  end
+
+  def test_rest_graph_normalized_request_uri_1
+    setup_mock(  'http://test.com/?lang=en&code=123')
+    assert_equal('http://test.com/?lang=en',
+                 RestGraph::RailsUtil.rest_graph_normalized_request_uri)
+  end
+
+  def test_rest_graph_normalized_request_uri_2
+    setup_mock(  'http://test.com/?session=abc&lang=en&code=123')
+    assert_equal('http://test.com/?lang=en',
+                 RestGraph::RailsUtil.rest_graph_normalized_request_uri)
+  end
+end

data/lib/rest-graph/rails_util.rb

@@ -237,13 +237,19 @@ module RestGraph::RailsUtil
   end
 
   def rest_graph_normalized_request_uri
-    if rest_graph_in_canvas?
-      "http://apps.facebook.com/" \
-      "#{rest_graph_oget(:canvas)}#{request.request_uri}"
-    else
-      request.url
-    end.sub(/[\&\?]session=[^\&]+/, '').
-        sub(/[\&\?]code=[^\&]+/, '')
+    URI.parse(if rest_graph_in_canvas?
+                # rails 3 uses newer rack which has fullpath
+                "http://apps.facebook.com/#{rest_graph_oget(:canvas)}" +
+                (request.respond_to?(:fullpath) ?
+                  request.fullpath : request.request_uri)
+              else
+                request.url
+              end).
+      tap{ |uri|
+        uri.query = uri.query.split('&').reject{ |q|
+                      q =~ /^(code|session)\=/
+                    }.join('&') if uri.query
+      }.to_s
   end
 
   def rest_graph_in_canvas?

data/lib/rest-graph/version.rb

@@ -1,4 +1,4 @@
 
 require 'rest-graph'
 
-RestGraph::VERSION = '1.4.2'
+RestGraph::VERSION = '1.4.3'

data/lib/rest-graph.rb

@@ -131,7 +131,7 @@ class RestGraph < RestGraphStruct
   end
 
   def fbs
-    "#{fbs_without_sig(data)}&sig=#{calculate_sig(data)}"
+    "#{fbs_without_sig(data).join('&')}&sig=#{calculate_sig(data)}"
   end
 
   # facebook's new signed_request...
@@ -239,12 +239,11 @@ class RestGraph < RestGraphStruct
   end
 
   def calculate_sig cookies
-    Digest::MD5.hexdigest(fbs_without_sig(cookies) + secret)
+    Digest::MD5.hexdigest(fbs_without_sig(cookies).join + secret)
   end
 
   def fbs_without_sig cookies
-    cookies.reject{ |(k, v)| k == 'sig' }.sort.
-      map{ |a| a.join('=') }.join
+    cookies.reject{ |(k, v)| k == 'sig' }.sort.map{ |a| a.join('=') }
   end
 
   def cache_key uri

data/test/test_parse.rb

@@ -98,4 +98,12 @@ describe RestGraph do
     rg.parse_fbs!(rg.fbs.sub(/sig\=\w+/, 'sig=abc')).should == nil
   end
 
+  it 'could generate correct fbs with additional parameters' do
+    rg = RestGraph.new(:access_token => 'a', :secret => 'z')
+    rg.data['expires'] = '1234'
+    rg.parse_fbs!(rg.fbs)                           .should.kind_of?(Hash)
+    rg.data['access_token']                         .should == 'a'
+    rg.data['expires']                              .should == '1234'
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest-graph
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Cardinal Blue
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 +08:00
+date: 2010-08-06 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -177,6 +177,7 @@ files:
 - example/rails/script/server
 - example/rails/test/functional/application_controller_test.rb
 - example/rails/test/test_helper.rb
+- example/rails/test/unit/rails_util_test.rb
 - init.rb
 - lib/rest-graph.rb
 - lib/rest-graph/auto_load.rb