get_them_all 1.0.1 → 1.0.2

data/lib/get_them_all/storage/dropbox_storage.rb

@@ -4,28 +4,23 @@ require 'girl_friday'
 
 module GetThemAll
   class DropboxStorage < Storage
-  
-  
-    # def self.deserialize(data)
-    #   consumer_key, consumer_secret, authorized, token, token_secret, ssl, mode = YAML.load(StringIO.new(data))
-    #   raise ArgumentError, "Must provide a properly serialized #{self.to_s} instance" unless [ consumer_key, consumer_secret, token, token_secret ].all? and authorized == true or authorized == false
+    
+    ##
+    # Constructor
     # 
-    #   session = self.new(consumer_key, consumer_secret, :ssl => ssl, :already_authorized => authorized)
-    #   if authorized then
-    #     session.set_access_token token, token_secret
-    #   else
-    #     session.set_request_token token, token_secret
-    #   end
-    #   session.mode = mode if mode
+    # @param [Hash] options options
+    # @option options [Array] :session The session array
+    # @option options [Integer] :timeout The timeout for
+    #   dropbox requests.
     # 
-    #   return session
-    # end
-  
     def initialize(options = {})
       super
     
       session_data = options.delete(:session)
       raise "session missing" unless session_data
+      
+      # default to 30s timeout
+      @timeout = options.delete(:timeout) || 30
     
       consumer_key, consumer_secret, authorized, token, token_secret, ssl, mode = session_data
     
@@ -80,12 +75,14 @@ module GetThemAll
       if delay
         @queue.push(:path => path, :data => data, :deferrable => deferrable)
       else
+        deferrable.timeout(@timeout)
+        
         destpath = build_destpath(path)
         filename, dirname = File.basename(destpath), File.dirname(destpath)
         @session.upload(StringIO.new(data), dirname, :as => filename)
         EM::next_tick{ deferrable.succeed }
       end
-    
+      
       deferrable
     rescue => err
       if retries < 4

data/lib/get_them_all/version.rb

@@ -1,3 +1,3 @@
 module GetThemAll
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: get_them_all
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70096048287860 !ruby/object:Gem::Requirement
+  requirement: &70134316437900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096048287860
+  version_requirements: *70134316437900
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70096048287240 !ruby/object:Gem::Requirement
+  requirement: &70134316437280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096048287240
+  version_requirements: *70134316437280
 - !ruby/object:Gem::Dependency
   name: em-priority-queue
-  requirement: &70096048286640 !ruby/object:Gem::Requirement
+  requirement: &70134316436580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70096048286640
+  version_requirements: *70134316436580
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70096048286060 !ruby/object:Gem::Requirement
+  requirement: &70134316435960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70096048286060
+  version_requirements: *70134316435960
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70096048285560 !ruby/object:Gem::Requirement
+  requirement: &70134316435400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096048285560
+  version_requirements: *70134316435400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70096048284900 !ruby/object:Gem::Requirement
+  requirement: &70134316434680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096048284900
+  version_requirements: *70134316434680
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70096048284280 !ruby/object:Gem::Requirement
+  requirement: &70134316434040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *70096048284280
+  version_requirements: *70134316434040
 - !ruby/object:Gem::Dependency
   name: dropbox
-  requirement: &70096048283860 !ruby/object:Gem::Requirement
+  requirement: &70134316433500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096048283860
+  version_requirements: *70134316433500
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &70096048283380 !ruby/object:Gem::Requirement
+  requirement: &70134316432900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096048283380
+  version_requirements: *70134316432900
 description: Mass downloader useable as standalone or as a library
 email: []
 executables:
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2337480508786894492
+      hash: 3235419344401135154
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2337480508786894492
+      hash: 3235419344401135154
 requirements: []
 rubyforge_project: get_them_all
 rubygems_version: 1.8.11