animoto 1.5.2 → 1.5.3

data/README.md

@@ -102,7 +102,9 @@ client and using HTTP callbacks for status updates.
     # and format.
     manifest = Manifests::DirectingAndRendering.new(
       :title => "Amazing Title!",
-      :resolution => "720p",
+      :resolution => "360p",
+	  :style => "original",
+	  :pacing => "fast",
       :framerate => 24,
       :format => 'h264'
     )
@@ -140,7 +142,7 @@ status.
 
     # Create a directing manifest.  The directing manifest controls the images
     # and other visual elements that will be in our final video.
-    manifest = Manifests::Directing.new(:title => "Amazing Title!")
+    manifest = Manifests::Directing.new(:title => "Amazing Title!", :pacing => "fast", :style => "original")
 
     # Add some images, text, and footage to our manifest.
     manifest << Assets::Image.new("http://website.com/picture.png")
@@ -168,7 +170,7 @@ status.
       # a rendering manifest.
       manifest = Manifests::Rendering.new(
         storyboard,
-        :resolution => "720p",
+        :resolution => "360p",
         :framerate => 24,
         :format => 'h264'
       )

data/lib/animoto.rb

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

data/lib/animoto/assets/footage.rb

@@ -54,7 +54,7 @@ module Animoto
       # @see Animoto::Assets::Base#to_hash
       def to_hash
         hash = super
-        hash['audio_mix'] = 'MIX' if audio_mix
+        hash['audio_mix'] = audio_mix if audio_mix
         hash['start_time'] = start_time if start_time
         hash['duration'] = duration if duration
         hash['rotation'] = rotation if rotation

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, :max_duration))
+        @directing_manifest = Manifests::Directing.new(options.only(:title, :pacing, :max_duration, :style, :postroll))
         @rendering_manifest = Manifests::Rendering.new(options.only(:resolution, :framerate, :format))
       end
 

data/lib/animoto/manifests/rendering.rb

@@ -3,7 +3,7 @@ module Animoto
     class Rendering < Animoto::Manifests::Base
     
       # The vertical resolution of the rendered video. Valid values are '180p', '270p',
-      # '360p', '480p', '576p', '720p' or '1080p'.
+      # '360p', '480p', or '720p'.
       # @return [String]
       attr_accessor :resolution
       
@@ -11,7 +11,7 @@ module Animoto
       # @return [Integer]
       attr_accessor :framerate
       
-      # The format of the rendered video. Valid values are 'h264', 'h264-iphone', 'flv' or 'iso'.
+      # The format of the rendered video. Valid values are 'h264'.
       # @return [String]
       attr_accessor :format
       
@@ -45,7 +45,7 @@ module Animoto
         @streaming  = options[:streaming]
         # We may or may not ever support other streaming formats
         @streaming_format = "http_live_streaming"
-      end
+     end
     
       # Returns true if an HTTP Live Streaming URL will be created for this video while it's
       # rendering.

data/lib/animoto/styles.rb

@@ -8,7 +8,19 @@ module Animoto
     COSMIC_TIDINGS        = "cosmic_tidings"
     WONDERLAND_OF_SNOW    = "wonderland_of_snow"
     THROUGH_THE_BLOSSOMS  = "valentines_day_2012_hands"
-
+	WATER				  = "elements_water"
+	SIMPLICITY			  = "slideshow_1"
+	AIR				      = "elements_air"
+	FIRE				  = "elements_fire"
+	EARTH				  = "elements_earth"
+	COLOR_FOLD			  = "Cubist_style"
+	COMING_UP_ROSES		  = "valentines_2011"
+	WRAPPING_SCRAPS		  = "xmas-2010-style1"
+	THE_WINDING_VINE	  = "mothers_day"
+	POPUP_PANDEMONIUM	  = "holiday_popup_pandemonium"
+	STARRY_NIGHT		  = "holiday_starry_night"
+	RETRO_WHEEL			  = "viewmaster"
+	
     DEPRECATED_NAMES = {
       :ORIGINAL         => :ANIMOTO_ORIGINAL,
       :MOTHERS_DAY_2011 => :WATERCOLOR_SEASHORE,

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, includes InstanceMethods, and
+      # When included into a class, also extends ClassMethods, inludes 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/assets/footage_spec.rb

@@ -45,7 +45,7 @@ describe Animoto::Assets::Footage do
     
     describe "if audio mixing is turned on" do
       before do
-        @footage.audio_mix = true
+        @footage.audio_mix = 'MIX'
       end
       
       it "should have an 'audio_mix' key telling how to mix" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: animoto
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Animoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-09 00:00:00 Z
+date: 2012-08-20 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.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client for working with the Animoto RESTful HTTP API