dragonfly-lossless_rotate 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4570113d02eed8571af6ccd48135730ecb435d85edc5db4f3c12dc5134fbb4c0
-  data.tar.gz: 1c711083d0e1a89a0f13ade6e1d30488f4f565aaefda54fcde30c73b356e4b94
+  metadata.gz: 980d9f58a025a965308c14d93100cf22bf293803ae7d7df58ef8ae484c50690b
+  data.tar.gz: b7e6c1af2f809f227a84a5db967b5d0abfee1ae2f2098df9da626fd678fd216e
 SHA512:
-  metadata.gz: 83923e26bc11d4cab7cbf1dfc30f1a81528917ff5454d5636eeb0d8a9920454639a6fa74c94820b84e804da5aa3ffd3ffa6c63c033284fd90ce839be8291743a
-  data.tar.gz: 8dd6253e9ac9f9766439c87f26c285c0f8be8bfc1d7bba6ba92ca92b773cb5ab72d4b611f914425839d24ce62d4486643c477b9ad82a9262dab2edd275b3fc10
+  metadata.gz: b8ca9e89edd39b58071e79cc297b698bd60493a7a649e785e015dfe2d8de87b05da9e785fc8d69e29470f76ff28fa3f11328d63c57b158e29c20ea8c04d5546e
+  data.tar.gz: 4e3137e0458fcc1649df916dfd3459767e27859e85b743e721ebae6a8cc1e957b35b323f33eb3313f10c2a2acd822b01817e213b70358ce8d8c02673492d7ed4

data/.rubocop.yml

@@ -0,0 +1,169 @@
+AllCops:
+  TargetRubyVersion: 2.4
+  # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
+  # to ignore them, so only the ones explicitly set in this file are enabled.
+  DisabledByDefault: true
+  Exclude:
+    - '**/templates/**/*'
+    - '**/vendor/**/*'
+    - 'actionpack/lib/action_dispatch/journey/parser.rb'
+    - 'railties/test/fixtures/tmp/**/*'
+
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
+
+# Do not use braces for hash literals when they are the last argument of a
+# method call.
+Style/BracesAroundHashParameters:
+  Enabled: true
+  EnforcedStyle: context_dependent
+
+# Align `when` with `case`.
+Layout/CaseIndentation:
+  Enabled: true
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+Layout/ElseAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+  AutoCorrect: true
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: true
+
+# In a regular class definition, no empty lines around the body.
+Layout/EmptyLinesAroundClassBody:
+  Enabled: true
+
+# In a regular method definition, no empty lines around the body.
+Layout/EmptyLinesAroundMethodBody:
+  Enabled: true
+
+# In a regular module definition, no empty lines around the body.
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: true
+
+Layout/FirstParameterIndentation:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: true
+
+# Method definitions after `private` or `protected` isolated calls need one
+# extra level of indentation.
+Layout/IndentationConsistency:
+  Enabled: true
+  EnforcedStyle: rails
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/LeadingCommentSpace:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeComma:
+    Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+    Enabled: true
+
+Style/DefWithParentheses:
+  Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
+  Exclude:
+    - 'actionview/test/**/*.builder'
+    - 'actionview/test/**/*.ruby'
+    - 'actionpack/test/**/*.builder'
+    - 'actionpack/test/**/*.ruby'
+    - 'activestorage/db/migrate/**/*.rb'
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Check quotes usage according to lint rule below.
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+# Detect hard tabs, no hard tabs.
+Layout/Tab:
+  Enabled: true
+
+# Blank lines should not have any spaces.
+Layout/TrailingBlankLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
+# Use quotes for string literals when they are enough.
+Style/UnneededPercentQ:
+  Enabled: true
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Lint/StringConversionInInterpolation:
+  Enabled: true
+
+Style/RedundantReturn:
+  Enabled: true
+  AllowMultipleReturnValues: true
+
+Style/Semicolon:
+  Enabled: true
+  AllowAsExpressionSeparator: true
+
+# Prefer Foo.method over Foo::method
+Style/ColonMethodCall:
+  Enabled: true

data/README.md

@@ -49,9 +49,6 @@ JPEG only:
 @image.process(:lossless_rotate, 180)
 @image.process(:lossless_rotate, 270)
 @image.process(:lossless_rotate, -90)
-
-# Without JPEG optimization
-@image.process(:lossless_rotate, 90, optimize: false)
 ```
 
 With fallback for other formats (rotate via ImageMagick):
@@ -59,6 +56,19 @@ With fallback for other formats (rotate via ImageMagick):
 @image.process(:safe_lossless_rotate)
 ```
 
+Other options:
+```ruby
+# Without JPEG optimization (default: true)
+@image.process(:lossless_rotate, 90, optimize: false)
+# Set default value
+plugin :lossless_rotate, libjpeg_optimize: false
+
+# Create progressive JPEG file (default: false)
+@image.process(:lossless_rotate, 90, progressive: true)
+# Set default value
+plugin :lossless_rotate, libjpeg_progressive: true
+```
+
 ## Benchmark
 
 - _libjpeg_ version 9b (17-Jan-2016)

data/dragonfly-lossless_rotate.gemspec

@@ -1,23 +1,25 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "dragonfly/lossless_rotate/version"
-
-Gem::Specification.new do |spec|
-  spec.name         = "dragonfly-lossless_rotate"
-  spec.version      = Dragonfly::LosslessRotate::VERSION
-  spec.summary      = "Dragonfly lossless image rotate"
-  spec.description  = "Lossless rotating and compressing JPEG images via libjpeg tools"
-  spec.author       = "Maxim Perepelitsa"
-  spec.email        = "n0xff@outlook.com"
-  spec.homepage     = "https://github.com/n0xff/dragonfly-lossless_rotate"
-  spec.license      = "MIT"
-
-  spec.requirements << "cjpeg"
-  spec.requirements << "djpeg"
-  spec.requirements << "jpegtran"
-  spec.requirements << "pnmflip"
-
-  spec.files        = `git ls-files`.split($/)
-
-  spec.add_runtime_dependency "dragonfly", "~> 1.0"
-end
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "dragonfly/lossless_rotate/version"
+
+Gem::Specification.new do |spec|
+  spec.name         = "dragonfly-lossless_rotate"
+  spec.version      = Dragonfly::LosslessRotate::VERSION
+  spec.summary      = "Dragonfly lossless image rotate"
+  spec.description  = "Lossless rotating and compressing JPEG images via libjpeg tools"
+  spec.author       = "Maxim Perepelitsa"
+  spec.email        = "n0xff@outlook.com"
+  spec.homepage     = "https://github.com/n0xff/dragonfly-lossless_rotate"
+  spec.license      = "MIT"
+
+  spec.requirements << "cjpeg"
+  spec.requirements << "djpeg"
+  spec.requirements << "jpegtran"
+  spec.requirements << "pnmflip"
+
+  spec.files = `git ls-files`.split($/)
+
+  spec.add_runtime_dependency "dragonfly", "~> 1.0"
+end

data/lib/dragonfly/lossless_rotate.rb

@@ -1,93 +1,102 @@
-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.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: true)
-        unless [90, 180, 270, -90, -180, -270].include?(degree)
-          warn "Rotate by 90, 180 and 270 degrees allowed"
-          degree = 90
-        end
-
-        rotate(content, degree, optimize)
-      end
-
-      private
-
-        def rotate(content, degree, optimize)
-          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
-            output_command = if optimize
-              " #{pnmflip_bin} -r#{pnmflip_degrees(degree)} | #{cjpeg_bin}#{optimize_option} > #{new_path}"
-            else
-              " convert - -rotate #{degree} JPG:#{new_path}"
-            end
-
-            lossless_rotate_command = "#{jpegtran_bin} -rotate #{jpegtran_degrees(degree)} -perfect#{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)
-        return super if jpeg?(content)
-
-        content.shell_update escape: false do |old_path, new_path|
-          "convert -rotate #{degree} #{old_path} > #{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]
+        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

data/lib/dragonfly/lossless_rotate/version.rb

@@ -1,5 +1,7 @@
-module Dragonfly
-  class LosslessRotate
-    VERSION = "0.1.0"
-  end
-end
+# frozen_string_literal: true
+
+module Dragonfly
+  class LosslessRotate
+    VERSION = "0.1.1"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-lossless_rotate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Maxim Perepelitsa
@@ -30,6 +30,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
 - README.md
 - dragonfly-lossless_rotate.gemspec
 - lib/dragonfly/lossless_rotate.rb