carrierwave-audio 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc52f0f740d2c0e991b05cd320ae11ecd943c989
-  data.tar.gz: efa91bef6f74e088b95f56cef3f9651e46cf521c
+  metadata.gz: 5cfd9c0f3a67df48a91532f5fc4824efade4cd07
+  data.tar.gz: 56886d59465e49ade882804c82d07596280ca0e4
 SHA512:
-  metadata.gz: bcf72a9e54478c4b81a16efd96695324191c14df2b9ad0127d579cbb054b98a815347137ebfa421900cb987ad107e9462d99b3873b33a6d9cfe0bb6a1b5de4c0
-  data.tar.gz: a60c7674dd03e62b1c1894bbc5a7e9b533c21e775ba949111918661ae7015328f7b14398e44dee963276ca52c2d29d44510ebe86e03e2f2b52e690143c26ea22
+  metadata.gz: 8c6693acb8a3a42eb9cbeb7ff5f1a8e80b50e1ab7c97a36ebd71c4dcf3384efd7e95c9997ec9c9f8f3fddc471e77cacb3bfcc0288772d8cbce517f7d512fe761
+  data.tar.gz: 8e1af9bdd51d822b47f88b056c572d75398fecc449a74c45f540848b894f1bf6f6ec13028265f62727c40391eaa0127c2b1665041be8ee8352d883bec64bd763

data/README.md

@@ -34,7 +34,7 @@ If you'd like to convert from your initially uploaded file-type to a different o
 
 ```ruby
   version :mp3 do
-    process :convert => [:mp3]
+    process :convert => [{output_format: :mp3}]
 
     def full_filename(for_file)
       "#{super.chomp(File.extname(super))}.mp3"
@@ -42,13 +42,13 @@ If you'd like to convert from your initially uploaded file-type to a different o
   end
 ```
 
-`process :convert` accepts two parameters:
+`process :convert` accepts a hash with one or two parameters:
 
 ```ruby
-  process :convert => [output_format, output_options]
+  process :convert => [{output_format:, output_options:}]
 ```
 
-`output_format` - Optional. The only currently available option is the default, `:mp3`.
+`output_format` - Accepts a symbol. The only currently available option is the default, `:mp3`.
 
 `output_options` - Optional. Sox options for the output file (see [ruby-sox](https://github.com/TMXCredit/ruby-sox) and the [SoX documentation](http://sox.sourceforge.net/sox.pdf)). Defaults to:
 
@@ -67,7 +67,10 @@ If you'd like to add a watermark over the top of your file, use `watermark` like
 
 ```ruby
   version :watermarked do
-    process :watermark => ["#{Rails.root}/db/watermark.mp3"]
+    process :watermark => [{
+      output_format: :mp3,
+      watermark_file: "#{Rails.root}/db/watermark.mp3"
+    }]
 
     def full_filename(for_file)
       "#{super.chomp(File.extname(super))}.mp3"
@@ -75,17 +78,17 @@ If you'd like to add a watermark over the top of your file, use `watermark` like
   end
 ```
 
-`process :watermark` accepts three parameters:
+`process :watermark` accepts a hash with up to three parameters:
 
 ```ruby
-  process :watermark => [watermark_file_path, output_format, output_options]
+  process :watermark => [{watermark_file:, output_format:, output_options:}]
 ```
 
-`watermark_file_path` - REQUIRED. Path to where your watermarked file is stored.
+`watermark_file` - REQUIRED. Path to where your watermarked file is stored.
 
 VERY IMPORTANT: The watermarked file must be a 44.1k, 2-channel mp3. It needs to be a long file. It'll be truncated to fit the length of your uploaded file.
 
-`output_format` - Optional. The only currently available option is the default, `:mp3`.
+`output_format` - Accepts a symbol. The only currently available option is the default, `:mp3`.
 
 `output_options` - Optional. Sox options for the output file (see [ruby-sox](https://github.com/TMXCredit/ruby-sox) and the [SoX documentation](http://sox.sourceforge.net/sox.pdf)). Defaults to:
 

data/lib/carrierwave/audio/processor.rb

@@ -88,26 +88,16 @@ module CarrierWave
 
           ext = File.extname(source)
           input_options = { type: ext.gsub(/\./, '') }
-          normalized_filename = tmp_filename(source: source, format: format, prefix: "norm")
-          @log.timed("\nNormalizing file to -6dB...") do
-            convert_file(
-              input_file_path: source, 
-              input_options: input_options, 
-              output_file_path: normalized_filename, 
-              output_options: output_options_for_format(input_options[:type]), 
-              fx: { gain: "-n -6" }
-            )
-          end
 
           watermark_ext = File.extname(watermark_file_path)
           watermark_options = { type: watermark_ext.gsub(/\./, '') }
           final_filename = tmp_filename(source: source, format: format, prefix: "wtmk")
-          @log.timed("\nCombining normalized file and watermark, normalizing final output to 0dB...") do
+          @log.timed("\nCombining source file and watermark, limiting final output...") do
             combiner = Sox::Cmd.new(combine: :mix)
-            combiner.add_input normalized_filename, input_options
+            combiner.add_input source, input_options
             combiner.add_input watermark_file_path, watermark_options
             combiner.set_output final_filename, output_options_for_format(format)
-            combiner.set_effects({ trim: "0 =#{Soxi::Wrapper.file(source).seconds}", gain: "-n" })
+            combiner.set_effects({ trim: "0 =#{Soxi::Wrapper.file(source).seconds}", vol: "0 db 0.01" })
             combiner.run
           end
 

data/lib/carrierwave/audio/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Audio
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-audio
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Trevor Hinesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -119,3 +119,4 @@ specification_version: 4
 summary: Simple SoX wrapper for CarrierWave uploader that allows audio file conversion
   and watermarking
 test_files: []
+has_rdoc: