tinify 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzlkN2ZlMGI2OTc3YzFhZmY1M2JmMjVkNDY5ZjJmZWY4ZmZlMTJlZg==
+    OTg3Y2VkOGIxZWJjNjVjNzIzOGU0ZWM4NjQ1MDE0ZGEyNzUyOGM4ZQ==
   data.tar.gz: !binary |-
-    NWNhZDgxMDE0NmU3MjhkNWZmNmVmYzJkNTkyYjE4MGFiM2RiODdlMA==
+    NzJiYjliMmNhYTQ1ZGJjN2FjMDdmNTNiYTcxNzIyZmYyZDU2MDM0Yw==
 SHA512:
   metadata.gz: !binary |-
-    NjdmNTM5YzIzY2Y0YWIwM2ZiMTIwZGFhOGIwNzA2MTMyYTEyYzc5NDc4NDk2
-    OWE4ODBhNDVkNTA4ZGMyODZjOGU4ZjNmOWE1ZDczMTM2YjM3NDYzNzhjMmI4
-    N2IyYTA2MDY2YzM3YzhjYTRjZjBlYmM5MDM0ZmVmZDY3NzkyZjA=
+    ODI3MmJmMDhlYTg2MGE1YzVlOWYzYjRkNjAwMDRiNjMzNjlkZWJhODgzM2Rk
+    NDE1Njk3ODc2OWZkODlhNjNiNGYyMjE2N2I4MTUxMzNmODRhYTk5ODVlOWRm
+    YTc0MTVkM2NiZDQ1NjNhMDRmMTFlM2FlNGU5YjliZWQwODRiMTg=
   data.tar.gz: !binary |-
-    ODhkYTA3NDg2YTIwZWJkYjYyMzQ1ZTM1YjIxN2E0NzdkYzMxMGFhY2MyMmU1
-    NWNhZWU3ZDUzZmQxMTZjNjgzZDUzMmYzOGM1MGYyMWRlMzA5MjhjODhiMjYz
-    YzI0NTJhYWM3ZDdjZDA4MGI2ZGY5ZTZkNzMzNjg2ZmYxZGRhN2E=
+    MzIxZTJlZWQwMDZhMzU4ZDkyODA3N2I5M2JiNGEwZTM4ODI0NjcxYTcxMWZj
+    ZTBjYjc5ZGJlYjg5MmU5MGZlZDVlYmI4YmViYjMxY2QzYWQyNWFlMWZmY2I3
+    YjY0N2Q3ZmU0YTQzNjk1ZTQ3NWI1YTEyOTMwNTgyYzM1MDdkNmI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tinify (1.2.0)
+    tinify (1.3.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.7.0.1)
+    httpclient (2.7.1)
     minitest (5.5.1)
     rake (10.4.2)
     safe_yaml (1.0.4)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2013-2015 Voormedia
+Copyright (c) 2013-2016 Voormedia
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/tinify.rb

@@ -10,8 +10,8 @@ require "thread"
 
 module Tinify
   class << self
-    attr_accessor :key
-    attr_accessor :app_identifier
+    attr_reader :key
+    attr_reader :app_identifier
     attr_accessor :compression_count
 
     def key=(key)
@@ -45,10 +45,10 @@ module Tinify
     @@mutex = Mutex.new
 
     def client
-      raise AccountError.new("Provide an API key with Tinify.key = ...") unless @key
+      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).freeze
       end
     end
   end

data/lib/tinify/source.rb

@@ -20,6 +20,11 @@ module Tinify
       @url, @commands = url.freeze, commands.freeze
     end
 
+    def preserve(*options)
+      options = Array(options).flatten
+      self.class.new(@url, @commands.merge(preserve: options))
+    end
+
     def resize(options)
       self.class.new(@url, @commands.merge(resize: options))
     end

data/lib/tinify/version.rb

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

data/test/integration.rb

@@ -12,27 +12,67 @@ describe "client integration" do
   optimized = Tinify.from_file(unoptimized_path)
 
   it "should compress from file" do
-    Tempfile.open("optimized.png") do |file|
+    Tempfile.open("optimized.png", encoding: "binary") do |file|
       optimized.to_file(file.path)
-      assert_operator file.size, :>, 0
-      assert_operator file.size, :<, 1500
+
+      size = file.size
+      contents = file.read
+
+      assert_operator size, :>, 1000
+      assert_operator size, :<, 1500
+
+      # width == 137
+      assert_includes contents, "\0\0\0\x89".force_encoding("binary")
+      refute_includes contents, "Copyright Voormedia".force_encoding("binary")
     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|
+    Tempfile.open("optimized.png", encoding: "binary") do |file|
       source.to_file(file.path)
-      assert_operator file.size, :>, 0
-      assert_operator file.size, :<, 1500
+
+      size = file.size
+      contents = file.read
+
+      assert_operator size, :>, 1000
+      assert_operator size, :<, 1500
+
+      # width == 137
+      assert_includes contents, "\0\0\0\x89".force_encoding("binary")
+      refute_includes contents, "Copyright Voormedia".force_encoding("binary")
     end
   end
 
   it "should resize" do
-    Tempfile.open("resized.png") do |file|
+    Tempfile.open("optimized.png", encoding: "binary") do |file|
       optimized.resize(method: "fit", width: 50, height: 20).to_file(file.path)
-      assert_operator file.size, :>, 0
-      assert_operator file.size, :<, 800
+
+      size = file.size
+      contents = file.read
+
+      assert_operator size, :>, 500
+      assert_operator size, :<, 1000
+
+      # width == 50
+      assert_includes contents, "\0\0\0\x32".force_encoding("binary")
+      refute_includes contents, "Copyright Voormedia".force_encoding("binary")
+    end
+  end
+
+  it "should preserve metadata" do
+    Tempfile.open("optimized.png", encoding: "binary") do |file|
+      optimized.preserve(:copyright, :creation).to_file(file.path)
+
+      size = file.size
+      contents = file.read
+
+      assert_operator size, :>, 1000
+      assert_operator size, :<, 2000
+
+      # width == 137
+      assert_includes contents, "\0\0\0\x89".force_encoding("binary")
+      assert_includes contents, "Copyright Voormedia".force_encoding("binary")
     end
   end
 end

data/test/tinify_source_test.rb

@@ -7,10 +7,10 @@ describe Tinify::Source 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:invalid@api.tinify.com/shrink")
+        .to_return(
+          status: 401,
+          body: '{"error":"Unauthorized","message":"Credentials are invalid"}')
     end
 
     describe "from_file" do
@@ -41,42 +41,22 @@ describe Tinify::Source do
   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(:get, "https://api:valid@api.tinify.com/some/location").to_return(
-        status: 200,
-        body: "compressed file"
-      )
-
-      stub_request(:get, "https://api:valid@api.tinify.com/some/location").with(
-        body: '{"resize":{"width":400}}'
-      ).to_return(
-        status: 200,
-        body: "small file"
-      )
-
-      stub_request(:post, "https://api:valid@api.tinify.com/some/location").with(
-        body: '{"store":{"service":"s3"}}'
-      ).to_return(
-        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
+      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")
+          .to_return(
+            status: 200,
+            body: "compressed file")
+      end
+
       it "should return source" do
         assert_kind_of Tinify::Source, Tinify::Source.from_file(dummy_file)
       end
@@ -87,6 +67,19 @@ describe Tinify::Source do
     end
 
     describe "from_buffer" 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")
+          .to_return(
+            status: 200,
+            body: "compressed file")
+      end
+
       it "should return source" do
         assert_kind_of Tinify::Source, Tinify::Source.from_buffer("png file")
       end
@@ -103,20 +96,18 @@ describe Tinify::Source do
           .to_return(
             status: 201,
             headers: { Location: "https://api.tinify.com/some/location" },
-            body: '{}'
-        )
+            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"}'
-          )
+            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"
-        )
+        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+          .to_return(
+            status: 200,
+            body: "compressed file")
       end
 
       it "should return source" do
@@ -135,12 +126,84 @@ describe Tinify::Source do
     end
 
     describe "result" 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")
+          .to_return(
+            status: 200,
+            body: "compressed file")
+      end
+
       it "should return result" do
         assert_kind_of Tinify::Result, Tinify::Source.from_buffer("png file").result
       end
     end
 
+    describe "preserve" 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: '{"preserve":["copyright","location"]}')
+          .to_return(
+            status: 200,
+            body: "copyrighted file")
+      end
+
+      it "should return source" do
+        source = Tinify::Source.from_buffer("png file").preserve(:copyright, :location)
+        assert_kind_of Tinify::Source, source
+      end
+
+      it "should return source with data" do
+        source = Tinify::Source.from_buffer("png file").preserve(:copyright, :location)
+        assert_equal "copyrighted file", source.to_buffer
+      end
+
+      it "should return source with data for array" do
+        source = Tinify::Source.from_buffer("png file").preserve([:copyright, :location])
+        assert_equal "copyrighted file", source.to_buffer
+      end
+
+      it "should include other options if set" do
+        stub_request(:get, "https://api:valid@api.tinify.com/some/location")
+          .with(
+            body: '{"resize":{"width":400},"preserve":["copyright","location"]}')
+          .to_return(
+            status: 200,
+            body: "copyrighted resized file")
+
+        source = Tinify::Source.from_buffer("png file").resize(width: 400).preserve(:copyright, :location)
+        assert_equal "copyrighted resized file", source.to_buffer
+      end
+    end
+
     describe "resize" 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: '{"resize":{"width":400}}')
+          .to_return(
+            status: 200,
+            body: "small file")
+      end
+
       it "should return source" do
         assert_kind_of Tinify::Source, Tinify::Source.from_buffer("png file").resize(width: 400)
       end
@@ -151,6 +214,22 @@ describe Tinify::Source do
     end
 
     describe "store" 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(:post, "https://api:valid@api.tinify.com/some/location")
+        .with(
+          body: '{"store":{"service":"s3"}}')
+        .to_return(
+          status: 200,
+          headers: { Location: "https://bucket.s3.amazonaws.com/example" })
+      end
+
       it "should return result meta" do
         assert_kind_of Tinify::ResultMeta, Tinify::Source.from_buffer("png file").store(service: "s3")
       end
@@ -160,19 +239,52 @@ describe Tinify::Source do
         assert_equal "https://bucket.s3.amazonaws.com/example", result.location
       end
 
-      it "should include resize options if set" do
+      it "should include other options if set" do
+        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" })
+
         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
+      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").to_return(
+          status: 200,
+          body: "compressed file"
+        )
+      end
+
       it "should return image data" do
         assert_equal "compressed file", Tinify::Source.from_buffer("png file").to_buffer
       end
     end
 
     describe "to_file" 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").to_return(
+          status: 200,
+          body: "compressed file"
+        )
+      end
+
       it "should store image data" do
         begin
           tmp = Tempfile.open("foo")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinify
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Rolf Timmermans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient