sendl 0.0.8 → 0.0.9

data/lib/sendl/uploader.rb

@@ -1,8 +1,8 @@
 module Sendl
   class Uploader
-    
+
     attr_accessor :endpoint, :api_key, :success, :errors, :recipients, :json_parser, :message, :share_url
-    
+
     def initialize(options)
       argument_errors = []
       argument_errors << "You must pass an API key!" unless options[:api_key]
@@ -18,16 +18,16 @@ module Sendl
       @share_id = nil
       @share_id = get_share_id
     end
-    
+
     def debug(msg)
       @debug && STDERR.puts(msg)
     end
-    
+
     def upload(files, options = {})
       files.each do |f|
         upload_file(f)
       end
-      
+
       if success?
         debug("success? was true, finalising the share")
         r = Curl::Easy.new(url_for("shares/#{@share_id}/finalise.json")) do |curl|
@@ -37,39 +37,39 @@ module Sendl
         STDERR.puts "Could not complete share as there were errors"
       end
     end
-    
+
     def success?
       errors.size == 0
     end
-    
+
     private
-    
+
     def de_dupe_recipients(all_recpipents)
       all_recpipents.map{|r| r.downcase.strip }.uniq
     end
 
     def upload_file(f)
       debug("Uploading #{f.filename}")
-      
+
       mime_type = MIME::Types.type_for(f.filename).first || 'application/octet-stream'
-      
+
       debug("Determined MIME Type of #{mime_type}")
       debug("Uploading by sha")
       r = Curl::Easy.new(url_for("shares/#{@share_id}/share_files.json")) do |curl|
         curl.http_post Curl::PostField.content("auth_token", api_key), Curl::PostField.content("file_data[sha512]", f.sha512), Curl::PostField.content("share_file[filename]", f.filename), Curl::PostField.content("share_file[content_type]", mime_type)
       end
-      
+
       file_share_id = parse_json(r.body_str)["share_file"]["id"]
-      
+
       if r.response_code == 201
         STDERR.puts "#{::File.basename(f.desired_name)} was already uploaded, skipping"
       elsif r.response_code == 202
         debug("Server requests the full file contents")
-        
+
         progress = ProgressBar.new(f.desired_name, f.size)
         progress.file_transfer_mode
         progress.bar_mark = "="
-        
+
         r = Curl::Easy.new(url_for("shares/#{@share_id}/share_files/#{file_share_id}.json")) do |curl|
           curl.multipart_form_post = true
           curl.on_progress do |dl_total, dl_now, ul_total, ul_now| # callback
@@ -84,22 +84,22 @@ module Sendl
         if r.response_code == 413
           debug("File was too large")
           @errors << "Could not create share, a file was too big"
-        elsif r.response_code != 200
+        elsif ![200,204].include? r.response_code
           debug("An unknown error occurred")
           @errors << "An unknown error occurred, the response code was #{r.response_code}"
         end
-                
+
         STDERR.puts
       else
         @errors << "Something went wrong, please tell us if you continue to see problems (response code was #{r.response_code})"
       end
     end
-    
+
     def get_share_id
       r = Curl::Easy.new(url_for('shares.json')) do |curl|
         curl.http_post Curl::PostField.content("auth_token", api_key), Curl::PostField.content("recipients", encode_json(recipients)), Curl::PostField.content("share[message]", message)
       end
-      
+
       if r.response_code != 201
         STDERR.puts "Could not create share, HTTP response was #{r.response_code} (expected 201)"
         exit 1
@@ -109,17 +109,17 @@ module Sendl
       @share_url = share["url"]
       @share_id = share["share"]["id"]
     end
-        
+
     # FIXME: de-duplicate
     def url_for(path)
       "#{endpoint}/#{path}"
     end
-    
+
     def parse_json(str)
       parser = Yajl::Parser.new
       parser.parse(str)
     end
-    
+
     def encode_json(str)
       encoder = Yajl::Encoder.new
       encoder.encode(str)

data/lib/sendl/version.rb

@@ -1,3 +1,3 @@
 module Sendl
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendl
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: getopt