koala 1.1.0 → 1.2.0

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
@@ -82,21 +86,53 @@ describe "Koala::UploadableIO" do
       end
     end
 
+    describe "when given an IO object" do
+      before(:each) do
+        @io = StringIO.open("abcdefgh")
+        @koala_io_params = [@io]
+      end
+
+      describe "and a content type" do
+        before :each do
+          @koala_io_params.concat(["image/jpg"])
+        end
+
+        it "returns an UploadableIO with the same io" do
+          Koala::UploadableIO.new(*@koala_io_params).io_or_path.should == @koala_io_params[0]
+        end
+
+        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
+      end
+
+      describe "and no content type" do
+        it "raises an exception" do
+          lambda { Koala::UploadableIO.new(*@koala_io_params) }.should raise_exception(Koala::KoalaError)
+        end
+      end
+    end
+
     describe "when given a Rails 3 ActionDispatch::Http::UploadedFile" do
       before(:each) 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 +141,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 +157,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 +189,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 +200,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 +216,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

data/spec/cases/utils_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Koala::Utils do
+  it "has a deprecate method" do
+    Koala::Utils.should respond_to(:deprecate)
+  end
+
+  # AFAIK there's no way to test that (Kernel.)warn receives the text
+  # Kernel.should_receive(:warn) doesn't seem to work, even though the text gets printed
+end

data/spec/fixtures/facebook_data.yml

@@ -1,23 +1,24 @@
-# Check out http://oauth.twoalex.com/ to easily generate tokens, cookies, etc.
-# Those values will work with the default settings in this yaml.
+# Testing data
+
+# IMPORTANT NOTE: live tests will run against a test users automatically
+# If you want to run them against a real user or test users on a different account, you can
+# 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.
-# Just remember to update all fields!
- 
-# You must supply this value yourself to test the GraphAPI class.
-# Your OAuth token should have publish_stream, read_stream, and user_photos permissions.
-oauth_token: 
+# Check out http://oauth.twoalex.com/ to easily generate tokens, cookies, etc.
 
-# for testing the OAuth class    
+# Your OAuth token should have the read_stream, publish_stream, user_photos, user_videos, and read_insights permissions.
+oauth_token:
+
+# for testing the OAuth class
 # baseline app
-oauth_test_data: 
-  # You must supply this value yourself, since they will expire.
-  code: 
-  # easiest way to get session keys: use multiple test accounts with the Javascript login at http://oauth.twoalex.com
-  session_key: 
-  multiple_session_keys:
-    - 
-    - 
-  
+oauth_test_data:
+  # the following two values are not needed for most of the test suite, but the relevant tests will not run if they're not present
+  code:
+  session_key:
+
   # These values will work out of the box
   app_id: 119908831367602
   secret: e45e55a333eec232d4206d2703de1307
@@ -25,15 +26,16 @@ oauth_test_data:
   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.
-  valid_cookies: 
+  valid_cookies:
     # note: the tests stub the time class so these default cookies are always valid (if you're using the default app)
     # if not you may want to remove the stubbing to test expiration
     fbs_119908831367602: '"access_token=119908831367602|2.LKE7ksSPOx0V_8mHPr2NHQ__.3600.1273363200-2905623|CMpi0AYbn03Oukzv94AUha2qbO4.&expires=1273363200&secret=lT_9zm5r5IbJ6Aa5O54nFw__&session_key=2.LKE7ksSPOx0V_8mHPr2NHQ__.3600.1273363200-2905623&sig=9515e93113921f9476a4efbdd4a3c746&uid=2905623"'
-  expired_cookies:
-    fbs_119908831367602: '"access_token=119908831367602|2.xv9mi6QSOpr474s4n2X_pw__.3600.1273287600-2905623|yVt5WH_S6J5p3gFa5_5lBzckhws.&expires=1273287600&secret=V_E79ovQnXqxGctFuC_n5A__&session_key=2.xv9mi6QSOpr474s4n2X_pw__.3600.1273287600-2905623&sig=eeef60838c0c800258d89b7e6ddddddb&uid=2905623"'
-  offline_access_cookies: 
+  offline_access_cookies:
     # note: I've revoked the offline access for security reasons, so you can't make calls against this :)
     fbs_119908831367602: '"access_token=119908831367602|08170230801eb225068e7a70-2905623|Q3LDCYYF8CX9cstxnZLsxiR0nwg.&expires=0&secret=78abaee300b392e275072a9f2727d436&session_key=08170230801eb225068e7a70-2905623&sig=423b8aa4b6fa1f9a571955f8e929d567&uid=2905623"'
+  valid_signed_cookies: 
+    "fbsr_119908831367602": "f1--LHwjHVCxfs97hRHL-4cF-0jNxZRc6MGzo1qHLb0.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImNvZGUiOiIyLkFRQm90a0pBWlhVY1l3RkMuMzYwMC4xMzE0ODEzNjAwLjEtMjkwNTYyM3x4V2xya0d0UmJIZlpIclRnVWwxQmxJcVhRbjQiLCJpc3N1ZWRfYXQiOjEzMTQ4MDY2NTUsInVzZXJfaWQiOiIyOTA1NjIzIn0"
+
 
   # These values from the OAuth Playground (see above) will work out of the box
   # You can update this to live data if desired
@@ -44,17 +46,17 @@ oauth_test_data:
       algorithm: HMAC-SHA256
       user_id: "2905623"
       oauth_token: 119908831367602|2.zVF_6NrMELHuJa4gIU9tKw__.3600.1301922000-2905623|zgqPsr2BG9LoOK9kekGgRURZx0k
-      user: 
+      user:
         country: de
         locale: de_DE
-        age: 
+        age:
           min: 21
       issued_at: 1301917299
 
 subscription_test_data:
   subscription_path: http://oauth.twoalex.com/subscriptions
   verify_token: "myverificationtoken|1f54545d5f722733e17faae15377928f"
-  challenge_data: 
+  challenge_data:
     "hub.challenge": "1290024882"
     "hub.verify_token": "myverificationtoken|1f54545d5f722733e17faae15377928f"
     "hub.mode": "subscribe"