koala 1.1.0 → 1.2.0beta1

data/spec/cases/realtime_updates_spec.rb

@@ -3,11 +3,10 @@ require 'spec_helper'
 describe "Koala::Facebook::RealtimeUpdates" do
   before :all do
     # get oauth data
-    @oauth_data = $testing_data["oauth_test_data"]
-    @app_id = @oauth_data["app_id"]
-    @secret = @oauth_data["secret"]
-    @callback_url = @oauth_data["callback_url"]
-    @app_access_token = @oauth_data["app_access_token"]
+    @app_id = KoalaTest.app_id
+    @secret = KoalaTest.secret
+    @callback_url = KoalaTest.oauth_test_data["callback_url"]
+    @app_access_token = KoalaTest.app_access_token
     
     # check OAuth data
     unless @app_id && @secret && @callback_url && @app_access_token
@@ -15,14 +14,13 @@ describe "Koala::Facebook::RealtimeUpdates" do
     end
     
     # get subscription data
-    @subscription_data = $testing_data["subscription_test_data"]
-    @verify_token = @subscription_data["verify_token"]
-    @challenge_data = @subscription_data["challenge_data"]
-    @subscription_path = @subscription_data["subscription_path"]
+    @verify_token = KoalaTest.subscription_test_data["verify_token"]
+    @challenge_data = KoalaTest.subscription_test_data["challenge_data"]
+    @subscription_path = KoalaTest.subscription_test_data["subscription_path"]
     
     # check subscription data
     unless @verify_token && @challenge_data && @subscription_path
-      raise Exception, "Must supply verify_token and equivalent challenge_data to run live subscription tests!" 
+      raise Exception, "Must supply verify_token and equivalent challenge_data to run subscription tests!" 
     end
   end
 
@@ -34,28 +32,40 @@ describe "Koala::Facebook::RealtimeUpdates" do
     end
     
     # attributes
-    it "should allow read access to app_id, app_access_token, and secret" do
-      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :app_access_token => @app_access_token)
-      # this should not throw errors
-      updates.app_id && updates.app_access_token && updates.secret
+    it "should allow read access to app_id" do
+      # in Ruby 1.9, .method returns symbols 
+      Koala::Facebook::RealtimeUpdates.instance_methods.map(&:to_sym).should include(:app_id)
+      Koala::Facebook::RealtimeUpdates.instance_methods.map(&:to_sym).should_not include(:app_id=)
     end
-    
-    it "should not allow write access to app_id" do
-      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :app_access_token => @app_access_token)
-      # this should not throw errors
-      updates.methods.map(&:to_sym).should_not include(:app_id=)
+
+    it "should allow read access to app_access_token" do
+      # in Ruby 1.9, .method returns symbols 
+      Koala::Facebook::RealtimeUpdates.instance_methods.map(&:to_sym).should include(:app_access_token)
+      Koala::Facebook::RealtimeUpdates.instance_methods.map(&:to_sym).should_not include(:app_access_token=)
     end
 
-    it "should not allow write access to app_access_token" do
-      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :app_access_token => @app_access_token)
-      # this should not throw errors
-      updates.methods.map(&:to_sym).should_not include(:app_access_token=)
+    it "should allow read access to secret" do
+      # in Ruby 1.9, .method returns symbols 
+      Koala::Facebook::RealtimeUpdates.instance_methods.map(&:to_sym).should include(:secret)
+      Koala::Facebook::RealtimeUpdates.instance_methods.map(&:to_sym).should_not include(:secret=)
     end
-  
-    it "should not allow write access to secret" do
-      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :app_access_token => @app_access_token)
-      # this should not throw errors
-      updates.methods.map(&:to_sym).should_not include(:secret=)
+
+    it "should allow read access to api" do
+      # in Ruby 1.9, .method returns symbols 
+      Koala::Facebook::RealtimeUpdates.instance_methods.map(&:to_sym).should include(:api)
+      Koala::Facebook::RealtimeUpdates.instance_methods.map(&:to_sym).should_not include(:api=)
+    end
+
+    # old graph_api accessor
+    it "returns the api object when graph_api is called" do
+      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :secret => @secret)
+      updates.graph_api.should == updates.api
+    end
+
+    it "fire a deprecation warning when graph_api is called" do
+      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :secret => @secret)
+      Koala::Utils.should_receive(:deprecate)
+      updates.graph_api
     end
     
     # init with secret / fetching the token
@@ -151,20 +161,24 @@ describe "Koala::Facebook::RealtimeUpdates" do
       end
       
       describe "and a block is given" do
+        before :each do
+          @params['hub.verify_token'] = @token
+        end
+          
         it "should give the block the token as a parameter" do
-          Koala::Facebook::RealtimeUpdates.meet_challenge(@params)do |token|
+          Koala::Facebook::RealtimeUpdates.meet_challenge(@params) do |token|
             token.should == @token
           end
         end
         
         it "should return false if the given block return false" do
-          Koala::Facebook::RealtimeUpdates.meet_challenge(@params)do |token|
+          Koala::Facebook::RealtimeUpdates.meet_challenge(@params) do |token|
             false
           end.should be_false
         end
         
         it "should return false if the given block returns nil" do
-          Koala::Facebook::RealtimeUpdates.meet_challenge(@params)do |token|
+          Koala::Facebook::RealtimeUpdates.meet_challenge(@params) do |token|
             nil
           end.should be_false
         end

data/spec/cases/rest_api_spec.rb

@@ -1,25 +1,41 @@
 require 'spec_helper'
 
 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
+
   context "without an access token" do
     before :each do
-      @api = Koala::Facebook::RestAPI.new
+      @api = Koala::Facebook::API.new
     end
 
     it_should_behave_like "Koala RestAPI"
     it_should_behave_like "Koala RestAPI without an access token"
   end
-  
-  context "with an access token" do
-    include LiveTestingDataHelper
 
+  context "with an access token" do
     before :each do
-      @api = Koala::Facebook::RestAPI.new(@token)
+      @api = Koala::Facebook::API.new(@token)
     end
 
     it_should_behave_like "Koala RestAPI"
     it_should_behave_like "Koala RestAPI with an access token"
   end
-  
+
 end

data/spec/cases/test_users_spec.rb

@@ -2,21 +2,16 @@ require 'spec_helper'
 
 describe "Koala::Facebook::TestUsers" do
   context "with access token" do
-    include LiveTestingDataHelper
-
     before :all do
       # get oauth data
-      @oauth_data = $testing_data["oauth_test_data"]
-      @app_id = @oauth_data["app_id"]
-      @secret = @oauth_data["secret"]
-      @app_access_token = @oauth_data["app_access_token"]
+      @app_id = KoalaTest.app_id
+      @secret = KoalaTest.secret
+      @app_access_token = KoalaTest.app_access_token
 
       # check OAuth data
       unless @app_id && @secret && @app_access_token
         raise Exception, "Must supply OAuth app id, secret, app_access_token, and callback to run live subscription tests!"
       end
-
-      @is_mock = Koala.http_service.respond_to?(:mock?) && Koala.http_service.mock?
     end
 
     describe "when initializing" do
@@ -39,58 +34,98 @@ describe "Koala::Facebook::TestUsers" do
         Koala::Facebook::OAuth.should_receive(:new).with(@app_id, @secret).and_return(oauth)
         test_users = Koala::Facebook::TestUsers.new(:app_id => @app_id, :secret => @secret)
       end
-    end
 
-    describe "when used without network" do
-      before :each do
-        @test_users = Koala::Facebook::TestUsers.new({:app_access_token => @app_access_token, :app_id => @app_id})
+      # attributes
+      it "should allow read access to app_id, app_access_token, and secret" do
+        # in Ruby 1.9, .method returns symbols
+        Koala::Facebook::TestUsers.instance_methods.map(&:to_sym).should include(:app_id)
+        Koala::Facebook::TestUsers.instance_methods.map(&:to_sym).should_not include(:app_id=)
       end
 
-      # TEST USER MANAGEMENT
-      it "should create a test user when not given installed" do
-        result = @test_users.create(false)
-        @temporary_object_id = result["id"]
-        result.should be_a(Hash)
-        (result["id"] && result["access_token"] && result["login_url"]).should
+      it "should allow read access to app_access_token" do
+        # in Ruby 1.9, .method returns symbols
+        Koala::Facebook::TestUsers.instance_methods.map(&:to_sym).should include(:app_access_token)
+        Koala::Facebook::TestUsers.instance_methods.map(&:to_sym).should_not include(:app_access_token=)
       end
 
-      it "should create a test user when not given installed, ignoring permissions" do
-        result = @test_users.create(false, "read_stream")
-        @temporary_object_id = result["id"]
-        result.should be_a(Hash)
-        (result["id"] && result["access_token"] && result["login_url"]).should
+      it "should allow read access to secret" do
+        # in Ruby 1.9, .method returns symbols
+        Koala::Facebook::TestUsers.instance_methods.map(&:to_sym).should include(:secret)
+        Koala::Facebook::TestUsers.instance_methods.map(&:to_sym).should_not include(:secret=)
       end
 
-      it "should accept permissions as a string" do
-        @test_users.graph_api.should_receive(:graph_call).with(anything, hash_including("permissions" => "read_stream,publish_stream"), anything, anything)
-        result = @test_users.create(true, "read_stream,publish_stream")
+      it "should allow read access to api" do
+        # in Ruby 1.9, .method returns symbols
+        Koala::Facebook::TestUsers.instance_methods.map(&:to_sym).should include(:api)
+        Koala::Facebook::TestUsers.instance_methods.map(&:to_sym).should_not include(:api=)
       end
 
-      it "should accept permissions as an array" do
-        @test_users.graph_api.should_receive(:graph_call).with(anything, hash_including("permissions" => "read_stream,publish_stream"), anything, anything)
-        result = @test_users.create(true, ["read_stream", "publish_stream"])
+      # old graph_api accessor
+      it "returns the api object when graph_api is called" do
+        test_users = Koala::Facebook::TestUsers.new(:app_id => @app_id, :secret => @secret)
+        test_users.graph_api.should == test_users.api
       end
 
-      it "should create a test user when given installed and a permission" do
-        result = @test_users.create(true, "read_stream")
-        @temporary_object_id = result["id"]
-        result.should be_a(Hash)
-        (result["id"] && result["access_token"] && result["login_url"]).should
+      it "fire a deprecation warning when graph_api is called" do
+        test_users = Koala::Facebook::TestUsers.new(:app_id => @app_id, :secret => @secret)
+        Koala::Utils.should_receive(:deprecate)
+        test_users.graph_api
       end
+    end
 
-      it "lets you specify other graph arguments, like uid and access token" do
-        args = {:uid => "some test user ID", :owner_access_token => "some owner access token"}
-        @test_users.graph_api.should_receive(:graph_call).with(anything, hash_including(args), anything, anything)
-        @test_users.create(true, nil, args)
+    describe "when used without network" do
+      before :each do
+        @test_users = Koala::Facebook::TestUsers.new({:app_access_token => @app_access_token, :app_id => @app_id})
       end
-      
-      it "lets you specify http options that get passed through to the graph call" do
-        options = {:some_http_option => true}
-        @test_users.graph_api.should_receive(:graph_call).with(anything, anything, anything, options)
-        @test_users.create(true, nil, {}, options)
+
+      # TEST USER MANAGEMENT
+
+      describe ".create" do
+        it "should create a test user when not given installed" do
+          result = @test_users.create(false)
+          @temporary_object_id = result["id"]
+          result.should be_a(Hash)
+          (result["id"] && result["access_token"] && result["login_url"]).should
+        end
+
+        it "should create a test user when not given installed, ignoring permissions" do
+          result = @test_users.create(false, "read_stream")
+          @temporary_object_id = result["id"]
+          result.should be_a(Hash)
+          (result["id"] && result["access_token"] && result["login_url"]).should
+        end
+
+        it "should accept permissions as a string" do
+          @test_users.graph_api.should_receive(:graph_call).with(anything, hash_including("permissions" => "read_stream,publish_stream"), anything, anything)
+          result = @test_users.create(true, "read_stream,publish_stream")
+        end
+
+        it "should accept permissions as an array" do
+          @test_users.graph_api.should_receive(:graph_call).with(anything, hash_including("permissions" => "read_stream,publish_stream"), anything, anything)
+          result = @test_users.create(true, ["read_stream", "publish_stream"])
+        end
+
+        it "should create a test user when given installed and a permission" do
+          result = @test_users.create(true, "read_stream")
+          @temporary_object_id = result["id"]
+          result.should be_a(Hash)
+          (result["id"] && result["access_token"] && result["login_url"]).should
+        end
+
+        it "lets you specify other graph arguments, like uid and access token" do
+          args = {:uid => "some test user ID", :owner_access_token => "some owner access token"}
+          @test_users.graph_api.should_receive(:graph_call).with(anything, hash_including(args), anything, anything)
+          @test_users.create(true, nil, args)
+        end
+
+        it "lets you specify http options that get passed through to the graph call" do
+          options = {:some_http_option => true}
+          @test_users.graph_api.should_receive(:graph_call).with(anything, anything, anything, options)
+          @test_users.create(true, nil, {}, options)
+        end
       end
 
-      describe "with a user to delete" do
+      describe ".delete" do
         before :each do
           @user1 = @test_users.create(true, "read_stream")
           @user2 = @test_users.create(true, "read_stream,user_interests")
@@ -116,7 +151,7 @@ describe "Koala::Facebook::TestUsers" do
         end
       end
 
-      describe "with delete_all" do
+      describe ".delete_all" do
         it "should delete all users found by the list commnand" do
           array = [1, 2, 3]
           @test_users.should_receive(:list).and_return(array)
@@ -125,6 +160,31 @@ describe "Koala::Facebook::TestUsers" do
         end
       end
 
+      describe ".update" do
+        before :each do
+          @updates = {:name => "Foo Baz"}
+        end
+
+        it "makes a POST with the test user Graph API " do
+          user = @test_users.create(true)
+          @test_users.graph_api.should_receive(:graph_call).with(anything, anything, "post", anything)
+          @test_users.update(user, @updates)
+        end
+
+        it "makes a request to the test user with the update params " do
+          user = @test_users.create(true)
+          @test_users.graph_api.should_receive(:graph_call).with(user["id"], @updates, anything, anything)
+          @test_users.update(user, @updates)
+        end
+
+        it "works" do
+          user = @test_users.create(true)
+          @test_users.update(user, @updates)
+          user_info = Koala::Facebook::API.new(user["access_token"]).get_object(user["id"])
+          user_info["name"].should == @updates[:name]
+        end
+      end
+
       describe "with existing users" do
         before :each do
           @user1 = @test_users.create(true, "read_stream")
@@ -143,22 +203,22 @@ describe "Koala::Facebook::TestUsers" do
           (first_user["id"] && first_user["access_token"] && first_user["login_url"]).should
           (second_user["id"] && second_user["access_token"] && second_user["login_url"]).should
         end
-      
+
         it "should make two users into friends with string hashes" do
           result = @test_users.befriend(@user1, @user2)
           result.should be_true
         end
-      
+
         it "should make two users into friends with symbol hashes" do
           new_user_1 = {}
           @user1.each_pair {|k, v| new_user_1[k.to_sym] = v}
           new_user_2 = {}
           @user2.each_pair {|k, v| new_user_2[k.to_sym] = v}
-        
+
           result = @test_users.befriend(new_user_1, new_user_2)
           result.should be_true
-        end        
-      
+        end
+
         it "should not accept user IDs anymore" do
           lambda { @test_users.befriend(@user1["id"], @user2["id"]) }.should raise_exception
         end
@@ -171,7 +231,7 @@ describe "Koala::Facebook::TestUsers" do
         @test_users = Koala::Facebook::TestUsers.new({:app_access_token => @app_access_token, :app_id => @app_id})
         @network = []
 
-        if @is_mock
+        if KoalaTest.mock_interface?
           id_counter = 999999900
           @test_users.stub!(:create).and_return do
             id_counter += 1
@@ -218,4 +278,4 @@ describe "Koala::Facebook::TestUsers" do
 
     end # when creating network
   end
-end  # describe Koala TestUsers
+end  # describe Koala TestUsers

data/spec/cases/uploadable_io_spec.rb

@@ -13,42 +13,41 @@ describe "Koala::UploadableIO" do
     tempfile = stub('Tempfile', :path => "foo")
     uploaded_file = stub('ActionDispatch::Http::UploadedFile',
       :content_type => true,
-      :tempfile => tempfile
+      :tempfile => tempfile,
+      :original_filename => "bar"
     )
     tempfile.stub!(:respond_to?).with(:path).and_return(true)
 
     [tempfile, uploaded_file]
   end
-  
+
   def sinatra_mocks
-    {:type => "type", :tempfile => "Tempfile"}
+    {:type => "type", :tempfile => "Tempfile", :filename => "foo.bar"}
   end
-  
+
   describe "the constructor" do
     describe "when given a file path" do
       before(:each) do
-        @koala_io_params = [File.open(BEACH_BALL_PATH)]
+        @path = BEACH_BALL_PATH
+        @koala_io_params = [@path]
       end
 
       describe "and a content type" do
         before :each do
-          @koala_io_params.concat([stub("image/jpg")])
+          @stub_type = stub("image/jpg")
+          @koala_io_params.concat([@stub_type])
         end
 
-        it "should return an UploadIO with the same file path" do
-          stub_path = @koala_io_params[0] = "/stub/path/to/file"
-          Koala::UploadableIO.new(*@koala_io_params).io_or_path.should == stub_path
+        it "returns an UploadIO with the same file path" do
+          Koala::UploadableIO.new(*@koala_io_params).io_or_path.should == @path
         end
 
-        it "should return an UploadIO with the same content type" do
-          stub_type = @koala_io_params[1] = stub('Content Type')
-          Koala::UploadableIO.new(*@koala_io_params).content_type.should == stub_type
+        it "returns an UploadIO with the same content type" do
+          Koala::UploadableIO.new(*@koala_io_params).content_type.should == @stub_type
         end
 
-        it "should detect that NetHTTPService must be used" do
-          @koala_io_params[0] = mock
-          @koala_io_params[0].stub!(:read)
-          Koala::UploadableIO.new(*@koala_io_params).requires_base_http_service.should be_true
+        it "returns an UploadIO with the file's name" do
+          Koala::UploadableIO.new(*@koala_io_params).filename.should == File.basename(@path)
         end
       end
 
@@ -59,7 +58,8 @@ describe "Koala::UploadableIO" do
 
     describe "when given a File object" do
       before(:each) do
-        @koala_io_params = [File.open(BEACH_BALL_PATH)]
+        @file = File.open(BEACH_BALL_PATH)
+        @koala_io_params = [@file]
       end
 
       describe "and a content type" do
@@ -67,14 +67,18 @@ describe "Koala::UploadableIO" do
           @koala_io_params.concat(["image/jpg"])
         end
 
-        it "should return an UploadIO with the same io" do
+        it "returns an UploadIO with the same io" do
           Koala::UploadableIO.new(*@koala_io_params).io_or_path.should == @koala_io_params[0]
         end
 
-        it "should return an UplaodIO with the same content_type" do
+        it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = stub('Content Type')
           Koala::UploadableIO.new(*@koala_io_params).content_type.should == content_stub
         end
+
+        it "returns an UploadableIO with the right filename" do
+          Koala::UploadableIO.new(*@koala_io_params).filename.should == File.basename(@file.path)
+        end
       end
 
       describe "and no content type" do
@@ -87,16 +91,20 @@ describe "Koala::UploadableIO" do
         @tempfile, @uploaded_file = rails_3_mocks
       end
 
-      it "should get the content type via the content_type method" do
+      it "gets the path from the tempfile associated with the UploadedFile" do
+        expected_path = stub('Tempfile')
+        @tempfile.should_receive(:path).and_return(expected_path)
+        Koala::UploadableIO.new(@uploaded_file).io_or_path.should == expected_path
+      end
+
+      it "gets the content type via the content_type method" do
         expected_content_type = stub('Content Type')
         @uploaded_file.should_receive(:content_type).and_return(expected_content_type)
         Koala::UploadableIO.new(@uploaded_file).content_type.should == expected_content_type
       end
 
-      it "should get the path from the tempfile associated with the UploadedFile" do
-        expected_path = stub('Tempfile')
-        @tempfile.should_receive(:path).and_return(expected_path)
-        Koala::UploadableIO.new(@uploaded_file).io_or_path.should == expected_path
+      it "gets the filename from the UploadedFile" do
+        Koala::UploadableIO.new(@uploaded_file).filename.should == @uploaded_file.original_filename
       end
     end
 
@@ -105,7 +113,15 @@ describe "Koala::UploadableIO" do
         @file_hash = sinatra_mocks
       end
 
-      it "should get the content type from the :type key" do
+      it "gets the io_or_path from the :tempfile key" do
+        expected_file = stub('File')
+        @file_hash[:tempfile] = expected_file
+
+        uploadable = Koala::UploadableIO.new(@file_hash)
+        uploadable.io_or_path.should == expected_file
+      end
+
+      it "gets the content type from the :type key" do
         expected_content_type = stub('Content Type')
         @file_hash[:type] = expected_content_type
 
@@ -113,12 +129,9 @@ describe "Koala::UploadableIO" do
         uploadable.content_type.should == expected_content_type
       end
 
-      it "should get the io_or_path from the :tempfile key" do
-        expected_file = stub('File')
-        @file_hash[:tempfile] = expected_file
-
+      it "gets the content type from the :type key" do
         uploadable = Koala::UploadableIO.new(@file_hash)
-        uploadable.io_or_path.should == expected_file
+        uploadable.filename.should == @file_hash[:filename]
       end
     end
 
@@ -148,7 +161,7 @@ describe "Koala::UploadableIO" do
         Koala::UploadableIO.new(BEACH_BALL_PATH, "content/type").to_upload_io.should == @upload_io
       end
     end
-    
+
     context "if a filename was provided" do
       it "should call the constructor with the content type, file name, and the filename" do
         filename = "file"
@@ -159,7 +172,7 @@ describe "Koala::UploadableIO" do
   end
 
   describe "getting a file" do
-    it "should return the File if initialized with a file" do
+    it "returns the File if initialized with a file" do
       f = File.new(BEACH_BALL_PATH)
       Koala::UploadableIO.new(f).to_file.should == f
     end
@@ -175,19 +188,19 @@ describe "Koala::UploadableIO" do
     it "returns true for Rails 3 file uploads" do
       Koala::UploadableIO.binary_content?(rails_3_mocks.last).should be_true
     end
-    
+
     it "returns true for Sinatra file uploads" do
       Koala::UploadableIO.binary_content?(rails_3_mocks.last).should be_true
     end
-    
+
     it "returns true for File objects" do
       Koala::UploadableIO.binary_content?(File.open(BEACH_BALL_PATH)).should be_true
     end
-    
+
     it "returns false for everything else" do
       Koala::UploadableIO.binary_content?(StringIO.new).should be_false
       Koala::UploadableIO.binary_content?(BEACH_BALL_PATH).should be_false
       Koala::UploadableIO.binary_content?(nil).should be_false
     end
   end
-end  # describe UploadableIO
+end  # describe UploadableIO