carrierwave-audio 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c9b7615a28c346d73cd16017f9943d4477b560d
-  data.tar.gz: ddd8e120252b8c032727e568f3d6fcaf6bbd4c9a
+  metadata.gz: 996e33c9cb030bee7964d4db792e9f1895de8c65
+  data.tar.gz: abb3d0ca6e0c6a1e0140a0376ebdb3eb3b89eedd
 SHA512:
-  metadata.gz: 7b5d82802d447ece58bd1260ed2bc538b130d19882132886975649dfb0d5d069f4b9a3db9ee77d8367141947935584908d6597bdc32567403d998c20502f6e22
-  data.tar.gz: 74ff970538d3d380daf2fba2244e66002bfd10d1639636b86b49889d552c3dedd0f9825795ad642b68c047215eb2ce3e9a82e24ac94d2d0d6432d5c2585b7f29
+  metadata.gz: 7575f6521c1acdb52b41d6e1055b41ce08781ce029d1083230f28c7740161026c4147dccb2a1282dd711bbf5ab700c2893502562ba844d876a9b533fafe3dc4a
+  data.tar.gz: eae7eddc4a4088da30e36897258e178c07a7196fcc9c955833f91f0a5b092ceb142642b397bc61d1627c5c6760d0d5c8302c2e9c31bbb4c02a7dcdec28c45fec

data/README.md

@@ -83,7 +83,7 @@ If you'd like to add a watermark over the top of your file, use `watermark` like
 
 `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.
+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`.
 

data/lib/carrierwave/audio/version.rb

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

data/lib/carrierwave/audio.rb

@@ -17,6 +17,7 @@ module CarrierWave
     end
 
     def convert output_format = :mp3, output_options = {}
+      cache_stored_file! if !cached?
       format = sanitized_format(output_format)
       ext = File.extname(current_path)
       input_options = { type: ext.gsub(/\./, '') }
@@ -28,6 +29,7 @@ module CarrierWave
     end
 
     def watermark watermark_file_path, output_format = :mp3, output_options = {}
+      cache_stored_file! if !cached?
       format = sanitized_format(output_format)
       ext = File.extname(current_path)
       watermark_ext = File.extname(watermark_file_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-audio
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Trevor Hinesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave