diff --git a/Gemfile b/Gemfile index c80ee36..b4e2a20 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ -source "http://rubygems.org" +source "https://rubygems.org" gemspec diff --git a/README.md b/README.md index aa7df93..5a03bb3 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ completed, or examine other attributes of the request. response[:assembly_id] # => '9bd733a...' # returns the API URL endpoint for the assembly -response[:assembly_url] # => 'http://api2.vivian.transloadit.com/assemblies/9bd733a...' +response[:assembly_ssl_url] # => 'https://api2.vivian.transloadit.com/assemblies/9bd733a...' # checks how many bytes were expected / received by transloadit response[:bytes_expected] # => 92933 @@ -198,7 +198,7 @@ You can also tell a step to use the original uploaded file by passing the Symbol `:original` instead of another step. Check the YARD documentation for more information on using -[use](http://rubydoc.info/gems/transloadit/frames/Transloadit/Step#use-instance_method). +[use](https://rubydoc.info/gems/transloadit/frames/Transloadit/Step#use-instance_method). ### 4. Creating an Assembly with Templates @@ -258,7 +258,7 @@ transloadit = Transloadit.new( ) transloadit.assembly( - :notify_url => 'http://example.com/processing_finished' + :notify_url => 'https://example.com/processing_finished' ).create! open('/PATH/TO/FILE.mpg') ``` @@ -413,8 +413,8 @@ and more can be found [here](https://github.com/transloadit/ruby-sdk/tree/master ## Documentation Up-to-date YARD documentation is automatically generated. You can view the -docs for the released gem or -for the latest [git master](http://rubydoc.info/github/transloadit/ruby-sdk/master/frames). +docs for the released gem or +for the latest [git master](https://rubydoc.info/github/transloadit/ruby-sdk/master/frames). ## Compatibility diff --git a/lib/transloadit.rb b/lib/transloadit.rb index 8645dc1..d7f1a04 100644 --- a/lib/transloadit.rb +++ b/lib/transloadit.rb @@ -53,7 +53,7 @@ def initialize(options = {}) # @param [String] name the name to give the step # @param [String] robot the robot to use in this step (e.g., '/image/resize') # @param [Hash] options a hash of options to customize the robot's - # operation; see the {online documentation}[http://transloadit.com/docs/building-assembly-instructions] + # operation; see the {online documentation}[https://transloadit.com/docs/building-assembly-instructions] # for robot-specific options # @return [Step] the created Step # @@ -66,7 +66,7 @@ def step(name, robot, options = {}) # # @param [Hash] options additional parameters to send with the assembly # submission; for a full list of parameters, see the official - # documentation on {templates}[http://transloadit.com/docs/templates]. + # documentation on {templates}[https://transloadit.com/docs/templates]. # @option options [Step, Array] :steps the steps to perform in this # assembly # @option options [String] :notify_url A URL to be POSTed when the assembly diff --git a/lib/transloadit/assembly.rb b/lib/transloadit/assembly.rb index c0c5579..b3940dd 100644 --- a/lib/transloadit/assembly.rb +++ b/lib/transloadit/assembly.rb @@ -22,7 +22,7 @@ def steps # server-side template. It's submitted along with a list of files to process, # at which point Transloadit will process and store the files according to the # rules in the Assembly. - # See the Transloadit {documentation}[http://transloadit.com/docs/building-assembly-instructions] + # See the Transloadit {documentation}[https://transloadit.com/docs/building-assembly-instructions] # for futher information on Assemblies and their parameters. # # Accepts as many IO objects as you wish to process in the assembly. @@ -36,7 +36,7 @@ def steps # @param [Array] *ios the files for the assembly to process # @param [Hash] params additional POST data to submit with the request; # for a full list of parameters, see the official documentation - # on {templates}[http://transloadit.com/docs/templates]. + # on {templates}[https://transloadit.com/docs/templates]. # @option params [Step, Array] :steps the steps to perform in this # assembly # @option params [String] :notify_url A URL to be POSTed when the assembly diff --git a/lib/transloadit/response/assembly.rb b/lib/transloadit/response/assembly.rb index a18dbbe..6e6d998 100644 --- a/lib/transloadit/response/assembly.rb +++ b/lib/transloadit/response/assembly.rb @@ -2,11 +2,11 @@ module Transloadit::Response::Assembly def reload! - replace Transloadit::Request.new(self["assembly_url"]).get + replace Transloadit::Request.new(self["assembly_ssl_url"]).get end def cancel! - replace Transloadit::Request.new(self["assembly_url"]).delete + replace Transloadit::Request.new(self["assembly_ssl_url"]).delete end def aborted? diff --git a/lib/transloadit/step.rb b/lib/transloadit/step.rb index 47096c8..4efe503 100644 --- a/lib/transloadit/step.rb +++ b/lib/transloadit/step.rb @@ -5,7 +5,7 @@ # +robot+ (e.g., '/image/resize' or '/video/thumbnail') and a hash of # +options+ specific to the chosen robot. # -# See the Transloadit {documentation}[http://transloadit.com/docs/building-assembly-instructions] +# See the Transloadit {documentation}[https://transloadit.com/docs/building-assembly-instructions] # for futher information on robot types and their parameters. # class Transloadit::Step @@ -38,7 +38,7 @@ def initialize(name, robot, options = {}) # # @param [Step, Array, Symbol, nil] input The input # step to use. Follows the conventions outlined in the - # online {documentation}[http://transloadit.com/docs/building-assembly-instructions#special-parameters]. + # online {documentation}[https://transloadit.com/docs/building-assembly-instructions#special-parameters]. # The symbol +:original+ specifies that the original file should be sent # to the robot. A Step indicates that this Step's output should be used # as the input to this one. Likewise, an array of Steps tells Transloadit diff --git a/test/fixtures/cassettes/cancel_assembly.yml b/test/fixtures/cassettes/cancel_assembly.yml index bd7e506..e793493 100644 --- a/test/fixtures/cassettes/cancel_assembly.yml +++ b/test/fixtures/cassettes/cancel_assembly.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: delete - uri: http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 + uri: https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 body: encoding: US-ASCII string: '' @@ -30,9 +30,9 @@ http_interactions: - chunked body: encoding: UTF-8 - string: ! '{"ok":"ASSEMBLY_CANCELED","message":"The assembly was canceled.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_url":"http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit + string: ! '{"ok":"ASSEMBLY_CANCELED","message":"The assembly was canceled.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_ssl_url":"https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit Ruby SDK 0.1.2","client_ip":"74.95.29.209","client_referer":null,"start_date":"2011/02/21 - 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","url":"http://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 + 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","ssl_url":"https://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 15:54:17 GMT","title":null,"description":null,"location":null,"city":null,"state":null,"country":null,"country_code":null,"keywords":"Photo Booth","aperture":null,"exposure_compensation":null,"exposure_mode":null,"exposure_time":null,"flash":null,"focal_length":null,"f_number":null,"iso":null,"light_value":null,"metering_mode":null,"shutter_speed":null,"white_balance":null,"device_name":null,"device_vendor":null,"device_software":null,"latitude":null,"longitude":null,"frame_count":null}}],"results":{}}' http_version: '1.1' diff --git a/test/fixtures/cassettes/create_template.yml b/test/fixtures/cassettes/create_template.yml index 3bea780..c1021b4 100644 --- a/test/fixtures/cassettes/create_template.yml +++ b/test/fixtures/cassettes/create_template.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://api2.transloadit.com/templates + uri: https://api2.transloadit.com/templates body: encoding: UTF-8 string: params=%7B%22auth%22%3A%7B%22key%22%3A%22%22%7D%2C%22name%22%3A%22foo%22%2C%22template%22%3A%7B%22key%22%3A%22value%22%7D%7D diff --git a/test/fixtures/cassettes/delete_template.yml b/test/fixtures/cassettes/delete_template.yml index 0bbb97e..dd30aae 100644 --- a/test/fixtures/cassettes/delete_template.yml +++ b/test/fixtures/cassettes/delete_template.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: delete - uri: http://api2.transloadit.com/templates/55c965a063a311e6ba2d379ef10b28f7 + uri: https://api2.transloadit.com/templates/55c965a063a311e6ba2d379ef10b28f7 body: encoding: US-ASCII string: '' diff --git a/test/fixtures/cassettes/fetch_assemblies.yml b/test/fixtures/cassettes/fetch_assemblies.yml index 36edb6c..31a81cb 100644 --- a/test/fixtures/cassettes/fetch_assemblies.yml +++ b/test/fixtures/cassettes/fetch_assemblies.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.transloadit.com/assemblies?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D + uri: https://api2.transloadit.com/assemblies?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D body: encoding: US-ASCII string: '' diff --git a/test/fixtures/cassettes/fetch_assembly_aborted.yml b/test/fixtures/cassettes/fetch_assembly_aborted.yml index 6860c4f..2e635f6 100644 --- a/test/fixtures/cassettes/fetch_assembly_aborted.yml +++ b/test/fixtures/cassettes/fetch_assembly_aborted.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 + uri: https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 body: encoding: US-ASCII string: '' @@ -28,9 +28,9 @@ http_interactions: - chunked body: encoding: UTF-8 - string: ! '{"ok":"REQUEST_ABORTED","message":"The upload connection was closed or timed out before receiving all data.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_url":"http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit + string: ! '{"ok":"REQUEST_ABORTED","message":"The upload connection was closed or timed out before receiving all data.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_ssl_url":"https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit Ruby SDK 0.1.2","client_ip":"74.95.29.209","client_referer":null,"start_date":"2011/02/21 - 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","url":"http://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 + 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","ssl_url":"https://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 15:54:17 GMT","title":null,"description":null,"location":null,"city":null,"state":null,"country":null,"country_code":null,"keywords":"Photo Booth","aperture":null,"exposure_compensation":null,"exposure_mode":null,"exposure_time":null,"flash":null,"focal_length":null,"f_number":null,"iso":null,"light_value":null,"metering_mode":null,"shutter_speed":null,"white_balance":null,"device_name":null,"device_vendor":null,"device_software":null,"latitude":null,"longitude":null,"frame_count":null}}],"results":{}}' http_version: '1.1' diff --git a/test/fixtures/cassettes/fetch_assembly_errors.yml b/test/fixtures/cassettes/fetch_assembly_errors.yml index 60411ab..c20e7fd 100644 --- a/test/fixtures/cassettes/fetch_assembly_errors.yml +++ b/test/fixtures/cassettes/fetch_assembly_errors.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 + uri: https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 body: encoding: US-ASCII string: '' @@ -28,9 +28,9 @@ http_interactions: - chunked body: encoding: UTF-8 - string: ! '{"ok":"ASSEMBLY_CANCELED","message":"The assembly is still in the process of being uploaded.","error": "INVALID_FORM_DATA", "assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_url":"http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit + string: ! '{"ok":"ASSEMBLY_CANCELED","message":"The assembly is still in the process of being uploaded.","error": "INVALID_FORM_DATA", "assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_ssl_url":"https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit Ruby SDK 0.1.2","client_ip":"74.95.29.209","client_referer":null,"start_date":"2011/02/21 - 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","url":"http://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 + 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","ssl_url":"https://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 15:54:17 GMT","title":null,"description":null,"location":null,"city":null,"state":null,"country":null,"country_code":null,"keywords":"Photo Booth","aperture":null,"exposure_compensation":null,"exposure_mode":null,"exposure_time":null,"flash":null,"focal_length":null,"f_number":null,"iso":null,"light_value":null,"metering_mode":null,"shutter_speed":null,"white_balance":null,"device_name":null,"device_vendor":null,"device_software":null,"latitude":null,"longitude":null,"frame_count":null}}],"results":{}}' http_version: '1.1' diff --git a/test/fixtures/cassettes/fetch_assembly_executing.yml b/test/fixtures/cassettes/fetch_assembly_executing.yml index d20b1b1..993e744 100644 --- a/test/fixtures/cassettes/fetch_assembly_executing.yml +++ b/test/fixtures/cassettes/fetch_assembly_executing.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 + uri: https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 body: encoding: US-ASCII string: '' @@ -28,9 +28,9 @@ http_interactions: - chunked body: encoding: UTF-8 - string: ! '{"ok":"ASSEMBLY_EXECUTING","message":"The assembly is currently being executed.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_url":"http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit + string: ! '{"ok":"ASSEMBLY_EXECUTING","message":"The assembly is currently being executed.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_ssl_url":"https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit Ruby SDK 0.1.2","client_ip":"74.95.29.209","client_referer":null,"start_date":"2011/02/21 - 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","url":"http://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 + 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","ssl_url":"https://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 15:54:17 GMT","title":null,"description":null,"location":null,"city":null,"state":null,"country":null,"country_code":null,"keywords":"Photo Booth","aperture":null,"exposure_compensation":null,"exposure_mode":null,"exposure_time":null,"flash":null,"focal_length":null,"f_number":null,"iso":null,"light_value":null,"metering_mode":null,"shutter_speed":null,"white_balance":null,"device_name":null,"device_vendor":null,"device_software":null,"latitude":null,"longitude":null,"frame_count":null}}],"results":{}}' http_version: '1.1' diff --git a/test/fixtures/cassettes/fetch_assembly_notifications.yml b/test/fixtures/cassettes/fetch_assembly_notifications.yml index 986ab3c..2cfc13d 100644 --- a/test/fixtures/cassettes/fetch_assembly_notifications.yml +++ b/test/fixtures/cassettes/fetch_assembly_notifications.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.transloadit.com/assembly_notifications?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D + uri: https://api2.transloadit.com/assembly_notifications?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D body: encoding: US-ASCII string: '' diff --git a/test/fixtures/cassettes/fetch_assembly_ok.yml b/test/fixtures/cassettes/fetch_assembly_ok.yml index a8d6ca1..c7c5e3b 100644 --- a/test/fixtures/cassettes/fetch_assembly_ok.yml +++ b/test/fixtures/cassettes/fetch_assembly_ok.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 + uri: https://api2.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 body: encoding: US-ASCII string: '' @@ -29,16 +29,16 @@ http_interactions: body: encoding: UTF-8 string: ! '{"ok":"ASSEMBLY_COMPLETED","message":"The assembly was successfully - completed.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_url":"http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit + completed.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_ssl_url":"https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit Ruby SDK 0.1.2","client_ip":"74.95.29.209","client_referer":null,"start_date":"2011/02/21 - 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","url":"http://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 + 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","ssl_url":"https://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 15:54:17 GMT","title":null,"description":null,"location":null,"city":null,"state":null,"country":null,"country_code":null,"keywords":"Photo Booth","aperture":null,"exposure_compensation":null,"exposure_mode":null,"exposure_time":null,"flash":null,"focal_length":null,"f_number":null,"iso":null,"light_value":null,"metering_mode":null,"shutter_speed":null,"white_balance":null,"device_name":null,"device_vendor":null,"device_software":null,"latitude":null,"longitude":null,"frame_count":null}}],"results":{}}' http_version: '1.1' recorded_at: Fri, 08 Mar 2013 15:13:10 GMT - request: method: get - uri: http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 + uri: https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 body: encoding: US-ASCII string: '' @@ -65,9 +65,9 @@ http_interactions: body: encoding: UTF-8 string: ! '{"ok":"ASSEMBLY_COMPLETED","message":"The assembly was successfully - completed.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_url":"http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit + completed.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_ssl_url":"https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit Ruby SDK 0.1.2","client_ip":"74.95.29.209","client_referer":null,"start_date":"2011/02/21 - 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","url":"http://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 + 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","ssl_url":"https://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 15:54:17 GMT","title":null,"description":null,"location":null,"city":null,"state":null,"country":null,"country_code":null,"keywords":"Photo Booth","aperture":null,"exposure_compensation":null,"exposure_mode":null,"exposure_time":null,"flash":null,"focal_length":null,"f_number":null,"iso":null,"light_value":null,"metering_mode":null,"shutter_speed":null,"white_balance":null,"device_name":null,"device_vendor":null,"device_software":null,"latitude":null,"longitude":null,"frame_count":null}}],"results":{}}' http_version: '1.1' diff --git a/test/fixtures/cassettes/fetch_assembly_uploading.yml b/test/fixtures/cassettes/fetch_assembly_uploading.yml index 7368d7f..81f23ea 100644 --- a/test/fixtures/cassettes/fetch_assembly_uploading.yml +++ b/test/fixtures/cassettes/fetch_assembly_uploading.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 + uri: https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4 body: encoding: US-ASCII string: '' @@ -28,9 +28,9 @@ http_interactions: - chunked body: encoding: UTF-8 - string: ! '{"ok":"ASSEMBLY_UPLOADING","message":"The assembly is still in the process of being uploaded.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_url":"http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit + string: ! '{"ok":"ASSEMBLY_UPLOADING","message":"The assembly is still in the process of being uploaded.","assembly_id":"76fe5df1c93a0a530f3e583805cf98b4","assembly_ssl_url":"https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4","bytes_received":95355,"bytes_expected":95355,"client_agent":"Transloadit Ruby SDK 0.1.2","client_ip":"74.95.29.209","client_referer":null,"start_date":"2011/02/21 - 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","url":"http://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 + 15:54:17 GMT","upload_duration":0.394,"execution_duration":0.006,"fields":{},"uploads":[{"id":"0767b43537389a177a1be96ab06e8a4b","name":"test.png","basename":"test","ext":"png","size":95010,"mime":"image/jpeg","type":"image","field":"file_0","original_id":"0767b43537389a177a1be96ab06e8a4b","ssl_url":"https://tmp.jane.transloadit.com/upload/bf7801cb21fb96cbafd403467244d125.png","meta":{"width":640,"height":480,"date_recorded":null,"date_file_created":null,"date_file_modified":"2011/02/21 15:54:17 GMT","title":null,"description":null,"location":null,"city":null,"state":null,"country":null,"country_code":null,"keywords":"Photo Booth","aperture":null,"exposure_compensation":null,"exposure_mode":null,"exposure_time":null,"flash":null,"focal_length":null,"f_number":null,"iso":null,"light_value":null,"metering_mode":null,"shutter_speed":null,"white_balance":null,"device_name":null,"device_vendor":null,"device_software":null,"latitude":null,"longitude":null,"frame_count":null}}],"results":{}}' http_version: '1.1' diff --git a/test/fixtures/cassettes/fetch_billing.yml b/test/fixtures/cassettes/fetch_billing.yml index 9405194..6d28d5b 100644 --- a/test/fixtures/cassettes/fetch_billing.yml +++ b/test/fixtures/cassettes/fetch_billing.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.transloadit.com/bill/2016-09?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D + uri: https://api2.transloadit.com/bill/2016-09?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D body: encoding: US-ASCII string: '' diff --git a/test/fixtures/cassettes/fetch_root.yml b/test/fixtures/cassettes/fetch_root.yml index 8a1dffe..1556055 100644 --- a/test/fixtures/cassettes/fetch_root.yml +++ b/test/fixtures/cassettes/fetch_root.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.transloadit.com + uri: https://api2.transloadit.com body: encoding: US-ASCII string: '' @@ -37,7 +37,7 @@ http_interactions: recorded_at: Fri, 08 Mar 2013 15:13:10 GMT - request: method: get - uri: http://api2.transloadit.com/?params=%7B%22params%22:%7B%22foo%22:%22bar%22%7D%7D + uri: https://api2.transloadit.com/?params=%7B%22params%22:%7B%22foo%22:%22bar%22%7D%7D body: encoding: US-ASCII string: '' @@ -72,7 +72,7 @@ http_interactions: recorded_at: Fri, 08 Mar 2013 15:13:10 GMT - request: method: get - uri: http://api2.transloadit.com/?params=%7B%22params%22:%7B%22foo%22:%22bar%22%7D%7D&signature=78f291e3038e3eeb82d9f79e11a68fe7b858ee97 + uri: https://api2.transloadit.com/?params=%7B%22params%22:%7B%22foo%22:%22bar%22%7D%7D&signature=78f291e3038e3eeb82d9f79e11a68fe7b858ee97 body: encoding: US-ASCII string: '' diff --git a/test/fixtures/cassettes/fetch_template.yml b/test/fixtures/cassettes/fetch_template.yml index 558d0a3..95c07f1 100644 --- a/test/fixtures/cassettes/fetch_template.yml +++ b/test/fixtures/cassettes/fetch_template.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D + uri: https://api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D body: encoding: US-ASCII string: '' diff --git a/test/fixtures/cassettes/fetch_templates.yml b/test/fixtures/cassettes/fetch_templates.yml index 5e98203..776ff05 100644 --- a/test/fixtures/cassettes/fetch_templates.yml +++ b/test/fixtures/cassettes/fetch_templates.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: http://api2.transloadit.com/templates?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D + uri: https://api2.transloadit.com/templates?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D body: encoding: US-ASCII string: '' diff --git a/test/fixtures/cassettes/post_assembly.yml b/test/fixtures/cassettes/post_assembly.yml index de4040f..05d5c05 100644 --- a/test/fixtures/cassettes/post_assembly.yml +++ b/test/fixtures/cassettes/post_assembly.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://api2.transloadit.com/assemblies + uri: https://api2.transloadit.com/assemblies body: encoding: UTF-8 string: params=%7B%22auth%22%3A%7B%22key%22%3A%22%22%2C%22expires%22%3A%222011%2F02%2F21%2023%3A15%3A43%2B00%3A00%22%7D%2C%22steps%22%3A%7B%22encode%22%3A%7B%22robot%22%3A%22%2Fvideo%2Fencode%22%7D%7D%7D&signature=d1a856e3d04103da448a512070139d3e721594cc @@ -37,7 +37,7 @@ http_interactions: body: encoding: UTF-8 string: ! '{"ok":"ASSEMBLY_COMPLETED","message":"The assembly was successfully - completed.","assembly_id":"2a4cb778995be35ffe5fcda3c01e4267","assembly_url":"http://api2.jane.transloadit.com/assemblies/2a4cb778995be35ffe5fcda3c01e4267","bytes_received":278,"bytes_expected":278,"client_agent":"Transloadit + completed.","assembly_id":"2a4cb778995be35ffe5fcda3c01e4267","assembly_ssl_url":"https://api2.jane.transloadit.com/assemblies/2a4cb778995be35ffe5fcda3c01e4267","bytes_received":278,"bytes_expected":278,"client_agent":"Transloadit Ruby SDK 0.1.2","client_ip":"74.95.29.209","client_referer":null,"start_date":"2011/02/21 23:15:33 GMT","upload_duration":0.094,"execution_duration":0,"fields":{},"uploads":[],"results":{}}' http_version: '1.1' diff --git a/test/fixtures/cassettes/rate_limit_fail.yml b/test/fixtures/cassettes/rate_limit_fail.yml index 7141d0e..e3c18ed 100644 --- a/test/fixtures/cassettes/rate_limit_fail.yml +++ b/test/fixtures/cassettes/rate_limit_fail.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://api2.transloadit.com/assemblies + uri: https://api2.transloadit.com/assemblies body: encoding: UTF-8 string: params=%7B%22steps%22%3A%7B%22a479db2c601661d8f914caf9cf258c0b%22%3A%7B%22robot%22%3A%22%2Fvideo%2Fthumbs%22%7D%7D%2C%22redirect_url%22%3A%22http%3A%2F%2Ffoo.bar%2F%22%2C%22auth%22%3A%7B%22key%22%3A%22%22%7D%2C%22file_0%22%3A%22%23%3CFile%3A0x00000100c63738%3E%22%7D @@ -36,7 +36,7 @@ http_interactions: recorded_at: Fri, 08 Mar 2013 15:13:10 GMT - request: method: post - uri: http://api2.transloadit.com/assemblies + uri: https://api2.transloadit.com/assemblies body: encoding: UTF-8 string: params=%7B%22steps%22%3A%7B%22a479db2c601661d8f914caf9cf258c0b%22%3A%7B%22robot%22%3A%22%2Fvideo%2Fthumbs%22%7D%7D%2C%22redirect_url%22%3A%22http%3A%2F%2Ffoo.bar%2F%22%2C%22auth%22%3A%7B%22key%22%3A%22%22%7D%2C%22file_0%22%3A%22%23%3CFile%3A0x00000100c63738%3E%22%7D @@ -70,7 +70,7 @@ http_interactions: recorded_at: Fri, 08 Mar 2013 15:13:10 GMT - request: method: post - uri: http://api2.transloadit.com/assemblies + uri: https://api2.transloadit.com/assemblies body: encoding: UTF-8 string: params=%7B%22steps%22%3A%7B%22a479db2c601661d8f914caf9cf258c0b%22%3A%7B%22robot%22%3A%22%2Fvideo%2Fthumbs%22%7D%7D%2C%22redirect_url%22%3A%22http%3A%2F%2Ffoo.bar%2F%22%2C%22auth%22%3A%7B%22key%22%3A%22%22%7D%2C%22file_0%22%3A%22%23%3CFile%3A0x00000100c63738%3E%22%7D diff --git a/test/fixtures/cassettes/rate_limit_succeed.yml b/test/fixtures/cassettes/rate_limit_succeed.yml index a486440..fe12433 100644 --- a/test/fixtures/cassettes/rate_limit_succeed.yml +++ b/test/fixtures/cassettes/rate_limit_succeed.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://api2.transloadit.com/assemblies + uri: https://api2.transloadit.com/assemblies body: encoding: UTF-8 string: params=%7B%22steps%22%3A%7B%22a479db2c601661d8f914caf9cf258c0b%22%3A%7B%22robot%22%3A%22%2Fvideo%2Fthumbs%22%7D%7D%2C%22redirect_url%22%3A%22http%3A%2F%2Ffoo.bar%2F%22%2C%22auth%22%3A%7B%22key%22%3A%22%22%7D%2C%22file_0%22%3A%22%23%3CFile%3A0x00000100c63738%3E%22%7D @@ -36,7 +36,7 @@ http_interactions: recorded_at: Fri, 08 Mar 2013 15:13:10 GMT - request: method: post - uri: http://api2.transloadit.com/assemblies + uri: https://api2.transloadit.com/assemblies body: encoding: UTF-8 string: params=%7B%22steps%22%3A%7B%22a479db2c601661d8f914caf9cf258c0b%22%3A%7B%22robot%22%3A%22%2Fvideo%2Fthumbs%22%7D%7D%2C%22redirect_url%22%3A%22http%3A%2F%2Ffoo.bar%2F%22%2C%22auth%22%3A%7B%22key%22%3A%22%22%7D%2C%22file_0%22%3A%22%23%3CFile%3A0x00000100c63738%3E%22%7D @@ -65,13 +65,13 @@ http_interactions: Access-Control-Allow-Headers: - X-Requested-With, Content-Type, Accept, Content-Length Location: - - http://foo.bar/?assembly_id=177c56e5435176f4877fbc1b397fa4f0&assembly_url=http://api2.vivian.transloadit.com/assemblies/177c56e5435176f4877fbc1b397fa4f0 + - https://foo.bar/?assembly_id=177c56e5435176f4877fbc1b397fa4f0&assembly_ssl_url=https://api2.vivian.transloadit.com/assemblies/177c56e5435176f4877fbc1b397fa4f0 Transfer-Encoding: - chunked body: encoding: UTF-8 string: ! '{"ok":"ASSEMBLY_COMPLETED","message":"The assembly was successfully - completed.","assembly_id":"177c56e5435176f4877fbc1b397fa4f0","assembly_url":"http://api2.vivian.transloadit.com/assemblies/177c56e5435176f4877fbc1b397fa4f0","bytes_received":298,"bytes_expected":298,"client_agent":"Transloadit + completed.","assembly_id":"177c56e5435176f4877fbc1b397fa4f0","assembly_ssl_url":"https://api2.vivian.transloadit.com/assemblies/177c56e5435176f4877fbc1b397fa4f0","bytes_received":298,"bytes_expected":298,"client_agent":"Transloadit Ruby SDK 0.0.1","client_ip":"69.180.12.41","client_referer":null,"start_date":"2011/02/07 04:29:15 GMT","upload_duration":0.038,"execution_duration":0.002,"fields":{},"uploads":[],"results":{}}' http_version: '1.1' diff --git a/test/fixtures/cassettes/replay_assembly.yml b/test/fixtures/cassettes/replay_assembly.yml index b903e8a..0f4ef70 100644 --- a/test/fixtures/cassettes/replay_assembly.yml +++ b/test/fixtures/cassettes/replay_assembly.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://api2.transloadit.com/assemblies/55c965a063a311e6ba2d379ef10b28f7/replay + uri: https://api2.transloadit.com/assemblies/55c965a063a311e6ba2d379ef10b28f7/replay body: encoding: UTF-8 string: params=%%7B%22auth%22:%7B%22key%22:%22%22%7D%7D @@ -43,7 +43,7 @@ http_interactions: body: encoding: UTF-8 string: '{"ok":"ASSEMBLY_REPLAYING","message":"The assembly is now in the process - of being replayed.","success":true,"assembly_id":"b8590300650211e6b826d727b2cfd9ce","assembly_url":"http://api2.sayuri.transloadit.com/assemblies/b8590300650211e6b826d727b2cfd9ce","notify_url":null}' + of being replayed.","success":true,"assembly_id":"b8590300650211e6b826d727b2cfd9ce","assembly_ssl_url":"https://api2.sayuri.transloadit.com/assemblies/b8590300650211e6b826d727b2cfd9ce","notify_url":null}' http_version: recorded_at: Tue, 16 Aug 2016 11:19:45 GMT recorded_with: VCR 3.0.3 diff --git a/test/fixtures/cassettes/replay_assembly_notification.yml b/test/fixtures/cassettes/replay_assembly_notification.yml index 6a7bb48..f735f11 100644 --- a/test/fixtures/cassettes/replay_assembly_notification.yml +++ b/test/fixtures/cassettes/replay_assembly_notification.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://api2.transloadit.com/assembly_notifications/2ea5d21063ad11e6bc93e53395ce4e7d/replay + uri: https://api2.transloadit.com/assembly_notifications/2ea5d21063ad11e6bc93e53395ce4e7d/replay body: encoding: UTF-8 string: params=%%7B%22auth%22:%7B%22key%22:%22%22%7D%7D diff --git a/test/fixtures/cassettes/submit_assembly.yml b/test/fixtures/cassettes/submit_assembly.yml index 1a09602..a7b3e8f 100644 --- a/test/fixtures/cassettes/submit_assembly.yml +++ b/test/fixtures/cassettes/submit_assembly.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: post - uri: http://api2.transloadit.com/assemblies + uri: https://api2.transloadit.com/assemblies body: encoding: UTF-8 string: params=%7B%22steps%22%3A%7B%22a479db2c601661d8f914caf9cf258c0b%22%3A%7B%22robot%22%3A%22%2Fvideo%2Fthumbs%22%7D%7D%2C%22redirect_url%22%3A%22http%3A%2F%2Ffoo.bar%2F%22%2C%22auth%22%3A%7B%22key%22%3A%22%22%7D%2C%22file_0%22%3A%22%23%3CFile%3A0x00000100c63738%3E%22%7D @@ -31,13 +31,13 @@ http_interactions: Access-Control-Allow-Headers: - X-Requested-With, Content-Type, Accept, Content-Length Location: - - http://foo.bar/?assembly_id=177c56e5435176f4877fbc1b397fa4f0&assembly_url=http://api2.vivian.transloadit.com/assemblies/177c56e5435176f4877fbc1b397fa4f0 + - https://foo.bar/?assembly_id=177c56e5435176f4877fbc1b397fa4f0&assembly_ssl_url=https://api2.vivian.transloadit.com/assemblies/177c56e5435176f4877fbc1b397fa4f0 Transfer-Encoding: - chunked body: encoding: UTF-8 string: ! '{"ok":"ASSEMBLY_COMPLETED","message":"The assembly was successfully - completed.","assembly_id":"177c56e5435176f4877fbc1b397fa4f0","assembly_url":"http://api2.vivian.transloadit.com/assemblies/177c56e5435176f4877fbc1b397fa4f0","bytes_received":298,"bytes_expected":298,"client_agent":"Transloadit + completed.","assembly_id":"177c56e5435176f4877fbc1b397fa4f0","assembly_ssl_url":"https://api2.vivian.transloadit.com/assemblies/177c56e5435176f4877fbc1b397fa4f0","bytes_received":298,"bytes_expected":298,"client_agent":"Transloadit Ruby SDK 0.0.1","client_ip":"69.180.12.41","client_referer":null,"start_date":"2011/02/07 04:29:15 GMT","upload_duration":0.038,"execution_duration":0.002,"fields":{},"uploads":[],"results":{}}' http_version: '1.1' diff --git a/test/fixtures/cassettes/update_template.yml b/test/fixtures/cassettes/update_template.yml index 28faf5f..820951e 100644 --- a/test/fixtures/cassettes/update_template.yml +++ b/test/fixtures/cassettes/update_template.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: put - uri: http://api2.transloadit.com/templates/55c965a063a311e6ba2d379ef10b28f7 + uri: https://api2.transloadit.com/templates/55c965a063a311e6ba2d379ef10b28f7 body: encoding: UTF-8 string: params=%7B%22auth%22%3A%7B%22key%22%3A%22%22%7D%7D diff --git a/test/unit/transloadit/test_assembly.rb b/test/unit/transloadit/test_assembly.rb index 5743d91..95bccc7 100644 --- a/test/unit/transloadit/test_assembly.rb +++ b/test/unit/transloadit/test_assembly.rb @@ -12,7 +12,7 @@ describe "when initialized" do before do @step = @transloadit.step "thumbs", "/video/thumbs" - @redirect = "http://foo.bar/" + @redirect = "https://foo.bar/" @assembly = Transloadit::Assembly.new @transloadit, steps: @step, @@ -45,7 +45,7 @@ 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/} + _(response.headers[:location]).must_match %r{^https://foo.bar/} end end @@ -54,7 +54,7 @@ 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 @@ -68,7 +68,7 @@ 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" end @@ -80,7 +80,7 @@ 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" @@ -92,7 +92,7 @@ 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"}}) end @@ -101,7 +101,7 @@ 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"}}) end @@ -187,7 +187,7 @@ 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") + 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) @@ -205,7 +205,7 @@ describe "when fetching single assembly" do it "must perform GET request to /assemblies/[id]" do - stub = stub_request(:get, "api2.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4") + stub = stub_request(:get, "https://api2.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4") @assembly.get "76fe5df1c93a0a530f3e583805cf98b4" assert_requested(stub) @@ -223,7 +223,7 @@ 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 diff --git a/test/unit/transloadit/test_response.rb b/test/unit/transloadit/test_response.rb index 4849415..18df6b3 100644 --- a/test/unit/transloadit/test_response.rb +++ b/test/unit/transloadit/test_response.rb @@ -1,7 +1,7 @@ require "test_helper" describe Transloadit::Response do - request_uri = "http://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4" + request_uri = "https://api2.jane.transloadit.com/assemblies/76fe5df1c93a0a530f3e583805cf98b4" it "must allow delegate initialization" do response = Transloadit::Response.new("test") @@ -22,13 +22,13 @@ end it "must allow access to body attributes" do - %w[ok message assembly_id assembly_url].each do |attribute| + %w[ok message assembly_id assembly_ssl_url].each do |attribute| _(@response[attribute]).must_equal @response.body[attribute] end end it "must allow access to body attributes as symbols" do - [:ok, :message, :assembly_id, :assembly_url].each do |attribute| + [:ok, :message, :assembly_id, :assembly_ssl_url].each do |attribute| _(@response[attribute]).must_equal @response.body[attribute.to_s] end end @@ -135,7 +135,7 @@ VCR.use_cassette "replay_assembly" do @response = Transloadit::Response.new( RestClient::Resource.new( - "http://api2.transloadit.com/assemblies/55c965a063a311e6ba2d379ef10b28f7/replay" + "https://api2.transloadit.com/assemblies/55c965a063a311e6ba2d379ef10b28f7/replay" ).post({}) ).extend!(Transloadit::Response::Assembly) end diff --git a/test/unit/transloadit/test_template.rb b/test/unit/transloadit/test_template.rb index 0f10697..75ba59c 100644 --- a/test/unit/transloadit/test_template.rb +++ b/test/unit/transloadit/test_template.rb @@ -30,7 +30,7 @@ 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") + stub = stub_request(:get, "https://api2.transloadit.com/templates?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D") @template.list assert_requested(stub) @@ -50,7 +50,7 @@ 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" + "https://api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4?params=%7B%22auth%22:%7B%22key%22:%22%22%7D%7D" ) @template.get "76fe5df1c93a0a530f3e583805cf98b4" @@ -68,7 +68,7 @@ describe "when updating template" do it "must perform PUT request to templates/[id]" do - url = "api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4" + url = "https://api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4" stub_request(:put, url) @template.update( "76fe5df1c93a0a530f3e583805cf98b4", @@ -95,7 +95,7 @@ describe "when deleting a template" do it "must perform DELETE request to templates/[id]" do - stub = stub_request(:delete, "api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4") + stub = stub_request(:delete, "https://api2.transloadit.com/templates/76fe5df1c93a0a530f3e583805cf98b4") @template.delete "76fe5df1c93a0a530f3e583805cf98b4" assert_requested(stub) diff --git a/transloadit.gemspec b/transloadit.gemspec index 19a59d9..fa34596 100644 --- a/transloadit.gemspec +++ b/transloadit.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |gem| 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.homepage = "https://github.com/transloadit/ruby-sdk/" gem.license = "MIT" gem.summary = "Official Ruby gem for Transloadit"