tinify 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjI0YTA0ZjFkZDdlYTlkNTVkMTY1MjQ4ZjAyZjMyNjk5NmVhNDhmNQ==
+    MzlkN2ZlMGI2OTc3YzFhZmY1M2JmMjVkNDY5ZjJmZWY4ZmZlMTJlZg==
   data.tar.gz: !binary |-
-    NTdhNzRjYjQ3ZjhhNDc2ZjlmZTI0YjFmY2U2ZWJmNjlmZGZhNTliZg==
+    NWNhZDgxMDE0NmU3MjhkNWZmNmVmYzJkNTkyYjE4MGFiM2RiODdlMA==
 SHA512:
   metadata.gz: !binary |-
-    MWJhOTQxYzUxMjBiOTI3MzQ4ZTJkNjBjZjI2MmFhMTkzYmUwMTE3NDY0M2Jl
-    MGU3MWQ0M2MzYmRlMzkxODJjNGE1NmRiMzZhZDE3OTUxOTZkYzVkZTZiZDcz
-    NWRkMjVmMzczYTlhYjFhZTQ0MTNkNTIxZmEyZDBjMjM0ZjU0YmE=
+    NjdmNTM5YzIzY2Y0YWIwM2ZiMTIwZGFhOGIwNzA2MTMyYTEyYzc5NDc4NDk2
+    OWE4ODBhNDVkNTA4ZGMyODZjOGU4ZjNmOWE1ZDczMTM2YjM3NDYzNzhjMmI4
+    N2IyYTA2MDY2YzM3YzhjYTRjZjBlYmM5MDM0ZmVmZDY3NzkyZjA=
   data.tar.gz: !binary |-
-    YTJlMDhlOWJiODc0N2Y4ZmY4MWIyOWEwM2M1ZmRiNDhjOGYwYjNkN2VkZjY4
-    ZmY2NDkzNjM1ZjIyZjYyMmIyMGI2MDkzMDg4ZWIxZWJjNDBhY2ExNzI5OWMx
-    NDEzNmU2YTZjZjQwZWU0MTdiODZkMjc5ODY5NGU3NDc2OGIyNmQ=
+    ODhkYTA3NDg2YTIwZWJkYjYyMzQ1ZTM1YjIxN2E0NzdkYzMxMGFhY2MyMmU1
+    NWNhZWU3ZDUzZmQxMTZjNjgzZDUzMmYzOGM1MGYyMWRlMzA5MjhjODhiMjYz
+    YzI0NTJhYWM3ZDdjZDA4MGI2ZGY5ZTZkNzMzNjg2ZmYxZGRhN2E=

data/.travis.yml

@@ -5,13 +5,21 @@ rvm:
 - 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: ruby-head
+  include:
+  - rvm: 2.2
+    env: INTEGRATION_TESTS=true
+    script: "if [ \"$TRAVIS_PULL_REQUEST\" == \"false\" ]; then rake integration; fi"
 notifications:
   email: false
   slack:
@@ -25,3 +33,4 @@ deploy:
     tags: true
     repo: tinify/tinify-ruby
     ruby: 2.2
+    condition: "$INTEGRATION_TESTS != true"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tinify (1.1.0)
+    tinify (1.2.0)
       httpclient (~> 2.6)
 
 GEM
@@ -10,7 +10,7 @@ GEM
     addressable (2.3.6)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    httpclient (2.6.0.1)
+    httpclient (2.7.0.1)
     minitest (5.5.1)
     rake (10.4.2)
     safe_yaml (1.0.4)

data/README.md

@@ -2,6 +2,12 @@
 
 # Tinify API client for Ruby
 
+Ruby client for the Tinify API, used for [TinyPNG](https://tinypng.com) and [TinyJPG](https://tinyjpg.com). Tinify compresses your images intelligently. Read more at [http://tinify.com](http://tinify.com).
+
+## Documentation
+
+[Go to the documentation for the Ruby client](https://tinypng.com/developers/reference/ruby).
+
 ## Installation
 
 Install the API client:
@@ -32,6 +38,13 @@ bundle install
 rake
 ```
 
+### Integration tests
+
+```
+bundle install
+TINIFY_KEY=$YOUR_API_KEY rake integration
+```
+
 ## License
 
 This software is licensed under the MIT License. [View the license](LICENSE).

data/Rakefile

@@ -5,4 +5,8 @@ Rake::TestTask.new do |t|
   t.test_files = FileList["test/*_test.rb"]
 end
 
+Rake::TestTask.new(:integration) do |t|
+  t.test_files = FileList["test/integration.rb"]
+end
+
 task default: :test

data/lib/tinify.rb

@@ -32,6 +32,10 @@ module Tinify
       Source.from_buffer(string)
     end
 
+    def from_url(string)
+      Source.from_url(string)
+    end
+
     def validate!
       client.request(:post, "/shrink")
     rescue ClientError

data/lib/tinify/client.rb

@@ -20,9 +20,13 @@ module Tinify
     end
 
     def request(method, url, body = nil, header = {})
-      if Hash === body && !body.empty?
-        body = JSON.generate(body)
-        header["Content-Type"] = "application/json"
+      if Hash === body
+        if body.empty?
+          body = nil
+        else
+          body = JSON.generate(body)
+          header["Content-Type"] = "application/json"
+        end
       end
 
       begin

data/lib/tinify/result.rb

@@ -13,7 +13,7 @@ module Tinify
     alias_method :to_buffer, :data
 
     def size
-      @meta["Content-Length"].to_i
+      @meta["Content-Length"].to_i.nonzero?
     end
 
     def media_type

data/lib/tinify/result_meta.rb

@@ -5,11 +5,11 @@ module Tinify
     end
 
     def width
-      @meta["Image-Width"].to_i
+      @meta["Image-Width"].to_i.nonzero?
     end
 
     def height
-      @meta["Image-Height"].to_i
+      @meta["Image-Height"].to_i.nonzero?
     end
 
     def location

data/lib/tinify/source.rb

@@ -9,6 +9,11 @@ module Tinify
         response = Tinify.client.request(:post, "/shrink", string)
         new(response.headers["Location"]).freeze
       end
+
+      def from_url(url)
+        response = Tinify.client.request(:post, "/shrink", source: { url: url })
+        new(response.headers["Location"]).freeze
+      end
     end
 
     def initialize(url, commands = {})

data/lib/tinify/version.rb

@@ -1,3 +1,3 @@
 module Tinify
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/helper.rb

@@ -10,18 +10,18 @@ module TestHelpers
   end
 
   def assert_raise_with_message(message)
-     err = nil
-     begin
-       yield
-     rescue => err
-     end
-     if message.is_a?(Regexp)
-       assert_match(message, err.message)
-     else
-       assert_equal(message, err.message)
-     end
-   end
- end
+    err = nil
+    begin
+      yield
+    rescue => err
+    end
+    if message.is_a?(Regexp)
+      assert_match(message, err.message)
+    else
+      assert_equal(message, err.message)
+    end
+  end
+end
 
 class MiniTest::Spec
   include TestHelpers

data/test/integration.rb

@@ -0,0 +1,38 @@
+abort "Set the TINIFY_KEY environment variable." unless ENV["TINIFY_KEY"]
+
+require "bundler/setup"
+require "tinify"
+
+require "minitest/autorun"
+
+describe "client integration" do
+  Tinify.key = ENV["TINIFY_KEY"]
+
+  unoptimized_path = File.expand_path("../examples/voormedia.png", __FILE__)
+  optimized = Tinify.from_file(unoptimized_path)
+
+  it "should compress from file" do
+    Tempfile.open("optimized.png") do |file|
+      optimized.to_file(file.path)
+      assert_operator file.size, :>, 0
+      assert_operator file.size, :<, 1500
+    end
+  end
+
+  it "should compress from url" do
+    source = Tinify.from_url("https://raw.githubusercontent.com/tinify/tinify-ruby/master/test/examples/voormedia.png")
+    Tempfile.open("optimized.png") do |file|
+      source.to_file(file.path)
+      assert_operator file.size, :>, 0
+      assert_operator file.size, :<, 1500
+    end
+  end
+
+  it "should resize" do
+    Tempfile.open("resized.png") do |file|
+      optimized.resize(method: "fit", width: 50, height: 20).to_file(file.path)
+      assert_operator file.size, :>, 0
+      assert_operator file.size, :<, 800
+    end
+  end
+end

data/test/tinify_client_test.rb

@@ -9,9 +9,16 @@ describe Tinify::Client do
     describe "when valid" do
       before do
         stub_request(:get, "https://api:key@api.tinify.com").to_return(
-          status: 200,
+          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"
+          }
+        )
       end
 
       it "should issue request" do
@@ -20,11 +27,32 @@ describe Tinify::Client do
           headers: { "Authorization" => "Basic " + ["api:key"].pack("m").chomp }
       end
 
+      it "should issue request to endpoint" do
+        subject.request(:get, "/shrink", {})
+        assert_requested :get, "https://api:key@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"
+      end
+
+      it "should return response" do
+        response = subject.request(:get, "/shrink", {})
+        assert_equal "https://api.tinify.com/output/3spbi1cd7rs812lb.png", response.headers["Location"]
+      end
+
       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
       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",
+          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",

data/test/tinify_result_meta_test.rb

@@ -28,4 +28,28 @@ describe Tinify::ResultMeta do
       end
     end
   end
+
+  describe "without metadata" do
+    subject do
+      Tinify::ResultMeta.new({})
+    end
+
+    describe "width" do
+      it "should return nil" do
+        assert_nil subject.width
+      end
+    end
+
+    describe "height" do
+      it "should return nil" do
+        assert_nil subject.height
+      end
+    end
+
+    describe "location" do
+      it "should return nil" do
+        assert_nil subject.location
+      end
+    end
+  end
 end

data/test/tinify_result_test.rb

@@ -8,6 +8,7 @@ describe Tinify::Result do
         "Image-Height" => "60",
         "Content-Length" => "450",
         "Content-Type" => "image/png",
+        "Location" => "https://api.tinify.com/output/13205af0a0ea.png"
       }, "image data")
     end
 
@@ -25,7 +26,7 @@ describe Tinify::Result do
 
     describe "location" do
       it "should return nil" do
-        assert_nil subject.location
+        assert_equal "https://api.tinify.com/output/13205af0a0ea.png", subject.location
       end
     end
 
@@ -47,4 +48,46 @@ describe Tinify::Result do
       end
     end
   end
+
+  describe "without meta and data" do
+    subject do
+      Tinify::Result.new({}, nil)
+    end
+
+    describe "width" do
+      it "should return nil" do
+        assert_nil subject.width
+      end
+    end
+
+    describe "height" do
+      it "should return nil" do
+        assert_nil subject.height
+      end
+    end
+
+    describe "location" do
+      it "should return nil" do
+        assert_nil subject.location
+      end
+    end
+
+    describe "size" do
+      it "should return nil" do
+        assert_nil subject.size
+      end
+    end
+
+    describe "content_type" do
+      it "should return nil" do
+        assert_nil subject.content_type
+      end
+    end
+
+    describe "to_buffer" do
+      it "should return nil" do
+        assert_nil subject.to_buffer
+      end
+    end
+  end
 end

data/test/tinify_source_test.rb

@@ -28,17 +28,26 @@ describe Tinify::Source do
         end
       end
     end
+
+    describe "from_url" do
+      it "should raise account error" do
+        assert_raises Tinify::AccountError do
+          Tinify::Source.from_url("http://example.com/test.jpg")
+        end
+      end
+    end
   end
 
   describe "with valid api key" 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: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").to_return(
         status: 200,
@@ -58,6 +67,13 @@ describe Tinify::Source do
         status: 200,
         headers: { Location: "https://bucket.s3.amazonaws.com/example" }
       )
+
+      stub_request(:post, "https://api:valid@api.tinify.com/some/location").with(
+        body: '{"resize":{"width":400},"store":{"service":"s3"}}'
+      ).to_return(
+        status: 200,
+        headers: { Location: "https://bucket.s3.amazonaws.com/example" }
+      )
     end
 
     describe "from_file" do
@@ -80,6 +96,44 @@ describe Tinify::Source do
       end
     end
 
+    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"}}')
+          .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"}}')
+          .to_return(
+            status: 400,
+            body: '{"error":"Source not found","message":"Cannot parse URL"}'
+          )
+
+        stub_request(:get, "https://api:valid@api.tinify.com/some/location").to_return(
+          status: 200,
+          body: "compressed file"
+        )
+      end
+
+      it "should return source" do
+        assert_kind_of Tinify::Source, Tinify::Source.from_url("http://example.com/test.jpg")
+      end
+
+      it "should return source with data" do
+        assert_equal "compressed file", Tinify::Source.from_url("http://example.com/test.jpg").to_buffer
+      end
+
+      it "should raise error if request is not ok" do
+        assert_raises Tinify::ClientError do
+          Tinify::Source.from_url("file://wrong")
+        end
+      end
+    end
+
     describe "result" do
       it "should return result" do
         assert_kind_of Tinify::Result, Tinify::Source.from_buffer("png file").result
@@ -105,6 +159,11 @@ describe Tinify::Source do
         result = Tinify::Source.from_buffer("png file").store(service: "s3")
         assert_equal "https://bucket.s3.amazonaws.com/example", result.location
       end
+
+      it "should include resize options if set" do
+        result = Tinify::Source.from_buffer("png file").resize(width: 400).store(service: "s3")
+        assert_equal "https://bucket.s3.amazonaws.com/example", result.location
+      end
     end
 
     describe "to_buffer" do

data/test/tinify_test.rb

@@ -116,4 +116,20 @@ describe Tinify do
       assert_kind_of Tinify::Source, Tinify.from_file(dummy_file)
     end
   end
+
+  describe "from_url" 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: '{}'
+      )
+    end
+
+    it "should return source" do
+      assert_kind_of Tinify::Source, Tinify.from_url("http://example.com/test.jpg")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinify
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Rolf Timmermans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -103,7 +103,9 @@ files:
 - lib/tinify/source.rb
 - lib/tinify/version.rb
 - test/examples/dummy.png
+- test/examples/voormedia.png
 - test/helper.rb
+- test/integration.rb
 - test/tinify_client_test.rb
 - test/tinify_result_meta_test.rb
 - test/tinify_result_test.rb
@@ -136,7 +138,9 @@ specification_version: 4
 summary: Ruby client for the Tinify API.
 test_files:
 - test/examples/dummy.png
+- test/examples/voormedia.png
 - test/helper.rb
+- test/integration.rb
 - test/tinify_client_test.rb
 - test/tinify_result_meta_test.rb
 - test/tinify_result_test.rb