transloadit 2.0.1 → 3.0.1

data/test/unit/transloadit/test_assembly.rb

@@ -1,60 +1,60 @@
-require 'test_helper'
+require "test_helper"
 
 describe Transloadit::Assembly do
   before do
-    @transloadit = Transloadit.new(:key => '')
+    @transloadit = Transloadit.new(key: "")
   end
 
-  it 'must inherit from Transloadit::ApiModel class' do
-    (Transloadit::Assembly < Transloadit::ApiModel).must_equal true
+  it "must inherit from Transloadit::ApiModel class" do
+    _(Transloadit::Assembly < Transloadit::ApiModel).must_equal true
   end
 
-  describe 'when initialized' do
+  describe "when initialized" do
     before do
-      @step     = @transloadit.step 'thumbs', '/video/thumbs'
-      @redirect = 'http://foo.bar/'
+      @step = @transloadit.step "thumbs", "/video/thumbs"
+      @redirect = "https://foo.bar/"
 
       @assembly = Transloadit::Assembly.new @transloadit,
-        :steps        => @step,
-        :redirect_url => @redirect
+        steps: @step,
+        redirect_url: @redirect
     end
 
-    it 'must wrap its step in a hash' do
-      @assembly.steps.must_equal @step.to_hash
+    it "must wrap its step in a hash" do
+      _(@assembly.steps).must_equal @step.to_hash
     end
 
-    it 'must not wrap a nil step' do
+    it "must not wrap a nil step" do
       @assembly.options[:steps] = nil
-      @assembly.steps.must_equal nil
+      assert_nil @assembly.steps
     end
 
-    it 'must not wrap a hash step' do
-      @assembly.options[:steps] = { :foo => 1 }
-      @assembly.steps.must_equal :foo => 1
+    it "must not wrap a hash step" do
+      @assembly.options[:steps] = {foo: 1}
+      _(@assembly.steps).must_equal foo: 1
     end
 
-    it 'must produce Transloadit-compatible hash output' do
-      @assembly.to_hash.must_equal(
-        :auth         => @transloadit.to_hash,
-        :steps        => @assembly.steps,
-        :redirect_url => @redirect
+    it "must produce Transloadit-compatible hash output" do
+      _(@assembly.to_hash).must_equal(
+        auth: @transloadit.to_hash,
+        steps: @assembly.steps,
+        redirect_url: @redirect
       )
     end
 
-    it 'must submit files for upload' do
-      VCR.use_cassette 'submit_assembly' do
-        response = @assembly.create! open('lib/transloadit/version.rb')
-        response.code.must_equal 302
-        response.headers[:location].must_match %r{^http://foo.bar/}
+    it "must submit files for upload" do
+      VCR.use_cassette "submit_assembly" do
+        response = @assembly.create! open("lib/transloadit/version.rb")
+        _(response.code).must_equal 302
+        _(response.headers[:location]).must_match %r{^https://foo.bar/}
       end
     end
 
-    describe 'with additional parameters' do
+    describe "with a secret" do
       include WebMock::API
 
       before do
         WebMock.reset!
-        stub_request(:post, 'api2.transloadit.com/assemblies')
+        stub_request(:post, "https://api2.transloadit.com/assemblies")
           .to_return(body: '{"ok":"ASSEMBLY_COMPLETED"}')
       end
 
@@ -62,58 +62,91 @@ describe Transloadit::Assembly do
         WebMock.reset!
       end
 
-      it 'must allow to send a template id along' do
+      it "must send the signature before any file" do
+        transloadit = Transloadit.new(key: "", secret: "foo")
+        Transloadit::Assembly.new(
+          transloadit
+        ).create! open("lib/transloadit/version.rb")
+
+        assert_requested(:post, "https://api2.transloadit.com/assemblies") do |req|
+          position_params = req.body.index 'name="params"'
+          position_signature = req.body.index 'name="signature"'
+          position_file = req.body.index 'name="file_0"'
+
+          _(position_params).wont_be_nil
+          _(position_signature).wont_be_nil
+          _(position_file).wont_be_nil
+
+          _(position_params < position_signature).must_equal true
+          _(position_signature < position_file).must_equal true
+        end
+      end
+    end
+
+    describe "with additional parameters" do
+      include WebMock::API
+
+      before do
+        WebMock.reset!
+        stub_request(:post, "https://api2.transloadit.com/assemblies")
+          .to_return(body: '{"ok":"ASSEMBLY_COMPLETED"}')
+      end
+
+      after do
+        WebMock.reset!
+      end
+
+      it "must allow to send a template id along" do
         Transloadit::Assembly.new(
           @transloadit,
-          :template_id => 'TEMPLATE_ID'
+          template_id: "TEMPLATE_ID"
         ).create!
 
-        assert_requested(:post, 'api2.transloadit.com/assemblies') do |req|
+        assert_requested(:post, "https://api2.transloadit.com/assemblies") do |req|
           values = values_from_post_body(req.body)
-          MultiJson.load(values['params'])['template_id'].must_equal 'TEMPLATE_ID'
+          _(MultiJson.load(values["params"])["template_id"]).must_equal "TEMPLATE_ID"
         end
       end
 
-      it 'must allow to send the fields hash' do
+      it "must allow to send the fields hash" do
         Transloadit::Assembly.new(
           @transloadit,
-          :fields => {:tag => 'ninja-cat'}
+          fields: {tag: "ninja-cat"}
         ).create!
 
-        assert_requested(:post, 'api2.transloadit.com/assemblies') do |req|
+        assert_requested(:post, "https://api2.transloadit.com/assemblies") do |req|
           values = values_from_post_body(req.body)
-          values['tag'].must_equal 'ninja-cat'
-          MultiJson.load(values['params'])['fields']['tag'].must_equal 'ninja-cat'
+          _(values["tag"]).must_equal "ninja-cat"
+          _(MultiJson.load(values["params"])["fields"]["tag"]).must_equal "ninja-cat"
         end
       end
 
-      it 'must allow steps through the create! method' do
+      it "must allow steps through the create! method" do
         Transloadit::Assembly.new(@transloadit).create!(
-          { :steps => @transloadit.step('thumbs', '/video/thumbs') }
+          steps: @transloadit.step("thumbs", "/video/thumbs")
         )
 
-        assert_requested(:post, 'api2.transloadit.com/assemblies') do |req|
+        assert_requested(:post, "https://api2.transloadit.com/assemblies") do |req|
           values = values_from_post_body(req.body)
-          MultiJson.load(values['params'])['steps'].must_equal({'thumbs'=>{'robot'=>'/video/thumbs'}})
+          _(MultiJson.load(values["params"])["steps"]).must_equal({"thumbs" => {"robot" => "/video/thumbs"}})
         end
       end
 
-      it 'must allow steps passed through the create! method override steps previously set' do
-        @assembly.create!({ :steps => @transloadit.step('resize', '/image/resize') })
+      it "must allow steps passed through the create! method override steps previously set" do
+        @assembly.create!(steps: @transloadit.step("resize", "/image/resize"))
 
-        assert_requested(:post, 'api2.transloadit.com/assemblies') do |req|
+        assert_requested(:post, "https://api2.transloadit.com/assemblies") do |req|
           values = values_from_post_body(req.body)
-          MultiJson.load(values['params'])['steps'].must_equal({"resize"=>{'robot'=>'/image/resize'}})
+          _(MultiJson.load(values["params"])["steps"]).must_equal({"resize" => {"robot" => "/image/resize"}})
         end
       end
     end
 
     describe 'when using the "submit!" method' do
-
-      it 'must call the create! method with the same parameters' do
-        VCR.use_cassette 'submit_assembly' do
-          file = open('lib/transloadit/version.rb')
-          mocker = MiniTest::Mock.new
+      it "must call the create! method with the same parameters" do
+        VCR.use_cassette "submit_assembly" do
+          file = open("lib/transloadit/version.rb")
+          mocker = Minitest::Mock.new
           mocker.expect :call, nil, [file]
           @assembly.stub :create!, mocker do
             @assembly.submit!(file)
@@ -123,54 +156,62 @@ describe Transloadit::Assembly do
       end
     end
 
-    describe 'when rate limit is reached' do
-
-      it 'must output a warning and retry for a successful request' do
-        VCR.use_cassette 'rate_limit_succeed' do
-          _, warning = capture_io do
-            response = @assembly.create! open('lib/transloadit/version.rb')
-            response['ok'].must_equal 'ASSEMBLY_COMPLETED'
-          end
-          warning.must_equal "Rate limit reached. Waiting for 0 seconds before retrying.\n"
+    describe "when rate limit is reached" do
+      it "must output a warning and retry for a successful request" do
+        VCR.use_cassette "rate_limit_succeed" do
+          _, warning = capture_io {
+            response = @assembly.create! open("lib/transloadit/version.rb")
+            _(response["ok"]).must_equal "ASSEMBLY_COMPLETED"
+          }
+          _(warning).must_equal "Rate limit reached. Waiting for 0 seconds before retrying.\n"
         end
       end
 
-      it 'must retry only the number of times specified' do
+      it "must retry only the number of times specified" do
         @assembly.options[:tries] = 1
 
-        VCR.use_cassette 'rate_limit_succeed' do
+        VCR.use_cassette "rate_limit_succeed" do
           assert_raises Transloadit::Exception::RateLimitReached do
-            response = @assembly.create! open('lib/transloadit/version.rb')
+            @assembly.create! open("lib/transloadit/version.rb")
           end
         end
       end
 
-      it 'must raise RateLimitReached exception after multiple retries request' do
-        VCR.use_cassette 'rate_limit_fail' do
+      it "must raise RateLimitReached exception after multiple retries request" do
+        VCR.use_cassette "rate_limit_fail" do
           assert_raises Transloadit::Exception::RateLimitReached do
-            response = @assembly.create! open('lib/transloadit/version.rb')
+            @assembly.create! open("lib/transloadit/version.rb")
           end
         end
       end
     end
   end
 
-  describe 'with multiple steps' do
+  describe "with multiple steps" do
     before do
-      @encode = @transloadit.step 'encode', '/video/encode'
-      @thumbs = @transloadit.step 'thumbs', '/video/thumbs'
+      @encode = @transloadit.step "encode", "/video/encode"
+      @thumbs = @transloadit.step "thumbs", "/video/thumbs"
 
       @assembly = Transloadit::Assembly.new @transloadit,
-        :steps => [ @encode, @thumbs ]
+        steps: [@encode, @thumbs]
     end
 
-    it 'must wrap its steps into one hash' do
-      @assembly.to_hash[:steps].keys.must_include @encode.name
-      @assembly.to_hash[:steps].keys.must_include @thumbs.name
+    it "must wrap its steps into one hash" do
+      _(@assembly.to_hash[:steps].keys).must_include @encode.name
+      _(@assembly.to_hash[:steps].keys).must_include @thumbs.name
+    end
+
+    it "must not allow duplicate steps" do
+      thumbs = @transloadit.step("thumbs", "/video/thumbs")
+      thumbs_duplicate = @transloadit.step("thumbs", "/video/encode")
+      options = {steps: [thumbs, thumbs_duplicate]}
+      assert_raises ArgumentError do
+        @assembly.create! open("lib/transloadit/version.rb"), **options
+      end
     end
   end
 
-  describe 'using assembly API methods' do
+  describe "using assembly API methods" do
     include WebMock::API
 
     before do
@@ -178,84 +219,79 @@ describe Transloadit::Assembly do
       @assembly = Transloadit::Assembly.new @transloadit
     end
 
-    describe 'when fetching all assemblies' do
-
-      it 'must perform GET request to /assemblies' do
-        stub = stub_request(:get, 'api2.transloadit.com/assemblies?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D')
+    describe "when fetching all assemblies" do
+      it "must perform GET request to /assemblies" do
+        stub = stub_request(:get, "https://api2.transloadit.com/assemblies?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D")
         @assembly.list
 
         assert_requested(stub)
       end
 
-      it 'must return a list of items' do
-        VCR.use_cassette 'fetch_assemblies' do
+      it "must return a list of items" do
+        VCR.use_cassette "fetch_assemblies" do
           response = @assembly.list
 
-          response['items'].must_equal []
-          response['count'].must_equal 0
+          _(response["items"]).must_equal []
+          _(response["count"]).must_equal 0
         end
       end
     end
 
-    describe 'when fetching single assembly' do
-
-      it 'must perform GET request to /assemblies/[id]' do
-        stub = stub_request(:get, 'api2.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4')
-        @assembly.get '76fe5df1c93a0a530f3e583805cf98b4'
+    describe "when fetching single assembly" do
+      it "must perform GET request to /assemblies/[id]" do
+        stub = stub_request(:get, "https://api2.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4")
+        @assembly.get "76fe5df1c93a0a530f3e583805cf98b4"
 
         assert_requested(stub)
       end
 
-      it 'must get assembly with specified id' do
-        VCR.use_cassette 'fetch_assembly_ok' do
-          response = @assembly.get '76fe5df1c93a0a530f3e583805cf98b4'
-          response['assembly_id'].must_equal '76fe5df1c93a0a530f3e583805cf98b4'
+      it "must get assembly with specified id" do
+        VCR.use_cassette "fetch_assembly_ok" do
+          response = @assembly.get "76fe5df1c93a0a530f3e583805cf98b4"
+          _(response["assembly_id"]).must_equal "76fe5df1c93a0a530f3e583805cf98b4"
         end
       end
     end
 
-    describe 'when fetching assembly notifications' do
-
-      it 'must perform GET request to /assembly_notifications' do
+    describe "when fetching assembly notifications" do
+      it "must perform GET request to /assembly_notifications" do
         stub = stub_request(
           :get,
-          'api2.transloadit.com/assembly_notifications?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D'
+          "https://api2.transloadit.com/assembly_notifications?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D"
         )
         @assembly.get_notifications
 
         assert_requested(stub)
       end
 
-      it 'must return a list of items' do
-        VCR.use_cassette 'fetch_assembly_notifications' do
+      it "must return a list of items" do
+        VCR.use_cassette "fetch_assembly_notifications" do
           response = @assembly.get_notifications
 
-          response['items'].must_equal []
-          response['count'].must_equal 0
+          _(response["items"]).must_equal []
+          _(response["count"]).must_equal 0
         end
       end
     end
 
-    describe 'when replaying assembly' do
-
-      it 'must perform POST request to assemblies/[id]/replay' do
-        VCR.use_cassette 'replay_assembly' do
-          response = @assembly.replay '55c965a063a311e6ba2d379ef10b28f7'
+    describe "when replaying assembly" do
+      it "must perform POST request to assemblies/[id]/replay" do
+        VCR.use_cassette "replay_assembly" do
+          response = @assembly.replay "55c965a063a311e6ba2d379ef10b28f7"
 
-          response['ok'].must_equal 'ASSEMBLY_REPLAYING'
-          response['assembly_id'].must_equal 'b8590300650211e6b826d727b2cfd9ce'
+          _(response["ok"]).must_equal "ASSEMBLY_REPLAYING"
+          _(response["assembly_id"]).must_equal "b8590300650211e6b826d727b2cfd9ce"
         end
       end
     end
 
-    describe 'when replaying assembly notification' do
-
-      it 'must replay notification of sepcified assembly' do
-        VCR.use_cassette 'replay_assembly_notification' do
-          response = @assembly.replay_notification '2ea5d21063ad11e6bc93e53395ce4e7d'
+    describe "when replaying assembly notification" do
+      it "must replay notification of sepcified assembly" do
+        VCR.use_cassette "replay_assembly_notification" do
+          response = @assembly.replay_notification "2ea5d21063ad11e6bc93e53395ce4e7d"
 
-          response['ok'].must_equal 'ASSEMBLY_NOTIFICATION_REPLAYED'
-          response['assembly_id'].must_equal '2ea5d21063ad11e6bc93e53395ce4e7d'
+          _(response["ok"]).must_equal "ASSEMBLY_NOTIFICATION_REPLAYED"
+          _(response["assembly_id"]).must_equal "2ea5d21063ad11e6bc93e53395ce4e7d"
         end
       end
     end

data/test/unit/transloadit/test_request.rb

@@ -1,78 +1,77 @@
-require 'test_helper'
+require "test_helper"
 
 describe Transloadit::Request do
-  it 'must allow initialization' do
-    request = Transloadit::Request.new '/'
-    request.must_be_kind_of Transloadit::Request
+  it "must allow initialization" do
+    request = Transloadit::Request.new "/"
+    _(request).must_be_kind_of Transloadit::Request
   end
 
-  describe 'when performing a GET' do
+  describe "when performing a GET" do
     before do
-      @request = Transloadit::Request.new '/'
+      @request = Transloadit::Request.new "/"
     end
 
-    it 'must inspect to the API URL' do
-      @request.inspect.must_equal @request.url.to_s.inspect
+    it "must inspect to the API URL" do
+      _(@request.inspect).must_equal @request.url.to_s.inspect
     end
 
-    it 'must perform a GET against the resource' do
-      VCR.use_cassette 'fetch_root' do
-        @request.get(:params => { :foo => 'bar'})['ok'].
-          must_equal 'SERVER_ROOT'
+    it "must perform a GET against the resource" do
+      VCR.use_cassette "fetch_root" do
+        _(@request.get(params: {foo: "bar"})["ok"])
+          .must_equal "SERVER_ROOT"
       end
     end
 
-    describe 'with secret' do
+    describe "with secret" do
       before do
         @request.secret = "tehsupersecrettoken"
       end
 
-      it 'must inspect to the API URL' do
-        @request.inspect.must_equal @request.url.to_s.inspect
+      it "must inspect to the API URL" do
+        _(@request.inspect).must_equal @request.url.to_s.inspect
       end
 
-      it 'must perform a GET against the resource' do
-        VCR.use_cassette 'fetch_root' do
-          @request.get(:params => { :foo => 'bar'})['ok'].
-              must_equal 'SERVER_ROOT'
+      it "must perform a GET against the resource" do
+        VCR.use_cassette "fetch_root" do
+          _(@request.get(params: {foo: "bar"})["ok"])
+            .must_equal "SERVER_ROOT"
         end
       end
-
     end
   end
 
-  describe 'when performing a POST' do
-    it 'must perform a POST against the resource' do
-      @request = Transloadit::Request.new('assemblies', 'secret')
+  describe "when performing a POST" do
+    it "must perform a POST against the resource" do
+      @request = Transloadit::Request.new("assemblies", "secret")
 
-      VCR.use_cassette 'post_assembly' do
-        @request.post(:params => {
-          :auth  => { :key     => '',
-                      :expires => (Time.now + 10).utc.strftime('%Y/%m/%d %H:%M:%S+00:00') },
-          :steps => { :encode => { :robot => '/video/encode' } }
-        })['ok'].must_equal 'ASSEMBLY_COMPLETED'
+      VCR.use_cassette "post_assembly" do
+        _(@request.post(params: {
+          auth: {key: "",
+                 expires: (Time.now + 10).utc.strftime("%Y/%m/%d %H:%M:%S+00:00")},
+          steps: {encode: {robot: "/video/encode"}}
+        })["ok"]).must_equal "ASSEMBLY_COMPLETED"
       end
     end
   end
 
-  describe 'when performing a PUT' do
-    it 'must perform a PUT against the resource' do
-      @request = Transloadit::Request.new('templates/55c965a063a311e6ba2d379ef10b28f7', 'secret')
-      VCR.use_cassette 'update_template' do
-        @request.put(:params => {
-          :name => 'foo',
-          :template => {:key => 'value'}
-        })['ok'].must_equal 'TEMPLATE_UPDATED'
+  describe "when performing a PUT" do
+    it "must perform a PUT against the resource" do
+      @request = Transloadit::Request.new("templates/55c965a063a311e6ba2d379ef10b28f7", "secret")
+      VCR.use_cassette "update_template" do
+        _(@request.put(params: {
+          name: "foo",
+          template: {key: "value"}
+        })["ok"]).must_equal "TEMPLATE_UPDATED"
       end
     end
   end
 
-  describe 'when performing a DELETE' do
-    it 'must perform a DELETE against the resource' do
-      @request = Transloadit::Request.new('templates/55c965a063a311e6ba2d379ef10b28f7', 'secret')
+  describe "when performing a DELETE" do
+    it "must perform a DELETE against the resource" do
+      @request = Transloadit::Request.new("templates/55c965a063a311e6ba2d379ef10b28f7", "secret")
 
-      VCR.use_cassette 'delete_template' do
-        @request.delete['ok'].must_equal 'TEMPLATE_DELETED'
+      VCR.use_cassette "delete_template" do
+        _(@request.delete["ok"]).must_equal "TEMPLATE_DELETED"
       end
     end
   end