Merge branch 'release/v1.0.1'

Author: adafairweather

filepicker_client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "filepicker_client"
-  s.version     = "1.0.0"
+  s.version     = "1.0.1"
   s.date        = "2013-07-25"
   s.summary     = "Filepicker.io Client"
   s.description = "A simple library for interfacing with the Filepicker.io REST API"

lib/filepicker_client.rb

@@ -113,13 +113,13 @@ def store(file, path=nil)
     signage = sign(path: path, call: :store)
 
     uri = URI.parse(FP_API_PATH)
-    uri.query = URI.encode_www_form(
+    query_params = {
       key: @api_key,
       signature: signage[:signature],
-      policy: signage[:encoded_policy],
-      path: signage[:policy]['path']
-    )
-
+      policy: signage[:encoded_policy]
+    }
+    query_params[:path] = signage[:policy]['path'] if path
+    uri.query = URI.encode_www_form(query_params)
     resource = get_fp_resource uri
 
     response = resource.post fileUpload: file
@@ -142,12 +142,13 @@ def store_url(file_url, path=nil)
     signage = sign(path: path, call: :store)
 
     uri = URI.parse(FP_API_PATH)
-    uri.query = URI.encode_www_form(
+    query_params = {
       key: @api_key,
       signature: signage[:signature],
-      policy: signage[:encoded_policy],
-      path: signage[:policy]['path']
-    )
+      policy: signage[:encoded_policy]
+    }
+    query_params[:path] = signage[:policy]['path'] if path
+    uri.query = URI.encode_www_form(query_params)
 
     resource = get_fp_resource uri
 
@@ -192,9 +193,9 @@ def convert_and_store(handle, path=nil, options={})
       key: @api_key,
       signature: signage[:signature],
       policy: signage[:encoded_policy],
-      storeLocation: 'S3',
-      storePath: signage[:policy]['path']
+      storeLocation: 'S3'
     )
+    options[:storePath] = signage[:policy]['path'] if path
     uri.query = URI.encode_www_form(options)
 
     resource = get_fp_resource uri