miniatura 0.3.4 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ffe72fc7dd04b59bd7714bcc0aa44bd762f43a4
-  data.tar.gz: d4d1a4f3eb993e84612ca65a42a706125e8d9411
+  metadata.gz: a94c30b0898a4bffe0850ff5852de1d5bd7a8249
+  data.tar.gz: d213a6e19002f89344c69419be9425803cb593a7
 SHA512:
-  metadata.gz: c59cc152233270a136a9736d5827004c66e925651a614d69541992080c41ed66f5d7ce6ec9276be89ed7df7236b3384cbbf42da6d0d283a31158ff2f862c588f
-  data.tar.gz: 9130434bfeeabb619f0c8b56d63755a327f9a66f64d07638fedcf2db2c9c1b31421cbfaaf5bbb4dbb1b2eadb15316b332d89369c1f3909dd9af00ce78d94f8f0
+  metadata.gz: 6f025aa6cb718d6764f4ba269b57a304290289d50be1cc2478e3aae33fcea98244af2d35163302bdff6d518f8c55732d007af840856e79ddb2afd501d71294e9
+  data.tar.gz: 59bb4e8aa970fa81d20aba457dd175d743d68d87bc781817f65d7029733c424885b5df7a0948078a749ab5d7d859b7e81e2cfa803ba248fd918f9894641e3eb9

data/lib/miniatura/logger.rb

@@ -1,14 +1,9 @@
 module Miniatura
-  class Logger
-  	attr_reader :logger
+	class Logger
+		attr_reader :logger
 
-  	def initialize options
-  	  if options.has_key? :logger
-  	  	@logger = options[:logger]
-  	  else
-  	  	@logger = Logger.new(STDOUT)
-  	  	@logger.level = Logger::INFO
-  	  end
-  	end
-  end
+		def initialize
+			@logger = Rails.logger
+		end
+	end
 end

data/lib/miniatura/options.rb

@@ -14,18 +14,16 @@ module Miniatura
     end
 
     def to_options
-      result = @options.map do |k, v|
-        send(k.to_s, v)
-      end
+      result = @options.map { |k, v| send(k.to_s, v) }
       result << '-vframes 1'
       result.join(' ')
     end
 
     def file_extension(value)
       case value
-        when 'jpeg' then
+        when 'jpeg'
           '-c mjpeg'
-        when 'png' then
+        when 'png'
           '-c png'
         else
           ''
@@ -34,11 +32,11 @@ module Miniatura
 
     def rotate(value)
       case value
-        when 90 then
+        when 90
           '-vf transpose=1'
-        when 180 then
+        when 180
           '-vf hflip '
-        when 270 then
+        when 270
           '-vf transpose=2'
         else
           ''

data/lib/miniatura/version.rb

@@ -1,3 +1,3 @@
 module Miniatura
-  VERSION = '0.3.4'
+  VERSION = '0.3.7'
 end

data/lib/miniatura.rb

@@ -6,31 +6,28 @@ require 'miniatura/generate_command'
 
 module Miniatura
   def generate_thumb(options = {})
+    @exit_code, @error = nil
+    raise Errno::ENOENT unless File.exist?(current_path)
     options[:file_extension] ||= 'jpeg'
-    options[:logger] = Rails.logger
-    size = options[:size]
     options[:rotate] = 0
-    video = MiniExiftool.new(current_path)
-    orientation = video.rotation
-    image_width, image_height = video_dimension(orientation, video.imagewidth, video.imageheight, size)
-    options[:size] = "#{image_width.to_i}" + "x" + "#{image_height.to_i}"
-    tmp_path = File.join(File.dirname(current_path), "tmpfile.#{options[:file_extension]}")
-    thumbnail = GenerateCommand.new(current_path, tmp_path)
-    cmd = thumbnail.generate_command(options)
-    logger = Miniatura::Logger.new(options).logger
-    logger.info("Running command: #{cmd}")
-    exit_code, error = nil
-    raise Errno::ENOENT unless File.exist?(current_path)
-    Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-      error = stderr.read
-      exit_code = wait_thr.value
-    end
-    handle_exit_code(exit_code, error, logger)
+    options[:size] = determine_thumb_dimension_ratio_from_uploaded_video(options[:size])
+    tmp_path = generate_temp_file(options[:file_extension])
+    cmd = generate_command_for_thumbnail(options, tmp_path)
+    show_logs(cmd)
+    execute_command(cmd)
+    handle_exit_code(@exit_code, @error)
     File.rename tmp_path, current_path
   end
 
   private
 
+  def determine_thumb_dimension_ratio_from_uploaded_video(size)
+    video = MiniExiftool.new(current_path)
+    orientation = video.rotation
+    image_width, image_height = video_dimension(orientation, video.imagewidth, video.imageheight, size)
+    return "#{image_width.to_i}" + 'x' + "#{image_height.to_i}"
+  end
+
   def video_dimension(orientation, video_width, video_height, size)
     case orientation
       when 0, 180
@@ -55,12 +52,33 @@ module Miniatura
     return image_width, image_height
   end
 
-  def handle_exit_code(exit_code, error, logger)
+  def generate_temp_file(file_extension)
+    File.join(File.dirname(current_path), "tmpfile.#{file_extension}")
+  end
+
+  def generate_command_for_thumbnail(options, temp_file_path)
+    thumbnail = GenerateCommand.new(current_path, temp_file_path)
+    return thumbnail.generate_command(options)
+  end
+
+  def show_logs(command)
+    logger = Miniatura::Logger.new.logger
+    logger.info("Running command: #{command}")
+  end
+
+  def execute_command(command)
+    Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+      @error = stderr.read
+      @exit_code = wait_thr.value
+    end
+  end
+
+  def handle_exit_code(exit_code, error)
+    logger = Miniatura::Logger.new.logger
     if exit_code == 0
       logger.info 'Success!'
     else
       logger.error "Failure due to following error:  #{error}"
     end
-    exit_code
   end
 end

data/miniatura.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.5'
+  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'carrierwave-video', '~> 0.5.6'
   spec.add_development_dependency 'mini_exiftool', '~> 2.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miniatura
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
 platform: ruby
 authors:
 - ssooraj
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement