zencodable 0.1.6 → 0.2.0

data/test/dummy/app/models/video.rb

@@ -3,7 +3,7 @@ class Video < ActiveRecord::Base
   has_video_encodings :video_files, :formats            => [:ogg, :mp4, :webm, :flv],
                                     :output_dimensions  => '852x480',
                                     :s3_config          => "#{Rails.root}/config/amazon_s3.yml",
-                                    :path               => "videos/zc/:basename/",
+                                    :path               => "videos/zc/:title/",
                                     :thumbnails         => { :number => 4, :aspect_mode => 'crop', 'size' => '290x160' },
                                     :options            => { :device_profile => 'mobile/advanced' }
 

data/test/zencodable_test.rb

@@ -54,35 +54,33 @@ class ZencodableTest < ActiveSupport::TestCase
   end
 
   test "creates a correct S3 url" do
-    path = "videos/encoded/:basename"
-    origin_url = 'http://foo.com/somepath/2/4/Rainbows and puppies [HD].with unicorns.mov'
-    s3_config = '/some/path/to/s3.yml'
-    bucket = 'zenbucket'
-    assert_equal "s3://zenbucket.s3.amazonaws.com/videos/encoded/rainbows-and-puppies-hd.with-unicorns/", Zencodable::Encoder::Job.s3_url(origin_url, bucket, path)
+    video_file = Factory :video, :origin_url => 'http://foo.com/somepath/2/4/Rainbows and puppies [HD].with unicorns.mov'
+    assert_equal "s3://zenbucket.s3.amazonaws.com/videos/encoded/", Zencodable::Encoder::Job.s3_url(video_file, 'zenbucket')
   end
 
   test "builds the correct default settings" do
-    origin_url = 'http://foo.com/somepath/2/4/super_tricks.mov'
+    video_file = Factory :video, :origin_url => 'http://foo.com/somepath/2/4/Rainbows and puppies [HD].with unicorns.mov'
 
     default_settings = [{
         :public => true,
         :format => "mp4",
         :label => "mp4",
         :mock => true,
+        :filename => 'rainbows-and-puppies-hd.with-unicorns.mp4',
         :base_url => "s3://zenbucket.s3.amazonaws.com/videos/encoded/"
     }]
 
-    minimal_config = {:bucket => 'zenbucket', :path => 'videos/encoded'}
+    Video.encoding_options = {:bucket => 'zenbucket', :path => 'videos/encoded'}
 
-    assert_equal default_settings, Zencodable::Encoder::Job.build_encoder_output_options(origin_url, minimal_config)
+    assert_equal default_settings, Zencodable::Encoder::Job.build_encoder_output_options(video_file)
   end
 
   test "builds correct settings when a thumbnails are requested" do
-    origin_url = 'http://foo.com/somepath/2/4/super_tricks.mov'
 
-    config = {:formats => [:ogg, :mp4], :bucket => 'zenbucket', :path => 'videos/encoded', :thumbnails => { :number => 4 }}
+    Video.encoding_options = {:formats => [:ogg, :mp4], :bucket => 'zenbucket', :path => 'videos/encoded', :thumbnails => { :number => 4 }}
+    video_file = Factory :video, :origin_url => 'http://foo.com/somepath/2/4/super_tricks.mov'
 
-    output_options = Zencodable::Encoder::Job.build_encoder_output_options(origin_url, config)
+    output_options = Zencodable::Encoder::Job.build_encoder_output_options(video_file)
 
     # there should be a thumbnails option set for the first format request
     assert_equal 4, output_options[0][:thumbnails][:number]
@@ -91,4 +89,18 @@ class ZencodableTest < ActiveSupport::TestCase
     assert_nil output_options[1][:thumbnails]
   end
 
+  test "interpolates model methods into the :path parameter" do
+    Video.encoding_options = {:formats => [:ogg, :mp4],
+                              :bucket => 'zenbucket',
+                              :path => 'videos/encoded/:rating/:title'}
+    Video.any_instance.stubs(:rating).returns('PG')
+    video_file = Factory :video, :title => 'Last of the Mohecans', :origin_url => 'http://foo.com/somepath/super kittehs!.mov'
+
+    output_options = Zencodable::Encoder::Job.build_encoder_output_options(video_file)
+
+    assert_equal 's3://zenbucket.s3.amazonaws.com/videos/encoded/PG/Last of the Mohecans/', output_options[0][:base_url]
+
+    assert_equal 'super-kittehs.ogg', output_options[0][:filename]
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zencodable
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19078580 !ruby/object:Gem::Requirement
+  requirement: &10687100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19078580
+  version_requirements: *10687100
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &19077880 !ruby/object:Gem::Requirement
+  requirement: &10686280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19077880
+  version_requirements: *10686280
 - !ruby/object:Gem::Dependency
   name: zencoder
-  requirement: &19077140 !ruby/object:Gem::Requirement
+  requirement: &10685480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19077140
+  version_requirements: *10685480
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &19076380 !ruby/object:Gem::Requirement
+  requirement: &10683060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19076380
+  version_requirements: *10683060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19075920 !ruby/object:Gem::Requirement
+  requirement: &10682560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19075920
+  version_requirements: *10682560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &19075340 !ruby/object:Gem::Requirement
+  requirement: &10682080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19075340
+  version_requirements: *10682080
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &19074800 !ruby/object:Gem::Requirement
+  requirement: &10681620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19074800
+  version_requirements: *10681620
 description: provides a `has_video_encodings` class method to your models that   allows
   you to configure and set up any Zencoder settings you will need   to create multiple
   output video container formats (mp4, ogg, wmv, etc) from a single   uploaded source