rscribd 1.1.0 → 1.2.0

data/lib/support/extensions.rb

@@ -0,0 +1,26 @@
+# @private
+class Symbol
+  def to_proc
+    Proc.new { |*args| args.shift.__send__(self, *args) }
+  end unless method_defined?(:to_proc)
+end
+
+# @private
+class Hash
+   # Taken from Rails, with appreciation to DHH
+   def stringify_keys
+     inject({}) do |options, (key, value)|
+       options[key.to_s] = value
+       options
+     end
+   end unless method_defined?(:stringify_keys)
+end
+
+# @private
+class Array
+  def to_hsh
+    h = Hash.new
+    each { |k, v| h[k] = v }
+    h
+  end
+end

data/lib/{scribdmultiparthack.rb → support/multipart_hack.rb}

@@ -6,7 +6,9 @@ require 'rubygems'
 require 'mime/types' # Requires gem install mime-types
 require 'cgi'
 
-module Net #:nodoc:all
+# @private
+module Net
+  # @private
   class HTTP::Post
     def multipart_params=(param_hash={})
       boundary_token = [Array.new(8) {rand(256)}].join

data/rscribd.gemspec

@@ -0,0 +1,86 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rscribd}
+  s.version = "1.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tim Morgan", "Jared Friedman", "Mike Watts"]
+  s.date = %q{2010-05-13}
+  s.description = %q{The official Ruby gem for the Scribd API. Scribd is a document-sharing website allowing people to upload and view documents online.}
+  s.email = %q{api@scribd.com}
+  s.extra_rdoc_files = [
+    "README"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "README",
+     "Rakefile",
+     "VERSION",
+     "lib/rscribd.rb",
+     "lib/scribd/api.rb",
+     "lib/scribd/category.rb",
+     "lib/scribd/collection.rb",
+     "lib/scribd/document.rb",
+     "lib/scribd/errors.rb",
+     "lib/scribd/resource.rb",
+     "lib/scribd/security.rb",
+     "lib/scribd/user.rb",
+     "lib/support/extensions.rb",
+     "lib/support/multipart_hack.rb",
+     "rscribd.gemspec",
+     "sample/01_upload.rb",
+     "sample/02_user.rb",
+     "sample/test.txt",
+     "spec/api_spec.rb",
+     "spec/category_spec.rb",
+     "spec/collection_spec.rb",
+     "spec/document_spec.rb",
+     "spec/error_spec.rb",
+     "spec/resource_spec.rb",
+     "spec/rscribd_spec.rb",
+     "spec/security_spec.rb",
+     "spec/user_spec.rb"
+  ]
+  s.homepage = %q{http://www.scribd.com/developers}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rscribd}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Ruby client library for the Scribd API}
+  s.test_files = [
+    "spec/api_spec.rb",
+     "spec/category_spec.rb",
+     "spec/collection_spec.rb",
+     "spec/document_spec.rb",
+     "spec/error_spec.rb",
+     "spec/resource_spec.rb",
+     "spec/rscribd_spec.rb",
+     "spec/security_spec.rb",
+     "spec/user_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+    else
+      s.add_dependency(%q<mime-types>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<mime-types>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+  end
+end
+

data/spec/category_spec.rb

@@ -0,0 +1,177 @@
+CATEGORY = Proc.new { |id, name, children|
+  id ||= rand(1000)
+  name ||= "Test Category #{id}"
+  children ||= nil
+  
+  str = <<-EOF
+    <id>#{id}</id>
+    <name><![CDATA[#{name}]]></name>
+  EOF
+  str + (children ? "<subcategories>#{children}</subcategories>" : "")
+}
+
+CATEGORY_TAG = Proc.new { |root, category|
+  root ||= 'result'
+  category ||= CATEGORY.call
+  
+  <<-EOF
+    <#{root}>
+      #{category}
+    </#{root}>
+  EOF
+}
+
+RESULT = Proc.new { |categories|
+  categories ||= (0..10).map { CATEGORY_TAG.call(nil, nil, ((0..10).map { CATEGORY_TAG.call('subcategory') }.join("\n"))) }.join("\n")
+  <<-EOF
+    <?xml version="1.0" encoding="UTF-8"?>
+    <rsp stat="ok">
+      <result_set>
+        #{categories}
+      </result_set>
+    </rsp>
+  EOF
+}
+
+describe Scribd::Category do
+  subject { Scribd::Category.new(:xml => REXML::Document.new(CATEGORY_TAG.call(nil, CATEGORY.call('12', 'test'))).root) }
+  
+  describe "#initialize" do
+    it "should raise an error if initialized without XML" do
+      lambda { Scribd::Category.new :name => 'foo' }.should raise_error
+    end
+    
+    context "attributes" do
+      its(:id) { should eql('12') }
+      its(:name) { should eql('test') }
+    end
+    
+    it "should populate children that link back to their parents" do
+      response = CATEGORY_TAG.call(nil, CATEGORY.call(nil, nil, CATEGORY_TAG.call('subcategory', CATEGORY.call('100'))))
+      
+      category = Scribd::Category.new(:xml => REXML::Document.new(response).root)
+      Scribd::API.instance.should_not_receive(:send_request) # not really being tested here, but we should make sure we don't actually make remote requests
+      category.children.should be_kind_of(Array)
+      category.children.first.should be_kind_of(Scribd::Category)
+      category.children.first.id.should eql('100')
+      category.children.first.name.should eql('Test Category 100')
+      category.children.first.children_preloaded?.should be_false
+      category.children.first.parent.should eql(category)
+    end
+    
+    it { should be_saved }
+    it { should be_created }
+  end
+  
+  describe "#children_preloaded?" do
+    it "should be true for categories initialized with children" do
+      response = CATEGORY_TAG.call(nil, CATEGORY.call(nil, nil, CATEGORY_TAG.call('subcategory')))
+      Scribd::Category.new(:xml => REXML::Document.new(response).root).children_preloaded?.should be_true
+    end
+    
+    it "should be false for categories initialized without children" do
+      Scribd::Category.new(:xml => REXML::Document.new(CATEGORY_TAG.call).root).children_preloaded?.should be_false
+    end
+  end
+  
+  describe :all do
+    before :each do
+      @response = REXML::Document.new(RESULT.call).root
+    end
+    
+    it "should send an API request to docs.getCategories" do
+      Scribd::API.instance.should_receive(:send_request).once.with('docs.getCategories').and_return(@response)
+      Scribd::Category.all
+    end
+    
+    it "should set with_subcategories if include_children is true" do
+      Scribd::API.instance.should_receive(:send_request).once.with('docs.getCategories', :with_subcategories => true).and_return(@response)
+      Scribd::Category.all(true)
+    end
+    
+    it "should return an array of categories" do
+      Scribd::API.instance.stub!(:send_request).and_return(@response)
+      categories = Scribd::Category.all
+      categories.should be_kind_of(Array)
+      categories.first.should be_kind_of(Scribd::Category)
+      categories.last.should be_kind_of(Scribd::Category)
+    end
+  end
+  
+  describe "#children" do
+    before :each do
+      xml = REXML::Document.new(CATEGORY_TAG.call(nil, CATEGORY.call(nil, nil, CATEGORY_TAG.call('subcategory')))).root
+      @preloaded = Scribd::Category.new(:xml => xml)
+      
+      xml = REXML::Document.new(CATEGORY_TAG.call(nil, CATEGORY.call('3'))).root
+      @not_preloaded = Scribd::Category.new(:xml => xml)
+      
+      @response = REXML::Document.new(RESULT.call(CATEGORY_TAG.call)).root
+    end
+    
+    it "should not make a network call if the category has preloaded children" do
+      Scribd::API.instance.should_not_receive(:send_request)
+      @preloaded.children
+    end
+    
+    it "should otherwise make an API call to docs.getCategories" do
+      Scribd::API.instance.should_receive(:send_request).once.with('docs.getCategories', :category_id => '3').and_return(@response)
+      @not_preloaded.children
+    end
+    
+    it "should return an array of child categories" do
+      Scribd::API.instance.stub!(:send_request).and_return(@response)
+      cats = @not_preloaded.children
+      cats.should be_kind_of(Array)
+      cats.first.should be_kind_of(Scribd::Category)
+    end
+  end
+  
+  describe "#browse" do
+    before :each do
+      @response = REXML::Document.new(<<-EOF
+        <?xml version="1.0" encoding="UTF-8"?>
+        <rsp stat="ok">
+          <result_set totalResultsAvailable="922" totalResultsReturned="2" firstResultPosition="1" list="true">
+            <result>
+              <title>&lt;![CDATA[Ruby on Java]]&gt;</title>
+              <description>&lt;![CDATA[Ruby On Java, Barcamp, Washington DC]]&gt;</description>
+              <access_key>key-t3q5qujoj525yun8gf7</access_key>
+              <doc_id>244565</doc_id>
+              <page_count>10</page_count>
+              <download_formats></download_formats>
+            </result>
+            <result>
+              <title>&lt;![CDATA[Ruby on Java Part II]]&gt;</title>
+              <description>&lt;![CDATA[Ruby On Java Part II, Barcamp, Washington DC]]&gt;</description>
+              <access_key>key-2b3udhalycthsm91d1ps</access_key>
+              <doc_id>244567</doc_id>
+              <page_count>12</page_count>
+              <download_formats>pdf,txt</download_formats>
+            </result>
+          </result_set>
+        </rsp>
+      EOF
+      ).root
+    end
+    
+    it "should make an API call to docs.browse" do
+      Scribd::API.instance.should_receive(:send_request).once.with('docs.browse', :category_id => '12').and_return(@response)
+      subject.browse
+    end
+    
+    it "should pass options to the API call" do
+      Scribd::API.instance.should_receive(:send_request).once.with('docs.browse', :category_id => '12', :foo => 'bar').and_return(@response)
+      subject.browse(:foo => 'bar')
+    end
+    
+    it "should return an array of Documents" do
+      Scribd::API.instance.stub!(:send_request).and_return(@response)
+      docs = subject.browse
+      docs.should be_kind_of(Array)
+      docs.each do |doc|
+        doc.should be_kind_of(Scribd::Document)
+      end
+    end
+  end
+end

data/spec/collection_spec.rb

@@ -0,0 +1,127 @@
+describe Scribd::Collection do
+  before :each do
+    Scribd::API.instance.key = 'test key'
+    Scribd::API.instance.secret = 'test sec'
+  end
+  
+  subject do
+    user = Scribd::User.new(:xml => REXML::Document.new("<rsp stat='ok'><user_id type='integer'>225</user_id><username>sancho</username><name>Sancho Sample</name><session_key>some key</session_key></rsp>").root)
+    Scribd::Collection.new(:xml => REXML::Document.new("<result><collection_id>61</collection_id><collection_name>My Collection</collection_name></result>").root, :owner => user)
+  end
+  
+  describe "#initialize" do
+    context "from XML" do
+      its(:collection_id) { should eql("61") }
+      its(:collection_name) { should eql("My Collection") }
+      it { should be_saved }
+      it { should be_created }
+      
+      it "should set the owner" do
+        user = Scribd::User.new
+        coll = Scribd::Collection.new(:xml => REXML::Document.new("<result><collection_id>61</collection_id><collection_name>My Collection</collection_name></result>").root, :owner => user)
+        coll.owner.should eql(user)
+      end
+    end
+    
+    context "from attributes" do
+      it "should raise an exception" do
+        lambda { Scribd::Collection.new(:collection_id => 61, :collection_name => "My Collection") }.should raise_error
+      end
+    end
+  end
+  
+  context "aliased attributes" do
+    its(:id) { should eql('61') }
+    its(:name) { should eql('My Collection') }
+  end
+  
+  describe "#add" do
+    before :each do
+      @good_response = <<-EOF
+        <?xml version="1.0" encoding="UTF-8"?>
+        <rsp stat="ok">
+        </rsp>
+      EOF
+      @document = Scribd::Document.new(:doc_id => '123')
+    end
+    
+    it "should raise ArgumentError if an invalid document is given" do
+      lambda { subject.add(123) }.should raise_error(ArgumentError)
+    end
+    
+    it "should make an API call to docs.addToCollection" do
+      Scribd::API.instance.should_receive(:send_request).once.with('docs.addToCollection', hash_including(:doc_id => '123', :collection_id => '61', :session_key => 'some key')).and_return(REXML::Document.new(@good_response).root)
+      subject.add(@document)
+    end
+    
+    it "should capture ResponseErrors of code 653 if ignore_if_exists is true" do
+      Scribd::API.instance.stub!(:send_request).and_raise(Scribd::ResponseError.new('653'))
+      lambda { subject.add(@document) }.should_not raise_error
+    end
+    
+    it "should not capture ResponseErrors of code 653 if ignore_if_exists is false" do
+      Scribd::API.instance.stub!(:send_request).and_raise(Scribd::ResponseError.new('653'))
+      lambda { subject.add(@document, false) }.should raise_error(Scribd::ResponseError)
+    end
+    
+    it "should not capture ResponseErrors of other codes" do
+      Scribd::API.instance.stub!(:send_request).and_raise(Scribd::ResponseError.new('652'))
+      lambda { subject.add(@document, false) }.should raise_error(Scribd::ResponseError)
+      lambda { subject.add(@document) }.should raise_error(Scribd::ResponseError)
+    end
+    
+    it "should return the document" do
+      Scribd::API.instance.stub!(:send_request).and_return(REXML::Document.new(@good_response).root)
+      subject.add(@document).should eql(@document)
+    end
+  end
+  
+  describe "#<<" do
+    it "should call #add" do
+      doc_mock = mock('Scribd::Document')
+      subject.should_receive(:add).once.with(doc_mock).and_return(doc_mock)
+      (subject << doc_mock).should eql(doc_mock)
+    end
+  end
+  
+  describe "#remove" do
+    before :each do
+      @good_response = <<-EOF
+        <?xml version="1.0" encoding="UTF-8"?>
+        <rsp stat="ok">
+        </rsp>
+      EOF
+      @document = Scribd::Document.new(:doc_id => '123')
+    end
+    
+    it "should raise ArgumentError if an invalid document is given" do
+      lambda { subject.remove(123) }.should raise_error(ArgumentError)
+    end
+    
+    it "should make an API call to docs.removeFromCollection" do
+      Scribd::API.instance.should_receive(:send_request).once.with('docs.removeFromCollection', hash_including(:doc_id => '123', :collection_id => '61', :session_key => 'some key')).and_return(REXML::Document.new(@good_response).root)
+      subject.remove(@document)
+    end
+    
+    it "should capture ResponseErrors of code 652 if ignore_if_missing is true" do
+      Scribd::API.instance.stub!(:send_request).and_raise(Scribd::ResponseError.new('652'))
+      lambda { subject.remove(@document) }.should_not raise_error
+    end
+    
+    it "should not capture ResponseErrors of code 653 if ignore_if_missing is false" do
+      Scribd::API.instance.stub!(:send_request).and_raise(Scribd::ResponseError.new('652'))
+      lambda { subject.remove(@document, false) }.should raise_error(Scribd::ResponseError)
+    end
+    
+    it "should not capture ResponseErrors of other codes" do
+      Scribd::API.instance.stub!(:send_request).and_raise(Scribd::ResponseError.new('653'))
+      lambda { subject.remove(@document, false) }.should raise_error(Scribd::ResponseError)
+      lambda { subject.remove(@document) }.should raise_error(Scribd::ResponseError)
+    end
+    
+    it "should return the document" do
+      Scribd::API.instance.stub!(:send_request).and_return(REXML::Document.new(@good_response).root)
+      subject.remove(@document).should eql(@document)
+    end
+  end
+end

data/spec/document_spec.rb

@@ -263,6 +263,13 @@ describe Scribd::Document do
         @document.save
       end
 
+      it "should not pass the thumbnail option to the docs.upload call" do
+        @document.thumbnail = 'sample/test.txt'
+        Scribd::API.instance.should_receive(:send_request).once.with('docs.upload', hash_not_including(:thumbnail))
+        Scribd::API.instance.should_receive(:send_request).any_number_of_times
+        @document.save
+      end
+
       describe "successfully" do
         before :each do
           @document.stub!(:id).and_return(3)
@@ -293,6 +300,49 @@ describe Scribd::Document do
           it "should return true" do
             @document.save.should be_true
           end
+
+          describe "with a path thumbnail" do
+            before :each do
+              @document.thumbnail = "sample/image.jpg"
+            end
+
+            it "should call docs.uploadThumb with a File object from the path" do
+              file_mock = mock('File (thumb)', :close => nil)
+              File.should_receive(:open).with(@document.thumbnail, 'rb').and_return(file_mock)
+              File.should_receive(:open).any_number_of_times.and_return(mock('File (content)', :close => nil))
+
+              Scribd::API.instance.should_receive(:send_request).once.with('docs.uploadThumb', :file => file_mock, :doc_id => 3)
+              Scribd::API.instance.should_receive(:send_request).any_number_of_times
+              
+              @document.save
+            end
+          end
+
+          describe "with a File thumbnail" do
+            before :each do
+              @document.thumbnail = File.open("sample/test.txt")
+            end
+
+            it "should call docs.uploadThumb with the File object" do
+              Scribd::API.instance.should_receive(:send_request).once.with('docs.uploadThumb', :file => @document.thumbnail, :doc_id => 3)
+              Scribd::API.instance.should_receive(:send_request).any_number_of_times
+              @document.save
+            end
+          end
+
+          describe "with a URL thumbnail" do
+            before :each do
+              @document.thumbnail = "http://www.scribd.com/favicon.ico"
+            end
+
+            it "should open a stream for the URL and pass it to docs.uploadThumb" do
+              stream_mock = mock('open-uri stream', :close => nil)
+              @document.should_receive(:open).once.with(an_instance_of(URI::HTTP)).and_return(stream_mock)
+              Scribd::API.instance.should_receive(:send_request).once.with('docs.uploadThumb', :file => stream_mock, :doc_id => 3)
+              Scribd::API.instance.should_receive(:send_request).any_number_of_times
+              @document.save
+            end
+          end
         end
 
         it "should not send the file, type, or access parameters to the changeSettings call" do
@@ -310,6 +360,13 @@ describe Scribd::Document do
           @document.save
         end
 
+        it "should not pass thumbnail to the changeSettings call" do
+          @document.thumbnail = 'sample/test.txt'
+          Scribd::API.instance.should_receive(:send_request).with('docs.changeSettings', hash_not_including(:thumbnail))
+          Scribd::API.instance.should_receive(:send_request).any_number_of_times
+          @document.save
+        end
+
         it "should pass the owner's session key to changeSettings" do
           owner = mock('Scribd::User owner')
           owner.stub!(:session_key).and_return('his key')
@@ -379,8 +436,8 @@ describe Scribd::Document do
       lambda { Scribd::Document.find('oh hai') }.should raise_error(ArgumentError)
     end
     
-    it "should raise an ArgumentError if a query is not provided for scoped lookups" do
-      lambda { Scribd::Document.find(:all, :title => 'hi') }.should raise_error(ArgumentError)
+    it "should raise an ArgumentError if a query is not provided for non-ID lookups" do
+      lambda { Scribd::Document.find(:title => 'hi') }.should raise_error(ArgumentError)
     end
     
     describe "by ID" do
@@ -393,11 +450,6 @@ describe Scribd::Document do
         Scribd::Document.find 123
       end
       
-      it "should pass other options to the getSettings call" do
-        Scribd::API.instance.should_receive(:send_request).once.with('docs.getSettings', hash_including(:arg => 'val')).and_return(@xml)
-        Scribd::Document.find 123, :arg => 'val'
-      end
-      
       it "should return a Document created from the resulting XML" do
         Scribd::API.instance.stub!(:send_request).and_return(@xml)
         doc = Scribd::Document.find(123)
@@ -411,34 +463,22 @@ describe Scribd::Document do
         @xml = REXML::Document.new("<rsp stat='ok'><result_set><result><access_key>abc123</access_key></result><result><access_key>abc321</access_key></result></result_set></rsp>")
       end
       
-      it "should set the scope field according to the parameter" do
-        Scribd::API.instance.should_receive(:send_request).with('docs.search', hash_including(:scope => 'all')).and_return(@xml)
-        Scribd::Document.find(:all, :query => 'test')
-      end
-      
       it "should return an ordered array of Document results" do
         Scribd::API.instance.stub!(:send_request).and_return(@xml)
-        docs = Scribd::Document.find(:all, :query => 'test')
+        docs = Scribd::Document.find(:query => 'test')
         docs.should have(2).items
         docs.first.access_key.should eql('abc123')
         docs.last.access_key.should eql('abc321')
       end
       
-      it "should set the scope to 'all' and return the first result if :first is provided" do
-        Scribd::API.instance.should_receive(:send_request).with('docs.search', hash_including(:scope => 'all')).and_return(@xml)
-        docs = Scribd::Document.find(:first, :query => 'test')
-        docs.should be_kind_of(Scribd::Document)
-        docs.access_key.should eql('abc123')
-      end
-      
       it "should set the num_results field to the limit option" do
         Scribd::API.instance.should_receive(:send_request).with('docs.search', hash_including(:num_results => 10)).and_return(@xml)
-        docs = Scribd::Document.find(:all, :query => 'test', :limit => 10)
+        docs = Scribd::Document.find(:query => 'test', :limit => 10)
       end
       
       it "should set the num_start field to the offset option" do
         Scribd::API.instance.should_receive(:send_request).with('docs.search', hash_including(:num_start => 10)).and_return(@xml)
-        docs = Scribd::Document.find(:all, :query => 'test', :offset => 10)
+        docs = Scribd::Document.find(:query => 'test', :offset => 10)
       end
     end
   end
@@ -448,16 +488,17 @@ describe Scribd::Document do
       @xml = REXML::Document.new("<rsp stat='ok'><result_set><result><access_key>abc123</access_key></result><result><access_key>abc321</access_key></result></result_set></rsp>")
     end
 
-    it "should set the scope field according the options" do
-      Scribd::API.instance.should_receive(:send_request).with('docs.featured', hash_including(:scope => 'hot')).and_return(@xml)
-      Scribd::Document.featured(:all, :scope => 'hot', :limit => 10)
-    end
-
-    it "should return first result if :first is provided" do
+    it "should call the docs.featured API method" do
       Scribd::API.instance.should_receive(:send_request).with('docs.featured', {}).and_return(@xml)
-      docs = Scribd::Document.featured(:first)
-      docs.should be_kind_of(Scribd::Document)
-      docs.access_key.should eql('abc123')
+      docs = Scribd::Document.featured
+      docs.should be_kind_of(Array)
+      docs.first.should be_kind_of(Scribd::Document)
+      docs.first.access_key.should eql('abc123')
+    end
+    
+    it "should pass options to the API" do
+      Scribd::API.instance.should_receive(:send_request).with('docs.featured', :foo => 'bar').and_return(@xml)
+      docs = Scribd::Document.featured(:foo => 'bar')
     end
   end
 
@@ -466,21 +507,20 @@ describe Scribd::Document do
       @xml = REXML::Document.new("<rsp stat='ok'><result_set><result><access_key>abc123</access_key></result><result><access_key>abc321</access_key></result></result_set></rsp>")
     end
 
-    it "should not pass the scope parameter in the options" do
-      Scribd::API.instance.should_receive(:send_request).with('docs.browse', hash_including(:sort => 'views', :category_id => 1, :limit => 10)).and_return(@xml)
-      Scribd::Document.browse(:all, :sort => 'views', :category_id => 1, :limit => 10)
-    end
-
-    it "should return first result if :first is provided" do
+    it "should call the docs.browse method" do
       Scribd::API.instance.should_receive(:send_request).with('docs.browse', {}).and_return(@xml)
-      docs = Scribd::Document.browse(:first)
-      docs.should be_kind_of(Scribd::Document)
-      docs.access_key.should eql('abc123')
+      docs = Scribd::Document.browse
+      docs.should be_kind_of(Array)
+      docs.first.should be_kind_of(Scribd::Document)
+      docs.first.access_key.should eql('abc123')
+    end
+    
+    it "should pass options to the API" do
+      Scribd::API.instance.should_receive(:send_request).with('docs.browse', :foo => 'bar').and_return(@xml)
+      docs = Scribd::Document.browse(:foo => 'bar')
     end
   end
 
-  it "should have an upload synonym for the create method"
-
   describe ".conversion_status" do
     before :each do
       @document = Scribd::Document.new(:xml => REXML::Document.new("<doc_id type='integer'>123</doc_id>"))
@@ -588,6 +628,30 @@ describe Scribd::Document do
       @document.download_url.should eql("http://www.example.com/doc.pdf")
     end
   end
+  
+  describe "#grant_access" do
+    it "should call Scribd::Security.grant_access" do
+      doc = Scribd::Document.new
+      Scribd::Security.should_receive(:grant_access).once.with('foo', doc)
+      doc.grant_access('foo')
+    end
+  end
+  
+  describe "#revoke_access" do
+    it "should call Scribd::Security.revoke_access" do
+      doc = Scribd::Document.new
+      Scribd::Security.should_receive(:revoke_access).once.with('foo', doc)
+      doc.revoke_access('foo')
+    end
+  end
+  
+  describe "#access_list" do
+    it "should call Scribd::Security.document_access_list" do
+      doc = Scribd::Document.new
+      Scribd::Security.should_receive(:document_access_list).once.with(doc)
+      doc.access_list
+    end
+  end
 end
 
 Dir.chdir old_dir