animoto 1.1.1 → 1.2.0

data/features/support/env.rb

@@ -0,0 +1,38 @@
+Bundler.setup(:default, :test)
+
+require 'cucumber'
+require 'rspec'
+require 'mocha'
+
+# Use mocha for mocking
+RSpec.configure do |config|
+  config.mock_with :mocha
+end
+
+# Verify mocha after each scenario
+After do
+  Mocha::Mockery.instance.verify(nil)
+  Mocha::Mockery.instance.teardown
+  Mocha::Mockery.reset_instance
+end
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'animoto', 'client'))
+
+module Animoto
+  class IntegrationTest
+    include Mocha::API
+  
+    def client
+      @client ||= begin
+        endpoint = case ENV['ANIMOTO_PLATFORM_ENV']
+        when 'production' : ''
+        when NilClass : '-sandbox'
+        else : "-#{ENV['ANIMOTO_PLATFORM_ENV']}"
+        end
+        Client.new ENV['ANIMOTO_USERNAME'], ENV['ANIMOTO_PASSWORD'], :endpoint => endpoint
+      end
+    end
+  end
+end
+
+World { Animoto::IntegrationTest.new }

data/lib/animoto/resources/video.rb

@@ -15,11 +15,12 @@ module Animoto
         links = unpack_links(body)
         params = unpack_rendering_parameters(body)
         super.merge({
-          :download_url   => links['file'],
-          :storyboard_url => links['storyboard'],
-          :format         => params['format'],
-          :framerate      => params['framerate'],
-          :resolution     => params['resolution']
+          :download_url     => links['file'],
+          :storyboard_url   => links['storyboard'],
+          :cover_image_url  => links['cover_image'],
+          :format           => params['format'],
+          :framerate        => params['framerate'],
+          :resolution       => params['resolution']
         })
       end
 
@@ -35,6 +36,10 @@ module Animoto
       # @return [Resources::Storyboard]
       attr_reader :storyboard
       
+      # In available, the URL to the cover image file.
+      # @return [String]
+      attr_reader :cover_image_url
+      
       # The format of the video.
       # @return [String]
       attr_reader :format
@@ -61,6 +66,7 @@ module Animoto
         @download_url = attributes[:download_url]
         @storyboard_url = attributes[:storyboard_url]
         @storyboard = Animoto::Resources::Storyboard.new(:url => @storyboard_url) if @storyboard_url
+        @cover_image_url = attributes[:cover_image_url]
         @format = attributes[:format]
         @framerate = attributes[:framerate]
         @resolution = attributes[:resolution]

data/lib/animoto/support/hash.rb

@@ -7,7 +7,7 @@ module Animoto
       # @param [Array<Object>] keys the keys to include
       # @return [Hash{Object=>Object}] a new hash with only the listed keys
       def only *keys
-        self.dup.delete_if { |k,v| !keys.include?(k) }
+        inject({}) { |h,(k,v)| h.merge(keys.include?(k) ? {k => v} : {}) }
       end unless {}.respond_to?(:only)
       
       # Returns a new hash with all keys from this hash except the listed ones.
@@ -15,7 +15,7 @@ module Animoto
       # @param [Array<Object>] keys the keys to exclude
       # @return [Hash{Object=>Object}] a new hash without the listed keys
       def except *keys
-        self.dup.delete_if { |k,v| keys.include?(v) }
+        inject({}) { |h,(k,v)| h.merge(!keys.include?(v) ? {k => v} : {}) }
       end unless {}.respond_to?(:except)
       
     end

data/lib/animoto/support/standard_envelope.rb

@@ -25,6 +25,7 @@ module Animoto
         if payload_key = unpack_base_payload(envelope).keys.first
           klass_name = payload_key.camelize
           if /(?:Job|Callback)$/ === klass_name
+            klass_name.sub!(/(?:Job|Callback)$/, '')
             Animoto::Resources::Jobs::const_get(klass_name) if Animoto::Resources::Jobs::const_defined?(klass_name)
           else
             Animoto::Resources::const_get(klass_name) if Animoto::Resources::const_defined?(klass_name)
@@ -111,9 +112,7 @@ module Animoto
             :errors => unpack_status(body)['errors'] || []
           }
         end        
-      end
-      
-      extend ClassMethods
+      end      
     end
   end
 end

data/lib/animoto.rb

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

data/spec/animoto/assets/base_spec.rb

@@ -2,4 +2,26 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Animoto::Assets::Base do
   
+  describe "initialization" do
+    before do
+      @source = 'http://website.com/asset'
+      @asset = Animoto::Assets::Base.new @source
+    end
+    
+    it "should set the source from the given source url" do
+      @asset.source.should == @source
+    end
+  end
+  
+  describe "#to_hash" do
+    before do
+      @asset = Animoto::Assets::Base.new 'http://website.com/asset'
+    end
+    
+    it "should have a 'source_url' key with the url" do
+      @asset.to_hash.should have_key('source_url')
+      @asset.to_hash['source_url'].should == @asset.source
+    end
+  end
+  
 end

data/spec/animoto/manifests/directing_and_rendering_spec.rb

@@ -20,7 +20,7 @@ describe Animoto::Manifests::DirectingAndRendering do
       manifest.to_hash.should have_key('directing_and_rendering_job')
       manifest.to_hash['directing_and_rendering_job'].should be_a(Hash)
     end
-
+    
     describe "when the callback url is set" do
       before do
         manifest.http_callback_url = 'http://website.com/callback'        
@@ -48,7 +48,11 @@ describe Animoto::Manifests::DirectingAndRendering do
         end
       end
     end
-    
+
+    it "should have a directing manifest attribute" do
+      @manifest.directing_manifest.should be_an_instance_of(Animoto::Manifests::Directing)
+    end
+        
     it "should have a 'directing_manifest' object within the job" do
       manifest.to_hash['directing_and_rendering_job'].should have_key('directing_manifest')
       manifest.to_hash['directing_and_rendering_job']['directing_manifest'].should be_a(Hash)
@@ -56,51 +60,73 @@ describe Animoto::Manifests::DirectingAndRendering do
     
     describe "directing_manifest" do
       before do
-        @hash = manifest.to_hash['directing_and_rendering_job']['directing_manifest']
+        @directing_manifest = manifest.directing_manifest
       end
       
-      it "should have a 'style' key in the manifest" do
-        @hash.should have_key('style')
-        @hash['style'].should == manifest.style
+      it "should have been initialized with the :title and :pacing attributes from the initial initialization" do
+        @directing_manifest.title.should == 'Funderful Wonderment'
+        @directing_manifest.pacing.should == 'double'
       end
-    
-      it "should have a 'pacing' key in the manifest" do
-        @hash.should have_key('pacing')
-        @hash['pacing'].should == manifest.pacing
+      
+      it "should defer unknown methods to the directing manifest if the directing manifest responds to those methods" do
+        manifest.should_not respond_to(:pacing)
+        @directing_manifest.should respond_to(:pacing)
+        @directing_manifest.expects(:pacing)
+        manifest.pacing
       end
+      
+      describe "to hash" do
+        before do
+          @hash = manifest.to_hash['directing_and_rendering_job']['directing_manifest']
+        end
+      
+        it "should have a 'style' key in the manifest" do
+          @hash.should have_key('style')
+          @hash['style'].should == manifest.style
+        end
     
-      it "should have a 'visuals' key in the manifest" do
-        @hash.should have_key('visuals')
-      end
+        it "should have a 'pacing' key in the manifest" do
+          @hash.should have_key('pacing')
+          @hash['pacing'].should == manifest.pacing
+        end
     
-      it "should have a 'song' object in the manifest" do
-        @hash.should have_key('song')
-        @hash['song'].should be_a(Hash)
-      end
+        it "should have a 'visuals' key in the manifest" do
+          @hash.should have_key('visuals')
+        end
     
-      describe "visuals array" do
-        before do
-          @visuals = @hash['visuals']
+        it "should have a 'song' object in the manifest" do
+          @hash.should have_key('song')
+          @hash['song'].should be_a(Hash)
         end
+    
+        describe "visuals array" do
+          before do
+            @visuals = @hash['visuals']
+          end
       
-        it "should have the visuals in the order they were added" do
-          @visuals[0].should == @image.to_hash
-          @visuals[1].should == @title_card.to_hash
-          @visuals[2].should == @footage.to_hash
+          it "should have the visuals in the order they were added" do
+            @visuals[0].should == @image.to_hash
+            @visuals[1].should == @title_card.to_hash
+            @visuals[2].should == @footage.to_hash
+          end
         end
-      end
     
-      describe "song" do
-        before do
-          @song = @hash['song']
-        end
+        describe "song" do
+          before do
+            @song = @hash['song']
+          end
       
-        it "should have info about the song" do
-          @song.should == @song_obj.to_hash
+          it "should have info about the song" do
+            @song.should == @song_obj.to_hash
+          end
         end
       end
     end
 
+    it "should have a rendering manifest attribute" do
+      manifest.rendering_manifest.should be_an_instance_of(Animoto::Manifests::Rendering)
+    end
+
     it "should have a 'rendering_manifest' object within the job" do
       manifest.to_hash['directing_and_rendering_job'].should have_key('rendering_manifest')
       manifest.to_hash['directing_and_rendering_job']['rendering_manifest'].should be_a(Hash)
