tinify 1.5.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a803ec1b6968af7760e203c5c2e1b44486cf04678604daad4b91b1c88b1c08c
-  data.tar.gz: e14489e735709b0a0d828cd448dc159b8423181382a8161cc2d983cc7f90af1d
+  metadata.gz: 6947ac2a5fe37cabbd10fcafeb6e762fc15a19c637f6f617b5179b7057ecb2c4
+  data.tar.gz: 2b8964ae5761665b4400f83008a4a43bf795ce6e0c60e3d8a9f02f11e3505a58
 SHA512:
-  metadata.gz: b18e31e7da9d25a9a6a28b140432efb12dceef754f2f6dfd8c17e12b1b2b7ebd600f60f45ebf533e47b69b0ea2e62b47d9b23bccb0c56338f08407efe5d8f988
-  data.tar.gz: f21a1adb3f7863769ede36d32d977c4f9d3e5ac5133b604f7a8336c14b0d274012a31ab391f5c851dc124e0c64718085fe55f9c12366a1cc895f695bae5810ec
+  metadata.gz: 473ff8623d4142617493e00c2f0d1a2e06ea9342ceccdd07794df8113e378c3b583c1a3a98d4d22d558003ba1c65d7fdc668e592cbd7b2710830185dbbe3914e
+  data.tar.gz: ee5ef195846f70e996576295c7f06c2403d77ddb8d03984162baf4b8b29622f86f62ef93be1d29943d0f50355ef89cc00b3db70ee63513d5ca7e4cf777ec8316

data/.github/workflows/ci-cd.yaml

@@ -0,0 +1,110 @@
+name: Ruby CI/CD
+
+on: [push, pull_request]
+
+permissions: {}
+jobs:
+  Unit_tests:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
+    # continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.1', '3.2', '3.3', '3.4', 'jruby']
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        # experimental: [false]
+        include:
+          # TruffleRuby on Windows may fail
+          # commented out, because it marks the build as failed with a red cross (X)
+          # - ruby-version: truffleruby
+          #   os: windows-latest
+          #   experimental: true
+          - ruby-version: truffleruby
+            os: macOS-latest
+            experimental: false
+          - ruby-version: truffleruby
+            os: ubuntu-latest
+            experimental: false
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+
+    - name: Install dependencies
+      run: bundle install
+
+    - name: Run specs
+      run: bundle exec rake
+
+  Integration_tests:
+    if: github.event_name == 'push'
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
+    needs: Unit_tests
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: [
+          "3.1", "3.4"
+        ]
+        os: [
+          ubuntu-latest,
+          macOS-latest,
+          # Disable windows due to an issue with binary encoding in the tests
+          # windows-latest
+        ]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Install dependencies
+      run: |
+        bundle install
+    - name: Run tests
+      env:
+        TINIFY_KEY: ${{ secrets.TINIFY_KEY }}
+      run: |
+        bundle exec rake integration
+  Publish:
+    if: |
+       github.repository == 'tinify/tinify-ruby' &&
+       startsWith(github.ref, 'refs/tags') &&
+       github.event_name == 'push'
+    timeout-minutes: 10
+    needs: [Unit_tests, Integration_tests]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby 3.4
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.4
+      - name: Check if properly tagged
+        run: |
+          PACKAGE_VERSION="$(ruby -e 'puts Gem::Specification::load("tinify.gemspec").version')";
+          CURRENT_TAG="${GITHUB_REF#refs/*/}";
+          if  [[ "${PACKAGE_VERSION}" != "${CURRENT_TAG}" ]]; then
+            >&2 echo "Tag mismatch"
+            >&2 echo "Version in lib/tinify/version.rb (${PACKAGE_VERSION}) does not match the current tag=${CURRENT_TAG}"
+            >&2 echo "Skipping deploy"
+            exit 1;
+          fi
+      - run: bundle install
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          gem push *.gem
+        env:
+          GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.gitignore

@@ -0,0 +1,2 @@
+vendor/bundle
+.bundle

data/CHANGES.md

@@ -1,3 +1,36 @@
+## 1.7.0
+
+* Added base64 gem to Gemfile
+
+Extend runtime support for:
+
+* Ruby 3.2
+* Ruby 3.3
+* Ruby 3.4
+
+Remove runtime support for:
+
+* Ruby 2.6
+* Ruby 3.0
+
+## 1.6.0
+
+Added transform & convert methods for the Tinify API.
+Added helper property for getting the file extension (Result.extension)
+
+Extend runtime support for the following runtimes:
+
+* Ruby 2.6
+* Ruby 2.7
+* Ruby 3.0
+* Ruby 3.1
+
+Experimental support
+
+* JRuby
+* Truffle Ruby
+
+
 ## 1.5.0
 * Retry failed requests by default.
 

data/Gemfile

@@ -2,3 +2,8 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in tinify.gemspec
 gemspec
+
+gem 'base64'
+gem 'rake'
+gem 'minitest'
+gem 'webmock'

data/Gemfile.lock

@@ -1,32 +1,47 @@
 PATH
   remote: .
   specs:
-    tinify (1.5.1)
-      httpclient (~> 2.6)
+    tinify (1.7.0)
+      httpclient (>= 2.9, < 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    httpclient (2.8.3)
-    minitest (5.5.1)
-    rake (10.4.2)
-    safe_yaml (1.0.4)
-    webmock (1.20.4)
-      addressable (>= 2.3.6)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.9)
+    bigdecimal (3.1.9-java)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    hashdiff (1.1.2)
+    httpclient (2.9.0)
+      mutex_m
+    minitest (5.25.5)
+    mutex_m (0.3.0)
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    rexml (3.4.1)
+    webmock (3.25.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  arm64-darwin
+  java
   ruby
+  x64-mingw-ucrt
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.7)
-  minitest (~> 5.5)
-  rake (~> 10.0)
+  base64
+  minitest
+  rake
   tinify!
-  webmock (~> 1.20)
+  webmock
 
 BUNDLED WITH
-   1.13.6
+   2.3.19

data/README.md

@@ -1,4 +1,6 @@
-[<img src="https://travis-ci.org/tinify/tinify-ruby.svg?branch=master" alt="Build Status">](https://travis-ci.org/tinify/tinify-ruby)
+[![Gem](https://img.shields.io/gem/v/tinify)](https://rubygems.org/gems/tinify)
+[![MIT License](http://img.shields.io/badge/license-MIT-green.svg) ](https://github.com/tinify/tinify-java/blob/main/LICENSE)
+[![Ruby CI](https://github.com/tinify/tinify-ruby/actions/workflows/ci-cd.yaml/badge.svg)](https://github.com/tinify/tinify-ruby/actions/workflows/ci-cd.yaml)
 
 # Tinify API client for Ruby
 

data/lib/tinify/result.rb

@@ -20,5 +20,12 @@ module Tinify
       @meta["Content-Type"]
     end
     alias_method :content_type, :media_type
+
+    def extension
+      if @meta['Content-Type']
+        parts = @meta["Content-Type"].split "/"
+        parts.last
+      end
+    end
   end
 end

data/lib/tinify/source.rb

@@ -29,6 +29,14 @@ module Tinify
       self.class.new(@url, @commands.merge(resize: options))
     end
 
+    def convert(options)
+      self.class.new(@url, @commands.merge(convert: options))
+    end
+
+    def transform(options)
+      self.class.new(@url, @commands.merge(transform: options))
+    end
+
     def store(options)
       response = Tinify.client.request(:post, @url, @commands.merge(store: options))
       ResultMeta.new(response.headers).freeze

data/lib/tinify/version.rb

@@ -1,3 +1,3 @@
 module Tinify
-  VERSION = "1.5.1"
+  VERSION = "1.7.0"
 end

data/test/helper.rb

@@ -1,8 +1,12 @@
+require "bundler/setup"
+Bundler.require
+
 require "minitest/autorun"
 require "webmock/minitest"
-
 require "tinify"
 
+WebMock.disable_net_connect!(allow_localhost: true)
+
 module TestHelpers
   def before_setup
     Tinify.key = nil
@@ -24,6 +28,8 @@ module TestHelpers
   end
 end
 
-class MiniTest::Spec
-  include TestHelpers
+module Minitest
+  class Spec
+    include TestHelpers
+  end
 end

data/test/integration.rb

@@ -76,4 +76,15 @@ describe "client integration" do
       assert_includes contents, "Copyright Voormedia".force_encoding("binary")
     end
   end
+
+  it "should convert" do
+    Tempfile.open("optimized.png", encoding: "binary") do |file|
+      optimized.convert(type: "image/webp").to_file(file.path)
+      r = file.read
+
+      assert_equal r[0..3], "RIFF".force_encoding("binary")
+      assert_equal r[8..11], "WEBP".force_encoding("binary")
+    end
+  end
+
 end

data/test/tinify_client_test.rb

@@ -11,33 +11,38 @@ describe Tinify::Client do
   describe "request" do
     describe "when valid" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_return(
-          status: 201,
-          headers: { "Compression-Count" => "12" }
-        )
-        stub_request(:get, "https://api:key@api.tinify.com/shrink").to_return(
-          status: 201,
-          headers: {
-            "Compression-Count" => "12",
-            "Location" => "https://api.tinify.com/output/3spbi1cd7rs812lb.png"
-          }
-        )
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_return(
+            status: 201,
+            headers: { "Compression-Count" => "12" }
+          )
+
+        stub_request(:get, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'key'])
+          .to_return(
+            status: 201,
+            headers: {
+              "Compression-Count" => "12",
+              "Location" => "https://api.tinify.com/output/3spbi1cd7rs812lb.png"
+            }
+          )
       end
 
       it "should issue request" do
         subject.request(:get, "/")
-        assert_requested :get, "https://api:key@api.tinify.com",
-          headers: { "Authorization" => "Basic " + ["api:key"].pack("m").chomp }
+        assert_requested :get, "https://api.tinify.com",
+          headers: { "Authorization" => "Basic #{ Base64.strict_encode64('api:key').chomp}" }
       end
 
       it "should issue request to endpoint" do
         subject.request(:get, "/shrink", {})
-        assert_requested :get, "https://api:key@api.tinify.com/shrink"
+        assert_requested :get, "https://api.tinify.com/shrink"
       end
 
       it "should issue request with method" do
         subject.request(:get, "/shrink", {})
-        assert_requested :get, "https://api:key@api.tinify.com/shrink"
+        assert_requested :get, "https://api.tinify.com/shrink"
       end
 
       it "should return response" do
@@ -47,25 +52,25 @@ describe Tinify::Client do
 
       it "should issue request without body when options are empty" do
         subject.request(:get, "/", {})
-        assert_requested :get, "https://api:key@api.tinify.com", body: nil
+        assert_requested :get, "https://api.tinify.com", body: nil
       end
 
       it "should issue request without content type when options are empty" do
         subject.request(:get, "/", {})
-        assert_not_requested :get, "https://api:key@api.tinify.com",
+        assert_not_requested :get, "https://api.tinify.com",
           headers: { "Content-Type" => "application/x-www-form-urlencoded" }
       end
 
       it "should issue request with json body" do
         subject.request(:get, "/", { hello: "world" })
-        assert_requested :get, "https://api:key@api.tinify.com",
+        assert_requested :get, "https://api.tinify.com",
           headers: { "Content-Type" => "application/json" },
           body: '{"hello":"world"}'
       end
 
       it "should issue request with user agent" do
         subject.request(:get, "/")
-        assert_requested :get, "https://api:key@api.tinify.com",
+        assert_requested :get, "https://api.tinify.com",
           headers: { "User-Agent" => Tinify::Client::USER_AGENT }
       end
 
@@ -81,7 +86,7 @@ describe Tinify::Client do
 
         it "should issue request with user agent" do
           subject.request(:get, "/")
-          assert_requested :get, "https://api:key@api.tinify.com",
+          assert_requested :get, "https://api.tinify.com",
             headers: { "User-Agent" => "#{Tinify::Client::USER_AGENT} TestApp/0.1" }
         end
       end
@@ -93,7 +98,7 @@ describe Tinify::Client do
 
         it "should issue request with proxy authorization" do
           subject.request(:get, "/")
-          assert_requested :get, "https://api:key@api.tinify.com",
+          assert_requested :get, "https://api.tinify.com",
             headers: { "Proxy-Authorization" => "Basic dXNlcjpwYXNz" }
         end
       end
@@ -101,8 +106,11 @@ describe Tinify::Client do
 
     describe "with timeout once" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_timeout
-          .then.to_return(status: 201)
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_timeout
+          .then
+          .to_return(status: 201)
       end
 
       it "should return response" do
@@ -113,7 +121,9 @@ describe Tinify::Client do
 
     describe "with timeout repeatedly" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_timeout
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_timeout
       end
 
       it "should raise connection error" do
@@ -131,7 +141,8 @@ describe Tinify::Client do
 
     describe "with socket error once" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com")
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
           .to_raise(SocketError.new("nodename nor servname provided"))
           .then.to_return(status: 201)
       end
@@ -144,7 +155,9 @@ describe Tinify::Client do
 
     describe "with socket error repeatedly" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_raise(SocketError.new("nodename nor servname provided"))
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_raise(SocketError.new("nodename nor servname provided"))
       end
 
       it "should raise error" do
@@ -162,9 +175,11 @@ describe Tinify::Client do
 
     describe "with unexpected error once" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com")
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
           .to_raise("some error")
-          .then.to_return(status: 201)
+          .then
+          .to_return(status: 201)
       end
 
       it "should return response" do
@@ -175,7 +190,9 @@ describe Tinify::Client do
 
     describe "with unexpected error repeatedly" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_raise("some error")
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_raise("some error")
       end
 
       it "should raise error" do
@@ -193,10 +210,14 @@ describe Tinify::Client do
 
     describe "with server error once" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_return(
-          status: 584,
-          body: '{"error":"InternalServerError","message":"Oops!"}'
-        ).then.to_return(status: 201)
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_return(
+            status: 584,
+            body: '{"error":"InternalServerError","message":"Oops!"}'
+          )
+          .then
+          .to_return(status: 201)
       end
 
       it "should return response" do
@@ -207,10 +228,12 @@ describe Tinify::Client do
 
     describe "with server error repeatedly" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_return(
-          status: 584,
-          body: '{"error":"InternalServerError","message":"Oops!"}'
-        )
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_return(
+            status: 584,
+            body: '{"error":"InternalServerError","message":"Oops!"}'
+          )
       end
 
       it "should raise server error" do
@@ -228,10 +251,14 @@ describe Tinify::Client do
 
     describe "with bad server response once" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_return(
-          status: 543,
-          body: '<!-- this is not json -->'
-        ).then.to_return(status: 201)
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_return(
+            status: 543,
+            body: '<!-- this is not json -->'
+          )
+          .then
+          .to_return(status: 201)
       end
 
       it "should return response" do
@@ -242,10 +269,12 @@ describe Tinify::Client do
 
     describe "with bad server response repeatedly" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_return(
-          status: 543,
-          body: '<!-- this is not json -->'
-        )
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_return(
+            status: 543,
+            body: '<!-- this is not json -->'
+          )
       end
 
       it "should raise server error" do
@@ -255,7 +284,7 @@ describe Tinify::Client do
       end
 
       it "should raise error with message" do
-        assert_raise_with_message %r{Error while parsing response: .*unexpected token at '<!-- this is not json -->' \(HTTP 543/ParseError\)} do
+        assert_raise_with_message(/\(HTTP 543\/ParseError\)/) do
           subject.request(:get, "/")
         end
       end
@@ -263,10 +292,13 @@ describe Tinify::Client do
 
     describe "with client error" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_return(
-          status: 492,
-          body: '{"error":"BadRequest","message":"Oops!"}'
-        ).then.to_return(status: 201)
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_return(
+            status: 492,
+            body: '{"error":"BadRequest","message":"Oops!"}'
+          ).then
+           .to_return(status: 201)
       end
 
       it "should raise client error" do
@@ -285,10 +317,13 @@ describe Tinify::Client do
 
     describe "with bad credentials" do
       before do
-        stub_request(:get, "https://api:key@api.tinify.com").to_return(
-          status: 401,
-          body: '{"error":"Unauthorized","message":"Oops!"}'
-        ).then.to_return(status: 201)
+        stub_request(:get, "https://api.tinify.com")
+          .with(basic_auth: ['api', 'key'])
+          .to_return(
+            status: 401,
+            body: '{"error":"Unauthorized","message":"Oops!"}'
+          ).then
+           .to_return(status: 201)
       end
 
       it "should raise account error" do

data/test/tinify_result_test.rb

@@ -47,6 +47,12 @@ describe Tinify::Result do
         assert_equal "image data", subject.to_buffer
       end
     end
+
+    describe "extension" do
+      it "should return extension" do
+        assert_equal "png", subject.extension
+      end
+    end
   end
 
   describe "without meta and data" do
@@ -89,5 +95,12 @@ describe Tinify::Result do
         assert_nil subject.to_buffer
       end
     end
+
+    describe "extension" do
+      it "should return nil" do
+        assert_nil subject.extension
+      end
+    end
+
   end
 end

data/test/tinify_source_test.rb

@@ -7,7 +7,8 @@ describe Tinify::Source do
     before do
       Tinify.key = "invalid"
 
-      stub_request(:post, "https://api:invalid@api.tinify.com/shrink")
+      stub_request(:post, "https://api.tinify.com/shrink")
+        .with(basic_auth: ['api', 'invalid'])
         .to_return(
           status: 401,
           body: '{"error":"Unauthorized","message":"Credentials are invalid"}')
@@ -45,13 +46,15 @@ describe Tinify::Source do
 
     describe "from_file" do
       before do
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
             body: '{}')
 
-        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+        stub_request(:get, "https://api.tinify.com/some/location")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 200,
             body: "compressed file")
@@ -68,13 +71,15 @@ describe Tinify::Source do
 
     describe "from_buffer" do
       before do
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
             body: '{}')
 
-        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+        stub_request(:get, "https://api.tinify.com/some/location")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 200,
             body: "compressed file")
@@ -91,20 +96,27 @@ describe Tinify::Source do
 
     describe "from_url" do
       before do
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
-          .with(body: '{"source":{"url":"http://example.com/test.jpg"}}')
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(
+            basic_auth: ['api', 'valid'],
+            body: '{"source":{"url":"http://example.com/test.jpg"}}'
+          )
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
             body: '{}')
 
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
-          .with(body: '{"source":{"url":"file://wrong"}}')
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(
+            body: '{"source":{"url":"file://wrong"}}',
+            basic_auth: ['api', 'valid']
+          )
           .to_return(
             status: 400,
             body: '{"error":"Source not found","message":"Cannot parse URL"}')
 
-        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+        stub_request(:get, "https://api.tinify.com/some/location")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 200,
             body: "compressed file")
@@ -127,13 +139,15 @@ describe Tinify::Source do
 
     describe "result" do
       before do
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
             body: '{}')
 
-        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+        stub_request(:get, "https://api.tinify.com/some/location")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 200,
             body: "compressed file")
@@ -146,14 +160,16 @@ describe Tinify::Source do
 
     describe "preserve" do
       before do
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
             body: '{}')
 
-        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+        stub_request(:get, "https://api.tinify.com/some/location")
           .with(
+            basic_auth: ['api', 'valid'],
             body: '{"preserve":["copyright","location"]}')
           .to_return(
             status: 200,
@@ -176,8 +192,9 @@ describe Tinify::Source do
       end
 
       it "should include other options if set" do
-        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+        stub_request(:get, "https://api.tinify.com/some/location")
           .with(
+            basic_auth: ['api', 'valid'],
             body: '{"resize":{"width":400},"preserve":["copyright","location"]}')
           .to_return(
             status: 200,
@@ -190,14 +207,16 @@ describe Tinify::Source do
 
     describe "resize" do
       before do
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
             body: '{}')
 
-        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+        stub_request(:get, "https://api.tinify.com/some/location")
           .with(
+            basic_auth: ['api', 'valid'],
             body: '{"resize":{"width":400}}')
           .to_return(
             status: 200,
@@ -213,17 +232,84 @@ describe Tinify::Source do
       end
     end
 
+    describe "convert" do
+      before do
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
+          .to_return(
+            status: 201,
+            headers: { Location: "https://api.tinify.com/some/location" },
+            body: '{}')
+
+        stub_request(:get, "https://api.tinify.com/some/location")
+          .with(
+            basic_auth: ['api', 'valid'],
+            body: '{"convert":{"type":["image/webp"]}}')
+          .to_return(
+            status: 200,
+            body: "converted file")
+      end
+
+      it "should return source" do
+        assert_kind_of Tinify::Source, Tinify::Source.from_buffer("png file").convert(type: ["image/webp"])
+      end
+
+      it "should return source with data" do
+        assert_equal "converted file", Tinify::Source.from_buffer("png file").convert(type: ["image/webp"]).to_buffer
+      end
+    end
+
+    describe "transform" do
+      before do
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
+          .to_return(
+            status: 201,
+            headers: { Location: "https://api.tinify.com/some/location" },
+            body: '{}')
+
+        stub_request(:get, "https://api.tinify.com/some/location")
+          .with(
+            basic_auth: ['api', 'valid'],
+            body: '{"transform":{"color":"black"}}')
+          .to_return(
+            status: 200,
+            body: "transformd file")
+      end
+
+      it "should return source" do
+        assert_kind_of Tinify::Source, Tinify::Source.from_buffer("png file").transform(color: "black'")
+      end
+
+      it "should return source with data" do
+        assert_equal "transformd file", Tinify::Source.from_buffer("png file").transform(color: "black").to_buffer
+      end
+
+      it "should include other options if set" do
+
+        stub_request(:get, "https://api.tinify.com/some/location").
+        with(:body => '{"convert":{"type":["image/webp"]},"transform":{"color":"black"}}',
+            ).
+        to_return(:status => 200, :body => "trans-formed-and-coded", :headers => {})
+
+        result = Tinify::Source.from_buffer("png file").convert(type: ["image/webp"]).transform(color: "black")
+        assert_equal "trans-formed-and-coded", result.to_buffer
+      end
+    end
+
     describe "store" do
       before do
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
             body: '{}'
           )
 
-        stub_request(:post, "https://api:valid@api.tinify.com/some/location")
+        stub_request(:post, "https://api.tinify.com/some/location")
         .with(
+          basic_auth: ['api', 'valid'],
           body: '{"store":{"service":"s3"}}')
         .to_return(
           status: 200,
@@ -240,8 +326,9 @@ describe Tinify::Source do
       end
 
       it "should include other options if set" do
-        stub_request(:post, "https://api:valid@api.tinify.com/some/location")
+        stub_request(:post, "https://api.tinify.com/some/location")
         .with(
+          basic_auth: ['api', 'valid'],
           body: '{"resize":{"width":400},"store":{"service":"s3"}}')
         .to_return(
           status: 200,
@@ -254,16 +341,19 @@ describe Tinify::Source do
 
     describe "to_buffer" do
       before do
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
             body: '{}')
 
-        stub_request(:get, "https://api:valid@api.tinify.com/some/location").to_return(
-          status: 200,
-          body: "compressed file"
-        )
+        stub_request(:get, "https://api.tinify.com/some/location")
+          .with(basic_auth: ['api', 'valid'])
+          .to_return(
+            status: 200,
+            body: "compressed file"
+          )
       end
 
       it "should return image data" do
@@ -273,16 +363,19 @@ describe Tinify::Source do
 
     describe "to_file" do
       before do
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink")
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
             body: '{}')
 
-        stub_request(:get, "https://api:valid@api.tinify.com/some/location").to_return(
-          status: 200,
-          body: "compressed file"
-        )
+        stub_request(:get, "https://api.tinify.com/some/location")
+          .with(basic_auth: ['api', 'valid'])
+          .to_return(
+            status: 200,
+            body: "compressed file"
+          )
       end
 
       it "should store image data" do

data/test/tinify_test.rb

@@ -5,7 +5,9 @@ describe Tinify do
 
   describe "key" do
     before do
-      stub_request(:get, "https://api:fghij@api.tinify.com").to_return(status: 200)
+      stub_request(:get, "https://api.tinify.com")
+        .with(basic_auth: ['api', 'fghij'])
+        .to_return(status: 200)
     end
 
     it "should reset client with new key" do
@@ -13,14 +15,16 @@ describe Tinify do
       Tinify.client
       Tinify.key = "fghij"
       Tinify.client.request(:get, "/")
-      assert_requested :get, "https://api:fghij@api.tinify.com",
-        headers: { "Authorization" => "Basic " + ["api:fghij"].pack("m").chomp }
+      assert_requested :get, "https://api.tinify.com",
+        headers: { "Authorization" => "Basic #{ Base64.strict_encode64('api:fghij').chomp}" }
     end
   end
 
   describe "app_identifier" do
     before do
-      stub_request(:get, "https://api:abcde@api.tinify.com").to_return(status: 200)
+      stub_request(:get, "https://api.tinify.com")
+        .with(basic_auth: ['api', 'abcde'])
+        .to_return(status: 200)
     end
 
     it "should reset client with new app identifier" do
@@ -29,14 +33,16 @@ describe Tinify do
       Tinify.client
       Tinify.app_identifier = "MyApp/2.0"
       Tinify.client.request(:get, "/")
-      assert_requested :get, "https://api:abcde@api.tinify.com",
+      assert_requested :get, "https://api.tinify.com",
         headers: { "User-Agent" => "#{Tinify::Client::USER_AGENT} MyApp/2.0" }
     end
   end
 
   describe "proxy" do
     before do
-      stub_request(:get, "https://api:abcde@api.tinify.com").to_return(status: 200)
+      stub_request(:get, "https://api.tinify.com")
+        .with(basic_auth: ['api', 'abcde'])
+        .to_return(status: 200)
     end
 
     it "should reset client with new proxy" do
@@ -45,7 +51,7 @@ describe Tinify do
       Tinify.client
       Tinify.proxy = "http://user:pass@localhost:8080"
       Tinify.client.request(:get, "/")
-      assert_requested :get, "https://api:abcde@api.tinify.com",
+      assert_requested :get, "https://api.tinify.com",
         headers: { "Proxy-Authorization" => "Basic dXNlcjpwYXNz" }
     end
   end
@@ -82,10 +88,12 @@ describe Tinify do
       before do
         Tinify.key = "valid"
 
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink").to_return(
-          status: 400,
-          body: '{"error":"Input missing","message":"No input"}'
-        )
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
+          .to_return(
+            status: 400,
+            body: '{"error":"Input missing","message":"No input"}'
+          )
       end
 
       it "should return true" do
@@ -97,10 +105,12 @@ describe Tinify do
       before do
         Tinify.key = "valid"
 
-        stub_request(:post, "https://api:valid@api.tinify.com/shrink").to_return(
-          status: 429,
-          body: '{"error":"Too many requests","message":"Your monthly limit has been exceeded"}'
-        )
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'valid'])
+          .to_return(
+            status: 429,
+            body: '{"error":"Too many requests","message":"Your monthly limit has been exceeded"}'
+          )
       end
 
       it "should return true" do
@@ -112,10 +122,12 @@ describe Tinify do
       before do
         Tinify.key = "invalid"
 
-        stub_request(:post, "https://api:invalid@api.tinify.com/shrink").to_return(
-          status: 401,
-          body: '{"error":"Unauthorized","message":"Credentials are invalid"}'
-        )
+        stub_request(:post, "https://api.tinify.com/shrink")
+          .with(basic_auth: ['api', 'invalid'])
+          .to_return(
+            status: 401,
+            body: '{"error":"Unauthorized","message":"Credentials are invalid"}'
+          )
       end
 
       it "should raise error" do
@@ -130,11 +142,13 @@ describe Tinify do
     before do
       Tinify.key = "valid"
 
-      stub_request(:post, "https://api:valid@api.tinify.com/shrink").to_return(
-        status: 201,
-        headers: { Location: "https://api.tinify.com/some/location" },
-        body: '{}'
-      )
+      stub_request(:post, "https://api.tinify.com/shrink")
+        .with(basic_auth: ['api', 'valid'])
+        .to_return(
+          status: 201,
+          headers: { Location: "https://api.tinify.com/some/location" },
+          body: '{}'
+        )
     end
 
     it "should return source" do
@@ -146,11 +160,13 @@ describe Tinify do
     before do
       Tinify.key = "valid"
 
-      stub_request(:post, "https://api:valid@api.tinify.com/shrink").to_return(
-        status: 201,
-        headers: { Location: "https://api.tinify.com/some/location" },
-        body: '{}'
-      )
+      stub_request(:post, "https://api.tinify.com/shrink")
+        .with(basic_auth: ['api', 'valid'])
+        .to_return(
+          status: 201,
+          headers: { Location: "https://api.tinify.com/some/location" },
+          body: '{}'
+        )
     end
 
     it "should return source" do
@@ -162,11 +178,13 @@ describe Tinify do
     before do
       Tinify.key = "valid"
 
-      stub_request(:post, "https://api:valid@api.tinify.com/shrink").to_return(
-        status: 201,
-        headers: { Location: "https://api.tinify.com/some/location" },
-        body: '{}'
-      )
+      stub_request(:post, "https://api.tinify.com/shrink")
+        .with(basic_auth: ['api', 'valid'])
+        .to_return(
+          status: 201,
+          headers: { Location: "https://api.tinify.com/some/location" },
+          body: '{}'
+        )
     end
 
     it "should return source" do

data/tinify.gemspec

@@ -18,10 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^test/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency("httpclient", "~> 2.6")
-
-  spec.add_development_dependency("bundler", "~> 1.7")
-  spec.add_development_dependency("rake", "~> 10.0")
-  spec.add_development_dependency("minitest", "~> 5.5")
-  spec.add_development_dependency("webmock", "~> 1.20")
+  spec.add_dependency('httpclient', '>= 2.9', '< 3')
 end

metadata

@@ -1,85 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: tinify
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Rolf Timmermans
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '2.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.5'
-  type: :development
+        version: '3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.5'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.20'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '2.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '3'
 description: Ruby client for the Tinify API. Tinify compresses your images intelligently.
   Read more at https://tinify.com.
 email:
@@ -88,7 +37,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".travis.yml"
+- ".github/workflows/ci-cd.yaml"
+- ".gitignore"
 - CHANGES.md
 - Gemfile
 - Gemfile.lock
@@ -118,7 +68,6 @@ homepage: https://tinify.com/developers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby client for the Tinify API.
 test_files:

data/.travis.yml

@@ -1,38 +0,0 @@
-language: ruby
-rvm:
-- 1.9.2
-- 1.9.3
-- 2.0
-- 2.1
-- 2.2
-- 2.3.0
-- ruby-head
-- jruby-19mode
-- jruby-20mode
-- rbx-2
-env:
-  global:
-  - secure: u2JnTDMbqgf0kP5vDywFP+lL0ON135Q4a4jXTS1J4K8Kp7qFe/yzyrtYSmDJux31U3Ob/U/ptwYLlFUYuwjwMgTb4ow35jms8d9RvLb6vIBH7Yw9Sf6eq3iJxHGNOjM2pTL9N5DHx4TTO2ov+vQ1PT/QY5P70LVrSKurgKFDjgIZKwnYbFSZtusHX0qTPPQ3FL+NDdcuDmxLxiGt294o+9pFrUAQUKVV4NAk+HUnLjpqKWFqD9pMEw/DYrX4g9RAmN5YWt0sE+CCMFEaKh6Ghrfcfxov9yDEcKDz2ELXNiot9526wwoNONA/zT9hNQXfxhIXfV/67JsJ9cmbZIgP9FLWd/ziRs/yjoTJRaSloifXtAXAft2PMiNx7dnB2C9FFnDzJuTTkJdQfdSEkcXkn0a1Hy5wUI6Ur9Vdjn/Jc5yAHF6Uc78ekgkXBIVxc/J9J9EjophlaCsZHQbgM2H+mADbRIAA/qV1WD9XTISxANP6N19Pt6xFW+wGDnfBBDqbzCO6vK9M+9fU2LW4N8177rtCEG7XkUVSllbJvq841MPqOi2k++B9LD2xAu6Db3ubV5KFL/wg1QBoyP5QOd1uAZ+goQFdvxOZ/7mN/45ytKYYammQlngZFUi638dAE6f4j+NUtrczk4QQJmDuFxXoP+KBtgiD1nrtmenaxOEp/gk=
-matrix:
-  allow_failures:
-  - rvm: jruby-20mode
-  - rvm: ruby-head
-  - rvm: rbx-2
-  include:
-  - rvm: 2.2
-    env: INTEGRATION_TESTS=true
-    script: "if [ \"$TRAVIS_PULL_REQUEST\" == \"false\" ]; then rake integration; fi"
-notifications:
-  email: false
-  slack:
-    secure: udqUs5rLo5XXIM+PpqBDCTOEobzqnQs2Vq+eHOBaJggVSjfYrN6OYQAmZVBLIpysCJPcuZhZ64u93p2Zl+Yu9vJHXPnhFIBEmQlFybCjRIQtz1MMaeqZTMCO49avY+SCjBvXZV902PKJ8vVeeR2O3T5oj894JTejtAnXm5yEInNft3ODMsF+v3R5WFjD8cS+RWegZRotkbhQmQNrqCKxD7rZ3ufTyJuhpVnJPsUZVyaMJbWUWJRsessbl9nBxk3fFR74KXoURgEOv/OmbQD5AkVv1FkxGh0Y7wpn0aU9UOSmJZzzsXp/MaGNfZW7UwGx4iMtTa1YK+h+/fD3PNePfCPLZfvIvxnheIUn3Zrky9TDfK3KP9KHNuAtGdW3c5oxSCimRNTmx2MmsnbGO2sElR/u+Jxr+h0NO5xaBQBmHQeGKjv7VYv3Hexeac0I9lf6lQzmpk6XlstsPfht/Qwia/45RyEu2E8/s4OTFiKYgCBtpttkQ1VTvRowUPgHcuddldUKlI0j6CZlM2gpt9oLAQvzSmdlGX3j4Hpa6nCHILzW8vLoNHvMHTgjz6GU6RJwSj9JjIDkg1XCmq60EmQOKaacjEGXAG2plp0Fulm5THgU7WKnxC5PA+lrSgspmUFb8A0nmKG3tyuSOytVGBRAyu3FLEQih0xrPcZJ2rZ5T0s=
-deploy:
-  provider: rubygems
-  api_key:
-    secure: E+dMU6AJuijnGrStl1+hrPizsiPzkWOAjpEG+zAhnuC6pBxTt0Ximc+UcrQiDmQdYQpxhulHreSO2otU9GkvDbpfrP+WE0c9j3AcAAHex6oHIctONWHwcbFnyyIMCNZpcFfMgVH8Nay3vnqVK+bhvNGLP/fVFeQE2co++JQp6BHpIMN6yxlIkGiJeP38Wcv4TVZmJMDcSxgLm+XlZ8xBIMkez9GEADnKXm2ZFfcx8p9K4bXK3hbZ34DF7bYYCN0eDqV4Y5ZGBF9FugUTz19fALyTlQxCks6NM2VT6gM/tg2ibGnzCQ4Wa3XR0pPH6H3xPJBtXlprUvXu27LYrb/PZ0rPN+cXI3nqGKsy6oxfCpVjr26qa5OoRG4XaX8w5ojUDo+D90HyT5Wxpe0BCAVQ+h/rgqOo9X0iByC2S9ORgCmo2lPPCUG442wmiX1V3um29rSNqX9CEb8WC0zZDgGwDp9YjlyztSy+hB96Ljy9rmQcSkQdcQETYSwareBqQmWFeHZbzy2iMR8xEzFpdCVUEnsY9isBVBeoJYYsAlrDRTrlt/A78K32JxP+9E5gQQegv6WQ/0nVJ9fmP6tnmFOLb1CUksmuAIJHA4FdVc0yZDnixHqZy8dyOxJ6dLwjAUx75TThI1ts36wATb8LBXIGgXXJb0y3RNP3KVY/DXPJE64=
-  gem: tinify
-  on:
-    tags: true
-    repo: tinify/tinify-ruby
-    ruby: 2.2
-    condition: "$INTEGRATION_TESTS != true"