animoto 1.5.3 → 1.5.4

data/lib/animoto.rb

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

data/lib/animoto/assets/image.rb

@@ -27,6 +27,11 @@ module Animoto
         @cover
       end
 
+      # Whether or not this image has a caption. If a caption is added, it will appear with the
+      # image in the video.
+      # @return [String]
+      attr_accessor :caption
+
       # Creates a new Image object.
       #
       # @param [String] source the source URL of this image
@@ -34,12 +39,14 @@ module Animoto
       # @option options [Integer] :rotation the number of clockwise 90-degree rotations to apply to this image
       # @option options [Boolean] :spotlit whether or not to spotlight this image
       # @option options [Boolean] :cover whether or not to generate the cover of this video from this image
+      # @option options [String] :caption the text that should be displayed with the image
       # @return [Assets::Image] the Image object
       def initialize source, options = {}
         super
         @rotation = options[:rotation]
         @spotlit  = options[:spotlit]
         @cover    = options[:cover]
+        @caption = options[:caption]
       end
       
       # Returns a representation of this Image as a Hash.
@@ -51,8 +58,9 @@ module Animoto
         hash['rotation'] = rotation if rotation
         hash['spotlit'] = spotlit? unless @spotlit.nil?
         hash['cover'] = cover? unless @cover.nil?
+        hash['caption'] = caption unless @caption.nil?
         hash
       end
     end
   end
-end
+end

data/spec/animoto/assets/image_spec.rb

@@ -5,7 +5,7 @@ describe Animoto::Assets::Image do
   describe "initialization" do
     before do
       @image = Animoto::Assets::Image.new 'http://website.com/image.png',
-        :rotation => 2, :spotlit => true, :cover => true
+        :rotation => 2, :spotlit => true, :cover => true, :caption => 'This is my caption'
     end
     
     it "should set the source to the given url" do
@@ -23,6 +23,10 @@ describe Animoto::Assets::Image do
     it "should set the cover to the given value" do
       @image.should be_a_cover
     end
+
+    it "should set the caption to the given text" do
+      @image.caption.should == 'This is my caption'
+    end
   end
 
   describe "#to_hash" do
@@ -67,5 +71,17 @@ describe Animoto::Assets::Image do
         @image.to_hash['cover'].should == @image.cover?
       end
     end
+
+    describe "if caption is given" do
+      before do
+        @image.caption = "This is my caption"
+      end
+
+      it "it should have a 'caption' key with the caption value" do
+        @image.to_hash.should have_key('caption')
+        @image.to_hash['caption'].should == @image.caption
+      end
+    end
+
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: animoto
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 5
-  - 3
-  version: 1.5.3
+  - 4
+  version: 1.5.4
 platform: ruby
 authors: 
 - Animoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-20 00:00:00 Z
+date: 2013-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json