rscribd 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.2 / 2009-7-9
+
+* Added support for getting information about the API user when no other user
+  has been logged in.
+* Files to upload can now be specified as both file paths and File streams.
+
 === 1.0.1 / 2009-3-4
 
 * Fixed a bug that would cause some API parameters to not be sent when uploading

data/README.txt

@@ -1,6 +1,6 @@
 = rscribd
 
-* 1.0.1 (Mar 4, 2009)
+* 1.0.2 (July 9, 2009)
 
 == DESCRIPTION:
 

data/Rakefile

@@ -2,7 +2,8 @@ require 'rubygems'
 require 'hoe'
 require 'spec/rake/spectask'
 
-Hoe.new('rscribd', '1.0.1') do |p|
+Hoe.spec('rscribd') do |p|
+  p.version = '1.0.2'
   p.rubyforge_name = 'rscribd'
   p.author = 'Jared Friedman, Tim Morgan'
   p.email = 'api@scribd.com'
@@ -14,11 +15,11 @@ Hoe.new('rscribd', '1.0.1') do |p|
   p.remote_rdoc_dir = ''
 end
 
-desc "Verify gem specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-  t.spec_opts = [ '-cfs' ]
-end
+# desc "Verify gem specs"
+# Spec::Rake::SpecTask.new do |t|
+#   t.spec_files = FileList['spec/*.rb']
+#   t.spec_opts = [ '-cfs' ]
+# end
 
 namespace :github do
   desc "Prepare for GitHub gem packaging"

data/lib/scribdapi.rb

@@ -1,5 +1,5 @@
 require 'singleton'
-require 'md5'
+require 'digest/md5'
 require 'rexml/document'
 
 module Scribd
@@ -70,6 +70,7 @@ module Scribd
       @asychronous = false
       @key = ENV['SCRIBD_API_KEY']
       @secret = ENV['SCRIBD_API_SECRET']
+      @user = User.new
     end
     
     def send_request(method, fields={}) #:nodoc:
@@ -203,7 +204,7 @@ module Scribd
     #   signature
     #
     def sign(args)
-      return MD5.md5(@secret + args.sort.flatten.join).to_s
+      return Digest::MD5.hexdigest(@secret + args.sort.flatten.join).to_s
     end
     
     # Outputs whatever is given into the $stderr if debugging is enabled.

data/lib/scribddoc.rb

@@ -100,9 +100,12 @@ module Scribd
       
       # Make a request form
       fields = @attributes.dup
-      if @attributes[:file] then
+      if file = @attributes[:file] then
         fields.delete :file
-        ext = @attributes[:file].split('.').last unless @attributes[:file].index('.').nil?
+        is_file_object = file.is_a?(File)
+        file_path = is_file_object ? file.path : file
+        ext = File.extname(file_path).gsub(/^\./, '')
+        ext = nil if ext == ''
         fields[:doc_type] = fields.delete(:type)
         fields[:doc_type] ||= ext
         fields[:doc_type].downcase! if fields[:doc_type]
@@ -122,10 +125,10 @@ module Scribd
           fields[:url] = @attributes[:file]
           response = API.instance.send_request 'docs.uploadFromUrl', fields
         elsif uri.kind_of? URI::Generic or uri.nil? then
-          File.open(@attributes[:file]) do |file|
-            fields[:file] = file
-            response = API.instance.send_request 'docs.upload', fields
-          end
+          file_obj = is_file_object ? file : File.open(file, 'r')
+          fields[:file] = file_obj
+          response = API.instance.send_request 'docs.upload', fields
+          file_obj.close unless is_file_object
         end
       end
       

data/lib/scribdmultiparthack.rb

@@ -2,9 +2,8 @@
 # http://pivots.pivotallabs.com/users/damon/blog/articles/227-standup-04-27-07-testing-file-uploads
 
 require 'net/https'
-require "rubygems"
-require "mime/types" # Requires gem install mime-types
-require "base64"
+require 'rubygems'
+require 'mime/types' # Requires gem install mime-types
 require 'cgi'
 
 module Net #:nodoc:all

data/sample/01_upload.rb

@@ -4,18 +4,44 @@ require 'rubygems'
 require 'rscribd'
 
 # Use your API key / secret here
-api_key = '4lj2rs4duuv4013y2qbw3'
-api_secret = 'sec-twkc39qf22dmplhy3j4flvzet'
+api_key = ''
+api_secret = ''
  
 # Create a scribd object
 Scribd::API.instance.key = api_key
 Scribd::API.instance.secret = api_secret
-Scribd::API.instance.debug = true
+#Scribd::API.instance.debug = true
 
 begin
-  Scribd::User.login 'riscfuture2', 'felicia'
-  doc = Scribd::Document.new :file => 'sample/test.txt', :flooza => 'booza'
+  Scribd::User.login 'LOGIN', 'PASSWORD'
+  # Upload the document from a file
+  print "Uploading a document ... "
+
+  doc = Scribd::Document.upload(:file => 'test.txt')
+  puts "Done doc_id=#{doc.id}, doc_access_key=#{doc.access_key}"
+
+  # Poll API until conversion is complete
+  while (doc.conversion_status == 'PROCESSING')
+    puts "Document conversion is processing"
+    sleep(2) # Very important to sleep to prevent a runaway loop that will get your app blocked
+  end
+  puts "Document conversion is complete"
+
+  # Edit various options of the document
+  # Note you can also edit options before your doc is done converting
+  doc.title = 'This is a test doc!'
+  doc.description = "I'm testing out the Scribd API!"
+  doc.access = 'private'
+  doc.language = 'en'
+  doc.license = 'c'
+  doc.tags = 'test,api'
+  doc.show_ads = true
   doc.save
+
+  # Delete the uploaded document
+  print "Deleting a document ... "
+  doc.destroy
+  puts "Done doc_id=#{doc.id}"
 rescue Scribd::ResponseError => e
   puts "failed code=#{e.code} error='#{e.message}'"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rscribd
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jared Friedman, Tim Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,9 +30,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.9.0
+        version: 2.3.1
     version: 
-description: This gem provides a simple and powerful library for the Scribd API, allowing you to write Ruby applications or Ruby on Rails websites that upload, convert, display, search, and control documents in many formats. For more information on the Scribd platform, visit http://www.scribd.com/publisher
+description: |-
+  This gem provides a simple and powerful library for the Scribd API, allowing you
+  to write Ruby applications or Ruby on Rails websites that upload, convert,
+  display, search, and control documents in many formats. For more information on
+  the Scribd platform, visit http://www.scribd.com/publisher
 email: api@scribd.com
 executables: []
 
@@ -60,6 +64,8 @@ files:
 - sample/test.txt
 has_rdoc: true
 homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -81,9 +87,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rscribd
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby client library for the Scribd API
 test_files: []