@@ -108,29 +134,48 @@ describe Animoto::Manifests::DirectingAndRendering do
 
     describe "rendering_manifest" do
       before do
-        @hash = manifest.to_hash['directing_and_rendering_job']['rendering_manifest']
+        @rendering_manifest = manifest.rendering_manifest
       end
       
-      it "should have a 'rendering_parameters' object in the manifest" do
-        @hash.should have_key('rendering_parameters')
-        @hash['rendering_parameters'].should be_a(Hash)
+      it "should have been initialized with the :format, :framerate, and :resolution attributes from the initial initialization" do
+        @rendering_manifest.format.should == 'flv'
+        @rendering_manifest.framerate.should == 24
+        @rendering_manifest.resolution.should == '720p'
+      end
+      
+      it "should defer unknown methods to the rendering manifest if the rendering manifest responds to those methods" do
+        manifest.should_not respond_to(:resolution)
+        @rendering_manifest.should respond_to(:resolution)
+        @rendering_manifest.expects(:resolution)
+        manifest.resolution
       end
 
-      describe "rendering_parameters" do
+      describe "to hash" do
         before do
-          @profile = @hash['rendering_parameters']
+          @hash = manifest.to_hash['directing_and_rendering_job']['rendering_manifest']
         end
-
-        it "should have a 'resolution' key" do
-          @profile['resolution'].should == manifest.resolution
+      
+        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
 
-        it "should have a 'framerate' key" do
-          @profile['framerate'].should == manifest.framerate
-        end
+        describe "rendering_parameters" do
+          before do
+            @profile = @hash['rendering_parameters']
+          end
+
+          it "should have a 'resolution' key" do
+            @profile['resolution'].should == manifest.resolution
+          end
+
+          it "should have a 'framerate' key" do
+            @profile['framerate'].should == manifest.framerate
+          end
 
-        it "should have a 'format' key" do
-          @profile['format'].should == manifest.format
+          it "should have a 'format' key" do
+            @profile['format'].should == manifest.format
+          end
         end
       end
     end

data/spec/animoto/resources/jobs/rendering_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 
 describe Animoto::Resources::Jobs::Rendering do
   
-  it "should have endpoint /jobs/rendering" do
+  it "should have endpoint '/jobs/rendering'" do
     Animoto::Resources::Jobs::Rendering.endpoint.should == '/jobs/rendering'
   end
   

data/spec/animoto/resources/jobs/storyboard_bundling_spec.rb

@@ -2,15 +2,15 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 
 describe Animoto::Resources::Jobs::StoryboardBundling do
 
-  it "should have endpoint /jobs/storyboard_bundling" do
+  it "should have endpoint '/jobs/storyboard_bundling'" do
     Animoto::Resources::Jobs::StoryboardBundling.endpoint.should == '/jobs/storyboard_bundling'
   end
   
-  it "should have content type 'application/vnd.animoto.storyboard_bundling_job" do
+  it "should have content type 'application/vnd.animoto.storyboard_bundling_job'" do
     Animoto::Resources::Jobs::StoryboardBundling.content_type.should == 'storyboard_bundling_job'
   end
   
-  it "should have payload key storyboard_bundling_job" do
+  it "should have payload key 'storyboard_bundling_job'" do
     Animoto::Resources::Jobs::StoryboardBundling.payload_key.should == 'storyboard_bundling_job'
   end
 

data/spec/animoto/resources/jobs/storyboard_unbundling_spec.rb

@@ -2,15 +2,15 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper")
 
 describe Animoto::Resources::Jobs::StoryboardUnbundling do
 
-  it "should have endpoint /jobs/storyboard_unbundling" do
+  it "should have endpoint '/jobs/storyboard_unbundling'" do
     Animoto::Resources::Jobs::StoryboardUnbundling.endpoint.should == '/jobs/storyboard_unbundling'
   end
   
-  it "should have content type 'application/vnd.animoto.storyboard_unbundling_job" do
+  it "should have content type 'application/vnd.animoto.storyboard_unbundling_job'" do
     Animoto::Resources::Jobs::StoryboardUnbundling.content_type.should == 'storyboard_unbundling_job'
   end
   
-  it "should have payload key storyboard_unbundling_job" do
+  it "should have payload key 'storyboard_unbundling_job'" do
     Animoto::Resources::Jobs::StoryboardUnbundling.payload_key.should == 'storyboard_unbundling_job'
   end
 

data/spec/animoto/resources/storyboard_spec.rb

@@ -1,8 +1,54 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Animoto::Resources::Storyboard do
-  def storyboard options = {}
-    @storyboard ||= Animoto::Resources::Storyboard.new options
+
+  it "should have content type 'application/vnd.animoto.storyboard'" do
+    Animoto::Resources::Storyboard.content_type.should == 'storyboard'
+  end
+  
+  it "should have payload key 'storyboard'" do
+    Animoto::Resources::Storyboard.payload_key.should == 'storyboard'
+  end
+
+  describe "initialization" do
+    before do
+      @body = {
+        'response' => {
+          'status' => {
+            'code' => 200
+          },
+          'payload' => {
+            'storyboard' => {
+              'metadata' => {
+                'duration' => 300.0,
+                'visuals_count' => 60
+              },
+              'links' => {
+                'self' => 'https://platform.animoto.com/storyboards/1',
+                'preview' => 'http://storage.com/previews/1.mp4'
+              }
+            }
+          }
+        }
+      }
+      @storyboard = Animoto::Resources::Storyboard.load(@body)
+    end
+    
+    it "should set its url from the 'self' link given" do
+      @storyboard.url.should == 'https://platform.animoto.com/storyboards/1'
+    end
+    
+    it "should set its preview url from the 'preview' link given" do
+      @storyboard.preview_url.should == 'http://storage.com/previews/1.mp4'
+    end
+    
+    it "should set its duration from the 'duration' metadata given" do
+      @storyboard.duration.should == 300.0
+    end
+    
+    it "should set its visuals count from the visuals_count metadata given" do
+      @storyboard.visuals_count.should == 60
+    end
   end
   
 end

data/spec/animoto/resources/video_spec.rb

@@ -2,4 +2,74 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Animoto::Resources::Video do
   
+  it "should have content type 'application/vnd.animoto.video'" do
+    Animoto::Resources::Video.content_type.should == 'video'
+  end
+  
+  it "should have payload key 'video'" do
+    Animoto::Resources::Video.payload_key.should == 'video'
+  end
+
+  describe "initialization" do
+    before do
+      @body = {
+        'response' => {
+          'status' => {
+            'code' => 200
+          },
+          'payload' => {
+            'video' => {
+              'metadata' => {
+                'rendering_parameters' => {
+                  'format' => 'h264',
+                  'framerate' => 30,
+                  'resolution' => '720p'
+                }
+              },
+              'links' => {
+                'self' => 'https://platform.animoto.com/videos/1',
+                'file' => 'http://storage.com/videos/1.mp4',
+                'cover_image' => 'http://storage.com/videos/1/cover_image.jpg',
+                'storyboard' => 'https://platform.animoto.com/storyboards/1'
+              }
+            }
+          }
+        }
+      }
+      @video = Animoto::Resources::Video.load(@body)
+    end
+    
+    it "should set its url from the 'self' link given" do
+      @video.url.should == 'https://platform.animoto.com/videos/1'
+    end
+    
+    it "should set its download url from the 'file' link given" do
+      @video.download_url.should == 'http://storage.com/videos/1.mp4'
+    end
+    
+    it "should set its cover image url from the 'cover_image' link given" do
+      @video.cover_image_url.should == 'http://storage.com/videos/1/cover_image.jpg'
+    end
+    
+    it "should set its storyboard url from the 'storyboard_url' given" do
+      @video.storyboard_url.should == 'https://platform.animoto.com/storyboards/1'
+    end
+    
+    it "should set its storyboard from its storyboard url" do
+      @video.storyboard.url.should == 'https://platform.animoto.com/storyboards/1'
+    end
+    
+    it "should set its format from the format given" do
+      @video.format.should == 'h264'
+    end
+    
+    it "should set its framerate from the framerate given" do
+      @video.framerate.should == 30
+    end
+    
+    it "should set its resolution from the resolution given" do
+      @video.resolution.should == '720p'
+    end
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: animoto
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Animoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -05:00
+date: 2011-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,14 @@ extra_rdoc_files: []
 
 files: 
 - README.md
+- ./features/step_definitions/bundling_steps.rb
+- ./features/step_definitions/directing_and_rendering_steps.rb
+- ./features/step_definitions/directing_steps.rb
+- ./features/step_definitions/rendering_steps.rb
+- ./features/step_definitions/storyboard_steps.rb
+- ./features/step_definitions/unbundling_steps.rb
+- ./features/step_definitions/video_steps.rb
+- ./features/support/env.rb
 - ./lib/animoto/assets/base.rb
 - ./lib/animoto/assets/footage.rb
 - ./lib/animoto/assets/image.rb