vzaar 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1f51bc51dfb2661ea560ab755d5d259ecf5bc9a
-  data.tar.gz: af11b53d12bd5a8e36e2ad787c0f14de5a7a1307
+  metadata.gz: 4d986a80dad0ab36749cc38b8316f006c788909e
+  data.tar.gz: 9ddee490c28424edff41e0147bea9e9a1d6a8756
 SHA512:
-  metadata.gz: 7850014b6cd0aa53d6fe9ddfc94fb919a90ef738bb7f76d1936909a65f74e044a899a34261c5c9279322cd4fa0a5e91a679cbbee58ebe16c91b613f698a7236f
-  data.tar.gz: faa4b22a4362cc33fa6a6e23d49cf969a40fa64ab9102aa1e17d734b4ef20bd17c34af63d01dee74744b2c59b138a46d4616ca7989016660b2d51e535cbd9bcc
+  metadata.gz: f6234fb2dff305773bcd961079fc85e29a731fdf13358c92a487070137dd87d51019d59416928a1ff3ddc23e18010f59469d31fdb49a4c22dec59a8062e2ddec
+  data.tar.gz: 7d0a77e07a21b27c36450b39c7a93e5b07b2ed6a5b5ffa39e25e6c8cad86abd9967ef021f7417b662c0d243275f262b653c56d7511828d58825b7c6085c8f947

data/ChangeLog

@@ -1,4 +1,8 @@
-[1.6.0] 2015-07-07 EJ <ed@vzaar.com>
+[1.6.1] 2016-04-21 EJ <ed@vzaar.com>
+
+  * escape ampersands in filename when sending signature request
+
+[1.6.0] 2016-03-03 EJ <ed@vzaar.com>
 
   * support for chunked uploads
 

data/lib/vzaar/request/url.rb

@@ -15,8 +15,8 @@ module Vzaar
       end
 
       def build_params
-        _params = params ? (params.delete_if {|k,v| v.nil?}) : {}
-        URI.escape(_params.collect { |k,v| "#{k}=#{v}" }.join('&'))
+        _params = params ? (params.delete_if { |k,v| v.nil? }) : {}
+        URI.encode_www_form(_params)
       end
 
     end

data/lib/vzaar/version.rb

@@ -1,3 +1,3 @@
 module Vzaar
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/vzaar/request/url_spec.rb

@@ -2,24 +2,31 @@ require 'spec_helper'
 require './lib/vzaar/request/url'
 
 describe Vzaar::Request::Url do
-  let(:params) do
-    { foo: 1, bar: 2 }
-  end
-
   let(:format) { :xml }
-
   let(:url) { "/api/endpoint" }
 
   subject { described_class.new(url, format, params) }
 
   describe "#build" do
+    let(:result) { subject.build }
+
     context "when there are params" do
-      specify { expect(subject.build).to eq("/api/endpoint.xml?foo=1&bar=2") }
+      let(:params) { { foo: 1, bar: 2 } }
+      let(:expected_result) { "/api/endpoint.xml?foo=1&bar=2" }
+      specify { expect(result).to eq expected_result }
+
+      context 'and the params contain an unescaped ampersand' do
+        let(:params) { { foo: 'this & that.mp4', bar: 2 } }
+        let(:encoded_params) { URI.encode_www_form params }
+        let(:expected_result) { "/api/endpoint.xml?#{encoded_params}" }
+        specify { expect(result).to eq expected_result }
+      end
     end
 
     context "when there are params" do
       let(:params) {{}}
-      specify { expect(subject.build).to eq("/api/endpoint.xml") }
+      let(:expected_result) { "/api/endpoint.xml" }
+      specify { expect(result).to eq expected_result }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzaar
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Ed James
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -319,7 +319,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: vzaar-1.6.0
+summary: vzaar-1.6.1
 test_files:
 - spec/fixtures/vcr_cassettes/account_type-fail.yml
 - spec/fixtures/vcr_cassettes/account_type-success.yml