rscribd 1.2.0 → 1.3.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.3.0 / 2011-7-5
+
+* Reduced memory usage for the built-in multipart-post method
+* Added support for (optional) multipart-post gem by Nick Sieger (even less memory usage)
+
 === 1.2.0 / 2010-5-13
 
 * Added support for collections.

data/README

@@ -1,6 +1,6 @@
 h1. rscribd
 
-* 1.2.0 (May 13, 2010)
+* 1.3.0 (July 5, 2011)
 
 h2. DESCRIPTION:
 
@@ -53,12 +53,21 @@ h2. REQUIREMENTS:
 
 * A Scribd API account
 * Ruby 1.8 or newer, with RubyGems 1.3 or newer.
+* (optional) multipart-post gem by Nick Sieger from http://github.com/nicksieger/multipart-post
 
 h2. INSTALL:
 
 * The client library is a RubyGem called *rscribd*. To install, type
   @sudo gem install rscribd@.
 
+* To use the optional multipart-post gem by Nick Sieger, make sure it is available in the load path and call
+<pre><code>
+Scribd::API.instance.enable_multipart_post_gem
+
+# and to stop using the multipart-post gem
+Scribd::API.instance.disable_multipart_post_gem
+</code></pre>
+
 h2. LICENSE:
 
 (The MIT License)

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/scribd/api.rb

@@ -83,6 +83,17 @@ module Scribd
       @key = ENV['SCRIBD_API_KEY']
       @secret = ENV['SCRIBD_API_SECRET']
       @user = User.new
+      disable_multipart_post_gem
+    end
+
+    def enable_multipart_post_gem
+      require 'net/http/post/multipart'
+      require File.expand_path('../../support/buffered_upload_io', __FILE__)
+      @use_multipart_post_gem = true
+    end
+
+    def disable_multipart_post_gem
+      @use_multipart_post_gem = false
     end
 
     # @private
@@ -117,6 +128,37 @@ module Scribd
       fields['api_sig'] = sign(sign_fields)
       debug("** POST parameters: #{fields.inspect}")
 
+      res = send_request_to_scribd(fields)
+
+      debug "** Response:"
+      debug(res.body)
+      debug "** End response"
+
+      # Convert response into XML
+      xml = REXML::Document.new(res.body)
+      raise MalformedResponseError, "The response received from the remote host could not be interpreted" unless xml.elements['/rsp']
+
+      # See if there was an error and raise an exception
+      if xml.elements['/rsp'].attributes['stat'] == 'fail'
+        # Load default code and error
+        code, message = -1, "Unidentified error:\n#{res.body}"
+
+        # Get actual error code and message
+        err = xml.elements['/rsp/error']
+        code, message = err.attributes['code'], err.attributes['message'] if err
+
+        # Add more data
+        message = "Method: #{method} Response: code=#{code} message=#{message}"
+
+        raise ResponseError.new(code), message
+      end
+
+      return xml
+    end
+
+    private 
+
+    def send_request_to_scribd(fields)
       # Create the connection
       http = Net::HTTP.new(HOST, PORT)
       # TODO configure timeouts through the properties
@@ -124,8 +166,7 @@ module Scribd
       # API methods can be SLOW.  Make sure this is set to something big to prevent spurious timeouts
       http.read_timeout = 15*60
 
-      request = Net::HTTP::Post.new(REQUEST_PATH)
-      request.multipart_params = fields
+      request = request_using_multipart_post_gem(fields) || request_using_supplied_multipart_post(fields)
 
       tries = TRIES
       begin
@@ -141,35 +182,32 @@ module Scribd
         end
         raise $!
       end
-      
-      debug "** Response:"
-      debug(res.body)
-      debug "** End response"
 
-      # Convert response into XML
-      xml = REXML::Document.new(res.body)
-      raise MalformedResponseError, "The response received from the remote host could not be interpreted" unless xml.elements['/rsp']
+    ensure
+      http.finish if http && http.started?
+    end
 
-      # See if there was an error and raise an exception
-      if xml.elements['/rsp'].attributes['stat'] == 'fail'
-        # Load default code and error
-        code, message = -1, "Unidentified error:\n#{res.body}"
+    def request_using_supplied_multipart_post(fields)
+      request = Net::HTTP::Post.new(REQUEST_PATH)
+      request.multipart_params = fields
+      request
+    end
 
-        # Get actual error code and message
-        err = xml.elements['/rsp/error']
-        code, message = err.attributes['code'], err.attributes['message'] if err
+    def request_using_multipart_post_gem(fields)
+      return nil unless @use_multipart_post_gem
 
-        # Add more data
-        message = "Method: #{method} Response: code=#{code} message=#{message}"
+      fields = fields.dup
+      original_file_value = fields['file']
+      if original_file_value
+        filename = File.basename(original_file_value.path)
+        mime_types = MIME::Types.of(filename)
+        mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
 
-        raise ResponseError.new(code), message
+        fields['file'] = BufferedUploadIO.new(original_file_value, mime_type, filename)
       end
-
-      return xml
+      Net::HTTP::Post::Multipart.new(REQUEST_PATH, fields)
     end
 
-    private 
-
     # FIXME: Since we don't need XMLRPC, the exception could be different
     # TODO: It would probably be better if we wrapped the fault
     # in something more meaningful. At the very least, a broad
@@ -228,4 +266,5 @@ module Scribd
       $stderr.puts(str) if @debug
     end
   end
+
 end

data/lib/scribd/category.rb

@@ -77,7 +77,7 @@ module Scribd
     
     def children
       return @children if @children
-      response = API.instance.send_request('docs.getCategories', :category_id => self.id)
+      response = API.instance.send_request('docs.getCategories', :category_id => self.scribd_id)
       children = Array.new
       response.get_elements('/rsp/result_set/result').each do |res|
         children << Category.new(:xml => res)
@@ -101,7 +101,7 @@ module Scribd
     #   category.browse(:sort => 'views', :category_id => 1, :limit => 10)
     
     def browse(options={})
-      response = API.instance.send_request('docs.browse', options.merge(:category_id => self.id))
+      response = API.instance.send_request('docs.browse', options.merge(:category_id => self.scribd_id))
       documents = []
       response.elements['/rsp/result_set'].elements.each do |doc|
         documents << Document.new(:xml => doc)

data/lib/scribd/document.rb

@@ -386,6 +386,61 @@ module Scribd
       Scribd::Security.document_access_list(self)
     end
     
+    # Returns a URL for a thumbnail image of this document.
+    #
+    # @param [Hash] options Options for customizing the thumbnail image.
+    # @option options [Fixnum] :page (1) The page number to generate a thumbnail
+    # of.
+    # @option options [Fixnum] :width The width of the image, in pixels.
+    # @option options [Fixnum] :height The height of the image, in pixels.
+    # @option options [Array<Fixnum>] :size A two-element array consisting of
+    # the width and height of the image, in pixels.
+    # @return [String] The URL of the thumbnail image.
+    # @raise [ArgumentError] If @:width@ is specified but @:height@ is not, or
+    # vice versa.
+    # @raise [ArgumentError] If @:width@ and @:size@ are both specified.
+    # @raise [ArgumentError] If @:size@ is not a two-item array.
+    
+    def thumbnail_url(options={})
+      self.class.thumbnail_url self.id, options
+    end
+    
+    # Returns a URL for a thumbnail image of a given document. The document must
+    # be public, or you must own it.
+    #
+    # @param [Fixnum] id The document's ID on the Scribd website.
+    # @param [Hash] options Options for customizing the thumbnail image.
+    # @option options [Fixnum] :page (1) The page number to generate a thumbnail
+    # of.
+    # @option options [Fixnum] :width The width of the image, in pixels.
+    # @option options [Fixnum] :height The height of the image, in pixels.
+    # @option options [Array<Fixnum>] :size A two-element array consisting of
+    # the width and height of the image, in pixels.
+    # @return [String] The URL of the thumbnail image.
+    # @raise [ArgumentError] If @:width@ is specified but @:height@ is not, or
+    # vice versa.
+    # @raise [ArgumentError] If @:width@ and @:size@ are both specified.
+    # @raise [ArgumentError] If @:size@ is not a two-item array.
+    
+    def self.thumbnail_url(id, options={})
+      w = h = nil
+      if (options[:width] or options[:height]) and options[:size] then
+        raise ArgumentError, "Cannot specify both width/height and size"
+      elsif options[:width] and options[:height] then
+        w = options[:width]
+        h = options[:height]
+      elsif options[:size] then
+        raise ArgumentError, "Size option must be a two-element array" unless options[:size].kind_of?(Array) and options[:size].size == 2
+        w = options[:size].first
+        h = options[:size].last
+      elsif options[:width] or options[:height] then
+        raise ArgumentError, "Must specify both width and height, or neither"
+      end
+      
+      response = API.instance.send_request('thumbnail.get', { :doc_id => id, :width => w, :height => h, :page => options[:page] }.compact)
+      response.elements['/rsp/thumbnail_url'].text
+    end
+    
     # @return The @document_id@ attribute.
     
     def id

data/lib/scribd/resource.rb

@@ -45,6 +45,11 @@ module Scribd
       @created = false
       @attributes = Hash.new
     end
+
+    # Return the Scribd ID for a resource, so as not to conflict with object.id
+    def scribd_id
+      @attributes[:id]
+    end
     
     # Creates a new instance with the given attributes, saves it immediately,
     # and returns it. You should call its {#created?} method if you need to

data/lib/support/buffered_upload_io.rb

@@ -0,0 +1,12 @@
+# while c = File.read(max_size); end  # still reads the whole file into memory
+# buffer = ''; while c = File.read(max_size, buffer ); end  # reuses a string variable to reduce memory usage
+class BufferedUploadIO < UploadIO
+  def initialize(*args)
+    super(*args)
+    @buffer = ''
+  end
+
+  def read(amount, buffer = @buffer)
+    @io.read(amount, buffer)
+  end
+end

data/lib/support/extensions.rb

@@ -14,6 +14,14 @@ class Hash
        options
      end
    end unless method_defined?(:stringify_keys)
+   
+   def compact
+     reject { |key, val| val.nil? }
+   end
+   
+   def compact!
+     delete_if { |key, val| val.nil? }
+   end
 end
 
 # @private

data/lib/support/multipart_hack.rb

@@ -14,24 +14,25 @@ module Net
       boundary_token = [Array.new(8) {rand(256)}].join
       self.content_type = "multipart/form-data; boundary=#{boundary_token}"
       boundary_marker = "--#{boundary_token}\r\n"
-      self.body = param_hash.map do |param_name, param_value|
-        boundary_marker + case param_value
+      self.body = param_hash.inject('') do |memo, (param_name, param_value)|
+        memo << boundary_marker
+        case param_value
         when File
-          file_to_multipart(param_name, param_value)
+          file_to_multipart(memo, param_name, param_value)
         else
-          text_to_multipart(param_name, param_value.to_s)
+          memo << text_to_multipart(param_name, param_value.to_s)
         end
-      end.join('') + "--#{boundary_token}--\r\n"
+      end << "--#{boundary_token}--\r\n"
     end
 
     protected
-    def file_to_multipart(key,file)
+    def file_to_multipart(memo, key,file)
       filename = File.basename(file.path)
       mime_types = MIME::Types.of(filename)
       mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
-      part = %Q|Content-Disposition: form-data; name="#{key}"; filename="#{filename}"\r\n|
-      part += "Content-Transfer-Encoding: binary\r\n"
-      part += "Content-Type: #{mime_type}\r\n\r\n#{file.read}\r\n"
+      memo << %Q|Content-Disposition: form-data; name="#{key}"; filename="#{filename}"\r\n|
+      memo << "Content-Transfer-Encoding: binary\r\n"
+      memo << "Content-Type: #{mime_type}\r\n\r\n#{file.read}\r\n"
     end
 
     def text_to_multipart(key,value)

data/rscribd.gemspec

@@ -1,74 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rscribd}
-  s.version = "1.2.0"
+  s.version = "1.3.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.date = %q{2011-07-06}
   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"
+    "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/buffered_upload_io.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/spec_helper.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.rubygems_version = %q{1.3.7}
   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
+    if Gem::Version.new(Gem::VERSION) >= 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"])

data/spec/api_spec.rb

