Run Ruby e2e upload test in CI

Author: kvz

.github/workflows/ci.yml

@@ -43,3 +43,21 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage/coverage.json
           fail_ci_if_error: true
+  e2e:
+    needs: ci
+    if: >
+      github.event_name != 'pull_request' ||
+      github.event.pull_request.head.repo.full_name == github.repository
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+          bundler-cache: true
+      - name: Run end-to-end upload test
+        env:
+          RUBY_SDK_E2E: 1
+          TRANSLOADIT_KEY: ${{ secrets.TRANSLOADIT_KEY }}
+          TRANSLOADIT_SECRET: ${{ secrets.TRANSLOADIT_SECRET }}
+        run: bundle exec ruby -Itest test/integration/test_e2e_upload.rb

README.md

@@ -521,7 +521,7 @@ To exercise the optional end-to-end upload against a real Transloadit account, p
 RUBY_SDK_E2E=1 ./scripts/test-in-docker.sh bundle exec ruby -Itest test/integration/test_e2e_upload.rb
 ```
 
-The test uploads `chameleon.jpg`, resizes it, and asserts on the live assembly results. It respects `TRANSLOADIT_HOST` and `TRANSLOADIT_REGION` overrides when present.
+The test uploads `chameleon.jpg`, resizes it, and asserts on the live assembly results.
 
 ### Releasing on RubyGems
 

lib/transloadit.rb

@@ -2,7 +2,6 @@
 require "date"
 require "json"
 require "openssl"
-require "uri"
 require "cgi"
 
 #
@@ -31,7 +30,6 @@ class Transloadit
   attr_accessor :duration
 
   attr_accessor :max_size
-  attr_accessor :service
 
   #
   # Creates a new instance of the Transloadit API.
@@ -49,7 +47,6 @@ def initialize(options = {})
     self.secret = options[:secret]
     self.duration = options[:duration] || 5 * 60
     self.max_size = options[:max_size]
-    self.service = _normalize_service(options[:service]) || _service_from_region(options[:region])
 
     _ensure_key_provided
   end
@@ -110,7 +107,7 @@ def bill(month = Date.today.month, year = Date.today.year)
     month = format "%02d", month
     path = "bill/#{year}-#{month}"
 
-    Transloadit::Request.new(request_url_for(path), secret).get({auth: to_hash})
+    Transloadit::Request.new(path, secret).get({auth: to_hash})
   end
 
   #
@@ -137,22 +134,6 @@ def to_json
     MultiJson.dump(to_hash)
   end
 
-  #
-  # Resolves an absolute URL for API requests, honoring custom service overrides.
-  #
-  # @param [String] path the request path or URL
-  # @return [String] the resolved URL or original path if already absolute
-  #
-  def request_url_for(path)
-    return path if service.nil? || service.empty?
-
-    uri = URI.parse(path.to_s)
-    return path if uri.host
-
-    base = service.end_with?("/") ? service : "#{service}/"
-    URI.join(base, path.to_s.sub(%r{\A/}, "")).to_s
-  end
-
   # @param workspace [String] Workspace slug
   # @param template [String] Template slug or template ID
   # @param input [String] Input value that is provided as `${fields.input}` in the template
@@ -203,30 +184,6 @@ def signed_smart_cdn_url(
 
   private
 
-  #
-  # Normalizes service URLs, returning nil for blank values.
-  #
-  def _normalize_service(value)
-    return nil if value.nil?
-
-    str = value.to_s.strip
-    return nil if str.empty?
-
-    str
-  end
-
-  #
-  # Builds a service URL from a region hint, if one is provided.
-  #
-  def _service_from_region(region)
-    return nil if region.nil?
-
-    str = region.to_s.strip
-    return nil if str.empty?
-
-    "https://api2-#{str}.transloadit.com"
-  end
-
   #
   # Raises an ArgumentError if no {#key} has been assigned.
   #

lib/transloadit/api_model.rb

@@ -68,7 +68,6 @@ def _do_request(path, params = nil, method = "get", extra_params = nil)
       params = {params: params} if ["post", "put", "delete"].include? method
       params.merge!(extra_params) unless extra_params.nil?
     end
-    request_url = transloadit.request_url_for(path)
-    Transloadit::Request.new(request_url, transloadit.secret).public_send(method, params)
+    Transloadit::Request.new(path, transloadit.secret).public_send(method, params)
   end
 end

scripts/test-in-docker.sh

@@ -76,8 +76,6 @@ fi
 PASSTHROUGH_ENV_VARS=(
   TRANSLOADIT_KEY
   TRANSLOADIT_SECRET
-  TRANSLOADIT_HOST
-  TRANSLOADIT_REGION
   TRANSLOADIT_TEMPLATE_ID
   RUBY_SDK_E2E
 )

test/integration/test_e2e_upload.rb

@@ -8,20 +8,12 @@
     @secret = ENV["TRANSLOADIT_SECRET"]
     skip "TRANSLOADIT_KEY and TRANSLOADIT_SECRET must be set to run live upload tests" if blank?(@key) || blank?(@secret)
 
-    @service = resolve_service
-
     @fixture_path = File.expand_path("../../chameleon.jpg", __dir__)
     skip "chameleon.jpg fixture missing; run tests from the repository root" unless File.file?(@fixture_path)
   end
 
   it "uploads and processes the chameleon image" do
-    options = {
-      key: @key,
-      secret: @secret
-    }
-    options[:service] = @service if @service
-
-    transloadit = Transloadit.new(options)
+    transloadit = Transloadit.new(key: @key, secret: @secret)
 
     resize_step = transloadit.step(
       "resize",
@@ -81,16 +73,6 @@ def e2e_enabled?
     %w[1 true yes on].include?(flag.to_s.strip.downcase)
   end
 
-  def resolve_service
-    host = ENV["TRANSLOADIT_HOST"].to_s.strip
-    return host unless host.empty?
-
-    region = ENV["TRANSLOADIT_REGION"].to_s.strip
-    return nil if region.empty?
-
-    "https://api2-#{region}.transloadit.com"
-  end
-
   def integer_if_present(value)
     return nil if blank?(value)