miniatura 0.3.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aebe9d9b53b477af6ced6fa88cb192c80d44e949
-  data.tar.gz: f122166ef6ab98f459f2a15782e7f0865817a0d1
+SHA256:
+  metadata.gz: b64b736961cca4c381da24644a7dabfbe157406ccfc8299ba90c978d725d65c9
+  data.tar.gz: dff8ea8f1f98ff9e23d42a4f2279169cbed0b43db2fca534d1193f079e53ad97
 SHA512:
-  metadata.gz: 7def9c36609659c7b6f3a7fa7850739ae3d6ef427d8832e37b3e4f77a4cbd221ad5acbc446489c5be3ce0b8133a1ae447a104f6d9defc74c58de6b912176c085
-  data.tar.gz: 1598d2901924eabdc6df743a9a49d1a14576820e7dd6a46cab86ba39e61c3c0b1086f7466dd64354ac6279cee926167f9f999fc668c402f869c966e721e61531
+  metadata.gz: 53bbae3adfd914425d677645610eb4b76a7996ac954de7fa9b3a490dbe1ba4ba9db964068693548e786f83016a78c0a6e8b286af727fd47693bf730f209def74
+  data.tar.gz: d36384e59bc4c712b51133558ff668dadc794226d38da0459cfa771a750d59b64f24761003f0a57688ac317e2e2cb1bc5205b9aa214da772aaa1b1924ec9f797

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.idea/

data/lib/miniatura.rb

@@ -1,69 +1,84 @@
-require "open3"
-require "miniatura/version"
-require "miniatura/options"
-require "miniatura/logger"
-require "miniatura/generate_command"
+require 'open3'
+require 'miniatura/version'
+require 'miniatura/options'
+require 'miniatura/logger'
+require 'miniatura/generate_command'
 
 module Miniatura
-  def generate_thumb options = {}
+  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]
-    video = MiniExiftool.new(current_path)
-    orientation = video.rotation
     options[:rotate] = 0
-    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 video_rotation orientation
-  #   case orientation
-  #   when 0
-  #     return 0
-  #   when 90
-  #     return 0
-  #   when 180
-  #     return 180
-  #   when 270
-  #     return 0
-  #   end
-  # end
+  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
+  def video_dimension(orientation, video_width, video_height, size)
     case orientation
-    when 0,180
-      image_width = size
-      ratio = size.to_f/video_width
-      image_height = video_height * ratio
-    else
-      image_width = size
-      ratio = size.to_f/video_height
-      image_height = video_width * ratio
+      when 0, 180
+        image_width, image_height = find_width_and_height_of_landscape_video(video_width, video_height, size)
+      else
+        image_width, image_height = find_width_and_height_of_portrait_video(video_width, video_height, size)
     end
     return image_width, image_height
   end
 
-  def handle_exit_code(exit_code, error, logger)
+  def find_width_and_height_of_portrait_video(video_width, video_height, size)
+    ratio = size.to_f/video_height
+    image_width = size
+    image_height = video_width * ratio
+    return image_width, image_height
+  end
+
+  def find_width_and_height_of_landscape_video(video_width, video_height, size)
+    ratio = size.to_f/video_width
+    image_width = size
+    image_height = video_height * ratio
+    return image_width, image_height
+  end
+
+  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!"
+      logger.info 'Success!'
     else
       logger.error "Failure due to following error:  #{error}"
     end
-    exit_code
   end
 end

data/lib/miniatura/generate_command.rb

@@ -9,7 +9,7 @@ module Miniatura
     end
     
     # Generates ffmpeg command to create the thumbnail.
-    def generate_command options = {}
+    def generate_command(options = {})
       options = Miniatura::Options.new(options)
       %Q(ffmpeg #{options.to_options} #{output_path} -i #{input_path})
     end

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

@@ -1,42 +1,45 @@
 module Miniatura
   class Options
-    #Options class to add various options to the ffmpeg command genrated.
+    #Options class to add various options to the ffmpeg command generated.
 
     CLI_KEY = {
-      size: '-s',
-      time_frame: '-ss',
-      quality: '-q',
-      file_extension: '-c'
+        size: '-s',
+        time_frame: '-ss',
+        quality: '-q',
+        file_extension: '-c'
     }
 
-    def initialize options
-      @ptions = options
+    def initialize(options)
+      @options = options
     end
 
     def to_options
-      result = @ptions.map do |k, v|
-        send(k.to_s, v)
-      end
-      result << "-vframes 1"
+      result = @options.map { |k, v| send(k.to_s, v) }
+      result << '-vframes 1'
       result.join(' ')
     end
 
-    def file_extension value
+    def file_extension(value)
       case value
-      when 'jpeg' then %Q(-c mjpeg)
-      when  'png' then %Q(-c png)
-      else
-        ""
+        when 'jpeg'
+          '-c mjpeg'
+        when 'png'
+          '-c png'
+        else
+          ''
       end
     end
 
-    def rotate value
+    def rotate(value)
       case value
-      when 90  then %Q(-vf transpose=1)
-      when 180 then %Q(-vf hflip )
-      when 270 then %Q(-vf transpose=2)
-      else
-        ""
+        when 90
+          '-vf transpose=1'
+        when 180
+          '-vf hflip '
+        when 270
+          '-vf transpose=2'
+        else
+          ''
       end
     end
 

data/lib/miniatura/version.rb

@@ -1,3 +1,3 @@
 module Miniatura
-  VERSION = "0.3.3"
+  VERSION = '0.6.0'
 end

data/miniatura.gemspec

@@ -4,23 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'miniatura/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "miniatura"
+  spec.name          = 'miniatura'
   spec.version       = Miniatura::VERSION
-  spec.authors       = ["ssooraj"]
-  spec.email         = ["ssooraj7@gmail.com"]
+  spec.authors       = ['ssooraj']
+  spec.email         = ['ssooraj7@gmail.com']
 
-  spec.summary       = "Carrierwave Video Thumbnailer."
-  spec.description   = "Generates a thumbnail for carrierwave uploaded videos."
-  spec.license       = "MIT"
+  spec.summary       = 'Carrierwave Video Thumbnailer.'
+  spec.description   = 'Generates a thumbnail for carrierwave uploaded videos.'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split("\n") 
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.5"
-  spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "carrierwave-video", "~> 0.5.6"
-  spec.add_development_dependency "mini_exiftool", "~> 2.8"
+  spec.add_development_dependency 'bundler', '~> 2.2.7'
+  spec.add_development_dependency 'rake', '~> 13.0.3'
+  spec.add_development_dependency 'rspec', '~> 3.10.0'
+  spec.add_development_dependency 'carrierwave-video', '~> 0.6.0'
+  spec.add_development_dependency 'mini_exiftool', '~> 2.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniatura
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.6.0
 platform: ruby
 authors:
 - ssooraj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2021-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: carrierwave-video
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mini_exiftool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 2.10.0
 description: Generates a thumbnail for carrierwave uploaded videos.
 email:
 - ssooraj7@gmail.com
@@ -102,6 +102,7 @@ files:
 - lib/miniatura/logger.rb
 - lib/miniatura/options.rb
 - lib/miniatura/version.rb
+- miniatura-0.5.0.gem
 - miniatura.gemspec
 - spec/lib/generate_command_spec.rb
 - spec/lib/miniatura_spec.rb
@@ -126,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Carrierwave Video Thumbnailer.