koala 2.4.0 → 3.5.0

data/spec/cases/realtime_updates_spec.rb

@@ -36,6 +36,45 @@ describe "Koala::Facebook::RealtimeUpdates" do
       expect(updates).to be_a(Koala::Facebook::RealtimeUpdates)
     end
 
+    context "with global defaults" do
+      let(:app_id) { :app_id }
+      let(:app_secret) { :app_secret }
+      let(:app_access_token) { :app_access_token }
+
+      before :each do
+        Koala.configure do |config|
+          config.app_id = app_id
+          config.app_secret = app_secret
+          config.app_access_token = app_access_token
+        end
+      end
+
+      it "defaults to the configured data if not otherwise provided" do
+        rtu = Koala::Facebook::RealtimeUpdates.new
+        expect(rtu.app_id).to eq(app_id)
+        expect(rtu.secret).to eq(app_secret)
+        expect(rtu.app_access_token).to eq(app_access_token)
+      end
+
+      it "lets you override app_id" do
+        other_value = :another_id
+        rtu = Koala::Facebook::RealtimeUpdates.new(app_id: other_value)
+        expect(rtu.app_id).to eq(other_value)
+      end
+
+      it "lets you override secret" do
+        other_value = :another_secret
+        rtu = Koala::Facebook::RealtimeUpdates.new(secret: other_value)
+        expect(rtu.secret).to eq(other_value)
+      end
+
+      it "lets you override app_id" do
+        other_value = :another_token
+        rtu = Koala::Facebook::RealtimeUpdates.new(app_access_token: other_value)
+        expect(rtu.app_access_token).to eq(other_value)
+      end
+    end
+
     # attributes
     it "allows read access to app_id" do
       # in Ruby 1.9, .method returns symbols
@@ -67,25 +106,24 @@ describe "Koala::Facebook::RealtimeUpdates" do
       expect(updates).to be_a(Koala::Facebook::RealtimeUpdates)
     end
 
-    it "fetches an app_token from Facebook when provided an app_id and a secret" do
-      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :secret => @secret)
-      expect(updates.app_access_token).not_to be_nil
+    it "sets up the API with the app access token" do
+      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :app_access_token => @app_access_token)
+      expect(updates.api).to be_a(Koala::Facebook::API)
+      expect(updates.api.access_token).to eq(@app_access_token)
     end
+  end
 
-    it "uses the OAuth class to fetch a token when provided an app_id and a secret" do
-      oauth = Koala::Facebook::OAuth.new(@app_id, @secret)
-      token = oauth.get_app_access_token
-      expect(oauth).to receive(:get_app_access_token).and_return(token)
-      expect(Koala::Facebook::OAuth).to receive(:new).with(@app_id, @secret).and_return(oauth)
+  describe "#app_access_token" do
+    it "fetches an app_token from Facebook when provided an app_id and a secret" do
+      # integration test
       updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :secret => @secret)
+      expect(updates.app_access_token).not_to be_nil
     end
 
-    it "sets up the with the app acces token" do
-      updates = Koala::Facebook::RealtimeUpdates.new(:app_id => @app_id, :app_access_token => @app_access_token)
-      expect(updates.api).to be_a(Koala::Facebook::API)
-      expect(updates.api.access_token).to eq(@app_access_token)
+    it "returns the provided token if provided" do
+      updates = Koala::Facebook::RealtimeUpdates.new(app_id: @app_id, app_access_token: @app_access_token)
+      expect(updates.app_access_token).to eq(@app_access_token)
     end
-
   end
 
   describe "#subscribe" do

data/spec/cases/test_users_spec.rb

@@ -40,12 +40,52 @@ describe "Koala::Facebook::TestUsers" do
       expect(test_users).to be_a(Koala::Facebook::TestUsers)
     end
 
+    context "with global defaults" do
+      let(:app_id) { :app_id }
+      let(:app_secret) { :app_secret }
+      let(:app_access_token) { :app_access_token }
+
+      before :each do
+        Koala.configure do |config|
+          config.app_id = app_id
+          config.app_secret = app_secret
+          config.app_access_token = app_access_token
+        end
+      end
+
+      it "defaults to the configured data if not otherwise provided" do
+        test_users = Koala::Facebook::TestUsers.new
+        expect(test_users.app_id).to eq(app_id)
+        expect(test_users.secret).to eq(app_secret)
+        expect(test_users.app_access_token).to eq(app_access_token)
+      end
+
+      it "lets you override app_id" do
+        other_value = :another_id
+        test_users = Koala::Facebook::TestUsers.new(app_id: other_value)
+        expect(test_users.app_id).to eq(other_value)
+      end
+
+      it "lets you override secret" do
+        other_value = :another_secret
+        test_users = Koala::Facebook::TestUsers.new(secret: other_value)
+        expect(test_users.secret).to eq(other_value)
+      end
+
+      it "lets you override app_id" do
+        other_value = :another_token
+        test_users = Koala::Facebook::TestUsers.new(app_access_token: other_value)
+        expect(test_users.app_access_token).to eq(other_value)
+      end
+    end
+
+
     it "uses the OAuth class to fetch a token when provided an app_id and a secret" do
       oauth = Koala::Facebook::OAuth.new(@app_id, @secret)
       token = oauth.get_app_access_token
       expect(oauth).to receive(:get_app_access_token).and_return(token)
       expect(Koala::Facebook::OAuth).to receive(:new).with(@app_id, @secret).and_return(oauth)
