animoto 1.5.0 → 1.5.1

data/lib/animoto.rb

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

data/lib/animoto/manifests/directing.rb

@@ -50,7 +50,7 @@ module Animoto
         super
         @title      = options[:title]
         @pacing     = options[:pacing]  || 'auto'
-        @style      = options[:style]   || Animoto::Styles::ORIGINAL
+        @style      = options[:style]   || Animoto::Styles::ANIMOTO_ORIGINAL
         @postroll   = Animoto::Postroll.new(options[:postroll] || Animoto::Postroll::POWERED_BY_ANIMOTO)
         @visuals    = []
         @song       = nil

data/lib/animoto/styles.rb

@@ -1,10 +1,28 @@
 module Animoto
   module Styles
-    ORIGINAL            = "original"
-    MOTHERS_DAY_2011    = "mothers_day_2011"
-    ELEGANCE            = "elegance_12"
-    VINTAGE             = "vintage"
-    COSMIC_TIDINGS      = "cosmic_tidings"
-    WONDERLAND_OF_SNOW  = "wonderland_of_snow"
+
+    ANIMOTO_ORIGINAL      = "original"
+    WATERCOLOR_SEASHORE   = "mothers_day_2011"
+    DUSK_RETREAT          = "elegance_12"
+    VINTAGE_VOYAGE        = "vintage"
+    COSMIC_TIDINGS        = "cosmic_tidings"
+    WONDERLAND_OF_SNOW    = "wonderland_of_snow"
+    THROUGH_THE_BLOSSOMS  = "valentines_day_2012_hands"
+
+    DEPRECATED_NAMES = {
+      :ORIGINAL         => :ANIMOTO_ORIGINAL,
+      :MOTHERS_DAY_2011 => :WATERCOLOR_SEASHORE,
+      :ELEGANCE         => :DUSK_RETREAT,
+      :VINTAGE          => :VINTAGE_VOYAGE
+    }
+
+    def self.const_missing old_name
+      if new_name = DEPRECATED_NAMES[old_name]
+        warn("The style name \"#{old_name.to_s}\" is deprecated. Use \"#{new_name}\" instead.")
+        const_set(old_name, const_get(new_name))
+      else
+        super
+      end
+    end
   end
 end

data/spec/animoto/manifests/directing_spec.rb

@@ -20,11 +20,11 @@ describe Animoto::Manifests::Directing do
     end
     
     it "should default to 'original' style" do
-      manifest.style.should == Animoto::Styles::ORIGINAL
+      manifest.style.should == Animoto::Styles::ANIMOTO_ORIGINAL
     end
 
     it "should be able to specify the style with a :style parameter" do
-      manifest(:style => Animoto::Styles::VINTAGE).style.should == Animoto::Styles::VINTAGE
+      manifest(:style => Animoto::Styles::VINTAGE_VOYAGE).style.should == Animoto::Styles::VINTAGE_VOYAGE
     end
 
     it "should default to having the 'powered by animoto' postroll" do

data/spec/animoto/styles_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe Animoto::Styles do
+  describe "deprecated constants" do
+    it "should warn you when using a deprecated constant name" do
+      Animoto::Styles.expects(:warn)
+      Animoto::Styles::ORIGINAL
+    end
+
+    it "should inform you of the new constant name" do
+      const = Animoto::Styles::DEPRECATED_NAMES[:ORIGINAL].to_s
+      Animoto::Styles.expects(:warn).with(regexp_matches(Regexp.compile(const)))
+      Animoto::Styles::ORIGINAL
+    end
+
+    it "should return the correct value of the new constant name" do
+      Animoto::Styles.stubs(:warn)
+      Animoto::Styles::ORIGINAL.should == Animoto::Styles::ANIMOTO_ORIGINAL
+    end
+
+    it "should define the deprecated constant to suppress multiple warnings" do
+      Animoto::Styles.expects(:warn).once
+      Animoto::Styles.const_defined?(:ORIGINAL).should_not be_true
+      Animoto::Styles::ORIGINAL
+      Animoto::Styles.const_defined?(:ORIGINAL).should be_true
+      Animoto::Styles::ORIGINAL
+    end
+
+    after do
+      Animoto::Styles.__send__(:remove_const, :ORIGINAL) if Animoto::Styles.const_defined?(:ORIGINAL)
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: animoto
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Animoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-02-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -43,14 +43,6 @@ 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
@@ -114,6 +106,7 @@ files:
 - ./spec/animoto/resources/video_spec.rb
 - ./spec/animoto/response_parsers/json_adapter_spec.rb
 - ./spec/animoto/response_parsers/yajl_adapter_spec.rb
+- ./spec/animoto/styles_spec.rb
 - ./spec/animoto/support/standard_envelope_spec.rb
 - ./spec/animoto_spec.rb
 - ./spec/spec_helper.rb
@@ -152,3 +145,4 @@ specification_version: 3
 summary: Client for working with the Animoto RESTful HTTP API
 test_files: []
 
+has_rdoc: true

data/features/support/env.rb

@@ -1,38 +0,0 @@
-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 }