tinify 1.3.0 → 1.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTg3Y2VkOGIxZWJjNjVjNzIzOGU0ZWM4NjQ1MDE0ZGEyNzUyOGM4ZQ==
-  data.tar.gz: !binary |-
-    NzJiYjliMmNhYTQ1ZGJjN2FjMDdmNTNiYTcxNzIyZmYyZDU2MDM0Yw==
+SHA1:
+  metadata.gz: d85217d62041c83e2295ef83e13a66bad20da81b
+  data.tar.gz: 501c89384831554faa4d7673ce2f1af222b9ec86
 SHA512:
-  metadata.gz: !binary |-
-    ODI3MmJmMDhlYTg2MGE1YzVlOWYzYjRkNjAwMDRiNjMzNjlkZWJhODgzM2Rk
-    NDE1Njk3ODc2OWZkODlhNjNiNGYyMjE2N2I4MTUxMzNmODRhYTk5ODVlOWRm
-    YTc0MTVkM2NiZDQ1NjNhMDRmMTFlM2FlNGU5YjliZWQwODRiMTg=
-  data.tar.gz: !binary |-
-    MzIxZTJlZWQwMDZhMzU4ZDkyODA3N2I5M2JiNGEwZTM4ODI0NjcxYTcxMWZj
-    ZTBjYjc5ZGJlYjg5MmU5MGZlZDVlYmI4YmViYjMxY2QzYWQyNWFlMWZmY2I3
-    YjY0N2Q3ZmU0YTQzNjk1ZTQ3NWI1YTEyOTMwNTgyYzM1MDdkNmI=
+  metadata.gz: abec96bd6ed1c1e66ab83f66a6920d6fdd03ac41e4ec9d73411f96f7b573f0ca0705287e2a4eea9329c3460c60bf9339d546350590c75a1be0534d6d565bf0ea
+  data.tar.gz: 1caf02c88fc5f118f4234375664c72c7d19800e2973216fee50120846f5f7495ae71f008010c512769efad2f2faf46a28cf6e266ae31b2a10c74994aaaa6c2c9

data/.travis.yml

@@ -16,6 +16,7 @@ env:
 matrix:
   allow_failures:
   - rvm: ruby-head
+  - rvm: rbx-2
   include:
   - rvm: 2.2
     env: INTEGRATION_TESTS=true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tinify (1.3.0)
+    tinify (1.4.0)
       httpclient (~> 2.6)
 
 GEM
@@ -27,3 +27,6 @@ DEPENDENCIES
   rake (~> 10.0)
   tinify!
   webmock (~> 1.20)
+
+BUNDLED WITH
+   1.13.6

data/lib/tinify.rb

@@ -12,6 +12,7 @@ module Tinify
   class << self
     attr_reader :key
     attr_reader :app_identifier
+    attr_reader :proxy
     attr_accessor :compression_count
 
     def key=(key)
@@ -24,6 +25,11 @@ module Tinify
       @client = nil
     end
 
+    def proxy=(proxy)
+      @proxy = proxy
+      @client = nil
+    end
+
     def from_file(path)
       Source.from_file(path)
     end
@@ -38,6 +44,9 @@ module Tinify
 
     def validate!
       client.request(:post, "/shrink")
+    rescue AccountError => err
+      return true if err.status == 429
+      raise err
     rescue ClientError
       true
     end
@@ -48,7 +57,7 @@ module Tinify
       raise AccountError.new("Provide an API key with Tinify.key = ...") unless key
       return @client if @client
       @@mutex.synchronize do
-        @client ||= Client.new(key, app_identifier).freeze
+        @client ||= Client.new(key, app_identifier, proxy).freeze
       end
     end
   end

data/lib/tinify/client.rb

@@ -7,8 +7,13 @@ module Tinify
     USER_AGENT = "Tinify/#{VERSION} Ruby/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL} (#{defined?(RUBY_ENGINE) ? RUBY_ENGINE : "unknown"})".freeze
     CA_BUNDLE = File.expand_path("../../data/cacert.pem", __FILE__).freeze
 
-    def initialize(key, app_identifier = nil)
-      @client = HTTPClient.new
+    def initialize(key, app_identifier = nil, proxy = nil)
+      begin
+        @client = HTTPClient.new(proxy)
+      rescue ArgumentError => err
+        raise ConnectionError.new("Invalid proxy: #{err.message}")
+      end
+
       @client.base_url = API_ENDPOINT
       @client.default_header = { "User-Agent" => [USER_AGENT, app_identifier].compact.join(" ") }
 

data/lib/tinify/error.rb

@@ -14,12 +14,14 @@ module Tinify
       end
     end
 
+    attr_reader :status
+
     def initialize(message, type = self.class.name.split("::").last, status = nil)
       @message, @type, @status = message, type, status
     end
 
     def message
-      if @status
+      if status
         "#{@message} (HTTP #{@status}/#{@type})"
       else
         "#{@message}"

data/lib/tinify/version.rb

@@ -1,3 +1,3 @@
 module Tinify
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/test/helper.rb

@@ -6,6 +6,7 @@ require "tinify"
 module TestHelpers
   def before_setup
     Tinify.key = nil
+    Tinify.proxy = nil
     super
   end
 

data/test/integration.rb

@@ -7,6 +7,7 @@ require "minitest/autorun"
 
 describe "client integration" do
   Tinify.key = ENV["TINIFY_KEY"]
+  Tinify.proxy = ENV["TINIFY_PROXY"]
 
   unoptimized_path = File.expand_path("../examples/voormedia.png", __FILE__)
   optimized = Tinify.from_file(unoptimized_path)

data/test/tinify_client_test.rb

@@ -82,6 +82,18 @@ describe Tinify::Client do
             headers: { "User-Agent" => "#{Tinify::Client::USER_AGENT} TestApp/0.1" }
         end
       end
+
+      describe "with proxy" do
+        subject do
+          Tinify::Client.new("key", nil, "http://user:pass@localhost:8080")
+        end
+
+        it "should issue request with proxy authorization" do
+          subject.request(:get, "/")
+          assert_requested :get, "https://api:key@api.tinify.com",
+            headers: { "Proxy-Authorization" => "Basic dXNlcjpwYXNz" }
+        end
+      end
     end
 
     describe "with timeout" do
@@ -159,7 +171,6 @@ describe Tinify::Client do
       end
     end
 
-
     describe "with bad server response" do
       before do
         stub_request(:get, "https://api:key@api.tinify.com").to_return(

data/test/tinify_test.rb

@@ -34,6 +34,22 @@ describe Tinify do
     end
   end
 
+  describe "proxy" do
+    before do
+      stub_request(:get, "https://api:abcde@api.tinify.com").to_return(status: 200)
+    end
+
+    it "should reset client with new proxy" do
+      Tinify.key = "abcde"
+      Tinify.proxy = "http://localhost"
+      Tinify.client
+      Tinify.proxy = "http://user:pass@localhost:8080"
+      Tinify.client.request(:get, "/")
+      assert_requested :get, "https://api:abcde@api.tinify.com",
+        headers: { "Proxy-Authorization" => "Basic dXNlcjpwYXNz" }
+    end
+  end
+
   describe "client" do
     describe "with key" do
       it "should return client" do
@@ -49,6 +65,16 @@ describe Tinify do
         end
       end
     end
+
+    describe "with invalid proxy" do
+      it "should raise error" do
+        assert_raises Tinify::ConnectionError do
+          Tinify.key = "abcde"
+          Tinify.proxy = "http-bad-url"
+          Tinify.client
+        end
+      end
+    end
   end
 
   describe "validate" do
@@ -58,7 +84,22 @@ describe Tinify do
 
         stub_request(:post, "https://api:valid@api.tinify.com/shrink").to_return(
           status: 400,
-          body: '{"error":"InputMissing","message":"No input"}'
+          body: '{"error":"Input missing","message":"No input"}'
+        )
+      end
+
+      it "should return true" do
+        assert_equal true, Tinify.validate!
+      end
+    end
+
+    describe "with limited key" 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"}'
         )
       end
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: tinify
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Rolf Timmermans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-12-21 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:
-    - - ~>
+    - - "~>"
       - !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.
@@ -88,7 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -122,12 +122,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []