animoto 0.1.1.beta1 → 1.0.0

data/lib/animoto/support/visual.rb

@@ -19,7 +19,7 @@ module Animoto
 
       # Returns a representation of this Visual as a Hash
       #
-      # @return [Hash<String,Object>] this Visual as a Hash
+      # @return [Hash{String=>Object}] this Visual as a Hash
       def to_hash
         hash = super rescue {}
         hash['spotlit'] = spotlit? unless @spotlit.nil?

data/spec/animoto/client_spec.rb

@@ -152,29 +152,5 @@ describe Animoto::Client do
       client.reload!(@job)
       @job.state.should == 'retrieving_assets'
     end
-  end
-  
-  describe "processing a callback" do
-    before do
-      @body = %Q({"response":{"payload":{"base_callback":{"state":"failed","links":{"self":"https://api.animoto.com/things/123"}}},"status":{"errors":[{"code":"COLLAPSING_HRUNG_DISASTER","message":"A hrung has chosen to collapse disastrously."},{"code":"TOTAL_EXISTENCE_FAILURE","message":"The server is suffering from Total Existence Failure."}]}}})
-      @callback = client.process_callback(Animoto::Callbacks::Base, @body)
-    end
-    
-    it "should return a callback instance" do
-      @callback.should be_an_instance_of(Animoto::Callbacks::Base)
-    end
-    
-    it "should set the state" do
-      @callback.state.should == "failed"
-    end
-    
-    it "should set the url" do
-      @callback.url.should == "https://api.animoto.com/things/123"
-    end
-    
-    it "should set the errors" do
-      @callback.errors.should be_an_instance_of(Array)
-      @callback.errors.should_not be_empty
-    end
-  end
+  end  
 end

data/spec/animoto/http_engines/base_spec.rb

@@ -20,7 +20,7 @@ describe Animoto::HTTPEngines::Base do
     end
     
     it "should raise an implementation error" do
-      lambda { @engine.request(:get, "http://www.example.com/thing") }.should raise_error(NotImplementedError)
+      lambda { @engine.request(:get, "http://www.example.com/thing") }.should raise_error(Animoto::AbstractMethodError)
     end
   end
   

data/spec/animoto/resources/base_spec.rb

@@ -30,10 +30,11 @@ describe Animoto::Resources::Base do
                 'self' => @url
               },
               'metadata' => {
-                'duration' => 300,
-                'format' => 'h264',
-                'framerate' => 30,
-                'vertical_resolution' => "720p"
+                'rendering_parameters' => {
+                  'format' => 'h264',
+                  'framerate' => 30,
+                  'vertical_resolution' => "720p"                  
+                }
               }
             }
           }
@@ -46,10 +47,10 @@ describe Animoto::Resources::Base do
     end
     
     it "should update the original instance with the initialization parameters of the new one" do
-      @video.duration.should be_nil
+      @video.framerate.should be_nil
       video = Animoto::Resources::Video.load(@body)
-      video.duration.should == 300
-      @video.duration.should == 300
+      video.framerate.should == 30
+      @video.framerate.should == 30
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'spec'
 require 'webmock/rspec'
 require 'mocha'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: animoto
 version: !ruby/object:Gem::Version 
-  hash: -1848230079
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
-  - 0
-  - 1
   - 1
-  - beta1
-  version: 0.1.1.beta1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Animoto
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2010-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,10 +50,6 @@ files:
 - ./lib/animoto/assets/image.rb
 - ./lib/animoto/assets/song.rb
 - ./lib/animoto/assets/title_card.rb
-- ./lib/animoto/callbacks/base.rb
-- ./lib/animoto/callbacks/directing.rb
-- ./lib/animoto/callbacks/directing_and_rendering.rb
-- ./lib/animoto/callbacks/rendering.rb
 - ./lib/animoto/client.rb
 - ./lib/animoto/http_engines/base.rb
 - ./lib/animoto/http_engines/curl_adapter.rb
@@ -80,7 +75,9 @@ files:
 - ./lib/animoto/support/coverable.rb
 - ./lib/animoto/support/dynamic_class_loader.rb
 - ./lib/animoto/support/errors.rb
+- ./lib/animoto/support/hash.rb
 - ./lib/animoto/support/standard_envelope.rb
+- ./lib/animoto/support/string.rb
 - ./lib/animoto/support/visual.rb
 - ./lib/animoto.rb
 - ./spec/animoto/assets/base_spec.rb
@@ -88,10 +85,6 @@ files:
 - ./spec/animoto/assets/image_spec.rb
 - ./spec/animoto/assets/song_spec.rb
 - ./spec/animoto/assets/title_card_spec.rb
-- ./spec/animoto/callbacks/base_spec.rb
-- ./spec/animoto/callbacks/directing_and_rendering_spec.rb
-- ./spec/animoto/callbacks/directing_spec.rb
-- ./spec/animoto/callbacks/rendering_spec.rb
 - ./spec/animoto/client_spec.rb
 - ./spec/animoto/http_engines/base_spec.rb
 - ./spec/animoto/manifests/directing_and_rendering_spec.rb
@@ -132,14 +125,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/lib/animoto/callbacks/base.rb

@@ -1,45 +0,0 @@
-module Animoto
-  module Callbacks
-
-    # @abstract
-    class Base
-      include Support::StandardEnvelope
-
-      # @return [String]
-      # @see Animoto::Support::StandardEnvelope::ClassMethods#payload_key
-      def self.payload_key
-        super + '_callback'
-      end
-      
-      # @return [Hash<Symbol,Object>]
-      # @see Animoto::Support::StandardEnvelope::ClassMethods#unpack_standard_envelope
-      def self.unpack_standard_envelope body = {}
-        super.merge({ :state => body['response']['payload'][payload_key]['state'] })
-      end
-
-      # The state of the job when it completed.
-      # @return [String]
-      attr_reader :state
-      
-      # Errors for the job.
-      # @return [Array<Animoto::Error>]
-      attr_reader :errors
-      
-      # The url for this job.
-      # @return [String]
-      attr_reader :url
-
-      # Creates a new Callback.
-      #
-      # @param [String] body the request body of the HTTP callback
-      # @return [Callbacks::Base] the Callback
-      def initialize body
-        params = unpack_standard_envelope(body)
-        @state  = params[:state]
-        @errors = params[:errors].collect { |e| Animoto::Error.new(e['message']) }
-        @url    = params[:url]
-      end
-      
-    end
-  end
-end

data/lib/animoto/callbacks/directing.rb

@@ -1,7 +0,0 @@
-module Animoto
-  module Callbacks
-    class Directing < Animoto::Callbacks::Base
-      
-    end
-  end
-end

data/lib/animoto/callbacks/directing_and_rendering.rb

@@ -1,7 +0,0 @@
-module Animoto
-  module Callbacks
-    class DirectingAndRendering < Animoto::Callbacks::Base
-      
-    end
-  end
-end

data/lib/animoto/callbacks/rendering.rb

@@ -1,7 +0,0 @@
-module Animoto
-  module Callbacks
-    class Rendering < Animoto::Callbacks::Base
-      
-    end
-  end
-end

data/spec/animoto/callbacks/base_spec.rb

@@ -1,76 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Animoto::Callbacks::Base do
-
-  describe "loading from a response body" do
-    describe "without errors" do
-      before do
-        @body = {
-          'response' => {
-            'payload' => {
-              'base_callback' => {
-                'state'  => 'completed',
-                'links'   => {
-                  'self'  => 'https://api.animoto.com/things/123'
-                }
-              }
-            }
-          }
-        }
-        @callback = Animoto::Callbacks::Base.new @body
-      end
-      
-      it "should set the state" do
-        @callback.state.should == 'completed'
-      end
-      
-      it "should set the url" do
-        @callback.url.should == 'https://api.animoto.com/things/123'
-      end
-      
-      it "should set the errors to an empty array" do
-        @callback.errors.should be_an_instance_of(Array)
-        @callback.errors.should be_empty
-      end
-    end
-    
-    describe "with errors" do
-      before do
-        @body = {
-          'response' => {
-            'payload' => {
-              'base_callback' => {
-                'state'  => 'failed',
-                'links'   => {
-                  'self'  => 'https://api.animoto.com/things/123'
-                }
-              }
-            },
-            'status' => {
-              'errors' => [
-                {
-                  'code' => 'COLLAPSING_HRUNG_DISASTER',
-                  'message' => 'A hrung has chosen to collapse disastrously.'
-                },
-                {
-                  'code' => 'TOTAL_EXISTENCE_FAILURE',
-                  'message' => 'The server is suffering from Total Existence Failure.'
-                }
-              ]
-            }
-          }
-        }
-        @callback = Animoto::Callbacks::Base.new @body
-      end
-      
-      it "should collect the errors into the errors array" do
-        @callback.errors.size.should == 2
-      end
-      
-      it "should cast the errors as Animoto::Error objects" do
-        @callback.errors.all? { |e| Animoto::Error === e }.should be_true
-      end      
-    end
-  end
-  
-end

data/spec/animoto/callbacks/directing_and_rendering_spec.rb

@@ -1,5 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Animoto::Callbacks::DirectingAndRendering do
-  
-end

data/spec/animoto/callbacks/directing_spec.rb

@@ -1,5 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Animoto::Callbacks::Directing do
-  
-end

data/spec/animoto/callbacks/rendering_spec.rb

@@ -1,5 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Animoto::Callbacks::Rendering do
-  
-end