get_them_all 1.1.1 → 1.1.2

data/get_them_all.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'i18n'
   s.add_runtime_dependency 'activesupport',      '~> 3.1.0'
   # s.add_runtime_dependency 'therubyracer',       '~> 0.9.8'
-  s.add_runtime_dependency 'dropbox'
+  s.add_runtime_dependency 'dropbox-api'
   s.add_runtime_dependency 'girl_friday'
 end

data/lib/get_them_all/extensions/action_logger.rb

@@ -62,6 +62,10 @@ module GetThemAll
       register_handler('action.download.skipped') do |name, worker, action|
         log("url Skipped: #{action.url}")
       end
+      
+      register_handler('action.download.failure') do |name, worker, action|
+        log("Failed to download file: #{action.url} from: #{action.parent_url}")
+      end
     
       register_handler('action.download.success') do |name, worker, action, destpath|
         @download_files += 1

data/lib/get_them_all/storage/dropbox_storage.rb

@@ -1,5 +1,4 @@
-require 'stringio'
-require 'dropbox'
+require 'dropbox-api'
 require 'girl_friday'
 
 module GetThemAll
@@ -15,18 +14,16 @@ module GetThemAll
     # 
     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
-    
-      @session = Dropbox::Session.new(consumer_key, consumer_secret, :ssl => ssl, :already_authorized => authorized)
-      @session.set_access_token(token, token_secret)
-      @session.mode = mode.to_sym
+      
+      Dropbox::API::Config.app_key    = options.delete(:app_key)
+      Dropbox::API::Config.app_secret = options.delete(:app_secret)
+      @client = Dropbox::API::Client.new(
+          :token  => options.delete(:token),
+          :secret => options.delete(:secret)
+        )
     
       @queue = GirlFriday::WorkQueue.new(:dropbox_upload, :size => 1) do |msg|
         # puts "Uploading file #{msg[:path]}..."
@@ -54,14 +51,14 @@ module GetThemAll
     def exist?(path)
       destpath = build_destpath(path)
     
-      metadata = @session.metadata(destpath)
-      if metadata.respond_to?(:is_deleted) && metadata.is_deleted
+      f = @client.find(destpath)
+      if f.is_deleted
         false
       else
         true
       end
       
-    rescue Dropbox::FileNotFoundError
+    rescue Dropbox::API::Error::NotFound
       false
     rescue => err
       show_error(err)
@@ -80,10 +77,10 @@ module GetThemAll
         @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)
+        @client.upload(destpath, data)
+        
         EM::next_tick{ deferrable.succeed }
       end
       
@@ -107,11 +104,20 @@ module GetThemAll
     # 
     def read(path)
       destpath = build_destpath(path)
-      @session.download(destpath)
+      @client.download(destpath)
     rescue => err
       show_error(err)
       raise ReadError, "cannot read file: #{err}"
     end
-  
+  private
+    def build_destpath(path)
+      ret = super
+      if ret[0] == '/'
+        ret[1..-1]
+      else
+        ret
+      end
+    end
+    
   end
 end

data/lib/get_them_all/version.rb

@@ -1,3 +1,3 @@
 module GetThemAll
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: get_them_all
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-29 00:00:00.000000000Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70173827072780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173827072780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70173827072240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70173827072240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: em-priority-queue
-  requirement: &70173827071420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70173827071420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70173827070560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70173827070560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70173827069940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173827069940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70173827069080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70173827069080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: dropbox
-  requirement: &70173827068540 !ruby/object:Gem::Requirement
+  name: dropbox-api
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173827068540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &70173827067900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173827067900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mass downloader useable as standalone or as a library
 email: []
 executables:
@@ -142,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2468731272085884149
+      hash: 1282639448533275158
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,10 +191,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2468731272085884149
+      hash: 1282639448533275158
 requirements: []
 rubyforge_project: get_them_all
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Mass downloader