koala 1.2.0 → 1.3.0

data/spec/fixtures/mock_facebook_responses.yml

@@ -14,26 +14,15 @@
 rest_api:
 
 # -- Stubbed Responses --
-  /method/fql.query:
+  /method/admin.setAppProperties:
+    'properties={"desktop":0}':
+      post:
+        with_token: 'true'
+  /method/fql.query: # for testing the beta tier
     query=select first_name from user where uid = 2901279:
       get:
         no_token: '[{"first_name":"Luke"}]'
         with_token: '[{"first_name":"Luke"}]'
-    query=select read_stream from permissions where uid = 2901279:
-      get:
-        with_token: '[{"read_stream":1}]'
-        no_token: '{"error_code":104,"error_msg":"Requires valid signature","request_args":[{"key":"method","value":"fql.query"},{"key":"format","value":"json"},{"key":"query","value":"select read_stream from permissions where uid = 2901279"}]}'
-
-  /method/fql.multiquery:
-    'queries=<%= MultiJson.encode({"query1" => "select post_id from stream where source_id = me()", "query2" => "select fromid from comment where post_id in (select post_id from #query1)", "query3" => "select uid, name from user where uid in (select fromid from #query2)"}) %>':
-      get:
-        with_token: '[{"name":"query1", "fql_result_set":[]},{"name":"query2", "fql_result_set":[]},{"name":"query3", "fql_result_set":[]}]'
-        no_token: '{"error_code":104,"error_msg":"Requires valid signature","request_args":[{"key":"method","value":"fql.query"},{"key":"format","value":"json"},{"key":"query","value":"select read_stream from permissions where uid = 2901279"}]}'
-    'queries=<%= MultiJson.encode({"query1" => "select first_name from user where uid = 2901279", "query2" => "select first_name from user where uid = 2905623"}) %>':
-      get:
-        with_token: '[{"name":"query1", "fql_result_set":[{"first_name":"Luke"}]},{"name":"query2", "fql_result_set":[{"first_name":"Alex"}]}]'
-        no_token: '[{"name":"query1", "fql_result_set":[{"first_name":"Luke"}]},{"name":"query2", "fql_result_set":[{"first_name":"Alex"}]}]'
-
 
 
 
@@ -148,6 +137,12 @@ graph_api:
     message=Hello, world, from the test suite, testing comments!:
       post:
         with_token: '{"id": "MOCK_FEED_ITEM"}'
+    message=Hello, world, from the test suite, testing comments again!:
+      post:
+        with_token: '{"id": "MOCK_FEED_ITEM"}'
+    message=Hello, world, from the test suite, testing liking!:
+      post:
+        with_token: '{"id": "MOCK_FEED_ITEM"}'
     message=the cats are asleep:
       post:
         with_token: '{"id": "FEED_ITEM_CATS"}'
@@ -160,6 +155,9 @@ graph_api:
     link=http://oauth.twoalex.com/&message=Hello, world, from the test suite again!&name=OAuth Playground:
       post:
         with_token: '{"id": "FEED_ITEM_CONTEXT"}'
+    link=http://oauth.twoalex.com/&message=body&name=It's a big question&picture=http://oauth.twoalex.com//images/logo.png&properties=<%= {"name"=>"Link1'", "text"=>"Left", "href"=>"http://oauth.twoalex.com/"}.to_s %>=<%= {"name"=>"other", "text"=>"Straight ahead"}.to_s %>&type=link:
+      post:
+        with_token: '{"id": "FEED_ITEM_CONTEXT"}'        
 
   /me/photos:
     source=[FILE]:
@@ -214,29 +212,26 @@ graph_api:
         with_token: '{"data": [{}], "paging": {}}'
 
   /lukeshepard/picture:
-    type=large:
+    no_args:
       get:
         no_token:
           code: 302
           headers:
-            Location: https://facebook.com/large
+            Location: http://facebook.com/
         with_token:
           code: 302
           headers:
-            Location: https://facebook.com/large
-
-
-  /chris.baclig/picture:
-    no_args:
+            Location: http://facebook.com/
+    type=large:
       get:
         no_token:
           code: 302
           headers:
-            Location: http://facebook.com/
+            Location: https://facebook.com/large
         with_token:
           code: 302
           headers:
-            Location: http://facebook.com/
+            Location: https://facebook.com/large
 
   /comments:
     ids=http://developers.facebook.com/blog/post/472:
@@ -266,6 +261,25 @@ graph_api:
         with_token: '{"data": [{"id": "507731521_100412693339488"}], "paging": {"previous": "https:\/\/graph.facebook.com\/7204941866\/photos?limit=25&until=2008-09-15T18%3A30%3A25%2B0000", "next": "https:\/\/graph.facebook.com\/7204941866\/photos?limit=25&until=2008-09-15T18%3A30%3A25%2B0000"}}'
         no_token: '{"data": [{"id": "507731521_100412693339488"}], "paging": {"previous": "https:\/\/graph.facebook.com\/7204941866\/photos?limit=25&until=2008-09-15T18%3A30%3A25%2B0000", "next": "https:\/\/graph.facebook.com\/7204941866\/photos?limit=25&until=2008-09-15T18%3A30%3A25%2B0000"}}'
 
+  /fql:
+    q=select uid, first_name from user where uid = 2901279:
+      get:
+        no_token: '[{"uid":2901279,"first_name":"Luke"}]'
+        with_token: '[{"uid":2901279,"first_name":"Luke"}]'
+    q=select read_stream from permissions where uid = 2901279:
+      get:
+        <<: *token_required
+        with_token: '[{"read_stream":1}]'
+    'q=<%= MultiJson.encode({"query1" => "select post_id from stream where source_id = me()", "query2" => "select fromid from comment where post_id in (select post_id from #query1)", "query3" => "select uid, name from user where uid in (select fromid from #query2)"}) %>':
+      get:
+        <<: *token_required
+        with_token: '[{"name":"query1", "fql_result_set":[]},{"name":"query2", "fql_result_set":[]},{"name":"query3", "fql_result_set":[]}]'
+    'q=<%= MultiJson.encode({"query1" => "select uid, first_name from user where uid = 2901279", "query2" => "select uid, first_name from user where uid = 2905623"}) %>':
+      get:
+        with_token: '[{"name":"query1", "fql_result_set":[{"uid":2901279,"first_name":"Luke"}]},{"name":"query2", "fql_result_set":[{"uid":"2905623","first_name":"Alex"}]}]'
+        no_token: '[{"name":"query1", "fql_result_set":[{"uid":2901279,"first_name":"Luke"}]},{"name":"query2", "fql_result_set":[{"uid":"2905623","first_name":"Alex"}]}]'
+
+
   '/115349521819193_113815981982767':
     no_args:
       delete:
@@ -277,6 +291,12 @@ graph_api:
         <<: *token_required
         with_token: '{"access_token": "<%= APP_ACCESS_TOKEN %>"}'
 
+
+  '/<%= APP_ID %>':
+    restrictions=<%= MultiJson.encode({"age_distr" => "13+"}) %>:
+      post:
+        with_token: "true"
+
   # -- OAuth responses --
   /oauth/access_token:
     client_id=<%= APP_ID %>&client_secret=<%= SECRET %>&code=<%= OAUTH_CODE %>&redirect_uri=<%= OAUTH_DATA["callback_url"] %>:
@@ -313,6 +333,10 @@ graph_api:
       post:
         with_token:
           code: 200
+    callback_url=<%= SUBSCRIPTION_DATA["subscription_path"] %>&fields=name&object=user:
+      post:
+        with_token:
+          code: 200
     callback_url=<%= SUBSCRIPTION_DATA["subscription_path"] %>foo&fields=name&object=user&verify_token=<%= SUBSCRIPTION_DATA["verify_token"] %>:
       post:
         with_token: '{"error":{"type":"Exception","message":"(#2200) subscription validation failed"}}'
@@ -402,7 +426,7 @@ graph_api:
         with_token: '{"id": "888888888", "access_token":"<%= ACCESS_TOKEN %>", "login_url":"https://www.facebook.com/platform/test_account.."}'
     no_args:
       get:
-        with_token: '{"data":[{"id": "999999999", "access_token":"<%= ACCESS_TOKEN %>", "login_url":"https://www.facebook.com/platform/test_account.."}, {"id": "888888888", "access_token":"119908831367602|o3wswWQ88LYjEC9-ukR_gjRIOMw.", "login_url":"https://www.facebook.com/platform/test_account.."}]}'
+        with_token: '{"data":[{"id": "999999999", "access_token":"<%= ACCESS_TOKEN %>", "login_url":"https://www.facebook.com/platform/test_account.."}, {"id": "888888888", "access_token":"119908831367602|o3wswWQ88LYjEC9-ukR_gjRIOMw.", "login_url":"https://www.facebook.com/platform/test_account.."}], "paging":{"next":"https://graph.facebook.com/119908831367602/accounts/test-users?access_token=119908831367602|o3wswWQ88LYjEC9-ukR_gjRIOMw&limit=50&offset=50&__after_id=100003241848740"}}'
 
   /999999999:
     no_args:

data/spec/spec_helper.rb

@@ -21,6 +21,9 @@ end
 # See https://github.com/tenderlove/psych/issues/8 for more details
 YAML::ENGINE.yamler = 'syck' if RUBY_VERSION == '1.9.2' && RUBY_PATCHLEVEL < 290
 
+# load custom RSpec matchers
+require 'support/custom_matchers'
+
 # load the library
 require 'koala'
 

data/spec/support/custom_matchers.rb

@@ -0,0 +1,28 @@
+# Verifies that two URLs are equal, ignoring the order of the query string parameters
+RSpec::Matchers.define :match_url do |url|
+  match do |original_url|
+    base, query_string = url.split("?")
+    original_base, original_query_string = original_url.split("?")
+    query_hash = query_to_params(query_string)
+    original_query_hash = query_to_params(original_query_string)
+
+    # the base URLs need to match
+    base.should == original_base
+    
+    # the number of parameters should match (avoid one being a subset of the other)
+    query_hash.values.length.should == original_query_hash.values.length
+    
+    # and ensure all the keys and values match
+    query_hash.each_pair do |key, value|
+      original_query_hash[key].should == value
+    end
+  end
+  
+  def query_to_params(query_string)
+    query_string.split("&").inject({}) do |hash, segment|
+      k, v = segment.split("=")
+      hash[k] = v
+      hash
+    end
+  end
+end