Fix typo

README.markdown

@@ -319,7 +319,7 @@ An array of Ruby:Box users in an enterprise (Supports Filtering, Limit and Offse
 users = client.users
 ```
 
-* Remeber the API filters "name" and "login" by the start of the string.  ie: to get "sean+awesome@gmail.com" an approriate filter term would be "sean"
+* Remember the API filters "name" and "login" by the start of the string.  ie: to get "sean+awesome@gmail.com" an approriate filter term would be "sean"
 
 ```ruby
 users = client.users("sean" , 10 , 1)

lib/ruby-box/client.rb

@@ -76,7 +76,7 @@ def create_folder(path)
       folder = root_folder
       folder_names = split_path(path)
       folder_names.each do |folder_name|
-        new_folder = folder.folders(folder_name).first        
+        new_folder = folder.folders(folder_name).first
         if !new_folder
           begin
             new_folder = folder.create_subfolder(folder_name)
@@ -158,6 +158,6 @@ def fmt_events_args(stream_position, stream_type, limit)
       limit = limit.kind_of?(Fixnum) ? limit : 100
       "stream_position=#{stream_position}&stream_type=#{stream_type}&limit=#{limit}"
     end
-    
+
   end
 end

lib/ruby-box/comment.rb

@@ -1,6 +1,6 @@
 module RubyBox
   class Comment < Item
-    
+
     private
 
     def resource_name
@@ -11,4 +11,4 @@ def has_mini_format?
       true
     end
   end
-end
+end

lib/ruby-box/event_response.rb

@@ -12,6 +12,6 @@ def events
     def resource_name
       'events'
     end
-    
+
   end
 end

lib/ruby-box/exceptions.rb

@@ -1,4 +1,4 @@
-module RubyBox 
+module RubyBox
   class RubyBoxError < StandardError
     attr_accessor :body, :status
 

lib/ruby-box/file.rb

@@ -78,7 +78,7 @@ def create_comment(message)
     def file_content_url
       "#{RubyBox::API_URL}/#{resource_name}/#{id}/content"
     end
-    
+
 
     def resource_name
       'files'

lib/ruby-box/folder.rb

@@ -22,7 +22,7 @@ def upload_file(filename, data, overwrite=true)
       begin
         resp = file.upload_content(data) #write a new file. If there is a conflict, update the conflicted file.
       rescue RubyBox::ItemNameInUse => e
-        
+
         # if overwrite flag is false, simply raise exception.
         raise e unless overwrite
 

lib/ruby-box/item.rb

@@ -75,12 +75,12 @@ def method_missing(method, *args, &block)
       # Support has many and paginated has many relationships.
       return many(key) if @@has_many.include?(key)
       return paginated(key, args[0] || 100, args[1] || 0, args[2]) if @@has_many_paginated.include?(key)
-      
+
       # update @raw_item hash if this appears to be a setter.
       setter = method.to_s.end_with?('=')
       key = key[0...-1] if setter
       @raw_item[key] = args[0] if setter and update_fields.include?(key)
-      
+
       # we may have a mini version of the object loaded, fix this.
       reload_meta if @raw_item[key].nil? and has_mini_format?
 

lib/ruby-box/session.rb

@@ -64,14 +64,17 @@ def request(uri, request, raw=false, retries=0)
       #http.set_debug_output($stdout)
 
       if @access_token
+        request.delete('Authorization')
         request.add_field('Authorization', "Bearer #{@access_token.token}")
       else
+        request.delete('Authorization')
         request.add_field('Authorization', build_auth_header)
       end
 
-
-      request.add_field('As-User', "#{@as_user}") if @as_user
-
+      if @as_user
+        request.delete('As-User')
+        request.add_field('As-User', "#{@as_user}")
+      end
       response = http.request(request)
 
       if response.is_a? Net::HTTPNotFound
@@ -111,6 +114,7 @@ def handle_errors( response, raw )
       body = response.body
       begin
         parsed_body = JSON.parse(body)
+        raise if body.empty? || body.nil?
       rescue
         msg = body.nil? || body.empty? ? "no data returned" : body
         parsed_body = { "message" =>  msg }

lib/ruby-box/shared_link.rb

@@ -1,10 +1,10 @@
 module RubyBox
   class SharedLink < Item
-    
+
     private
-    
+
     def has_mini_format?
       false
     end
   end
-end
+end

lib/ruby-box/user.rb

@@ -1,16 +1,16 @@
 module RubyBox
   class User < Item
-    
+
     def enterprise
       resp = @session.get( "#{RubyBox::API_URL}/users/#{id}?fields=enterprise" )
       resp["enterprise"]
     end
-    
+
     private
 
     def resource_name
       'users'
     end
-    
+
   end
-end
+end

spec/client_spec.rb

@@ -37,23 +37,23 @@
       client.split_path('foo/bar/').should == ['foo', 'bar']
     end
   end
-  
+
   describe '#create_folder' do
     it 'doesnt call folder.create_folder if the folder exists' do
       client = RubyBox::Client.new(@session)
-      mock_root_folder = mock( Object )
-      test_folder = mock( Object )
+      mock_root_folder = double
+      test_folder = double
       mock_root_folder.should_receive(:folders).and_return([test_folder])
       mock_root_folder.should_not_receive(:create_subfolder)
       client.should_receive(:root_folder).and_return(mock_root_folder)
       result = client.create_folder( '/test0')
       result.should == test_folder
     end
-    
+
     it 'calls folder.create_folder if the folder does not exist' do
       client = RubyBox::Client.new(@session)
-      mock_root_folder = mock( Object )
-      test_folder = mock( Object )
+      mock_root_folder = double
+      test_folder = double
       mock_root_folder.should_receive(:folders).and_return([])
       mock_root_folder.should_receive(:create_subfolder).and_return(test_folder)
       client.should_receive(:root_folder).and_return(mock_root_folder)

spec/file_spec.rb

@@ -51,7 +51,7 @@
       file.name = 'Funky Monkey.jpg'
       file.description = 'a new description'
       file.name.should == 'Funky Monkey.jpg'
-      file.description.should == 'a new description'    
+      file.description.should == 'a new description'
     end
 
     it 'should not update files raw_item hash for keys not in update_fields' do
@@ -107,4 +107,4 @@
     end
   end
 
-end
+end

spec/folder_spec.rb

@@ -34,7 +34,7 @@
     it "compares name in a case insensitive manner" do
       items = [
         JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047867",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s your folder"        },        {            "type": "file",            "id": "409042867",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "0",    "limit": "2"}'),
-        JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047868",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s another folder"        },        {            "type": "file",            "id": "409042810",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "2",    "limit": "2"}')  
+        JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047868",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s another folder"        },        {            "type": "file",            "id": "409042810",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "2",    "limit": "2"}')
       ]
 
       RubyBox::Session.any_instance.stub(:request) { items.pop }
@@ -96,7 +96,7 @@
     it "should allow you to filter files by name" do
       items = [
         JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047867",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s your folder"        },        {            "type": "file",            "id": "409042867",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "0",    "limit": "2"}'),
-        JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047868",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s another folder"        },        {            "type": "file",            "id": "409042810",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "2",    "limit": "2"}')  
+        JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047868",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s another folder"        },        {            "type": "file",            "id": "409042810",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "2",    "limit": "2"}')
       ]
 
       RubyBox::Session.any_instance.stub(:request) { items.pop }
@@ -108,7 +108,7 @@
 
       items = [
         JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047867",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s your folder"        },        {            "type": "file",            "id": "409042867",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "0",    "limit": "2"}'),
-        JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047868",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s another folder"        },        {            "type": "file",            "id": "409042810",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "2",    "limit": "2"}')  
+        JSON.parse('{    "total_count": 4,    "entries": [        {            "type": "folder",            "id": "409047868",            "sequence_id": "1",            "etag": "1",            "name": "Here\'s another folder"        },        {            "type": "file",            "id": "409042810",            "sequence_id": "1",            "etag": "1",            "name": "A choice file"        }    ],    "offset": "2",    "limit": "2"}')
       ]
 
       # should return no files.