@@ -1,6 +1,4 @@
-old_dir = Dir.getwd
-Dir.chdir(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rscribd'
+require 'spec_helper'
 
 describe Scribd::API do
   it "should be a singleton" do
@@ -127,5 +125,3 @@ Content-Disposition: form-data; name=#{key.to_s.inspect}
     Scribd::API.instance.user.should_not be_nil
   end
 end
-
-Dir.chdir old_dir

data/spec/category_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 CATEGORY = Proc.new { |id, name, children|
   id ||= rand(1000)
   name ||= "Test Category #{id}"
@@ -42,7 +44,7 @@ describe Scribd::Category do
     end
     
     context "attributes" do
-      its(:id) { should eql('12') }
+      its(:scribd_id) { should eql('12') }
       its(:name) { should eql('test') }
     end
     
@@ -53,7 +55,7 @@ describe Scribd::Category do
       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.scribd_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)
@@ -76,7 +78,7 @@ describe Scribd::Category do
   
   describe :all do
     before :each do
-      @response = REXML::Document.new(RESULT.call).root
+      @response = REXML::Document.new(RESULT.call(CATEGORY_TAG.call)).root
     end
     
     it "should send an API request to docs.getCategories" do

data/spec/collection_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Scribd::Collection do
   before :each do
     Scribd::API.instance.key = 'test key'

data/spec/document_spec.rb

@@ -1,6 +1,4 @@
-old_dir = Dir.getwd
-Dir.chdir(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rscribd'
+require 'spec_helper'
 
 describe Scribd::Document do
   before :each do
@@ -68,6 +66,7 @@ describe Scribd::Document do
       @response = mock('Net::HTTPResponse @response')
       @response.stub!(:body).and_return "<rsp stat='ok'></rsp>"
       @http.stub!(:request).and_return(@response)
+      @http.stub!(:started?).and_return(false)
       Net::HTTP.stub!(:new).and_return(@http)
     end
     
@@ -652,6 +651,77 @@ describe Scribd::Document do
       doc.access_list
     end
   end
+  
+  describe "#thumbnail_url" do
+    before :each do
+      @doc = Scribd::Document.new(:doc_id => 123)
+    end
+    
+    it "should call Scribd::Document.thumbnail_url" do
+      Scribd::Document.should_receive(:thumbnail_url).once.with(123, {})
+      @doc.thumbnail_url
+    end
+    
+    it "should pass options" do
+      Scribd::Document.should_receive(:thumbnail_url).once.with(123, { :page => 10 })
+      @doc.thumbnail_url(:page => 10)
+    end
+  end
+  
+  describe ".thumbnail_url" do
+    before :each do
+      @url = "http://imgv2-2.scribdassets.com/img/word_document/1/111x142/ff94c77a69/1277782307"
+      @response = REXML::Document.new(<<-EOF
+        <?xml version="1.0" encoding="UTF-8"?>
+        <rsp stat="ok">
+          <thumbnail_url>#{@url}</thumbnail_url>
+        </rsp>
+      EOF
+      )
+    end
+    
+    it "should raise an exception if both width/height and size are specified" do
+      Scribd::API.instance.stub!(:send_request).and_return(@response)
+      lambda { Scribd::Document.thumbnail_url(123, :width => 123, :size => [ 1, 2 ]) }.should raise_error(ArgumentError)
+      lambda { Scribd::Document.thumbnail_url(123, :height => 123, :size => [ 1, 2 ]) }.should raise_error(ArgumentError)
+      lambda { Scribd::Document.thumbnail_url(123, :width => 123, :height => 321, :size => [ 1, 2 ]) }.should raise_error(ArgumentError)
+    end
+    
+    it "should raise an exception if size is not an array" do
+      Scribd::API.instance.stub!(:send_request).and_return(@response)
+      lambda { Scribd::Document.thumbnail_url(123, :size => 123) }.should raise_error(ArgumentError)
+    end
+    
+    it "should raise an exception if size is not 2 elements long" do
+      Scribd::API.instance.stub!(:send_request).and_return(@response)
+      lambda { Scribd::Document.thumbnail_url(123, :size => [ 1 ]) }.should raise_error(ArgumentError)
+      lambda { Scribd::Document.thumbnail_url(123, :size => [ 1, 2, 3 ]) }.should raise_error(ArgumentError)
+    end
+    
+    it "should raise an exception if either width xor height is specified" do
+      Scribd::API.instance.stub!(:send_request).and_return(@response)
+      lambda { Scribd::Document.thumbnail_url(123, :width => 123) }.should raise_error(ArgumentError)
+      lambda { Scribd::Document.thumbnail_url(123, :height => 123) }.should raise_error(ArgumentError)
+    end
+    
+    it "should call the thumbnail.get API method" do
+      Scribd::API.instance.should_receive(:send_request).once.with('thumbnail.get', :doc_id => 123).and_return(@response)
+      Scribd::Document.thumbnail_url(123).should eql(@url)
+    end
+    
+    it "should pass the width and height" do
+      Scribd::API.instance.should_receive(:send_request).once.with('thumbnail.get', :doc_id => 123, :width => 2, :height => 4).and_return(@response)
+      Scribd::Document.thumbnail_url(123, :width => 2, :height => 4)
+    end
+    
+    it "should pass a size" do
+      Scribd::API.instance.should_receive(:send_request).once.with('thumbnail.get', :doc_id => 123, :width => 2, :height => 4).and_return(@response)
+      Scribd::Document.thumbnail_url(123, :size => [ 2, 4 ])
+    end
+    
+    it "should pass the page number" do
+      Scribd::API.instance.should_receive(:send_request).once.with('thumbnail.get', :doc_id => 123, :page => 10).and_return(@response)
+      Scribd::Document.thumbnail_url(123, :page => 10)
+    end
+  end
 end
-
-Dir.chdir old_dir

data/spec/error_spec.rb

@@ -1,6 +1,4 @@
-old_dir = Dir.getwd
-Dir.chdir(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rscribd'
+require 'spec_helper'
 
 describe Scribd::ResponseError do
   it "should set the code attribute on initialization" do
@@ -8,5 +6,3 @@ describe Scribd::ResponseError do
     error.code.should eql(123)
   end
 end
-
-Dir.chdir old_dir

data/spec/resource_spec.rb

@@ -1,6 +1,4 @@
-old_dir = Dir.getwd
-Dir.chdir(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rscribd'
+require 'spec_helper'
 
 describe Scribd::Resource do
   describe "initialized from attributes" do
@@ -122,5 +120,3 @@ describe Scribd::Resource do
     end
   end
 end
-
-Dir.chdir old_dir

data/spec/rscribd_spec.rb

@@ -1,6 +1,4 @@
-old_dir = Dir.getwd
-Dir.chdir(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rscribd'
+require 'spec_helper'
 
 describe Symbol do
   it "should define a to_proc method" do
@@ -31,5 +29,3 @@ describe Array do
     [ [ 1, 2], [3, 4] ].to_hsh.should == { 1 => 2, 3 => 4 }
   end
 end
-
-Dir.chdir old_dir

data/spec/security_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Scribd::Security do
   before :each do
     @document = Scribd::Document.new(:xml => REXML::Document.new('<result><doc_id>123</doc_id></result>').root)

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('..', __FILE__)
+
+require 'rscribd'

data/spec/user_spec.rb

@@ -1,6 +1,4 @@
-old_dir = Dir.getwd
-Dir.chdir(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rscribd'
+require 'spec_helper'
 
 describe Scribd::User do
   describe "initialized from attributes" do
@@ -279,5 +277,3 @@ describe Scribd::User do
     end
   end
 end
-
-Dir.chdir old_dir

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rscribd
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Tim Morgan
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -07:00
+date: 2011-07-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -35,9 +38,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +52,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,7 +71,6 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- .gitignore
 - History.txt
 - README
 - Rakefile
@@ -78,6 +84,7 @@ files:
 - lib/scribd/resource.rb
 - lib/scribd/security.rb
 - lib/scribd/user.rb
+- lib/support/buffered_upload_io.rb
 - lib/support/extensions.rb
 - lib/support/multipart_hack.rb
 - rscribd.gemspec
@@ -92,44 +99,41 @@ files:
 - spec/resource_spec.rb
 - spec/rscribd_spec.rb
 - spec/security_spec.rb
+- spec/spec_helper.rb
 - spec/user_spec.rb
 has_rdoc: true
 homepage: http://www.scribd.com/developers
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rscribd
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby client library for the Scribd API
-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
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-doc
-pkg
-.idea
-.DS_Store
-.yardoc