animoto 1.5.1 → 1.5.2

data/lib/animoto.rb

@@ -6,6 +6,6 @@ module Animoto
   #
   # @return [String]
   def self.version
-    "1.5.1"
+    "1.5.2"
   end
 end

data/lib/animoto/manifests/directing.rb

@@ -19,6 +19,10 @@ module Animoto
       # @return [String]
       attr_accessor :pacing
 
+      # The maximum duration in seconds. Optional.
+      # #return [String]
+      attr_accessor :max_duration
+
       # The array of visual objects in this manifest.
       # @return [Array<Assets::Base,Assets::TitleCard>]
       attr_reader   :visuals
@@ -50,6 +54,7 @@ module Animoto
         super
         @title      = options[:title]
         @pacing     = options[:pacing]  || 'auto'
+        @max_duration = options[:max_duration]
         @style      = options[:style]   || Animoto::Styles::ANIMOTO_ORIGINAL
         @postroll   = Animoto::Postroll.new(options[:postroll] || Animoto::Postroll::POWERED_BY_ANIMOTO)
         @visuals    = []
@@ -143,6 +148,7 @@ module Animoto
         manifest              = job['directing_manifest']
         manifest['style']     = style
         manifest['pacing']    = pacing if pacing
+        manifest['fitting']   = {'type' => 'best_fit', 'max_duration' => @max_duration} if @max_duration
         manifest['postroll']  = postroll.to_hash if postroll
         manifest['title']     = title if title
         manifest['visuals']   = []

data/lib/animoto/manifests/directing_and_rendering.rb

@@ -26,7 +26,7 @@ module Animoto
       # @return [Manifests::DirectingAndRendering] the manifest
       def initialize options = {}
         super
-        @directing_manifest = Manifests::Directing.new(options.only(:title, :pacing))
+        @directing_manifest = Manifests::Directing.new(options.only(:title, :pacing, :max_duration))
         @rendering_manifest = Manifests::Rendering.new(options.only(:resolution, :framerate, :format))
       end
 
@@ -62,4 +62,4 @@ module Animoto
     
     end
   end
-end
+end

data/lib/animoto/support/standard_envelope.rb

@@ -2,7 +2,7 @@ module Animoto
   module Support
     module StandardEnvelope
     
-      # When included into a class, also extends ClassMethods, inludes InstanceMethods, and
+      # When included into a class, also extends ClassMethods, includes InstanceMethods, and
       # includes Support::ContentType
       #
       # @param [Module] base the module this is being included into
@@ -115,4 +115,4 @@ module Animoto
       end      
     end
   end
-end
+end

data/spec/animoto/manifests/directing_and_rendering_spec.rb

@@ -98,7 +98,36 @@ describe Animoto::Manifests::DirectingAndRendering do
           @hash.should have_key('song')
           @hash['song'].should be_a(Hash)
         end
-    
+
+        it "should not have a 'fitting' hash in the manifest" do
+          @hash.should_not have_key('fitting')
+        end
+
+        describe "with a 'max_duration' option" do
+          before do
+            opts = {:title => 'Funderful Wonderment', :pacing => 'double', :resolution => "720p",
+              :framerate => 24, :format => 'flv', :max_duration => '30'}
+            @mfest = Animoto::Manifests::DirectingAndRendering.new(opts)
+            @title_card = @mfest.add_title_card 'woohoo', 'this is awesome'
+            @song_obj = @mfest.add_song 'http://website.com/song.mp3'
+            @hash = @mfest.to_hash['directing_and_rendering_job']['directing_manifest']
+          end
+
+          it "should have a 'fitting' hash in the manifest" do
+            @hash.should have_key('fitting')
+          end
+
+          it "should specify a max duration in the manifest" do
+            @hash['fitting'].should have_key('max_duration')
+            @hash['fitting']['max_duration'].should == '30'
+          end
+
+          it "should specify a type in the manifest" do
+            @hash['fitting'].should have_key('type')
+            @hash['fitting']['type'].should == 'best_fit'
+          end
+        end
+
         describe "visuals array" do
           before do
             @visuals = @hash['visuals']
@@ -180,4 +209,4 @@ describe Animoto::Manifests::DirectingAndRendering do
       end
     end
   end  
-end
+end

data/spec/animoto/manifests/directing_spec.rb

@@ -19,6 +19,10 @@ describe Animoto::Manifests::Directing do
       manifest(:pacing => 'fast').pacing.should == 'fast'
     end
     
+    it "should be able to specify the max_duration with a :max_duration parameter" do
+      manifest(:max_duration => '30').max_duration.should == '30'
+    end
+    
     it "should default to 'original' style" do
       manifest.style.should == Animoto::Styles::ANIMOTO_ORIGINAL
     end
@@ -151,6 +155,33 @@ describe Animoto::Manifests::Directing do
       manifest.to_hash['directing_job']['directing_manifest']['pacing'].should == manifest.pacing
     end
     
+    it "should not have a 'fitting' key in the manifest" do
+      manifest.to_hash['directing_job']['directing_manifest'].should_not have_key('fitting')
+    end
+
+    describe "with a max_duration option" do
+      before do
+        opts = {:title => 'Funderful Wonderment', :pacing => 'double', :max_duration => '30'}
+        @mfest = Animoto::Manifests::Directing.new(opts)
+        @title_card = @mfest.add_title_card 'woohoo', 'this is awesome'
+        @song_obj = @mfest.add_song 'http://website.com/song.mp3'
+      end
+
+      it "should have a 'fitting' key in the manifest" do
+        @mfest.to_hash['directing_job']['directing_manifest'].should have_key('fitting')
+      end
+
+      it "should have a 'max_duration' key in the manifest" do
+        @mfest.to_hash['directing_job']['directing_manifest']['fitting'].should have_key('max_duration')
+        @mfest.to_hash['directing_job']['directing_manifest']['fitting']['max_duration'].should == @mfest.max_duration
+      end
+
+      it "should have a 'type' key in the manifest" do
+        @mfest.to_hash['directing_job']['directing_manifest']['fitting'].should have_key('type')
+        @mfest.to_hash['directing_job']['directing_manifest']['fitting']['type'].should == 'best_fit'
+      end
+    end
+    
     it "should have a 'visuals' key in the manifest" do
       manifest.to_hash['directing_job']['directing_manifest'].should have_key('visuals')
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: animoto
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Animoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Client for working with the Animoto RESTful HTTP API