koala 1.3.0rc1 → 1.3.0rc2

data/spec/cases/graph_api_batch_spec.rb

@@ -10,7 +10,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
     @app_api = Koala::Facebook::API.new(@app_access_token)
   end
 
-  describe "BatchOperations" do
+  describe Koala::Facebook::GraphBatchAPI::BatchOperation do
     before :each do
       @args = {
         :url => "my url",
@@ -24,30 +24,30 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
     describe ".new" do
       it "makes http_options accessible" do
-        Koala::Facebook::BatchOperation.new(@args).http_options.should == @args[:http_options]
+        Koala::Facebook::GraphBatchAPI::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]
+        Koala::Facebook::GraphBatchAPI::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]
+        Koala::Facebook::GraphBatchAPI::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)
+        Koala::Facebook::GraphBatchAPI::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::GraphBatchAPI::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)
+        expect { Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args.merge(:access_token => nil)) }.to raise_exception(Koala::KoalaError)
       end
 
       describe "when supplied binary files" do
@@ -69,7 +69,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
         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 = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args)
           batch_op.files.should_not be_nil
           batch_op.files.find {|k, v| v == @uploadable_io}.should_not be_nil
         end
@@ -77,24 +77,24 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         it "works if supplied an UploadableIO as an argument" do
           # as happens with put_picture at the moment
           @args[:args].merge!("source" => @uploadable_io)
-          batch_op = Koala::Facebook::BatchOperation.new(@args)
+          batch_op = Koala::Facebook::GraphBatchAPI::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 "assigns each binary parameter unique name" do
           @args[:args].merge!("source" => @binary, "source2" => @binary)
-          batch_op = Koala::Facebook::BatchOperation.new(@args)
+          batch_op = Koala::Facebook::GraphBatchAPI::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)
+          batch_op = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args)
           # simulate the batch operation, since it's used in determination
           @batch_queue << batch_op
-          batch_op2 = Koala::Facebook::BatchOperation.new(@args)
+          batch_op2 = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args)
           @batch_queue << batch_op2
           # 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
@@ -102,7 +102,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
         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=/
+          Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:body].should_not =~ /source=/
         end
       end
 
@@ -116,7 +116,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
             @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}"
+            Koala::Facebook::GraphBatchAPI::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
@@ -124,16 +124,16 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
             @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}"
+            Koala::Facebook::GraphBatchAPI::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::GraphBatchAPI::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
+            Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:body].should be_nil
           end
         end
 
@@ -142,13 +142,13 @@ describe "Koala::Facebook::GraphAPI in batch mode" 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
+            Koala::Facebook::GraphBatchAPI::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
+            Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:body].should be_nil
           end
 
 
@@ -156,7 +156,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
             test_args = "foo"
             Koala.http_service.stub(:encode_params).and_return(test_args)
 
-            Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)[:relative_url].should == @args[:url]
+            Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)[:relative_url].should == @args[:url]
           end
         end
 
@@ -194,45 +194,45 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
       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 = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)
          params[:relative_url].should =~ /access_token=#{@args[:access_token]}/
       end
 
       it "includes the other arguments if the token is not the main one for the request" do
         @args[:args] = {:a => 2}
-        params = Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)
+        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)
         params[:relative_url].should =~ /a=2/
       end
 
       it "does not include the access token if the token is the main one for the request" do
-         params = Koala::Facebook::BatchOperation.new(@args).to_batch_params(@args[:access_token])
+         params = Koala::Facebook::GraphBatchAPI::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 = Koala::Facebook::GraphBatchAPI::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
-        params = Koala::Facebook::BatchOperation.new(@args).to_batch_params(nil)
+        params = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args).to_batch_params(nil)
         params.should include(batch_args)
       end
 
       it "includes the method" do
-        params = Koala::Facebook::BatchOperation.new(@args).to_batch_params(@args[:access_token])
+        params = Koala::Facebook::GraphBatchAPI::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
+        expect { Koala::Facebook::GraphBatchAPI::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
+        expect { Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args.merge(:args => nil)).to_batch_params(nil) }.not_to raise_exception
       end
 
       describe "with binary files" do
@@ -252,7 +252,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
         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)
+          batch_op = Koala::Facebook::GraphBatchAPI::BatchOperation.new(@args)
           file_ids = batch_op.files.find_all {|k, v| v == @uploadable_io}.map {|k, v| k}
           params = batch_op.to_batch_params(nil)
           params[:attached_files].should == file_ids.join(",")
@@ -264,7 +264,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
   describe "GraphAPI batch interface" do
     it "returns nothing for a batch operation" do
-      Koala.stub(:make_request).and_return(Koala::Response.new(200, "[]", {}))
+      Koala.stub(:make_request).and_return(Koala::HTTPService::Response.new(200, "[]", {}))
       @api.batch do |batch_api|
         batch_api.get_object('me').should be_nil
       end
@@ -272,7 +272,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
     describe "#batch" do
       before :each do
-        @fake_response = Koala::Response.new(200, "[]", {})
+        @fake_response = Koala::HTTPService::Response.new(200, "[]", {})
         Koala.stub(:make_request).and_return(@fake_response)
       end
 
@@ -299,9 +299,9 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
         it "sets args['batch'] to a json'd map of all the batch params" do
           access_token = "bar"
-          op = Koala::Facebook::BatchOperation.new(:access_token => access_token, :method => :get, :url => "/")
+          op = Koala::Facebook::GraphBatchAPI::BatchOperation.new(:access_token => access_token, :method => :get, :url => "/")
           op.stub(:to_batch_params).and_return({:a => 2})
-          Koala::Facebook::BatchOperation.stub(:new).and_return(op)
+          Koala::Facebook::GraphBatchAPI::BatchOperation.stub(:new).and_return(op)
 
           # two requests should generate two batch operations
           expected = MultiJson.encode([op.to_batch_params(access_token), op.to_batch_params(access_token)])
@@ -319,7 +319,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
           @key = "file0_0"
           @uploadable_io = stub("UploadableIO")
           batch_op = stub("Koala Batch Operation", :files => {@key => @uploadable_io}, :to_batch_params => {}, :access_token => "foo")
-          Koala::Facebook::BatchOperation.stub(:new).and_return(batch_op)
+          Koala::Facebook::GraphBatchAPI::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::API.new("bar").batch do |batch_api|
@@ -366,7 +366,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
       describe "processing the request" 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\"}"}]', {}))
+          Koala.stub(:make_request).and_return(Koala::HTTPService::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(KoalaTest.user1, {}, :http_component => :headers)
           end
@@ -375,7 +375,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         
         describe "if it errors" do
           it "raises an APIError if the response is not 200" do
-            Koala.stub(:make_request).and_return(Koala::Response.new(500, "[]", {}))
+            Koala.stub(:make_request).and_return(Koala::HTTPService::Response.new(500, "[]", {}))
             expect { 
               Koala::Facebook::API.new("foo").batch {|batch_api| batch_api.get_object('me') }
             }.to raise_exception(Koala::Facebook::APIError)
@@ -383,7 +383,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
 
           context "with the old style" do
             before :each do
-              Koala.stub(:make_request).and_return(Koala::Response.new(200, '{"error":190,"error_description":"Error validating access token."}', {}))
+              Koala.stub(:make_request).and_return(Koala::HTTPService::Response.new(200, '{"error":190,"error_description":"Error validating access token."}', {}))
             end
             
             it "throws an error if the response is an old Batch API-style error" do
@@ -411,7 +411,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
           
           context "with the new style" do          
             before :each do
-              Koala.stub(:make_request).and_return(Koala::Response.new(200, '{"error":{"message":"Request 0 cannot depend on an  unresolved request with  name f. Requests can only depend on preceding requests","type":"GraphBatchException"}}', {}))
+              Koala.stub(:make_request).and_return(Koala::HTTPService::Response.new(200, '{"error":{"message":"Request 0 cannot depend on an  unresolved request with  name f. Requests can only depend on preceding requests","type":"GraphBatchException"}}', {}))
             end
 
             it "throws an error if the response is a new Graph API-style error" do
@@ -431,7 +431,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
         end
 
         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\"}"}]', {}))
+          Koala.stub(:make_request).and_return(Koala::HTTPService::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(KoalaTest.user1, {}, :http_component => :status)
           end
@@ -547,7 +547,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" do
       it "posts binary files" do
         file = File.open(File.join(File.dirname(__FILE__), "..", "fixtures", "beach.jpg"))
 
-        Koala::Facebook::BatchOperation.instance_variable_set(:@identifier, 0)
+        Koala::Facebook::GraphBatchAPI::BatchOperation.instance_variable_set(:@identifier, 0)
         result = @api.batch do |batch_api|
           batch_api.put_picture(file)
         end
@@ -560,7 +560,7 @@ describe "Koala::Facebook::GraphAPI in batch mode" 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)
+        Koala::Facebook::GraphBatchAPI::BatchOperation.instance_variable_set(:@identifier, 0)
         results = @api.batch do |batch_api|
           batch_api.put_picture(file)
           batch_api.put_picture(file2, {}, KoalaTest.user1)

data/spec/cases/http_service_spec.rb

@@ -28,7 +28,7 @@ describe "Koala::HTTPService" do
     end
 
     it "adds multipart" do
-      @builder.should_receive(:use).with(Koala::MultipartRequest)
+      @builder.should_receive(:use).with(Koala::HTTPService::MultipartRequest)
       Koala::HTTPService::DEFAULT_MIDDLEWARE.call(@builder)
     end
 
@@ -422,26 +422,5 @@ describe "Koala::HTTPService" do
         end
       end
     end
-
-    {
-      :typhoeus => Koala::TyphoeusService, 
-      :net_http => Koala::NetHTTPService
-    }.each_pair do |adapter, module_class|
-      describe module_class.to_s do
-        it "responds to deprecated_interface" do
-           module_class.should respond_to(:deprecated_interface)
-        end
-      
-        it "issues a deprecation warning" do
-          Koala::Utils.should_receive(:deprecate)
-          module_class.deprecated_interface
-        end
-      
-        it "sets the default adapter to #{adapter}" do
-          module_class.deprecated_interface
-          Faraday.default_adapter.should == adapter
-        end
-      end
-    end
   end
 end

data/spec/cases/legacy_spec.rb

@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+# Support for legacy / deprecated interfaces
+describe "legacy APIs" do
+  describe Koala::Facebook::GraphAPI do
+    describe "class consolidation" do
+      before :each do
+        Koala::Utils.stub(:deprecate) # avoid actual messages to stderr
+      end
+
+      it "still allows you to instantiate a GraphAndRestAPI object" do
+        api = Koala::Facebook::GraphAPI.new("token").should be_a(Koala::Facebook::GraphAPI)
+      end
+
+      it "ultimately creates an API object" do
+        api = Koala::Facebook::GraphAPI.new("token").should be_a(Koala::Facebook::API)
+      end
+
+      it "fires a depreciation warning" do
+        Koala::Utils.should_receive(:deprecate)
+        api = Koala::Facebook::GraphAPI.new("token")
+      end
+    end
+  end
+
+  describe Koala::Facebook::RestAPI do
+    describe "class consolidation" do
+      before :each do
+        Koala::Utils.stub(:deprecate) # avoid actual messages to stderr
+      end
+
+      it "still allows you to instantiate a GraphAndRestAPI object" do
+        api = Koala::Facebook::RestAPI.new("token").should be_a(Koala::Facebook::RestAPI)
+      end
+
+      it "ultimately creates an API object" do
+        api = Koala::Facebook::RestAPI.new("token").should be_a(Koala::Facebook::API)
+      end
+
+      it "fires a depreciation warning" do
+        Koala::Utils.should_receive(:deprecate)
+        api = Koala::Facebook::RestAPI.new("token")
+      end
+    end
+  end
+
+  describe Koala::Facebook::GraphAndRestAPI do
+    describe "class consolidation" do
+      before :each do
+        Koala::Utils.stub(:deprecate) # avoid actual messages to stderr
+      end
+
+      it "still allows you to instantiate a GraphAndRestAPI object" do
+        api = Koala::Facebook::GraphAndRestAPI.new("token").should be_a(Koala::Facebook::GraphAndRestAPI)
+      end
+
+      it "ultimately creates an API object" do
+        api = Koala::Facebook::GraphAndRestAPI.new("token").should be_a(Koala::Facebook::API)
+      end
+
+      it "fires a depreciation warning" do
+        Koala::Utils.should_receive(:deprecate)
+        api = Koala::Facebook::GraphAndRestAPI.new("token")
+      end
+    end
+  end
+
+  {:typhoeus => Koala::TyphoeusService, :net_http => Koala::NetHTTPService}.each_pair do |adapter, module_class|
+    describe module_class.to_s do
+      it "responds to deprecated_interface" do
+        module_class.should respond_to(:deprecated_interface)
+      end
+
+      it "issues a deprecation warning" do
+        Koala::Utils.should_receive(:deprecate)
+        module_class.deprecated_interface
+      end
+
+      it "sets the default adapter to #{adapter}" do
+        module_class.deprecated_interface
+        Faraday.default_adapter.should == adapter
+      end
+    end
+  end
+
+  describe "moved classes" do
+    it "allows you to access Koala::HTTPService::MultipartRequest through the Koala module" do
+      Koala::MultipartRequest.should == Koala::HTTPService::MultipartRequest
+    end
+    
+    it "allows you to access Koala::Response through the Koala module" do
+      Koala::Response.should == Koala::HTTPService::Response
+    end
+    
+    it "allows you to access Koala::Response through the Koala module" do
+      Koala::UploadableIO.should == Koala::HTTPService::UploadableIO
+    end
+    
+    it "allows you to access Koala::Facebook::GraphBatchAPI::BatchOperation through the Koala::Facebook module" do
+      Koala::Facebook::BatchOperation.should == Koala::Facebook::GraphBatchAPI::BatchOperation
+    end 
+    
+    it "allows you to access Koala::Facebook::API::GraphCollection through the Koala::Facebook module" do
+      Koala::Facebook::GraphCollection.should == Koala::Facebook::API::GraphCollection
+    end   
+  end
+end

data/spec/cases/multipart_request_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-describe Koala::MultipartRequest do
+describe Koala::HTTPService::MultipartRequest do
   it "is a subclass of Faraday::Request::Multipart" do
-    Koala::MultipartRequest.superclass.should == Faraday::Request::Multipart
+    Koala::HTTPService::MultipartRequest.superclass.should == Faraday::Request::Multipart
   end
   
   it "defines mime_type as multipart/form-data" do
-    Koala::MultipartRequest.mime_type.should == 'multipart/form-data'
+    Koala::HTTPService::MultipartRequest.mime_type.should == 'multipart/form-data'
   end
   
   describe "#process_request?" do
     before :each do
       @env = {}
-      @multipart = Koala::MultipartRequest.new
+      @multipart = Koala::HTTPService::MultipartRequest.new
       @multipart.stub(:request_type).and_return("")
     end
     
@@ -46,7 +46,7 @@ describe Koala::MultipartRequest do
   describe "#process_params" do
     before :each do
       @parent = Faraday::Request::Multipart.new
-      @multipart = Koala::MultipartRequest.new 
+      @multipart = Koala::HTTPService::MultipartRequest.new 
       @block = lambda {|k, v| "#{k}=#{v}"}     
     end