tinify 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a803ec1b6968af7760e203c5c2e1b44486cf04678604daad4b91b1c88b1c08c
-  data.tar.gz: e14489e735709b0a0d828cd448dc159b8423181382a8161cc2d983cc7f90af1d
+  metadata.gz: 9aadffa84ff9efe65549cdd2ffc0e3aa15290bf9c761c9bb6a2cf230b673371b
+  data.tar.gz: f0eb080d6e890d1e06a96524046991768b30eccf52e436bf7ae030ae3fe0d31e
 SHA512:
-  metadata.gz: b18e31e7da9d25a9a6a28b140432efb12dceef754f2f6dfd8c17e12b1b2b7ebd600f60f45ebf533e47b69b0ea2e62b47d9b23bccb0c56338f08407efe5d8f988
-  data.tar.gz: f21a1adb3f7863769ede36d32d977c4f9d3e5ac5133b604f7a8336c14b0d274012a31ab391f5c851dc124e0c64718085fe55f9c12366a1cc895f695bae5810ec
+  metadata.gz: bffe92ca1ff9e0cbf9de95590fbf2c2e73e764e2a8cab6fc107d30a0cea6554409146db037bfd1c52a3640d17151557414d24de366e554830d65570bb538582e
+  data.tar.gz: bb6135ba1eedacd4bbed3dbc29e8d456f9486f9845c6c8e584f3e39da01e9f44ef742105e8191b2126e6cd755d1083ca5eb552f1eb62e439b139574ba6b1c7de

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

@@ -0,0 +1,113 @@
+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: [
+          '2.6', '2.7', '3.0', '3.1',
+          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@v3
+
+    - 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: [
+          "2.7", "3.1"
+        ]
+        os: [
+          ubuntu-latest,
+          macOS-latest,
+          # Disable windows due to an issue with binary encoding in the tests
+          # windows-latest
+        ]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up ruby ${{ matrix.ruby-version }}
+      uses: actions/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 2.7
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - 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,21 @@
+## 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,10 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in tinify.gemspec
 gemspec
+
+gem "rake", ">= 12.3.3"
+gem 'minitest', '~> 5.5'
+
+# TODO: Pinned because `Webmock ~> 1.24` breaks specs. Unpin in future
+#       refactor.
+gem 'webmock', '~> 1.23.0'

data/Gemfile.lock

@@ -1,32 +1,35 @@
 PATH
   remote: .
   specs:
-    tinify (1.5.1)
+    tinify (1.6.0)
       httpclient (~> 2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    crack (0.4.5)
+      rexml
+    hashdiff (0.3.9)
     httpclient (2.8.3)
-    minitest (5.5.1)
-    rake (10.4.2)
-    safe_yaml (1.0.4)
-    webmock (1.20.4)
+    minitest (5.16.3)
+    public_suffix (5.0.0)
+    rake (13.0.6)
+    rexml (3.2.5)
+    webmock (1.23.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.7)
   minitest (~> 5.5)
-  rake (~> 10.0)
+  rake (>= 12.3.3)
   tinify!
-  webmock (~> 1.20)
+  webmock (~> 1.23.0)
 
 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.6.0"
 end

data/test/helper.rb

@@ -1,6 +1,10 @@
+require "bundler/setup"
 require "minitest/autorun"
+
 require "webmock/minitest"
 
+WebMock.disable_net_connect!(allow_localhost: true)
+
 require "tinify"
 
 module TestHelpers

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

@@ -255,7 +255,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

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

@@ -213,6 +213,69 @@ describe Tinify::Source do
       end
     end
 
+    describe "convert" do
+      before do
+        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(:get, "https://api:valid@api.tinify.com/some/location")
+          .with(
+            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:valid@api.tinify.com/shrink")
+          .to_return(
+            status: 201,
+            headers: { Location: "https://api.tinify.com/some/location" },
+            body: '{}')
+
+        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+          .with(
+            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:valid@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")

data/tinify.gemspec

@@ -19,9 +19,4 @@ Gem::Specification.new do |spec|
   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")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinify
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Rolf Timmermans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -24,62 +24,6 @@ dependencies:
     - - "~>"
       - !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:
-    - - "~>"
-      - !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
-  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:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.20'
 description: Ruby client for the Tinify API. Tinify compresses your images intelligently.
   Read more at https://tinify.com.
 email:
@@ -88,7 +32,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".travis.yml"
+- ".github/workflows/ci-cd.yaml"
+- ".gitignore"
 - CHANGES.md
 - Gemfile
 - Gemfile.lock
@@ -133,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby client for the Tinify API.

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"