transloadit 1.2.0 → 2.0.0

data/test/unit/transloadit/test_request.rb

@@ -1,26 +1,14 @@
 require 'test_helper'
 
 describe Transloadit::Request do
-  before do
-    # reset the API endpoint between tests
-    Transloadit::Request.api Transloadit::Request::API_ENDPOINT
-  end
-
   it 'must allow initialization' do
     request = Transloadit::Request.new '/'
     request.must_be_kind_of Transloadit::Request
   end
 
-  it 'must locate bored instances' do
-    VCR.use_cassette 'fetch_bored' do
-      Transloadit::Request.bored!.
-        wont_equal Transloadit::Request::API_ENDPOINT.host
-    end
-  end
-
   describe 'when performing a GET' do
     before do
-      @request = Transloadit::Request.new('instances/bored')
+      @request = Transloadit::Request.new '/'
     end
 
     it 'must inspect to the API URL' do
@@ -28,9 +16,9 @@ describe Transloadit::Request do
     end
 
     it 'must perform a GET against the resource' do
-      VCR.use_cassette 'fetch_bored' do
+      VCR.use_cassette 'fetch_root' do
         @request.get(:params => { :foo => 'bar'})['ok'].
-          must_equal 'BORED_INSTANCE_FOUND'
+          must_equal 'SERVER_ROOT'
       end
     end
 
@@ -44,9 +32,9 @@ describe Transloadit::Request do
       end
 
       it 'must perform a GET against the resource' do
-        VCR.use_cassette 'fetch_bored' do
+        VCR.use_cassette 'fetch_root' do
           @request.get(:params => { :foo => 'bar'})['ok'].
-              must_equal 'BORED_INSTANCE_FOUND'
+              must_equal 'SERVER_ROOT'
         end
       end
 
@@ -54,11 +42,9 @@ describe Transloadit::Request do
   end
 
   describe 'when performing a POST' do
-    before do
+    it 'must perform a POST against the resource' do
       @request = Transloadit::Request.new('assemblies', 'secret')
-    end
 
-    it 'must perform a POST against the resource' do
       VCR.use_cassette 'post_assembly' do
         @request.post(:params => {
           :auth  => { :key     => '',
@@ -68,4 +54,26 @@ describe Transloadit::Request do
       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'
+      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')
+
+      VCR.use_cassette 'delete_template' do
+        @request.delete['ok'].must_equal 'TEMPLATE_DELETED'
+      end
+    end
+  end
 end

data/test/unit/transloadit/test_response.rb

@@ -76,6 +76,36 @@ describe Transloadit::Response do
     end
   end
 
+  describe 'long-running assembly' do
+    before do
+      VCR.use_cassette 'fetch_assembly_executing' do
+        @response = Transloadit::Response.new(
+          RestClient::Resource.new(REQUEST_URI).get
+        ).extend!(Transloadit::Response::Assembly)
+      end
+    end
+
+    it 'must allow reloading until finished' do
+      @response.finished?.must_equal false
+
+      VCR.use_cassette 'fetch_assembly_ok' do
+        VCR.use_cassette 'fetch_assembly_executing' do
+          @response.reload_until_finished!
+        end
+      end
+
+      @response.finished?.must_equal true
+    end
+
+    it 'must raise exception if reload until finished tries exceeded' do
+      assert_raises Transloadit::Exception::ReloadLimitReached do
+        VCR.use_cassette 'fetch_assembly_executing', :allow_playback_repeats => true do
+          @response.reload_until_finished! tries: 1
+        end
+      end
+    end
+  end
+
   describe 'statuses' do
     it 'must allow checking for upload' do
       VCR.use_cassette 'fetch_assembly_uploading' do
@@ -101,6 +131,20 @@ describe Transloadit::Response do
       @response.error?.must_equal false
     end
 
+    it 'must allow to check for replaying' do
+      VCR.use_cassette 'replay_assembly' do
+        @response = Transloadit::Response.new(
+          RestClient::Resource.new(
+            'http://api2.transloadit.com/assemblies/55c965a063a311e6ba2d379ef10b28f7/replay'
+          ).post({})
+        ).extend!(Transloadit::Response::Assembly)
+      end
+
+      @response.finished?.must_equal false
+      @response.replaying?.must_equal true
+      @response.error?.must_equal false
+    end
+
     it 'must allow to check for aborted' do
       VCR.use_cassette 'fetch_assembly_aborted' do
         @response = Transloadit::Response.new(

data/test/unit/transloadit/test_template.rb

@@ -0,0 +1,118 @@
+require 'test_helper'
+
+describe Transloadit::Template do
+
+  it 'must inherit from Transloadit::ApiModel class' do
+    (Transloadit::Template < Transloadit::ApiModel).must_equal true
+  end
+
+  describe 'using template API methods' do
+    include WebMock::API
+
+    before do
+      WebMock.reset!
+      @transloadit = Transloadit.new(:key => '')
+      @template = Transloadit::Template.new @transloadit
+    end
+
+    it 'must allow to create new template' do
+      VCR.use_cassette 'create_template' do
+        response = @template.create(
+          {
+            :name => 'foo',
+            :template => {'key' => 'value'}
+          }
+        )
+        response['ok'].must_equal 'TEMPLATE_CREATED'
+        response['template_name'].must_equal 'foo'
+        response['template_content']['key'].must_equal 'value'
+      end
+    end
+
+    describe 'when fetching all templates' do
+
+      it 'must perform GET request to /templates' do
+        stub = stub_request(:get, 'api2.transloadit.com/templates?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D')
+        @template.list
+
+        assert_requested(stub)
+      end
+
+      it 'must return a list of items' do
+        VCR.use_cassette 'fetch_templates' do
+          response = @template.list
+
+          response['items'].must_equal []
+          response['count'].must_equal 0
+        end
+      end
+    end
+
+    describe 'when fetching single template' do
+
+      it 'must perform GET request to /templates/[id]' do
+        stub = stub_request(
+          :get,
+          'api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D'
+        )
+        @template.get '76fe5df1c93a0a530f3e583805cf98b4'
+
+        assert_requested(stub)
+      end
+
+      it 'must get template with specified id' do
+        VCR.use_cassette 'fetch_template' do
+          response = @template.get '76fe5df1c93a0a530f3e583805cf98b4'
+          response['ok'].must_equal 'TEMPLATE_FOUND'
+          response['template_id'].must_equal '76fe5df1c93a0a530f3e583805cf98b4'
+        end
+      end
+    end
+
+    describe 'when updating template' do
+
+      it 'must perform PUT request to templates/[id]' do
+        url = 'api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4'
+        stub_request(:put, url)
+        @template.update(
+          '76fe5df1c93a0a530f3e583805cf98b4',
+          {:name => 'foo', :template => {:key => 'value'}}
+        )
+
+        assert_requested(:put, url) do |req|
+          values = values_from_post_body(req.body)
+          data = MultiJson.load(values['params'])
+          data['name'].must_equal 'foo'
+          data['template']['key'].must_equal 'value'
+        end
+      end
+
+      it 'must update template with specified id' do
+        VCR.use_cassette 'update_template' do
+          response = @template.update '55c965a063a311e6ba2d379ef10b28f7'
+
+          response['ok'].must_equal 'TEMPLATE_UPDATED'
+          response['template_id'].must_equal '55c965a063a311e6ba2d379ef10b28f7'
+        end
+      end
+    end
+
+    describe 'when deleting a template' do
+
+      it 'must perform DELETE request to templates/[id]' do
+        stub = stub_request(:delete, 'api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4')
+        @template.delete '76fe5df1c93a0a530f3e583805cf98b4'
+
+        assert_requested(stub)
+      end
+
+      it 'must delete specified template templates' do
+        VCR.use_cassette 'delete_template' do
+          response = @template.delete '55c965a063a311e6ba2d379ef10b28f7'
+
+          response['ok'].must_equal 'TEMPLATE_DELETED'
+        end
+      end
+    end
+  end
+end

data/transloadit.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.summary     = 'Official Ruby gem for Transloadit'
   gem.description = 'The transloadit gem allows you to automate uploading files through the Transloadit REST API'
 
-  gem.required_rubygems_version = '>= 1.3.6'
-  gem.required_ruby_version     = '>= 1.9.2'
+  gem.required_rubygems_version = '>= 2.2.0'
+  gem.required_ruby_version     = '>= 2.1.0'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'rest-client'
   gem.add_dependency 'multi_json'
-  gem.add_dependency 'mime-types', '~> 2.99'
+  gem.add_dependency 'mime-types'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transloadit
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Stephen Touset
@@ -9,146 +9,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The transloadit gem allows you to automate uploading files through the
@@ -160,35 +160,58 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- examples/README.md
+- examples/basic/audio-concat-transcoder.rb
+- examples/basic/audio-transcoder.rb
+- examples/basic/image-transcoder.rb
+- examples/basic/main.rb
+- examples/basic/media-transcoder.rb
 - lib/transloadit.rb
+- lib/transloadit/api_model.rb
 - lib/transloadit/assembly.rb
+- lib/transloadit/exception.rb
 - lib/transloadit/request.rb
 - lib/transloadit/response.rb
 - lib/transloadit/response/assembly.rb
 - lib/transloadit/step.rb
+- lib/transloadit/template.rb
 - lib/transloadit/version.rb
 - test/fixtures/cassettes/cancel_assembly.yml
+- test/fixtures/cassettes/create_template.yml
+- test/fixtures/cassettes/delete_template.yml
+- test/fixtures/cassettes/fetch_assemblies.yml
 - test/fixtures/cassettes/fetch_assembly_aborted.yml
 - test/fixtures/cassettes/fetch_assembly_errors.yml
 - test/fixtures/cassettes/fetch_assembly_executing.yml
+- test/fixtures/cassettes/fetch_assembly_notifications.yml
 - test/fixtures/cassettes/fetch_assembly_ok.yml
 - test/fixtures/cassettes/fetch_assembly_uploading.yml
-- test/fixtures/cassettes/fetch_bored.yml
+- test/fixtures/cassettes/fetch_billing.yml
+- test/fixtures/cassettes/fetch_root.yml
+- test/fixtures/cassettes/fetch_template.yml
+- test/fixtures/cassettes/fetch_templates.yml
 - test/fixtures/cassettes/post_assembly.yml
+- test/fixtures/cassettes/rate_limit_fail.yml
+- test/fixtures/cassettes/rate_limit_succeed.yml
+- test/fixtures/cassettes/replay_assembly.yml
+- test/fixtures/cassettes/replay_assembly_notification.yml
 - test/fixtures/cassettes/submit_assembly.yml
+- test/fixtures/cassettes/update_template.yml
 - test/test_helper.rb
 - test/unit/test_transloadit.rb
+- test/unit/transloadit/test_api.rb
 - test/unit/transloadit/test_assembly.rb
 - test/unit/transloadit/test_request.rb
 - test/unit/transloadit/test_response.rb
 - test/unit/transloadit/test_step.rb
+- test/unit/transloadit/test_template.rb
 - transloadit.gemspec
 homepage: http://github.com/transloadit/ruby-sdk/
 licenses:
@@ -200,34 +223,48 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 2.2.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Official Ruby gem for Transloadit
 test_files:
 - test/fixtures/cassettes/cancel_assembly.yml
+- test/fixtures/cassettes/create_template.yml
+- test/fixtures/cassettes/delete_template.yml
+- test/fixtures/cassettes/fetch_assemblies.yml
 - test/fixtures/cassettes/fetch_assembly_aborted.yml
 - test/fixtures/cassettes/fetch_assembly_errors.yml
 - test/fixtures/cassettes/fetch_assembly_executing.yml
+- test/fixtures/cassettes/fetch_assembly_notifications.yml
 - test/fixtures/cassettes/fetch_assembly_ok.yml
 - test/fixtures/cassettes/fetch_assembly_uploading.yml
-- test/fixtures/cassettes/fetch_bored.yml
+- test/fixtures/cassettes/fetch_billing.yml
+- test/fixtures/cassettes/fetch_root.yml
+- test/fixtures/cassettes/fetch_template.yml
+- test/fixtures/cassettes/fetch_templates.yml
 - test/fixtures/cassettes/post_assembly.yml
+- test/fixtures/cassettes/rate_limit_fail.yml
+- test/fixtures/cassettes/rate_limit_succeed.yml
+- test/fixtures/cassettes/replay_assembly.yml
+- test/fixtures/cassettes/replay_assembly_notification.yml
 - test/fixtures/cassettes/submit_assembly.yml
+- test/fixtures/cassettes/update_template.yml
 - test/test_helper.rb
 - test/unit/test_transloadit.rb
+- test/unit/transloadit/test_api.rb
 - test/unit/transloadit/test_assembly.rb
 - test/unit/transloadit/test_request.rb
 - test/unit/transloadit/test_response.rb
 - test/unit/transloadit/test_step.rb
+- test/unit/transloadit/test_template.rb
 has_rdoc: