tinify 1.5.0 → 1.6.0

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.0"
+  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

data/update-cacert.sh

@@ -1,17 +1,17 @@
-#!/bin/sh
+#!/usr/bin/env bash
 dir=lib/data
 
 cert=0
-curl https://curl.haxx.se/ca/cacert.pem | while read line; do
+curl --silent --fail https://curl.se/ca/cacert.pem  | while read -r line; do
   if [ "-----BEGIN CERTIFICATE-----" == "$line" ]; then
       cert=1
-      echo $line
+      echo "$line"
   elif [ "-----END CERTIFICATE-----" == "$line" ]; then
       cert=0
-      echo $line
+      echo "$line"
   else
       if [ $cert == 1 ]; then
-          echo $line
+          echo "$line"
       fi
   fi
-done > $dir/cacert.pem
+done > "$dir/cacert.pem"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinify
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Rolf Timmermans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 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,8 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+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"