dragonfly-lossless_rotate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 980d9f58a025a965308c14d93100cf22bf293803ae7d7df58ef8ae484c50690b
-  data.tar.gz: b7e6c1af2f809f227a84a5db967b5d0abfee1ae2f2098df9da626fd678fd216e
+  metadata.gz: 344be41ffd0ead843a69adc18b8161e08dab0fef2ffb8c1591607976ff01f2b2
+  data.tar.gz: a515cc697760c756aac4d2dfe770d42507f2948833de0d9623b6ee0a00b41845
 SHA512:
-  metadata.gz: b8ca9e89edd39b58071e79cc297b698bd60493a7a649e785e015dfe2d8de87b05da9e785fc8d69e29470f76ff28fa3f11328d63c57b158e29c20ea8c04d5546e
-  data.tar.gz: 4e3137e0458fcc1649df916dfd3459767e27859e85b743e721ebae6a8cc1e957b35b323f33eb3313f10c2a2acd822b01817e213b70358ce8d8c02673492d7ed4
+  metadata.gz: 82c2acf9d420d436f6f356674de868247176401c51c6ba9b0a7225115b25078b1a50c564d6e7ae99e4ece9dd11e39e1f8a50f7faa101d424364d17db98daf5f7
+  data.tar.gz: 8cc2b9bad7e9769e5559a9cb3ac1259ef2676e189ea30265e95b7869b5b207f103a1f30e690b9258b0e6882263a193775e357dfe66ac42f61f5c4072264f9fa5

data/README.md

@@ -71,7 +71,6 @@ plugin :lossless_rotate, libjpeg_progressive: true
 
 ## Benchmark
 
-- _libjpeg_ version 9b (17-Jan-2016)
 - _libjpeg-turbo_ version 1.4.2 (build 20160222)
 - _MozJPEG_ version 3.3.2 (build 20180713)
 
@@ -88,34 +87,6 @@ puts Benchmark.measure { 500.times { @image.rotate(90).apply } }
 
 ### Lossless rotate
 
-#### libjpeg
-
-##### (optimize=true)
-```bash
-jpegtran -rotate 90 -perfect -optimize old_path > new_path
-```
-
-```ruby
-puts Benchmark.measure { 500.times { @image.process(:lossless_rotate).apply } }
-  0.240000   1.190000  10.600000 ( 11.368903)
-
-puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate).apply } }
-  0.440000   1.640000  24.360000 ( 26.211808)
-```
-
-##### (optimize=false)
-```bash
-jpegtran -rotate 90 -perfect old_path > new_path
-```
-
-```ruby
-puts Benchmark.measure { 500.times { @image.process(:lossless_rotate, 90, optimize: false).apply } }
-  0.290000   1.170000   9.600000 ( 10.321087)
-
-puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate, 90, optimize: false).apply } }
-  0.450000   1.470000  23.610000 ( 25.478872)
-```
-
 #### libjpeg-turbo
 
 ##### (optimize=true)
@@ -138,10 +109,10 @@ jpegtran -rotate 90 -perfect old_path > new_path
 
 ```ruby
 puts Benchmark.measure { 500.times { @image.process(:lossless_rotate, 90, optimize: false).apply } }
-  0.290000   1.170000   9.600000 ( 10.321087)
+  0.250000   1.090000   8.110000 (  8.601707)
 
 puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate, 90, optimize: false).apply } }
-  0.450000   1.470000  23.610000 ( 25.478872)
+  0.360000   1.170000  21.480000 ( 22.744040)
 ```
 
 #### MozJPEG
@@ -178,32 +149,6 @@ puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate, 90, o
 
 Same image but resized to 556x417px
 
-#### libjpeg
-
-##### (optimize=true)
-```bash
-djpeg old_path | pnmflip -r270 | cjpeg -optimize > new_path
-```
-```ruby
-puts Benchmark.measure { 500.times { @image.process(:lossless_rotate).apply } }
-  0.340000   0.930000  19.320000 ( 16.055059)
-
-puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate).apply } }
-  0.390000   1.240000  32.520000 ( 30.055926)
-```
-
-##### (optimize=false)
-```bash
-djpeg old_path | convert - -rotate 90 JPG:new_path
-```
-```ruby
-puts Benchmark.measure { 500.times { @image.process(:lossless_rotate, 90, optimize: false).apply } }
-  0.310000   1.450000  30.520000 ( 28.357557)
-
-puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate, 90, optimize: false).apply } }
-  0.530000   1.520000  43.790000 ( 41.732961)
-```
-
 #### libjpeg-turbo
 
 ##### (optimize=true)
@@ -220,14 +165,14 @@ puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate).apply
 
 ##### (optimize=false)
 ```bash
-djpeg old_path | convert - -rotate 90 JPG:new_path
+djpeg old_path | pnmflip -r270 | cjpeg > new_path
 ```
 ```ruby
 puts Benchmark.measure { 500.times { @image.process(:lossless_rotate, 90, optimize: false).apply } }
-  0.470000   1.110000  29.630000 ( 26.944807)
+  0.330000   1.250000  15.190000 ( 11.990070)
 
 puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate, 90, optimize: false).apply } }
-  0.500000   1.810000  43.420000 ( 42.309805)
+  0.330000   1.330000  29.010000 ( 26.816061)
 ```
 
 #### MozJPEG
@@ -246,12 +191,12 @@ puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate).apply
 
 ##### (optimize=false)
 ```bash
-mozjpeg-djpeg old_path | convert - -rotate 90 JPG:new_path
+mozjpeg-djpeg old_path | pnmflip -r270 | mozjpeg-cjpeg > new_path
 ```
 ```ruby
 puts Benchmark.measure { 500.times { @image.process(:lossless_rotate, 90, optimize: false).apply } }
-  0.270000   1.170000  31.300000 ( 28.983087)
+  0.240000   0.860000  40.550000 ( 38.247647)
 
 puts Benchmark.measure { 500.times { @image.process(:safe_lossless_rotate, 90, optimize: false).apply } }
-  0.340000   1.310000  44.890000 ( 43.052428)
+  0.480000   1.330000  54.550000 ( 52.941735)
 ```

data/lib/dragonfly/lossless_rotate.rb

@@ -1,102 +1,101 @@
-# frozen_string_literal: true
-
-require "dragonfly"
-
-Dragonfly::App.register_plugin(:lossless_rotate) { Dragonfly::LosslessRotate::Plugin.new }
-
-module Dragonfly
-  class LosslessRotate
-    class Plugin
-      def call(app, opts = {})
-        app.env[:cjpeg_bin] = opts[:cjpeg_bin] || "cjpeg"
-        app.env[:djpeg_bin] = opts[:djpeg_bin] || "djpeg"
-        app.env[:jpegtran_bin] = opts[:jpegtran_bin] || "jpegtran"
-        app.env[:pnmflip_bin] = opts[:pnmflip_bin] || "pnmflip"
-
-        app.env[:libjpeg_optimize] = opts[:libjpeg_optimize] || true
-        app.env[:libjpeg_progressive] = opts[:libjpeg_progressive] || false
-
-        app.add_processor :lossless_rotate, Dragonfly::LosslessRotate::Rotate.new
-        app.add_processor :safe_lossless_rotate, Dragonfly::LosslessRotate::SafeRotate.new
-      end
-    end
-
-    # Only JPEG format
-    class Rotate
-      def call(content, degree = 90, optimize: nil, progressive: nil)
-        unless [90, 180, 270, -90, -180, -270].include?(degree)
-          warn "Rotate only by 90, 180 and 270 degrees allowed"
-          degree = 90
-        end
-
-        optimize    ||= content.env[:libjpeg_optimize]
-        progressive ||= content.env[:libjpeg_progressive]
-
-        rotate(content, degree, optimize, progressive)
-      end
-
-      private
-
-        def rotate(content, degree, optimize, progressive)
-          cjpeg_bin    = content.env[:cjpeg_bin] || "cjpeg"
-          djpeg_bin    = content.env[:djpeg_bin] || "djpeg"
-          jpegtran_bin = content.env[:jpegtran_bin] || "jpegtran"
-          pnmflip_bin  = content.env[:pnmflip_bin] || "pnmflip"
-
-          content.shell_update escape: false do |old_path, new_path|
-            optimize_option    = " -optimize" if optimize
-            progressive_option = " -progressive" if progressive
-
-            output_command = if optimize
-              " #{pnmflip_bin} -r#{pnmflip_degrees(degree)} | #{cjpeg_bin}#{progressive_option}#{optimize_option} > '#{new_path}'"
-            else
-              " convert - -rotate #{degree} 'JPG:#{new_path}'"
-            end
-
-            lossless_rotate_command = "#{jpegtran_bin} -rotate #{jpegtran_degrees(degree)} -perfect#{progressive_option}#{optimize_option} '#{old_path}' > '#{new_path}'"
-            lossy_rotate_command = "#{djpeg_bin} '#{old_path}' |#{output_command}"
-
-            "#{lossless_rotate_command} || #{lossy_rotate_command}"
-          end
-        end
-
-        def pnmflip_degrees(degree)
-          {
-            90 => 270,
-            180 => 180,
-            270 => 90,
-            -90 => 90,
-            -180 => 180,
-            -270 => 270
-          }[degree]
-        end
-
-        def jpegtran_degrees(degree)
-          {
-            90 => 90,
-            180 => 180,
-            270 => 180,
-            -90 => 270,
-            -180 => 180,
-            -270 => 90
-          }[degree]
-        end
-
-        def jpeg?(content)
-          content.shell_eval { |path| "identify -format \%m #{path}" } == "JPEG"
-        end
-    end
-
-    # All formats support by ImageMagick
-    class SafeRotate < Rotate
-      def rotate(content, degree, optimize, progressive)
-        return super if jpeg?(content)
-
-        content.shell_update do |old_path, new_path|
-          "convert #{old_path} -rotate #{degree} #{new_path}"
-        end
-      end
-      private :rotate
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "dragonfly"
+
+Dragonfly::App.register_plugin(:lossless_rotate) { Dragonfly::LosslessRotate::Plugin.new }
+
+module Dragonfly
+  class LosslessRotate
+    class Plugin
+      def call(app, opts = {})
+        app.env[:cjpeg_bin] = opts[:cjpeg_bin] || "cjpeg"
+        app.env[:djpeg_bin] = opts[:djpeg_bin] || "djpeg"
+        app.env[:jpegtran_bin] = opts[:jpegtran_bin] || "jpegtran"
+        app.env[:pnmflip_bin] = opts[:pnmflip_bin] || "pnmflip"
+
+        app.env[:libjpeg_optimize] = opts[:libjpeg_optimize] || true
+        app.env[:libjpeg_progressive] = opts[:libjpeg_progressive] || false
+
+        app.add_processor :lossless_rotate, Dragonfly::LosslessRotate::Rotate.new
+        app.add_processor :safe_lossless_rotate, Dragonfly::LosslessRotate::SafeRotate.new
+      end
+    end
+
+    # Only JPEG format
+    class Rotate
+      def call(content, degree = 90, optimize: nil, progressive: nil)
+        unless [90, 180, 270, -90, -180, -270].include?(degree)
+          warn "Rotate only by 90, 180 and 270 degrees allowed"
+          degree = 90
+        end
+
+        optimize    = content.env[:libjpeg_optimize] if optimize.nil?
+        progressive = content.env[:libjpeg_progressive] if progressive.nil?
+
+        rotate(content, degree, optimize, progressive)
+      end
+
+      private
+
+        def rotate(content, degree, optimize, progressive)
+          cjpeg_bin    = content.env[:cjpeg_bin] || "cjpeg"
+          djpeg_bin    = content.env[:djpeg_bin] || "djpeg"
+          jpegtran_bin = content.env[:jpegtran_bin] || "jpegtran"
+          pnmflip_bin  = content.env[:pnmflip_bin] || "pnmflip"
+
+          content.shell_update escape: false do |old_path, new_path|
+            optimize_option    = " -optimize" if optimize
+            progressive_option = " -progressive" if progressive
+
+            lossless_rotate_command = "#{jpegtran_bin} -rotate #{jpegtran_degrees(degree)} -perfect#{progressive_option}#{optimize_option} '#{old_path}' > '#{new_path}'"
+
+            decompress_command = " #{djpeg_bin} '#{old_path}'"
+            pnmflip_command    = " #{pnmflip_bin} -r#{pnmflip_degrees(degree)}"
+            cjpeg_command      = " #{cjpeg_bin}#{progressive_option}#{optimize_option} > '#{new_path}'"
+
+            lossy_rotate_command = "#{decompress_command} |#{pnmflip_command} |#{cjpeg_command}"
+
+            "#{lossless_rotate_command} ||#{lossy_rotate_command}"
+          end
+        end
+
+        def pnmflip_degrees(degree)
+          {
+            90 => 270,
+            180 => 180,
+            270 => 90,
+            -90 => 90,
+            -180 => 180,
+            -270 => 270
+          }[degree]
+        end
+
+        def jpegtran_degrees(degree)
+          {
+            90 => 90,
+            180 => 180,
+            270 => 180,
+            -90 => 270,
+            -180 => 180,
+            -270 => 90
+          }[degree]
+        end
+
+        def jpeg?(content)
+          content.shell_eval { |path| "identify -format \%m #{path}" } == "JPEG"
+        end
+    end
+
+    # All formats support by ImageMagick
+    class SafeRotate < Rotate
+      def rotate(content, degree, optimize, progressive)
+        return super if jpeg?(content)
+
+        content.shell_update do |old_path, new_path|
+          "convert #{old_path} -rotate #{degree} #{new_path}"
+        end
+      end
+      private :rotate
+    end
+  end
+end

data/lib/dragonfly/lossless_rotate/version.rb

@@ -2,6 +2,6 @@
 
 module Dragonfly
   class LosslessRotate
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-lossless_rotate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Maxim Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-15 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly