animoto 0.0.0.alpha7 → 0.0.0.alpha8

data/README.md

@@ -114,7 +114,6 @@ client and using HTTP callbacks for status updates.
     # "http://mysite.com/animoto_callback"
     client.direct_and_render!(manifest)
 
-
 ### A basic example using the Ruby client
 
 This example shows how to separately direct a storyboard and render a video
@@ -129,7 +128,7 @@ status.
 
     # Create a directing manifest.  The directing manifest controls the images
     # and other visual elements that will be in our final video.
-    manifest = DirectingManifest.new(:title => "Amazing Title!", :producer => "Fishy Joe")
+    manifest = DirectingManifest.new(:title => "Amazing Title!")
     
     # Add some images, text, and footage to our manifest.
     manifest << Image.new("http://website.com/picture.png")
@@ -138,7 +137,7 @@ status.
     manifest << Footage.new("http://website.com/movie.mp4", :duration => 3.5)
     
     # Setup the soundtrack.
-    manifest << Song.new("http://website.com/song.mp3", :artist => "Fishy Joe")
+    manifest << Song.new("http://website.com/song.mp3")
 
     # Request a new directing job by sending the API our directing manifest.
     directing_job = client.direct!(manifest)
@@ -169,7 +168,8 @@ status.
       # If the job has a video associated with it, everything worked out ok.
     	if video = rendering_job.video
     	  # Print a link to download the video file.
-    		puts video.url
+    	  client.reload!(video)
+    		puts video.download_url
     	else
     	  # Something happened during rendering...
     		raise rendering_job.errors.first

data/integration/test.rb

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'rdiscount'
+require 'nokogiri'
+require 'yaml'
+
+puts "Reading in code from README.md"
+
+readme_path = File.dirname(__FILE__) + '/../README.md'
+begin
+  readme = RDiscount.new(File.read(readme_path))
+rescue Errno::ENOENT
+  raise "README.md not found in #{File.expand_path(readme_path)}!"
+end
+
+begin
+  credentials = YAML.load(File.read(File.dirname(__FILE__) + '/credentials.yml'))
+rescue Errno::ENOENT
+  raise "Credentials file not found at #{File.expand_path(File.dirname(__FILE__) + '/credentials.yml')}!"
+end
+
+begin
+  assets = YAML.load(File.read(File.dirname(__FILE__) + '/assets.yml'))
+rescue Errno::ENOENT
+  raise "Assets file not found in at #{File.dirname(__FILE__) + '/assets.yml'}!" unless assets
+end
+
+doc = Nokogiri::HTML(readme.to_html)
+example_code_path = '//h3[contains(text(),"basic example")]/following-sibling::pre/code/text()'
+code_node = doc.at(example_code_path)
+
+raise "Example code not found in README (expected at xpath '#{example_code_path}')" unless code_node
+
+code = code_node.text
+
+puts "Replacing example credentials with valid ones"
+code.sub!(/Client\.new\(.+\)/, %Q{Client.new("#{credentials[:key]}","#{credentials[:secret]}")})
+
+puts "Replacing example assets with valid ones"
+code.gsub!(/Image\.new\(.+\)/) { %Q{Image.new("#{assets[:images].shift}")} }
+# Replace the song with a real one
+code.sub!(/Song\.new\(.+\)/, %Q{Song.new("#{assets[:song]}")})
+# Get rid of the footage (since it won't render right now anyway)
+code = code.lines.reject { |l| /Footage\.new/ === l }.join
+
+puts "Executing example"
+eval code
+
+puts
+puts "If you're seeing this, things should have worked fine!"
+puts "Enjoy your video at #{video.download_url}"

data/lib/animoto/client.rb

@@ -220,9 +220,9 @@ module Animoto
     def request method, url, body, headers = {}, options = {}
       error = catch(:fail) do
         options = { :username => @key, :password => @secret }.merge(options)
-        @logger.info "Sending request to #{url.inspect} with body #{body.inspect}"
+        @logger.info "Sending request to #{url.inspect} with body #{body}"
         response = http_engine.request(method, url, body, headers, options)
-        @logger.info "Received response #{response.inspect}"
+        @logger.info "Received response #{response}"
         return response_parser.parse(response)
       end
       if error

data/lib/animoto/directing_and_rendering_manifest.rb

@@ -13,11 +13,11 @@ module Animoto
     def to_hash options = {}
       hash  = super
       directing_job = hash.delete('directing_job')
-      hash['directing_and_rendering_job'] = directing_job.merge('rendering_manifest' => { 'rendering_profile' => {}})
-      profile = hash['directing_and_rendering_job']['rendering_manifest']['rendering_profile']
-      profile['vertical_resolution'] = resolution
-      profile['framerate'] = framerate
-      profile['format'] = format
+      hash['directing_and_rendering_job'] = directing_job.merge('rendering_manifest' => { 'rendering_parameters' => {}})
+      params = hash['directing_and_rendering_job']['rendering_manifest']['rendering_parameters']
+      params['resolution'] = resolution
+      params['framerate'] = framerate
+      params['format'] = format
       hash
     end
     

data/lib/animoto.rb

@@ -1,5 +1,5 @@
 module Animoto
   def self.version
-    "0.0.0.alpha7"
+    "0.0.0.alpha8"
   end
-end
+end

data/spec/animoto/directing_and_rendering_manifest_spec.rb

@@ -111,18 +111,18 @@ describe Animoto::DirectingAndRenderingManifest do
         @hash = manifest.to_hash['directing_and_rendering_job']['rendering_manifest']
       end
       
-      it "should have a 'rendering_profile' object in the manifest" do
-        @hash.should have_key('rendering_profile')
-        @hash['rendering_profile'].should be_a(Hash)
+      it "should have a 'rendering_parameters' object in the manifest" do
+        @hash.should have_key('rendering_parameters')
+        @hash['rendering_parameters'].should be_a(Hash)
       end
 
-      describe "rendering_profile" do
+      describe "rendering_parameters" do
         before do
-          @profile = @hash['rendering_profile']
+          @profile = @hash['rendering_parameters']
         end
 
-        it "should have a 'vertical_resolution' key" do
-          @profile['vertical_resolution'].should == manifest.resolution
+        it "should have a 'resolution' key" do
+          @profile['resolution'].should == manifest.resolution
         end
 
         it "should have a 'framerate' key" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: animoto
 version: !ruby/object:Gem::Version 
-  hash: -1710980403
+  hash: -1710980406
   prerelease: true
   segments: 
   - 0
   - 0
   - 0
-  - alpha7
-  version: 0.0.0.alpha7
+  - alpha8
+  version: 0.0.0.alpha8
 platform: ruby
 authors: 
 - Animoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 -04:00
+date: 2010-09-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ extra_rdoc_files: []
 
 files: 
 - README.md
+- ./integration/test.rb
 - ./lib/animoto/asset.rb
 - ./lib/animoto/client.rb
 - ./lib/animoto/content_type.rb