carrierwave-audio 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49be079517a1eb28406b25ccca4a0060bd179c6e
-  data.tar.gz: 2700deff88842e204e30d388c4a31024259f39c7
+  metadata.gz: 8c9b7615a28c346d73cd16017f9943d4477b560d
+  data.tar.gz: ddd8e120252b8c032727e568f3d6fcaf6bbd4c9a
 SHA512:
-  metadata.gz: e515174ee12fe72e4a2964fb9d91d7276ef86ddb6ee00bbb19f85bc31b3f95105f3ebc9fefa8951f677644d4f40177308db7b646184cac8d5bbb54c4ac944841
-  data.tar.gz: 25510a82ccf5ee7fc64cad64ab1127f4d8cf7b2345881bec62dee7b871a93e254d5ad235c3eeb83e1d035650546a4c60afb8b22b27a288eac34d904aa3f2cb13
+  metadata.gz: 7b5d82802d447ece58bd1260ed2bc538b130d19882132886975649dfb0d5d069f4b9a3db9ee77d8367141947935584908d6597bdc32567403d998c20502f6e22
+  data.tar.gz: 74ff970538d3d380daf2fba2244e66002bfd10d1639636b86b49889d552c3dedd0f9825795ad642b68c047215eb2ce3e9a82e24ac94d2d0d6432d5c2585b7f29

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 Include CarrierWave::Audio into your CarrierWave uploader class:
 
 ```ruby
-class VideoUploader < CarrierWave::Uploader::Base
+class AudioUploader < CarrierWave::Uploader::Base
   include CarrierWave::Audio
 end
 ```
@@ -81,7 +81,9 @@ If you'd like to add a watermark over the top of your file, use `watermark` like
   process :watermark => [watermark_file_path, output_format, output_options]
 ```
 
-`watermark_file_path` - REQUIRED. Path to where your watermarked file is stored
+`watermark_file_path` - 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 concatenated to fit the length of your uploaded file.
 
 `output_format` - Optional. The only currently available option is the default, `:mp3`.
 

data/lib/carrierwave/audio/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Audio
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/carrierwave/audio.rb

@@ -37,16 +37,16 @@ module CarrierWave
 
       # Normalize file to -6dB
       normalized_tmp_path = File.join File.dirname(current_path), "tmp_norm_#{current_filename_without_extension}_#{Time.current.to_i}.#{input_options[:type]}"
-      convert_file(current_path, input_options, normalized_tmp_path, input_options, { gain: "-n -6" })
+      convert_file(current_path, input_options, normalized_tmp_path, default_output_options(input_options[:type]), { gain: "-n -6" })
 
       # Combine normalized file and watermark, normalizing final product to 0dB
       final_tmp_path = File.join File.dirname(current_path), "tmp_wtmk_#{current_filename_without_extension}_#{Time.current.to_i}.#{format}"
-      converter = Sox::Cmd.new(combine: :mix)
-      converter.add_input normalized_tmp_path, input_options
-      converter.add_input watermark_file_path, watermark_options
-      converter.set_output final_tmp_path, default_output_options(format).merge(output_options)
-      converter.set_effects({ trim: "0 #{Soxi::Wrapper.file(current_path).seconds}", gain: "-n" })
-      converter.run
+      combiner = Sox::Cmd.new(combine: :mix)
+      combiner.add_input normalized_tmp_path, input_options
+      combiner.add_input watermark_file_path, watermark_options
+      combiner.set_output final_tmp_path, default_output_options(format).merge(output_options)
+      combiner.set_effects({ trim: "0 #{Soxi::Wrapper.file(current_path).seconds}", gain: "-n" })
+      combiner.run
       File.rename final_tmp_path, current_path
       set_content_type format
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-audio
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Trevor Hinesley