-      test_users = Koala::Facebook::TestUsers.new(:app_id => @app_id, :secret => @secret)
+      Koala::Facebook::TestUsers.new(:app_id => @app_id, :secret => @secret)
     end
 
     # attributes
@@ -265,9 +305,23 @@ describe "Koala::Facebook::TestUsers" do
         options = {:some_http_option => true}
         # should come twice, once for each user
         @stubbed = true
-        expect(Koala.http_service).to receive(:make_request).with(anything, anything, anything, options).twice.and_return(Koala::HTTPService::Response.new(200, "{}", {}))
+        expect(Koala.http_service).to receive(:make_request).twice do |request|
+          expect(request.raw_options).to eq(options)
+          Koala::HTTPService::Response.new(200, "{}", {})
+        end
         @test_users.befriend(@user1, @user2, options)
       end
+
+      it "includes the secret, generating the appsecret_proof in both calls if provided" do
+        # should come twice, once for each user
+        @stubbed = true
+        test_users = Koala::Facebook::TestUsers.new({:secret => @secret, :app_id => @app_id})
+        expect(Koala.http_service).to receive(:make_request).twice do |request|
+          expect(request.post_args).to include("appsecret_proof")
+          Koala::HTTPService::Response.new(200, "{}", {})
+        end
+        test_users.befriend(@user1, @user2)
+      end
     end
   end # when used without network
 

data/spec/cases/uploadable_io_spec.rb

@@ -8,7 +8,7 @@ module Koala::MIME
   end
 end
 
-describe "Koala::UploadableIO" do
+describe "Koala::HTTPService::UploadableIO" do
   def rails_3_mocks
     tempfile = double('Tempfile', :path => "foo")
     uploaded_file = double('ActionDispatch::Http::UploadedFile',
@@ -39,15 +39,15 @@ describe "Koala::UploadableIO" do
         end
 
         it "returns an UploadIO with the same file path" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@path)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@path)
         end
 
         it "returns an UploadIO with the same content type" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(@stub_type)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(@stub_type)
         end
 
         it "returns an UploadIO with the file's name" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@path))
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@path))
         end
       end
 
@@ -68,16 +68,16 @@ describe "Koala::UploadableIO" do
         end
 
         it "returns an UploadIO with the same io" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
         end
 
         it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = double('Content Type')
-          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
         end
 
         it "returns an UploadableIO with the right filename" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
         end
       end
 
@@ -100,16 +100,16 @@ describe "Koala::UploadableIO" do
 
         it "returns an UploadIO with the same io" do
           #Problem comparing Tempfile in Ruby 1.8, REE and Rubinius mode 1.8
-          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path.path).to eq(@koala_io_params[0].path)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).io_or_path.path).to eq(@koala_io_params[0].path)
         end
 
         it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = double('Content Type')
-          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
         end
 
         it "returns an UploadableIO with the right filename" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).filename).to eq(File.basename(@file.path))
         end
       end
 
@@ -130,18 +130,18 @@ describe "Koala::UploadableIO" do
         end
 
         it "returns an UploadableIO with the same io" do
-          expect(Koala::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).io_or_path).to eq(@koala_io_params[0])
         end
 
         it "returns an UploadableIO with the same content_type" do
           content_stub = @koala_io_params[1] = double('Content Type')
-          expect(Koala::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
+          expect(Koala::HTTPService::UploadableIO.new(*@koala_io_params).content_type).to eq(content_stub)
         end
       end
 
       describe "and no content type" do
         it "raises an exception" do
-          expect { Koala::UploadableIO.new(*@koala_io_params) }.to raise_exception(Koala::KoalaError)
+          expect { Koala::HTTPService::UploadableIO.new(*@koala_io_params) }.to raise_exception(Koala::KoalaError)
         end
       end
     end
@@ -154,17 +154,17 @@ describe "Koala::UploadableIO" do
       it "gets the path from the tempfile associated with the UploadedFile" do
         expected_path = double('Tempfile')
         expect(@tempfile).to receive(:path).and_return(expected_path)
-        expect(Koala::UploadableIO.new(@uploaded_file).io_or_path).to eq(expected_path)
+        expect(Koala::HTTPService::UploadableIO.new(@uploaded_file).io_or_path).to eq(expected_path)
       end
 
       it "gets the content type via the content_type method" do
         expected_content_type = double('Content Type')
         expect(@uploaded_file).to receive(:content_type).and_return(expected_content_type)
-        expect(Koala::UploadableIO.new(@uploaded_file).content_type).to eq(expected_content_type)
+        expect(Koala::HTTPService::UploadableIO.new(@uploaded_file).content_type).to eq(expected_content_type)
       end
 
       it "gets the filename from the UploadedFile" do
-        expect(Koala::UploadableIO.new(@uploaded_file).filename).to eq(@uploaded_file.original_filename)
+        expect(Koala::HTTPService::UploadableIO.new(@uploaded_file).filename).to eq(@uploaded_file.original_filename)
       end
     end
 
@@ -177,7 +177,7 @@ describe "Koala::UploadableIO" do
         expected_file = double('File')
         @file_hash[:tempfile] = expected_file
 
-        uploadable = Koala::UploadableIO.new(@file_hash)
+        uploadable = Koala::HTTPService::UploadableIO.new(@file_hash)
         expect(uploadable.io_or_path).to eq(expected_file)
       end
 
@@ -185,12 +185,12 @@ describe "Koala::UploadableIO" do
         expected_content_type = double('Content Type')
         @file_hash[:type] = expected_content_type
 
-        uploadable = Koala::UploadableIO.new(@file_hash)
+        uploadable = Koala::HTTPService::UploadableIO.new(@file_hash)
         expect(uploadable.content_type).to eq(expected_content_type)
       end
 
       it "gets the content type from the :type key" do
-        uploadable = Koala::UploadableIO.new(@file_hash)
+        uploadable = Koala::HTTPService::UploadableIO.new(@file_hash)
         expect(uploadable.filename).to eq(@file_hash[:filename])
       end
     end
@@ -199,12 +199,12 @@ describe "Koala::UploadableIO" do
       # what that means is tested below
       it "should accept a file object alone" do
         params = [BEACH_BALL_PATH]
-        expect { Koala::UploadableIO.new(*params) }.not_to raise_exception
+        expect { Koala::HTTPService::UploadableIO.new(*params) }.not_to raise_exception
       end
 
       it "should accept a file path alone" do
         params = [BEACH_BALL_PATH]
-        expect { Koala::UploadableIO.new(*params) }.not_to raise_exception
+        expect { Koala::HTTPService::UploadableIO.new(*params) }.not_to raise_exception
       end
     end
   end
@@ -218,7 +218,7 @@ describe "Koala::UploadableIO" do
     context "if no filename was provided" do
       it "should call the constructor with the content type, file name, and a dummy file name" do
         expect(UploadIO).to receive(:new).with(BEACH_BALL_PATH, "content/type", anything).and_return(@upload_io)
-        expect(Koala::UploadableIO.new(BEACH_BALL_PATH, "content/type").to_upload_io).to eq(@upload_io)
+        expect(Koala::HTTPService::UploadableIO.new(BEACH_BALL_PATH, "content/type").to_upload_io).to eq(@upload_io)
       end
     end
 
@@ -226,7 +226,7 @@ describe "Koala::UploadableIO" do
       it "should call the constructor with the content type, file name, and the filename" do
         filename = "file"
         expect(UploadIO).to receive(:new).with(BEACH_BALL_PATH, "content/type", filename).and_return(@upload_io)
-        Koala::UploadableIO.new(BEACH_BALL_PATH, "content/type", filename).to_upload_io
+        Koala::HTTPService::UploadableIO.new(BEACH_BALL_PATH, "content/type", filename).to_upload_io
       end
     end
   end
@@ -234,33 +234,33 @@ describe "Koala::UploadableIO" do
   describe "getting a file" do
     it "returns the File if initialized with a file" do
       f = File.new(BEACH_BALL_PATH)
-      expect(Koala::UploadableIO.new(f).to_file).to eq(f)
+      expect(Koala::HTTPService::UploadableIO.new(f).to_file).to eq(f)
     end
 
     it "should open up and return a file corresponding to the path if io_or_path is a path" do
       result = double("File")
       expect(File).to receive(:open).with(BEACH_BALL_PATH).and_return(result)
-      expect(Koala::UploadableIO.new(BEACH_BALL_PATH).to_file).to eq(result)
+      expect(Koala::HTTPService::UploadableIO.new(BEACH_BALL_PATH).to_file).to eq(result)
     end
   end
 
   describe ".binary_content?" do
     it "returns true for Rails 3 file uploads" do
-      expect(Koala::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
+      expect(Koala::HTTPService::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
     end
 
     it "returns true for Sinatra file uploads" do
-      expect(Koala::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
+      expect(Koala::HTTPService::UploadableIO.binary_content?(rails_3_mocks.last)).to be_truthy
     end
 
     it "returns true for File objects" do
-      expect(Koala::UploadableIO.binary_content?(File.open(BEACH_BALL_PATH))).to be_truthy
+      expect(Koala::HTTPService::UploadableIO.binary_content?(File.open(BEACH_BALL_PATH))).to be_truthy
     end
 
     it "returns false for everything else" do
-      expect(Koala::UploadableIO.binary_content?(StringIO.new)).to be_falsey
-      expect(Koala::UploadableIO.binary_content?(BEACH_BALL_PATH)).to be_falsey
-      expect(Koala::UploadableIO.binary_content?(nil)).to be_falsey
+      expect(Koala::HTTPService::UploadableIO.binary_content?(StringIO.new)).to be_falsey
+      expect(Koala::HTTPService::UploadableIO.binary_content?(BEACH_BALL_PATH)).to be_falsey
+      expect(Koala::HTTPService::UploadableIO.binary_content?(nil)).to be_falsey
     end
   end
 end  # describe UploadableIO

data/spec/fixtures/facebook_data.yml

@@ -5,9 +5,7 @@
 # by enter an OAuth token, code, and session_key (for real users) or changing the app_id and secret (for test users)
 # (note for real users: this will leave some photos and videos posted to your wall, since they can't be deleted through the API)
 
-# These values are configured to work with the OAuth Playground app by default
-# Of course, you can change this to work with your own app.
-# Check out http://oauth.twoalex.com/ to easily generate tokens, cookies, etc.
+# These values are configured to work with a test app. If you want, you can change this to work with your own app.
 
 # Your OAuth token should have the read_stream, publish_stream, user_photos, user_videos, and read_insights permissions.
 oauth_token:
@@ -22,7 +20,7 @@ oauth_test_data:
   # These values will work out of the box
   app_id: 119908831367602
   secret: e45e55a333eec232d4206d2703de1307
-  callback_url: http://oauth.twoalex.com/
+  callback_url: http://testdomain.koalatest.test/
   app_access_token: 119908831367602|o3wswWQ88LYjEC9-ukR_gjRIOMw.
   raw_token_string: "access_token=119908831367602|2.6GneoQbnEqtSiPppZzDU4Q__.3600.1273366800-2905623|3OLa3w0x1K4C1S5cOgbs07TytAk.&expires=6621"
   raw_offline_access_token_string: access_token=119908831367602|2.6GneoQbnEqtSiPppZzDU4Q__.3600.1273366800-2905623|3OLa3w0x1K4C1S5cOgbs07TytAk.
@@ -54,7 +52,7 @@ oauth_test_data:
       issued_at: 1301917299
 
 subscription_test_data:
-  subscription_path: http://oauth.twoalex.com/subscriptions
+  subscription_path: https://testdomain.koalatest.test/subscriptions
   verify_token: "myverificationtoken|1f54545d5f722733e17faae15377928f"
   challenge_data:
     "hub.challenge": "1290024882"
@@ -62,4 +60,4 @@ subscription_test_data:
     "hub.mode": "subscribe"
 
 vcr_data:
-  oauth_token: CAACEdEose0cBAKuiUM40KZBEsq2l0iggaMGZBPI74svGQRMmZCPXb7eZCYPhNUbVXnnYZCjXKFKIc7HgYllr4RDIKrANHm6kKncOx0Y3UpDqLliRGZAnSEUypyFworUnBMOQJBlAuB1wlwYJZB7LIZCobCcnT2q9QwrZBpK3qAZB3u7ZAJaZAdsMZBsyALkAXatoj75leWXhgXfT1QiJHZBGoRlz07Q85z1dZBReK4ZD
+  oauth_token: CAACEdEose0cBAKuiUM40KZBEsq2l0iggaMGZBPI74svGQRMmZCPXb7eZCYPhNUbVXnnYZCjXKFKIc7HgYllr4RDIKrANHm6kKncOx0Y3UpDqLliRGZAnSEUypyFworUnBMOQJBlAuB1wlwYJZB7LIZCobCcnT2q9QwrZBpK3qAZB3u7ZAJaZAdsMZBsyALkAXatoj75leWXhgXfT1QiJHZBGoRlz07Q85z1dZBReK4ZD