dropio 3.0.0.pre6 → 3.0.0.pre7

data/dropio.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dropio}
-  s.version = "3.0.0.pre6"
+  s.version = "3.0.0.pre7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jake Good, Eric Skiff, Kunal Shah, Seth Thomas Rasmussen"]
+  s.authors = ["Jake Good, Eric Skiff, Kunal Shah, Seth Thomas Rasmussen, Matthew Rathbone"]
   s.date = %q{2010-09-21}
   s.description = %q{A Ruby client library for the Drop.io Rich Media Backbone (RMB) API (http://backbone.drop.io). Please send all feedback to contact@dropio.com}
-  s.email = ["jake@dropio.com", "eric@dropio.com", "kunal@dropio.com", "seth@dropio.com"]
+  s.email = ["jake@dropio.com", "eric@dropio.com", "kunal@dropio.com", "seth@dropio.com", "matthew@dropio.com"]
   s.extra_rdoc_files = ["History.rdoc", "Readme.rdoc", "Todo.rdoc"]
   s.files = ["Gemfile", "History.rdoc", "LICENSE.txt", "Manifest", "Rakefile", "Readme.rdoc", "Todo.rdoc", "dropio.gemspec", "lib/dropio.rb", "lib/dropio/api.rb", "lib/dropio/asset.rb", "lib/dropio/client.rb", "lib/dropio/drop.rb", "lib/dropio/job.rb", "lib/dropio/resource.rb", "lib/dropio/subscription.rb", "lib/dropio/version.rb", "spec/dropio/api_spec.rb", "spec/dropio/asset_spec.rb", "spec/dropio/client_spec.rb", "spec/dropio/drop_spec.rb", "spec/dropio/subscription_spec.rb", "spec/dropio_spec.rb", "spec/spec.opts", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/dropio/dropio}

data/lib/dropio/api.rb

@@ -76,17 +76,22 @@ class Dropio::Api
     File.open(file_path) do |file|
       mime_type = (MIME::Types.type_for(file_path)[0] || MIME::Types["application/octet-stream"][0])
 
-      params = sign_if_needed({
-        'api_key'           => self.class.default_params[:api_key],
-        'drop_name'         => drop_name,
-        'format'            => 'json',
-        'description'       => description,
+      params = {
+        "api_key" => self.class.default_params[:api_key],
+        "format" => 'json',
         'version'           => Dropio::Config.version,
-        'conversion'        => convert_to,
-        'pingback_url'      => pingback_url,
-        'output_locations'  => locs
-      }).merge('file'  => UploadIO.new(file, mime_type, file_path))
-
+        'file'  => UploadIO.new(file, mime_type, file_path)
+      }
+      
+      params = sign_if_needed(params)
+      # stuff passed in by a user. Done like this as if you pass a parameter without a value it can cause an issue (with the output_locations anyway)
+      # although this will be fixed in the API, we shouldn't be doing it anyway.
+      params['drop_name'] = drop_name if drop_name
+      params['description'] = description if description
+      params['conversion'] = convert_to if convert_to
+      params['pingback_url'] = pingback_url if pingback_url
+      params['output_locations'] = locs if locs
+      
       req  = Net::HTTP::Post::Multipart.new(url.path, params)
       http = Net::HTTP.new(url.host, url.port)
       http.set_debug_output $stderr if Dropio::Config.debug

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: dropio
 version: !ruby/object:Gem::Version 
-  hash: -1876988211
+  hash: -1876988214
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - pre6
-  version: 3.0.0.pre6
+  - pre7
+  version: 3.0.0.pre7
 platform: ruby
 authors: 
-- Jake Good, Eric Skiff, Kunal Shah, Seth Thomas Rasmussen
+- Jake Good, Eric Skiff, Kunal Shah, Seth Thomas Rasmussen, Matthew Rathbone
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -127,6 +127,7 @@ email:
 - eric@dropio.com
 - kunal@dropio.com
 - seth@dropio.com
+- matthew@dropio.com
 executables: []
 
 extensions: []