miniatura 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aebe9d9b53b477af6ced6fa88cb192c80d44e949
-  data.tar.gz: f122166ef6ab98f459f2a15782e7f0865817a0d1
+  metadata.gz: 2ffe72fc7dd04b59bd7714bcc0aa44bd762f43a4
+  data.tar.gz: d4d1a4f3eb993e84612ca65a42a706125e8d9411
 SHA512:
-  metadata.gz: 7def9c36609659c7b6f3a7fa7850739ae3d6ef427d8832e37b3e4f77a4cbd221ad5acbc446489c5be3ce0b8133a1ae447a104f6d9defc74c58de6b912176c085
-  data.tar.gz: 1598d2901924eabdc6df743a9a49d1a14576820e7dd6a46cab86ba39e61c3c0b1086f7466dd64354ac6279cee926167f9f999fc668c402f869c966e721e61531
+  metadata.gz: c59cc152233270a136a9736d5827004c66e925651a614d69541992080c41ed66f5d7ce6ec9276be89ed7df7236b3384cbbf42da6d0d283a31158ff2f862c588f
+  data.tar.gz: 9130434bfeeabb619f0c8b56d63755a327f9a66f64d07638fedcf2db2c9c1b31421cbfaaf5bbb4dbb1b2eadb15316b332d89369c1f3909dd9af00ce78d94f8f0

data/.gitignore

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

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/options.rb

@@ -1,42 +1,47 @@
 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|
+      result = @options.map do |k, v|
         send(k.to_s, v)
       end
-      result << "-vframes 1"
+      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' then
+          '-c mjpeg'
+        when 'png' then
+          '-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 then
+          '-vf transpose=1'
+        when 180 then
+          '-vf hflip '
+        when 270 then
+          '-vf transpose=2'
+        else
+          ''
       end
     end
 

data/lib/miniatura/version.rb

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

data/lib/miniatura.rb

@@ -1,20 +1,20 @@
-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 = {})
     options[:file_extension] ||= 'jpeg'
     options[:logger] = Rails.logger
     size = options[:size]
+    options[:rotate] = 0
     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]}")
+    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
@@ -22,7 +22,7 @@ module Miniatura
     exit_code, error = nil
     raise Errno::ENOENT unless File.exist?(current_path)
     Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-      error =  stderr.read
+      error = stderr.read
       exit_code = wait_thr.value
     end
     handle_exit_code(exit_code, error, logger)
@@ -31,36 +31,33 @@ module Miniatura
 
   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 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 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 handle_exit_code(exit_code, error, logger)
     if exit_code == 0
-      logger.info "Success!"
+      logger.info 'Success!'
     else
       logger.error "Failure due to following error:  #{error}"
     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', '~> 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'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniatura
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - ssooraj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Carrierwave Video Thumbnailer.