transloadit 1.1.0 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 709626bb099cd40ada8a3224b687fbf39ffb557d
+  data.tar.gz: d8ba3b52509a6d1232c4de7164ad9fbadcbac2f7
+SHA512:
+  metadata.gz: 79b3fc7ca14d347b55376a4e5dc8d5858cc7cfa3fe7e77195fae0f08c7127c58fc98cceb987e22ba4107b2a2d694bfc8e8e0da877bfbb18cdc3af821b525bee2
+  data.tar.gz: 3730079c2989d9586f8d0be352fd0b29bf81156e8d85caeee49b06602dc9a449172d4b656efbd5a08d68359f2b3d64af160975002eecbb4b1d45a6d541181e23

data/.travis.yml

@@ -9,4 +9,4 @@ rvm:
   - rbx-19mode
   - jruby-18mode
   - jruby-19mode
-script: "bundle exec rake test"
+script: "COVERAGE=false bundle exec rake test"

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-### 1.0.6 / 2013-04-22 ###
+### 1.1.1 / 2013-06-25 ###
+
+* request.get with secret (thanks @miry for the patch)
+
+### 1.1.0 / 2013-04-22 ###
 
 * We now have more statuses available in the response:
     * finished? to check if processing is finished

data/README.md

@@ -1,4 +1,6 @@
 [![Build Status](https://travis-ci.org/transloadit/ruby-sdk.png?branch=master)](https://travis-ci.org/transloadit/ruby-sdk)
+[![Code Climate](https://codeclimate.com/github/transloadit/ruby-sdk.png)](https://codeclimate.com/github/transloadit/ruby-sdk)
+[![Dependency Status](https://gemnasium.com/transloadit/ruby-sdk.png)](https://gemnasium.com/transloadit/ruby-sdk)
 
 # transloadit
 

data/lib/transloadit.rb

@@ -10,19 +10,19 @@ class Transloadit
   autoload :Response, 'transloadit/response'
   autoload :Step,     'transloadit/step'
   autoload :VERSION,  'transloadit/version'
-  
+
   # @return [String] your Transloadit auth key
   attr_accessor :key
-  
+
   # @return [String] your Transloadit auth secret, for signing requests
   attr_accessor :secret
-  
+
   # @return [Integer] the duration in seconds that signed API requests
   #   generated from this instance remain valid
   attr_accessor :duration
-  
+
   attr_accessor :max_size
-  
+
   #
   # Creates a new instance of the Transloadit API.
   #
@@ -39,10 +39,10 @@ class Transloadit
     self.secret   = options[:secret]
     self.duration = options[:duration] || 5 * 60
     self.max_size = options[:max_size]
-    
+
     _ensure_key_provided
   end
-  
+
   #
   # Creates a Transloadit::Step describing a step in an upload assembly.
   #
@@ -56,7 +56,7 @@ class Transloadit
   def step(name, robot, options = {})
     Transloadit::Step.new(name, robot, options)
   end
-  
+
   #
   # Creates a Transloadit::Assembly ready to be sent to the REST API.
   #
@@ -74,14 +74,14 @@ class Transloadit
   def assembly(options = {})
     Transloadit::Assembly.new(self, options)
   end
-  
+
   #
   # @return [String] a human-readable version of the Transloadit.
   #
   def inspect
     self.to_hash.inspect
   end
-  
+
   #
   # @return [Hash] a Transloadit-compatible Hash of the instance's contents
   #
@@ -91,16 +91,16 @@ class Transloadit
     result.update(:expires => _generate_expiry) unless self.secret.nil?
     result
   end
-  
+
   #
   # @return [String] JSON-encoded String containing the object's hash contents
   #
   def to_json
     MultiJson.dump(self.to_hash)
   end
-  
+
   private
-  
+
   #
   # Raises an ArgumentError if no {#key} has been assigned.
   #
@@ -109,7 +109,7 @@ class Transloadit
       raise ArgumentError, 'an authentication key must be provided'
     end
   end
-  
+
   #
   # Generates an API-compatible request expiration timestamp. Uses the
   # current instance's duration.

data/lib/transloadit/assembly.rb

@@ -13,10 +13,10 @@ require 'transloadit'
 class Transloadit::Assembly
   # @return [Transloadit] the associated Transloadit instance
   attr_reader   :transloadit
-  
+
   # @return [Hash] the options describing the Assembly
   attr_accessor :options
-  
+
   #
   # Creates a new Assembly authenticated using the given +transloadit+
   # instance.
@@ -29,14 +29,14 @@ class Transloadit::Assembly
     self.transloadit = transloadit
     self.options     = options
   end
-  
+
   #
   # @return [Hash] the processing steps, formatted for sending to Transloadit
   #
   def steps
     _wrap_steps_in_hash options[:steps]
   end
-  
+
   #
   # Submits the assembly for processing. Accepts as many IO objects as you
   # wish to process in the assembly. The last argument is an optional Hash
@@ -53,28 +53,28 @@ class Transloadit::Assembly
     params  = _extract_options!(ios)
     payload = { :params => self.to_hash.update(params) }
     payload.merge!(self.options[:fields]) if self.options[:fields]
-    
+
     # update the payload with file entries
     ios.each_with_index {|f, i| payload.update :"file_#{i}" => f }
-    
+
     # find a bored instance
     Transloadit::Request.bored!
-    
+
     # create the request
     request = Transloadit::Request.new '/assemblies',
       self.transloadit.secret
-    
+
     # post the request, extend it with the Assembly extensions
     request.post(payload).extend!(Transloadit::Response::Assembly)
   end
-  
+
   #
   # @return [String] a human-readable version of the Assembly
   #
   def inspect
     self.to_hash.inspect
   end
-  
+
   #
   # @return [Hash] a Transloadit-compatible Hash of the Assembly's contents
   #
@@ -84,20 +84,20 @@ class Transloadit::Assembly
       :steps => self.steps
     ).delete_if {|k,v| v.nil? || k == :fields}
   end
-  
+
   #
   # @return [String] JSON-encoded String containing the Assembly's contents
   #
   def to_json
     MultiJson.dump(self.to_hash)
   end
-  
+
   protected
-  
+
   attr_writer :transloadit
-  
+
   private
-  
+
   #
   # Returns a Transloadit-compatible Hash wrapping the +steps+ passed to it.
   # Accepts any supported format the +steps+ could come in.
@@ -114,7 +114,7 @@ class Transloadit::Assembly
         steps.inject({}) {|h, s| h.update s }
     end
   end
-  
+
   #
   # Extracts the last argument from a set of arguments if it's a hash.
   # Otherwise, returns an empty hash.

data/lib/transloadit/request.rb

@@ -11,19 +11,19 @@ require 'openssl'
 class Transloadit::Request
   # The default Transloadit API endpoint.
   API_ENDPOINT = URI.parse('http://api2.transloadit.com/')
-  
+
   # The default headers to send to the API.
   API_HEADERS  = { 'User-Agent' => %{Transloadit Ruby SDK #{Transloadit::VERSION}} }
-  
+
   # The HMAC algorithm used for calculation request signatures.
   HMAC_ALGORITHM = OpenSSL::Digest::Digest.new('sha1')
-  
+
   # @return [String] the API endpoint for the request
   attr_reader   :url
-  
+
   # @return [String] the authentication secret to sign the request with
   attr_accessor :secret
-  
+
   #
   # Automatically sets the API endpoint to the server with the most free
   # resources. This is called automatically the first time a request is made.
@@ -31,7 +31,7 @@ class Transloadit::Request
   def self.bored!
     self.api self.bored
   end
-  
+
   #
   # Prepares a request against an endpoint URL, optionally with an encryption
   # secret. If only a path is passed, the API will automatically determine the
@@ -45,7 +45,7 @@ class Transloadit::Request
     self.url    = URI.parse(url.to_s)
     self.secret = secret
   end
-  
+
   #
   # Performs an HTTP GET to the request's URL. Takes an optional hash of
   # query params.
@@ -58,7 +58,7 @@ class Transloadit::Request
       self.api[url.path + self.to_query(params)].get(API_HEADERS)
     end
   end
-  
+
   #
   # Performs an HTTP DELETE to the request's URL. Takes an optional hash of
   # query params.
@@ -71,7 +71,7 @@ class Transloadit::Request
       self.api[url.path + self.to_query(params)].delete(API_HEADERS)
     end
   end
-  
+
   #
   # Performs an HTTP POST to the request's URL. Takes an optional hash
   # containing the form-encoded payload.
@@ -84,18 +84,18 @@ class Transloadit::Request
       self.api[url.path].post(self.to_payload(payload), API_HEADERS)
     end
   end
-  
+
   #
   # @return [String] a human-readable version of the prepared Request
   #
   def inspect
     self.url.to_s.inspect
   end
-  
+
   protected
-  
+
   attr_writer :url
-  
+
   #
   # Locates the API server with the smallest job queue.
   #
@@ -104,7 +104,7 @@ class Transloadit::Request
   def self.bored
     self.new(API_ENDPOINT + '/instances/bored').get['api2_host']
   end
-  
+
   #
   # Sets or retrieves the base URI of the API endpoint.
   #
@@ -119,7 +119,7 @@ class Transloadit::Request
     @api   = RestClient::Resource.new(uri) if uri
     @api ||= RestClient::Resource.new(self.bored)
   end
-  
+
   #
   # Retrieves the current API endpoint. If the URL of the request contains a
   # hostname, then the hostname is used as the base endpoint of the API.
@@ -135,7 +135,7 @@ class Transloadit::Request
       end
     end
   end
-  
+
   #
   # Updates the POST payload passed to be compliant with the Transloadit API
   # spec. JSONifies the value for the +params+ key and signs the request with
@@ -147,14 +147,14 @@ class Transloadit::Request
   def to_payload(payload = nil)
     return {} if payload.nil?
     return {} if payload.respond_to?(:empty?) and payload.empty?
-    
+
     # TODO: refactor this, don't update a hash that's not ours
     payload.update :params    => MultiJson.dump(payload[:params])
     payload.update :signature => self.signature(payload[:params])
     payload.delete :signature if payload[:signature].nil?
     payload
   end
-  
+
   #
   # Updates the GET/DELETE params hash to be compliant with the Transloadit
   # API by URI escaping and encoding the params hash, and attaching a
@@ -166,16 +166,19 @@ class Transloadit::Request
   def to_query(params = nil)
     return '' if params.nil?
     return '' if params.respond_to?(:empty?) and params.empty?
-    
+
     escape    = Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
+    params_in_json = MultiJson.dump(params)
+    uri_params = URI.escape(params_in_json, escape)
+
     params    = {
-      :params    => URI.escape(MultiJson.dump(params), escape),
-      :signature => self.signature(params)
+      :params    => uri_params,
+      :signature => self.signature(params_in_json)
     }
-    
+
     '?' + params.map {|k,v| "#{k}=#{v}" if v }.compact.join('&')
   end
-  
+
   #
   # Wraps a request's results in a Transloadit::Response, even if an exception
   # is raised by RestClient.
@@ -185,7 +188,7 @@ class Transloadit::Request
   rescue RestClient::Exception => e
     Transloadit::Response.new e.response
   end
-  
+
   #
   # Computes the HMAC digest of the params hash, if a secret was given to the
   # instance.
@@ -196,9 +199,9 @@ class Transloadit::Request
   def signature(params)
     self.class._hmac(self.secret, params) if self.secret.to_s.length > 0
   end
-  
+
   private
-  
+
   #
   # Computes an HMAC digest from the key and message.
   #

data/lib/transloadit/response.rb

@@ -5,7 +5,7 @@ require 'delegate'
 
 class Transloadit::Response < Delegator
   autoload :Assembly, 'transloadit/response/assembly'
-  
+
   #
   # Creates an enhanced response wrapped around a RestClient response.
   #
@@ -14,7 +14,7 @@ class Transloadit::Response < Delegator
   def initialize(response)
     self.__setobj__(response)
   end
-  
+
   #
   # Returns the attribute from the JSON response.
   #
@@ -24,7 +24,7 @@ class Transloadit::Response < Delegator
   def [](attribute)
     self.body[attribute.to_s]
   end
-  
+
   #
   # Returns the parsed JSON body.
   #
@@ -33,7 +33,7 @@ class Transloadit::Response < Delegator
   def body
     MultiJson.load self.__getobj__.body
   end
-  
+
   #
   # Inspects the body of the response.
   #
@@ -42,7 +42,7 @@ class Transloadit::Response < Delegator
   def inspect
     self.body.inspect
   end
-  
+
   #
   # Chainably extends the response with additional methods. Used to add
   # context-specific functionality to a response.
@@ -54,9 +54,9 @@ class Transloadit::Response < Delegator
     self.extend(mod)
     self
   end
-  
+
   protected
-  
+
   #
   # The object to delegate method calls to.
   #
@@ -65,7 +65,7 @@ class Transloadit::Response < Delegator
   def __getobj__
     @response
   end
-  
+
   #
   # Sets the object to delegate method calls to.
   #
@@ -75,7 +75,7 @@ class Transloadit::Response < Delegator
   def __setobj__(response)
     @response = response
   end
-  
+
   #
   # Replaces the object this instance delegates to with the one the other
   # object uses.

data/lib/transloadit/step.rb

@@ -11,13 +11,13 @@ require 'transloadit'
 class Transloadit::Step
   # @return [String] the name to give the step
   attr_accessor :name
-  
+
   # @return [String] the robot to use
   attr_reader :robot
-  
+
   # @return [Hash] the robot's options
   attr_accessor :options
-  
+
   #
   # Creates a new Step with the given +robot+.
   #
@@ -31,7 +31,7 @@ class Transloadit::Step
     self.robot   = robot
     self.options = options
   end
-  
+
   #
   # Specifies that this Step should process the provided +input+ instead of
   # the output of the Step before it.
@@ -50,36 +50,36 @@ class Transloadit::Step
   #
   def use(input)
     self.options.delete(:use) and return if input.nil?
-    
+
     self.options[:use] = case input
       when Symbol then input.inspect
       when Array  then input.map {|i| i.name }
       else             [ input.name ]
     end
   end
-  
+
   #
   # @return [String] a human-readable version of the Step
   #
   def inspect
     self.to_hash[self.name].inspect
   end
-  
+
   #
   # @return [Hash] a Transloadit-compatible Hash of the Step's contents
   #
   def to_hash
     { self.name => options.merge(:robot => self.robot) }
   end
-  
+
   #
   # @return [String] JSON-encoded String containing the Step's hash contents
   #
   def to_json
     MultiJson.dump(self.to_hash)
   end
-  
+
   protected
-  
+
   attr_writer :robot
 end

data/lib/transloadit/version.rb

@@ -1,3 +1,3 @@
 class Transloadit
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/test/fixtures/cassettes/fetch_bored.yml

@@ -70,4 +70,39 @@ http_interactions:
       string: ! '{"ok":"BORED_INSTANCE_FOUND","host":"jane.transloadit.com","api2_host":"jane.transloadit.com"}'
     http_version: '1.1'
   recorded_at: Fri, 08 Mar 2013 15:13:10 GMT
+- request:
+    method: get
+    uri: http://api2.transloadit.com/instances/bored?params=%7B%22params%22:%7B%22foo%22:%22bar%22%7D%7D&signature=78f291e3038e3eeb82d9f79e11a68fe7b858ee97
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*; q=0.5, application/xml'
+      Accept-Encoding:
+      - gzip, deflate
+      User-Agent:
+      - Transloadit Ruby SDK 0.1.2
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Headers:
+      - X-Requested-With, Content-Type, Accept, Content-Length
+      Access-Control-Allow-Methods:
+      - POST, GET, PUT, DELETE, OPTIONS
+      Access-Control-Allow-Origin:
+      - ! '*'
+      Content-Type:
+      - text/plain
+      Content-Length:
+      - '94'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: ! '{"ok":"BORED_INSTANCE_FOUND","host":"jane.transloadit.com","api2_host":"jane.transloadit.com"}'
+    http_version: '1.1'
+  recorded_at: Fri, 08 Mar 2013 15:13:10 GMT
 recorded_with: VCR 2.4.0

data/test/test_helper.rb

@@ -1,9 +1,10 @@
 $:.unshift File.dirname(__FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-require 'simplecov'
-
-SimpleCov.start { add_filter '/test/' }
+if ENV['COVERAGE'] != 'false'
+  require 'simplecov'
+  SimpleCov.start { add_filter '/test/' }
+end
 
 require 'minitest/autorun'
 require 'transloadit'

data/test/unit/test_transloadit.rb

@@ -7,29 +7,29 @@ describe Transloadit do
     @duration = 10
     @max_size = 100
   end
-  
+
   it 'must allow initialization' do
     t = Transloadit.new(:key => @key, :secret => @secret)
     t.must_be_kind_of Transloadit
   end
-  
+
   it 'must not be initialized with no arguments' do
     lambda { Transloadit.new }.must_raise ArgumentError
   end
-  
+
   it 'must require a key' do
     lambda { Transloadit.new(:secret => @secret) }.must_raise ArgumentError
   end
-  
+
   it 'must not require a secret' do
     t = Transloadit.new(:key => @key)
     t.must_be_kind_of Transloadit
   end
-  
+
   it 'must provide a default duration' do
     Transloadit.new(:key => @key).duration.wont_be_nil
   end
-  
+
   describe 'when initialized' do
     before do
       @transloadit = Transloadit.new(
@@ -39,75 +39,75 @@ describe Transloadit do
         :max_size => @max_size
       )
     end
-    
+
     it 'must allow access to the key' do
       @transloadit.key.must_equal @key
     end
-    
+
     it 'must allow access to the secret' do
       @transloadit.secret.must_equal @secret
     end
-    
+
     it 'must allow access to the duration' do
       @transloadit.duration.must_equal @duration
     end
-    
+
     it 'must allow access to the max_size' do
       @transloadit.max_size.must_equal @max_size
     end
-    
+
     it 'must create steps' do
       step = @transloadit.step('resize', '/image/resize', :width => 320)
-      
+
       step.must_be_kind_of Transloadit::Step
       step.name.   must_equal 'resize'
       step.robot.  must_equal '/image/resize'
       step.options.must_equal :width => 320
     end
-    
-    it 'must create assemblies' do                     
+
+    it 'must create assemblies' do
       step     = @transloadit.step(nil, nil)
       assembly = @transloadit.assembly :steps => step
-      
+
       assembly.must_be_kind_of Transloadit::Assembly
       assembly.steps.must_equal step.to_hash
     end
-    
+
     it 'must create assemblies with multiple steps' do
       steps = [
         @transloadit.step(nil, nil),
         @transloadit.step(nil, nil),
       ]
-      
+
       assembly = @transloadit.assembly :steps => steps
       assembly.steps.must_equal steps.inject({}) {|h,s| h.merge s }
     end
-    
+
     it 'must inspect like a hash' do
       @transloadit.inspect.must_equal @transloadit.to_hash.inspect
     end
-    
+
     it 'must produce Transloadit-compatible hash output' do
       @transloadit.to_hash[:key]     .must_equal @key
       @transloadit.to_hash[:max_size].must_equal @max_size
       @transloadit.to_hash[:expires] .
         must_match %r{\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}\+00:00}
     end
-    
+
     it 'must produce Transloadit-compatible JSON output' do
       @transloadit.to_json.must_equal MultiJson.dump(@transloadit.to_hash)
     end
   end
-  
+
   describe 'with no secret' do
     before do
       @transloadit = Transloadit.new(:key => @key)
     end
-    
+
     it 'must not include a secret in its hash output' do
       @transloadit.to_hash.keys.wont_include :secret
     end
-    
+
     it 'must not include a secret in its JSON output' do
       @transloadit.to_json.must_equal MultiJson.dump(@transloadit.to_hash)
     end

data/test/unit/transloadit/test_assembly.rb

@@ -4,51 +4,51 @@ describe Transloadit::Assembly do
   before do
     @transloadit = Transloadit.new(:key => '')
   end
-  
+
   it 'must allow initialization' do
     Transloadit::Assembly.new(@transloadit).
       must_be_kind_of Transloadit::Assembly
   end
-  
+
   describe 'when initialized' do
-    before do    
+    before do
       @step     = @transloadit.step 'thumbs', '/video/thumbs'
       @redirect = 'http://foo.bar/'
-      
+
       @assembly = Transloadit::Assembly.new @transloadit,
         :steps        => @step,
         :redirect_url => @redirect
     end
-    
+
     it 'must store a pointer to the transloadit instance' do
       @assembly.transloadit.must_equal @transloadit
     end
-    
+
     it 'must remember the options passed' do
       @assembly.options.must_equal(
         :steps        => @step,
         :redirect_url => @redirect
       )
     end
-    
+
     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
       @assembly.options[:steps] = nil
       @assembly.steps.must_equal nil
     end
-    
+
     it 'must not wrap a hash step' do
       @assembly.options[:steps] = { :foo => 1 }
       @assembly.steps.must_equal :foo => 1
     end
-    
+
     it 'must inspect like a hash' do
       @assembly.inspect.must_equal @assembly.to_hash.inspect
     end
-    
+
     it 'must produce Transloadit-compatible hash output' do
       @assembly.to_hash.must_equal(
         :auth         => @transloadit.to_hash,
@@ -56,11 +56,11 @@ describe Transloadit::Assembly do
         :redirect_url => @redirect
       )
     end
-    
+
     it 'must produce Transloadit-compatible JSON output' do
       @assembly.to_json.must_equal MultiJson.dump(@assembly.to_hash)
     end
-    
+
     it 'must submit files for upload' do
       VCR.use_cassette 'submit_assembly' do
         response = @assembly.submit! open('lib/transloadit/version.rb')
@@ -110,16 +110,16 @@ describe Transloadit::Assembly do
       end
     end
   end
-  
+
   describe 'with multiple steps' do
     before do
       @encode = @transloadit.step 'encode', '/video/encode'
       @thumbs = @transloadit.step 'thumbs', '/video/thumbs'
-      
+
       @assembly = Transloadit::Assembly.new @transloadit,
         :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

data/test/unit/transloadit/test_request.rb

@@ -2,46 +2,64 @@ require 'test_helper'
 
 describe Transloadit::Request do
   REQUEST_URI = 'http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4'
-  
+
   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')
     end
-    
+
     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_bored' do
         @request.get(:params => { :foo => 'bar'})['ok'].
           must_equal 'BORED_INSTANCE_FOUND'
       end
     end
+
+    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
+      end
+
+      it 'must perform a GET against the resource' do
+        VCR.use_cassette 'fetch_bored' do
+          @request.get(:params => { :foo => 'bar'})['ok'].
+              must_equal 'BORED_INSTANCE_FOUND'
+        end
+      end
+
+    end
   end
-  
+
   describe 'when performing a POST' do
     before do
-      @request = Transloadit::Request.new('assemblies', '')
+      @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 => {

data/test/unit/transloadit/test_step.rb

@@ -5,7 +5,7 @@ describe Transloadit::Step do
     Transloadit::Step.new('store', '/s3/store').
       must_be_kind_of Transloadit::Step
   end
-  
+
   describe 'when initialized' do
     before do
       @name   = 'store'
@@ -13,21 +13,21 @@ describe Transloadit::Step do
       @key    = 'aws-access-key-id'
       @secret = 'aws-secret-access-key'
       @bucket = 's3-bucket-name'
-      
+
       @step = Transloadit::Step.new @name, @robot,
         :key    => @key,
         :secret => @secret,
         :bucket => @bucket
     end
-    
+
     it 'should use the name given' do
       @step.name.must_equal @name
     end
-    
+
     it 'must remember the type' do
       @step.robot.must_equal @robot
     end
-    
+
     it 'must remember the parameters' do
       @step.options.must_equal(
         :key    => @key,
@@ -35,11 +35,11 @@ describe Transloadit::Step do
         :bucket => @bucket
       )
     end
-    
+
     it 'must inspect like a hash' do
       @step.inspect.must_equal @step.to_hash[@step.name].inspect
     end
-    
+
     it 'must produce Transloadit-compatible hash output' do
       @step.to_hash.must_equal(
         @step.name => {
@@ -50,45 +50,45 @@ describe Transloadit::Step do
         }
       )
     end
-    
+
     it 'must produce Transloadit-compatible JSON output' do
       @step.to_json.must_equal MultiJson.dump(@step.to_hash)
     end
   end
-  
+
   describe 'when using alternative inputs' do
     before do
       @step = Transloadit::Step.new 'resize', '/image/resize'
     end
-    
+
     it 'must allow using the original file as input' do
       @step.use(:original).must_equal ':original'
       @step.options[:use] .must_equal ':original'
     end
-    
+
     it 'must allow using another step' do
       input = Transloadit::Step.new 'thumbnail', '/video/thumbnail'
-      
+
       @step.use(input).   must_equal [ input.name ]
       @step.options[:use].must_equal [ input.name ]
     end
-    
+
     it 'must allow using multiple steps' do
       inputs = [
         Transloadit::Step.new('thumbnail', '/video/thumbnail'),
         Transloadit::Step.new('resize',    '/image/resize')
       ]
-      
+
       @step.use(inputs).  must_equal inputs.map {|i| i.name }
       @step.options[:use].must_equal inputs.map {|i| i.name }
     end
-    
+
     it 'must allow using nothing' do
       @step.use :original
       @step.use(nil).must_equal nil
       @step.options.keys.wont_include(:use)
     end
-    
+
     it 'must include the used steps in the hash output' do
       @step.use(:original).           must_equal ':original'
       @step.to_hash[@step.name][:use].must_equal ':original'

data/transloadit.gemspec

@@ -6,31 +6,31 @@ Gem::Specification.new do |gem|
   gem.name     = 'transloadit'
   gem.version  = Transloadit::VERSION
   gem.platform = Gem::Platform::RUBY
-  
+
   gem.authors  = [ "Stephen Touset", "Robin Mehner" ]
   gem.email    = %w{ stephen@touset.org robin@coding-robin.de }
   gem.homepage = 'http://github.com/transloadit/ruby-sdk/'
-  
+
   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.rubyforge_project         = 'transloadit'
-  
+
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = %w{ lib }
-  
+
   gem.add_dependency 'rest-client'
   gem.add_dependency 'multi_json'
-  
+
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest' # needed for < 1.9.2
   gem.add_development_dependency 'simplecov'
-  
+
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'webmock'
-  
+
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'kramdown' # for YARD rdoc formatting
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transloadit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors:
 - Stephen Touset
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -111,7 +98,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -127,7 +112,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -135,7 +119,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -143,7 +126,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -151,7 +133,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -196,30 +177,26 @@ files:
 - transloadit.gemspec
 homepage: http://github.com/transloadit/ruby-sdk/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1627827986787108787
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: transloadit
-rubygems_version: 1.8.25
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Official Ruby gem for Transloadit
 test_files:
 - test/fixtures/cassettes/cancel_assembly.yml