koala 1.1.0 → 1.2.0

data/spec/cases/graph_api_batch_spec.rb

@@ -1,16 +1,15 @@
 require 'spec_helper'
 
 describe "Koala::Facebook::GraphAPI in batch mode" do
-  include LiveTestingDataHelper
+
   before :each do
-    @api = Koala::Facebook::GraphAPI.new(@token)
+    @api = Koala::Facebook::API.new(@token)
     # app API
-    @oauth_data = $testing_data["oauth_test_data"]
-    @app_id = @oauth_data["app_id"]
-    @app_access_token = @oauth_data["app_access_token"]
-    @app_api = Koala::Facebook::GraphAPI.new(@app_access_token)
-  end 
-  
+    @app_id = KoalaTest.app_id
+    @app_access_token = KoalaTest.app_access_token
+    @app_api = Koala::Facebook::API.new(@app_access_token)
+  end
+
   describe "BatchOperations" do
     before :each do
       @args = {
@@ -22,43 +21,43 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         :post_processing => lambda { }
       }
     end
-    
+
     describe "#new" do
       it "makes http_options accessible" do
         Koala::Facebook::BatchOperation.new(@args).http_options.should == @args[:http_options]
       end
-      
+
       it "makes post_processing accessible" do
         Koala::Facebook::BatchOperation.new(@args).post_processing.should == @args[:post_processing]
       end
-      
+
       it "makes access_token accessible" do
         Koala::Facebook::BatchOperation.new(@args).access_token.should == @args[:access_token]
       end
-            
+
       it "doesn't change the original http_options" do
         @args[:http_options][:name] = "baz2"
         expected = @args[:http_options].dup
         Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)
         @args[:http_options].should == expected
       end
-      
+
       it "leaves the file array nil by default" do
-        Koala::Facebook::BatchOperation.new(@args).files.should be_nil        
+        Koala::Facebook::BatchOperation.new(@args).files.should be_nil
       end
-      
+
       it "raises a KoalaError if no access token supplied" do
         expect { Koala::Facebook::BatchOperation.new(@args.merge(:access_token => nil)) }.to raise_exception(Koala::KoalaError)
       end
-      
+
       describe "when supplied binary files" do
         before :each do
           @binary = stub("Binary file")
           @uploadable_io = stub("UploadableIO 1")
-          
+
           @batch_queue = []
           Koala::Facebook::GraphAPI.stub(:batch_calls).and_return(@batch_queue)
-          
+
           Koala::UploadableIO.stub(:new).with(@binary).and_return(@uploadable_io)
           Koala::UploadableIO.stub(:binary_content?).and_return(false)
           Koala::UploadableIO.stub(:binary_content?).with(@binary).and_return(true)
@@ -67,14 +66,14 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
           @args[:method] = "post" # files are always post
         end
-        
+
         it "adds binary files to the files attribute as UploadableIOs" do
           @args[:args].merge!("source" => @binary)
           batch_op = Koala::Facebook::BatchOperation.new(@args)
           batch_op.files.should_not be_nil
           batch_op.files.find {|k, v| v == @uploadable_io}.should_not be_nil
         end
-        
+
         it "works if supplied an UploadableIO as an argument" do
           # as happens with put_picture at the moment
           @args[:args].merge!("source" => @uploadable_io)
@@ -82,14 +81,14 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
           batch_op.files.should_not be_nil
           batch_op.files.find {|k, v| v == @uploadable_io}.should_not be_nil
         end
-                
+
         it "assigns each binary parameter unique name" do
           @args[:args].merge!("source" => @binary, "source2" => @binary)
           batch_op = Koala::Facebook::BatchOperation.new(@args)
           # if the name wasn't unique, there'd just be one item
           batch_op.files.should have(2).items
         end
-        
+
         it "assigns each binary parameter unique name across batch requests" do
           @args[:args].merge!("source" => @binary, "source2" => @binary)
           batch_op = Koala::Facebook::BatchOperation.new(@args)
@@ -100,59 +99,59 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
           # if the name wasn't unique, we should have < 4 items since keys would be the same
           batch_op.files.merge(batch_op2.files).should have(4).items
         end
-        
+
         it "removes the value from the arguments" do
           @args[:args].merge!("source" => @binary)
           Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)[:body].should_not =~ /source=/
         end
-      end   
-      
+      end
+
     end
-    
-    describe ".to_batch_params" do    
+
+    describe ".to_batch_params" do
       describe "handling arguments and URLs" do
         shared_examples_for "request with no body" do
           it "adds the args to the URL string, with ? if no args previously present" do
             test_args = "foo"
             @args[:url] = url = "/"
             Koala.http_service.stub(:encode_params).and_return(test_args)
-          
+
             Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)[:relative_url].should == "#{url}?#{test_args}"
           end
-        
+
           it "adds the args to the URL string, with & if args previously present" do
             test_args = "foo"
             @args[:url] = url = "/?a=2"
             Koala.http_service.stub(:encode_params).and_return(test_args)
-          
+
             Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)[:relative_url].should == "#{url}&#{test_args}"
           end
-          
+
           it "adds nothing to the URL string if there are no args to be added" do
             @args[:args] = {}
-            Koala::Facebook::BatchOperation.new(@args).to_batch_params(@args[:access_token])[:relative_url].should == @args[:url]            
+            Koala::Facebook::BatchOperation.new(@args).to_batch_params(@args[:access_token])[:relative_url].should == @args[:url]
           end
-          
+
           it "adds nothing to the body" do
             Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)[:body].should be_nil
           end
         end
-        
+
         shared_examples_for "requests with a body param" do
           it "sets the body to the encoded args string, if there are args" do
             test_args = "foo"
             Koala.http_service.stub(:encode_params).and_return(test_args)
-          
+
             Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)[:body].should == test_args
           end
-          
+
           it "does not set the body if there are no args" do
             test_args = ""
             Koala.http_service.stub(:encode_params).and_return(test_args)
             Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)[:body].should be_nil
           end
-          
-        
+
+
           it "doesn't change the url" do
             test_args = "foo"
             Koala.http_service.stub(:encode_params).and_return(test_args)
@@ -160,40 +159,40 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
             Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)[:relative_url].should == @args[:url]
           end
         end
-            
+
         context "for get operations" do
           before :each do
             @args[:method] = :get
           end
-        
-          it_should_behave_like "request with no body"        
+
+          it_should_behave_like "request with no body"
         end
-      
+
         context "for delete operations" do
           before :each do
             @args[:method] = :delete
           end
-        
-          it_should_behave_like "request with no body"        
+
+          it_should_behave_like "request with no body"
         end
-      
+
         context "for get operations" do
           before :each do
             @args[:method] = :put
           end
-        
-          it_should_behave_like "requests with a body param"  
+
+          it_should_behave_like "requests with a body param"
         end
-      
+
         context "for delete operations" do
           before :each do
             @args[:method] = :post
           end
-        
-          it_should_behave_like "requests with a body param"       
+
+          it_should_behave_like "requests with a body param"
         end
       end
-    
+
       it "includes the access token if the token is not the main one for the request" do
          params = Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)
          params[:relative_url].should =~ /access_token=#{@args[:access_token]}/
@@ -209,13 +208,13 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
          params = Koala::Facebook::BatchOperation.new(@args).to_batch_params(@args[:access_token])
          params[:relative_url].should_not =~ /access_token=#{@args[:access_token]}/
       end
-      
+
       it "includes the other arguments if the token is the main one for the request" do
         @args[:args] = {:a => 2}
         params = Koala::Facebook::BatchOperation.new(@args).to_batch_params(@args[:access_token])
         params[:relative_url].should =~ /a=2/
       end
-      
+
       it "includes any arguments passed as http_options[:batch_args]" do
         batch_args = {:name => "baz", :headers => {:some_param => true}}
         @args[:http_options][:batch_args] = batch_args
@@ -227,22 +226,22 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         params = Koala::Facebook::BatchOperation.new(@args).to_batch_params(@args[:access_token])
         params[:method].should == @args[:method].to_s
       end
-      
+
       it "works with nil http_options" do
         expect { Koala::Facebook::BatchOperation.new(@args.merge(:http_options => nil)).to_batch_params(nil) }.not_to raise_exception
       end
-      
+
       it "works with nil args" do
         expect { Koala::Facebook::BatchOperation.new(@args.merge(:args => nil)).to_batch_params(nil) }.not_to raise_exception
-      end 
-      
+      end
+
       describe "with binary files" do
         before :each do
           @binary = stub("Binary file")
           Koala::UploadableIO.stub(:binary_content?).and_return(false)
           Koala::UploadableIO.stub(:binary_content?).with(@binary).and_return(true)
           @uploadable_io = stub("UploadableIO")
-          Koala::UploadableIO.stub(:new).with(@binary).and_return(@uploadable_io)          
+          Koala::UploadableIO.stub(:new).with(@binary).and_return(@uploadable_io)
           @uploadable_io.stub(:is_a?).with(Koala::UploadableIO).and_return(true)
 
           @batch_queue = []
@@ -250,7 +249,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
           @args[:method] = "post" # files are always post
         end
-        
+
         it "adds file identifiers as attached_files in a comma-separated list" do
           @args[:args].merge!("source" => @binary, "source2" => @binary)
           batch_op = Koala::Facebook::BatchOperation.new(@args)
@@ -293,7 +292,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         it "includes the first operation's access token as the main one in the args" do
           access_token = "foo"
           Koala.should_receive(:make_request).with(anything, hash_including("access_token" => access_token), anything, anything).and_return(@fake_response)
-          Koala::Facebook::GraphAPI.new(access_token).batch do |batch_api|
+          Koala::Facebook::API.new(access_token).batch do |batch_api|
             batch_api.get_object('me')
             batch_api.get_object('me', {}, {'access_token' => 'bar'})
           end
@@ -308,7 +307,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
           # two requests should generate two batch operations
           expected = MultiJson.encode([op.to_batch_params(access_token), op.to_batch_params(access_token)])
           Koala.should_receive(:make_request).with(anything, hash_including("batch" => expected), anything, anything).and_return(@fake_response)
-          Koala::Facebook::GraphAPI.new(access_token).batch do |batch_api|
+          Koala::Facebook::API.new(access_token).batch do |batch_api|
             batch_api.get_object('me')
             batch_api.get_object('me')
           end
@@ -324,7 +323,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
           Koala::Facebook::BatchOperation.stub(:new).and_return(batch_op)
 
           Koala.should_receive(:make_request).with(anything, hash_including(@key => @uploadable_io), anything, anything).and_return(@fake_response)
-          Koala::Facebook::GraphAPI.new("bar").batch do |batch_api|
+          Koala::Facebook::API.new("bar").batch do |batch_api|
             batch_api.put_picture("path/to/file", "image/jpeg")
           end
         end
@@ -337,7 +336,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
             (args ||= {})["batch"].should =~ /.*me\/farglebarg.*otheruser\/bababa/
             @fake_response
           end
-          Koala::Facebook::GraphAPI.new(access_token).batch do |batch_api|
+          Koala::Facebook::API.new(access_token).batch do |batch_api|
             batch_api.get_connections('me', "farglebarg")
             batch_api.get_connections('otheruser', "bababa")
           end
@@ -345,14 +344,14 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
         it "makes a POST request" do
           Koala.should_receive(:make_request).with(anything, anything, "post", anything).and_return(@fake_response)
-          Koala::Facebook::GraphAPI.new("foo").batch do |batch_api|
+          Koala::Facebook::API.new("foo").batch do |batch_api|
             batch_api.get_object('me')
           end
         end
 
         it "makes a request to /" do
           Koala.should_receive(:make_request).with("/", anything, anything, anything).and_return(@fake_response)
-          Koala::Facebook::GraphAPI.new("foo").batch do |batch_api|
+          Koala::Facebook::API.new("foo").batch do |batch_api|
             batch_api.get_object('me')
           end
         end
@@ -360,7 +359,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         it "includes any http options specified at the top level" do
           http_options = {"a" => "baz"}
           Koala.should_receive(:make_request).with(anything, anything, anything, hash_including(http_options)).and_return(@fake_response)
-          Koala::Facebook::GraphAPI.new("foo").batch(http_options) do |batch_api|
+          Koala::Facebook::API.new("foo").batch(http_options) do |batch_api|
             batch_api.get_object('me')
           end
         end
@@ -369,14 +368,14 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
       describe "processing the request" do
         it "throws an error if the response is not 200" do
           Koala.stub(:make_request).and_return(Koala::Response.new(500, "[]", {}))
-          expect { Koala::Facebook::GraphAPI.new("foo").batch do |batch_api|
+          expect { Koala::Facebook::API.new("foo").batch do |batch_api|
             batch_api.get_object('me')
           end }.to raise_exception(Koala::Facebook::APIError)
         end
 
         it "throws an error if the response is a Batch API-style error" do
           Koala.stub(:make_request).and_return(Koala::Response.new(200, '{"error":190,"error_description":"Error validating access token."}', {}))
-          expect { Koala::Facebook::GraphAPI.new("foo").batch do |batch_api|
+          expect { Koala::Facebook::API.new("foo").batch do |batch_api|
             batch_api.get_object('me')
           end }.to raise_exception(Koala::Facebook::APIError)
         end
@@ -384,7 +383,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         it "returns the result status if http_component is status" do
           Koala.stub(:make_request).and_return(Koala::Response.new(200, '[{"code":203,"headers":[{"name":"Content-Type","value":"text/javascript; charset=UTF-8"}],"body":"{\"id\":\"1234\"}"}]', {}))
           result = @api.batch do |batch_api|
-            batch_api.get_object("koppel", {}, :http_component => :status)
+            batch_api.get_object(KoalaTest.user1, {}, :http_component => :status)
           end
           result[0].should == 203
         end
@@ -392,7 +391,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         it "returns the result headers as a hash if http_component is headers" do
           Koala.stub(:make_request).and_return(Koala::Response.new(200, '[{"code":203,"headers":[{"name":"Content-Type","value":"text/javascript; charset=UTF-8"}],"body":"{\"id\":\"1234\"}"}]', {}))
           result = @api.batch do |batch_api|
-            batch_api.get_object("koppel", {}, :http_component => :headers)
+            batch_api.get_object(KoalaTest.user1, {}, :http_component => :headers)
           end
           result[0].should == {"Content-Type" => "text/javascript; charset=UTF-8"}
         end
@@ -404,26 +403,26 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         thread_two_count = 0
         first_count = 20
         second_count = 10
-        
+
         Koala.stub(:make_request).and_return(@fake_response)
 
         thread1 = Thread.new do
-          @api.batch do |batch_api| 
+          @api.batch do |batch_api|
             first_count.times {|i| batch_api.get_object("me"); sleep(0.01) }
             thread_one_count = batch_api.batch_calls.count
           end
         end
-            
+
         thread2 = Thread.new do
-          @api.batch do |batch_api| 
+          @api.batch do |batch_api|
             second_count.times {|i| batch_api.get_object("me"); sleep(0.01) }
             thread_two_count = batch_api.batch_calls.count
           end
         end
-        
+
         thread1.join
         thread2.join
-        
+
         thread_one_count.should == first_count
         thread_two_count.should == second_count
       end
@@ -431,25 +430,24 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
   end
 
   describe "usage tests" do
-    it "can get two results at once" do
+    it "gets two results at once" do
       me, koppel = @api.batch do |batch_api|
         batch_api.get_object('me')
-        batch_api.get_object('koppel')
+        batch_api.get_object(KoalaTest.user1)
       end
       me['id'].should_not be_nil
       koppel['id'].should_not be_nil
     end
 
-    it "works with GraphAndRestAPI instances" do
-      me, koppel = Koala::Facebook::GraphAndRestAPI.new(@api.access_token).batch do |batch_api|
+    it 'makes mixed calls inside of a batch' do
+      me, friends = @api.batch do |batch_api|
         batch_api.get_object('me')
-        batch_api.get_object('koppel')
+        batch_api.get_connections('me', 'friends')
       end
-      me['id'].should_not be_nil
-      koppel['id'].should_not be_nil
+      friends.should be_a(Koala::Facebook::GraphCollection)
     end
-
-    it 'should be able to make mixed calls inside of a batch' do
+    
+    it 'turns pageable results into GraphCollections' do
       me, friends = @api.batch do |batch_api|
         batch_api.get_object('me')
         batch_api.get_connections('me', 'friends')
@@ -458,14 +456,14 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
       friends.should be_an(Array)
     end
 
-    it 'should be able to make a get_picture call inside of a batch' do
+    it 'makes a get_picture call inside of a batch' do
       pictures = @api.batch do |batch_api|
         batch_api.get_picture('me')
       end
       pictures.first.should_not be_empty
     end
 
-    it "should handle requests for two different tokens" do
+    it "handles requests for two different tokens" do
       me, insights = @api.batch do |batch_api|
         batch_api.get_object('me')
         batch_api.get_connections(@app_id, 'insights', {}, {"access_token" => @app_api.access_token})
@@ -477,7 +475,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
     it "inserts errors in the appropriate place, without breaking other results" do
       failed_insights, koppel = @api.batch do |batch_api|
         batch_api.get_connections(@app_id, 'insights')
-        batch_api.get_object("koppel", {}, {"access_token" => @app_api.access_token})
+        batch_api.get_object(KoalaTest.user1, {}, {"access_token" => @app_api.access_token})
       end
       failed_insights.should be_a(Koala::Facebook::APIError)
       koppel["id"].should_not be_nil
@@ -495,12 +493,12 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
     it "allows FQL" do
       result = @api.batch do |batch_api|
-        batch_api.graph_call("method/fql.query", {:query=>"select name from user where uid=4"}, "post")
+        batch_api.graph_call("method/fql.query", {:query=>"select first_name from user where uid=#{KoalaTest.user1_id}"}, "post")
       end
 
       fql_result = result[0]
       fql_result[0].should be_a(Hash)
-      fql_result[0]["name"].should == "Mark Zuckerberg"
+      fql_result[0]["first_name"].should == "Alex"
     end
 
     describe "binary files" do
@@ -518,11 +516,12 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
       it "posts binary files with multiple requests" do
         file = File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "beach.jpg"))
+        file2 = File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "beach.jpg"))
 
         Koala::Facebook::BatchOperation.instance_variable_set(:@identifier, 0)
         results = @api.batch do |batch_api|
           batch_api.put_picture(file)
-          batch_api.put_picture(file, {}, "koppel")
+          batch_api.put_picture(file2, {}, KoalaTest.user1)
         end
         results[0]["id"].should_not be_nil
         results[1]["id"].should_not be_nil
@@ -553,7 +552,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
       it "allows you to create dependencies" do
         me, koppel = @api.batch do |batch_api|
           batch_api.get_object("me", {}, :batch_args => {:name => "getme"})
-          batch_api.get_object("koppel", {}, :batch_args => {:depends_on => "getme"})
+          batch_api.get_object(KoalaTest.user1, {}, :batch_args => {:depends_on => "getme"})
         end
 
         me.should be_nil # gotcha!  it's omitted because it's a successfully-executed dependency
@@ -563,7 +562,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
       it "properly handles dependencies that fail" do
         data, koppel = @api.batch do |batch_api|
           batch_api.get_connections(@app_id, 'insights', {}, :batch_args => {:name => "getdata"})
-          batch_api.get_object("koppel", {}, :batch_args => {:depends_on => "getdata"})
+          batch_api.get_object(KoalaTest.user1, {}, :batch_args => {:depends_on => "getdata"})
         end
 
         data.should be_a(Koala::Facebook::APIError)
@@ -580,30 +579,4 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
       end
     end
   end
-
-  describe "new interface" do
-    it "includes a deprecation warning on GraphAPI" do
-      begin 
-        Koala::Facebook::GraphAPI.batch do
-        end
-      rescue NoMethodError => @err
-      end
-      
-      # verify the message points people to the wiki page
-      @err.should
-      @err.message.should =~ /https\:\/\/github.com\/arsduo\/koala\/wiki\/Batch-requests/
-    end
-    
-    it "includes a deprecation warning on GraphAndRESTAPI" do
-      begin 
-        Koala::Facebook::GraphAndRestAPI.batch do
-        end
-      rescue NoMethodError => @err
-      end
-      
-      # verify the message points people to the wiki page
-      @err.should
-      @err.message.should =~ /https\:\/\/github.com\/arsduo\/koala\/wiki\/Batch-requests/
-    end
-  end
 end

data/spec/cases/graph_api_spec.rb

@@ -1,25 +1,22 @@
 require 'spec_helper'
 
 describe "Koala::Facebook::GraphAPI" do
-  include LiveTestingDataHelper
-  
-  context "with an access token" do
+  describe "class consolidation" do
     before :each do
-      @api = Koala::Facebook::GraphAPI.new(@token)
+      Koala::Utils.stub(:deprecate) # avoid actual messages to stderr
     end
 
-    it_should_behave_like "Koala GraphAPI"
-    it_should_behave_like "Koala GraphAPI with an access token"
-    it_should_behave_like "Koala GraphAPI with GraphCollection"
-  end
+    it "still allows you to instantiate a GraphAndRestAPI object" do
+      api = Koala::Facebook::GraphAPI.new("token").should be_a(Koala::Facebook::GraphAPI)
+    end
 
-  context "without an access token" do
-    before :each do
-      @api = Koala::Facebook::GraphAPI.new
+    it "ultimately creates an API object" do
+      api = Koala::Facebook::GraphAPI.new("token").should be_a(Koala::Facebook::API)
     end
 
-    it_should_behave_like "Koala GraphAPI"
-    it_should_behave_like "Koala GraphAPI without an access token"
-    it_should_behave_like "Koala GraphAPI with GraphCollection"
+    it "fires a depreciation warning" do
+      Koala::Utils.should_receive(:deprecate)
+      api = Koala::Facebook::GraphAPI.new("token")
+    end
   end
 end