carrierwave-video 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4efda64fe5fc3076a571a57adb8933dc58604931
-  data.tar.gz: 420cd6253e94fbdbd971b0dc8b6e7644e64c66f7
+  metadata.gz: 95679b1b2e16fb661650f03586f126d8477be156
+  data.tar.gz: 81715a2918564e59d20910e33ddaa27f2d135def
 SHA512:
-  metadata.gz: 419bbd778322c2e4f43f7b09e7c33783205e7b7813b77e59e401c875276f28c577d03a2a631ce4bf54c82355607fd8861983198061eed2cb5048dafc99ce84c3
-  data.tar.gz: 7de98e004cd585e3c5c96918c8a46eee7acffff6000659faebb025e077e7b1f714f3b2ec6509274c20576e4a47bcd365fb298c3efd0659d3821799d2db1aafc4
+  metadata.gz: 9d470bc9348adbaeaff769cdee8f00af8d2df9f006eefb514b96c09667664f789f2c5883f89f25e415979859328cea7a73937aa829234dcc8053d8c39b3b74bb
+  data.tar.gz: d00292a59ad84837b73847619b685c67b9312857a3ba081dcc7fdafd087285930b32b6bd515ca98332b1a5326a60a0150a61ee3b1965325c424ba37b691dc5d1

data/README.rdoc

@@ -38,6 +38,9 @@ Resolution passed to ffmpeg:
     resolution: "640x360"
 
 If you want to keep the same resolution:
+
+Note: This only works with the edge version of streamio-ffmpeg (as of Feb 28, 2014) https://github.com/streamio/streamio-ffmpeg/issues/72
+
   resolution: :same
 
 If you want to keep the same video bitrate:

data/lib/carrierwave-video/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Video
-    VERSION = "0.5.5"
+    VERSION = "0.5.6"
   end
 end

data/lib/carrierwave/video/ffmpeg_options.rb

@@ -42,6 +42,7 @@ module CarrierWave
       # output
       def format_params
         params = @format_options.dup
+        params.delete(:watermark)
         params[:custom] = [params[:custom], watermark_params].compact.join(' ')
         params
       end

data/spec/lib/carrierwave_video_spec.rb

@@ -207,6 +207,18 @@ describe CarrierWave::Video do
           path: 'path/to/file.png'
         })
       end
+
+      it "removes watermark options from common options" do
+        movie.should_receive(:transcode) do |path, opts, codec_opts|
+          opts.should_not have_key(:watermark)
+        end
+
+        converter.encode_video(format, watermark: {
+          path: 'path/to/file.png',
+          position: :bottom_left,
+          pixels_from_edge: 5
+        })
+      end
     end
 
     context "with resolution set to :same" do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-video
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - rheaton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Transcodes to html5-friendly videos.
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -97,12 +97,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
@@ -110,7 +110,7 @@ requirements:
 - ffmpeg, version 0.11.1 or greater with libx256, libfaac, libtheora, libvorbid, libvpx
   enabled
 rubyforge_project: carrierwave-video
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Carrierwave extension that uses ffmpeg to transcode videos.
@@ -118,3 +118,4 @@ test_files:
 - spec/lib/carrierwave_video_spec.rb
 - spec/lib/ffmpeg_theora_spec.rb
 - spec/spec_helper.rb
+has_rdoc: