koala 1.0.0 → 1.1.0rc

data/spec/support/rest_api_shared_examples.rb

@@ -87,6 +87,29 @@ shared_examples_for "Koala RestAPI" do
 
       @api.rest_call('anything', {}, options)
     end
+    
+    it "uses get by default" do
+      @api.should_receive(:api).with(
+        anything,
+        anything,
+        "get",
+        anything
+      )
+
+      @api.rest_call('anything')
+    end
+    
+    it "allows you to specify other http methods as the last argument" do
+      method = 'bar'
+      @api.should_receive(:api).with(
+        anything,
+        anything,
+        method,
+        anything
+      )
+
+      @api.rest_call('anything', {}, {}, method)
+    end
 
     it "should throw an APIError if the result hash has an error key" do
       Koala.stub(:make_request).and_return(Koala::Response.new(500, {"error_code" => "An error occurred!"}, {}))
@@ -96,8 +119,7 @@ shared_examples_for "Koala RestAPI" do
     describe "when making a FQL request" do
       it "should call fql.query method" do
         @api.should_receive(:rest_call).with(
-          "fql.query",
-          anything
+          "fql.query", anything, anything
         ).and_return(Koala::Response.new(200, "2", {}))
 
         @api.fql_query stub('query string')
@@ -107,17 +129,78 @@ shared_examples_for "Koala RestAPI" do
         query = stub('query string')
 
         @api.should_receive(:rest_call).with(
-          anything,
-          hash_including("query" => query)
+          anything, hash_including(:query => query), anything
         )
 
         @api.fql_query(query)
       end
+      
+      it "should pass on any other arguments provided" do
+        args = {:a => 2}
+        @api.should_receive(:rest_call).with(anything, hash_including(args), anything)
+        @api.fql_query("a query", args)
+      end
+      
+      it "should pass on any http options provided" do
+        opts = {:a => 2}
+        @api.should_receive(:rest_call).with(anything, anything, hash_including(opts))
+        @api.fql_query("a query", {}, opts)
+      end
+    end
+    
+    describe "when making a FQL-multiquery request" do
+      it "should call fql.multiquery method" do
+        @api.should_receive(:rest_call).with(
+          "fql.multiquery", anything, anything
+        ).and_return({})
+
+        @api.fql_multiquery stub('query string')
+      end
+
+      it "should pass a queries argument" do
+        queries = stub('query string')
+        queries_json = "some JSON"
+        queries.stub(:to_json).and_return(queries_json)
+        
+        @api.should_receive(:rest_call).with(
+          anything,
+          hash_including(:queries => queries_json),
+          anything
+        )
+
+        @api.fql_multiquery(queries)
+      end
+      
+      it "simplifies the response format" do
+        raw_results = [
+          {"name" => "query1", "fql_result_set" => [1, 2, 3]},
+          {"name" => "query2", "fql_result_set" => [:a, :b, :c]}
+        ]
+        expected_results = {
+          "query1" => [1, 2, 3],
+          "query2" => [:a, :b, :c]
+        }
+        
+        @api.stub(:rest_call).and_return(raw_results)
+        results = @api.fql_multiquery({:query => true})
+        results.should == expected_results
+      end
+      
+      it "should pass on any other arguments provided" do
+        args = {:a => 2}
+        @api.should_receive(:rest_call).with(anything, hash_including(args), anything)
+        @api.fql_multiquery("a query", args)
+      end
+      
+      it "should pass on any http options provided" do
+        opts = {:a => 2}
+        @api.should_receive(:rest_call).with(anything, anything, hash_including(opts))
+        @api.fql_multiquery("a query", {}, opts)
+      end
     end
   end
 end
 
-
 shared_examples_for "Koala RestAPI with an access token" do
   # FQL
   it "should be able to access public information via FQL" do
@@ -126,6 +209,16 @@ shared_examples_for "Koala RestAPI with an access token" do
     result.first['first_name'].should == 'Chris'
   end
 
+  it "should be able to access public information via FQL.multiquery" do
+    result = @api.fql_multiquery(
+      :query1 => 'select first_name from user where uid = 216743',
+      :query2 => 'select first_name from user where uid = 2905623'
+    )
+    result.size.should == 2
+    result["query1"].first['first_name'].should == 'Chris'
+    result["query2"].first['first_name'].should == 'Alex'
+  end
+
   it "should be able to access protected information via FQL" do
     # Tests agains the permissions fql table
 
@@ -138,10 +231,21 @@ shared_examples_for "Koala RestAPI with an access token" do
     result = @api.fql_query("select read_stream from permissions where uid = #{id}")
 
     result.size.should == 1
-    # we assume that you have read_stream permissions, so we can test against that
-    # (should we keep this?)
+    # we've verified that you have read_stream permissions, so we can test against that
     result.first["read_stream"].should == 1
   end
+  
+  
+  it "should be able to access protected information via FQL.multiquery" do
+    result = @api.fql_multiquery(
+      :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)"
+    )
+    result.size.should == 3 
+    result.keys.should include("query1", "query2", "query3")
+  end
+
 end
 
 
@@ -153,9 +257,29 @@ shared_examples_for "Koala RestAPI without an access token" do
       @result.size.should == 1
       @result.first["first_name"].should == "Chris"
     end
+    
+    it "should be able to access public information via FQL.multiquery" do
+      result = @api.fql_multiquery(
+        :query1 => 'select first_name from user where uid = 216743',
+        :query2 => 'select first_name from user where uid = 2905623'
+      )
+      result.size.should == 2
+      result["query1"].first['first_name'].should == 'Chris'
+      result["query2"].first['first_name'].should == 'Alex'
+    end
 
     it "should not be able to access protected information via FQL" do
       lambda { @api.fql_query("select read_stream from permissions where uid = 216743") }.should raise_error(Koala::Facebook::APIError)
     end
+    
+    it "should not be able to access protected information via FQL.multiquery" do
+      lambda { 
+        @api.fql_multiquery(
+          :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)"
+        ) 
+      }.should raise_error(Koala::Facebook::APIError)
+    end
   end
 end

data/spec/support/setup_mocks_or_live.rb

@@ -5,11 +5,11 @@ module KoalaTest
     # make sure we have the necessary permissions
     api = Koala::Facebook::GraphAndRestAPI.new(token)
     uid = api.get_object("me")["id"]
-    perms = api.fql_query("select read_stream, publish_stream, user_photos from permissions where uid = #{uid}")[0]
+    perms = api.fql_query("select read_stream, publish_stream, user_photos, read_insights from permissions where uid = #{uid}")[0]
     perms.each_pair do |perm, value|
-      unless value == 1
+      if value == (perm == "read_insights" ? 1 : 0) # live testing depends on insights calls failing 
         puts "failed!\n" # put a new line after the print above
-        raise ArgumentError, "Your access token must have the read_stream, publish_stream, and user_photos permissions.  You have: #{perms.inspect}"
+        raise ArgumentError, "Your access token must have the read_stream, publish_stream, and user_photos permissions, and lack read_insights.  You have: #{perms.inspect}"
       end
     end
     puts "done!"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: koala
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 7712002
+  prerelease: 5
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  - rc
+  version: 1.1.0rc
 platform: ruby
 authors: 
 - Alex Koppel, Chris Baclig, Rafi Jacoby, Context Optional
@@ -15,10 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 Z
+date: 2011-06-06 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +31,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :runtime
-  name: json
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,27 +46,26 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :runtime
-  name: multipart-post
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: multipart-post
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 9
         segments: 
         - 2
         - 5
-        - 0
-        version: 2.5.0
-  type: :development
-  name: rspec
+        version: "2.5"
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,11 +77,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  type: :development
-  name: rake
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,9 +93,9 @@ dependencies:
         - 2
         - 4
         version: 0.2.4
-  type: :development
-  name: typhoeus
   version_requirements: *id005
+  name: typhoeus
+  prerelease: false
 description: Koala is a lightweight, flexible Ruby SDK for Facebook.  It allows read/write access to the social graph via the Graph and REST APIs, as well as support for realtime updates and OAuth and Facebook Connect authentication.  Koala is fully tested and supports Net::HTTP and Typhoeus connections out of the box and can accept custom modules for other services.
 email: alex@alexkoppel.com
 executables: []
@@ -105,16 +106,22 @@ extra_rdoc_files:
 - readme.md
 - CHANGELOG
 files: 
+- .autotest
 - .gitignore
 - CHANGELOG
 - Gemfile
 - LICENSE
 - Manifest
 - Rakefile
+- autotest/discover.rb
 - koala.gemspec
 - lib/koala.rb
 - lib/koala/graph_api.rb
+- lib/koala/graph_api_batch.rb
 - lib/koala/http_services.rb
+- lib/koala/http_services/net_http_service.rb
+- lib/koala/http_services/typhoeus_service.rb
+- lib/koala/oauth.rb
 - lib/koala/realtime_updates.rb
 - lib/koala/rest_api.rb
 - lib/koala/test_users.rb
@@ -122,10 +129,12 @@ files:
 - readme.md
 - spec/cases/api_base_spec.rb
 - spec/cases/graph_and_rest_api_spec.rb
+- spec/cases/graph_api_batch_spec.rb
 - spec/cases/graph_api_spec.rb
 - spec/cases/http_services/http_service_spec.rb
 - spec/cases/http_services/net_http_service_spec.rb
 - spec/cases/http_services/typhoeus_service_spec.rb
+- spec/cases/koala_spec.rb
 - spec/cases/oauth_spec.rb
 - spec/cases/realtime_updates_spec.rb
 - spec/cases/rest_api_spec.rb
@@ -141,6 +150,7 @@ files:
 - spec/support/rest_api_shared_examples.rb
 - spec/support/setup_mocks_or_live.rb
 - spec/support/uploadable_io_shared_examples.rb
+has_rdoc: true
 homepage: http://github.com/arsduo/koala
 licenses: []
 
@@ -174,17 +184,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A lightweight, flexible library for Facebook with support for the Graph API, the REST API, realtime updates, and OAuth authentication.
 test_files: 
 - spec/cases/api_base_spec.rb
 - spec/cases/graph_and_rest_api_spec.rb
+- spec/cases/graph_api_batch_spec.rb
 - spec/cases/graph_api_spec.rb
 - spec/cases/http_services/http_service_spec.rb
 - spec/cases/http_services/net_http_service_spec.rb
 - spec/cases/http_services/typhoeus_service_spec.rb
+- spec/cases/koala_spec.rb
 - spec/cases/oauth_spec.rb
 - spec/cases/realtime_updates_spec.rb
 - spec/cases/rest_api_spec.rb