animoto 0.0.0.alpha2 → 0.0.0.alpha3

data/lib/animoto/client.rb

@@ -36,7 +36,7 @@ module Animoto
       :post => Net::HTTP::Post
     }
     
-    attr_accessor :key, :secret
+    attr_accessor :key, :secret, :endpoint
     attr_reader   :format
     
     # Creates a new Client object which handles credentials, versioning, making requests, and
@@ -44,7 +44,8 @@ module Animoto
     #
     # If you have your key and secret in ~/.animotorc or /etc/.animotorc, those credentials will
     # be read from those files (in that order) whenever you make a new Client if you don't specify
-    # them explicitly.
+    # them explicitly. You can also specify the endpoint (staging, sandbox, etc.) in the rc file.
+    # The default endpoint will be used if one isn't specified.
     #
     # @param [String] key the API key for your account
     # @param [String] secret the secret key for your account
@@ -55,20 +56,22 @@ module Animoto
       options = args.last.is_a?(Hash) ? args.pop : {}
       @key = args[0]
       @secret = args[1]
+      @endpoint = options[:endpoint]
+
+      home_path = File.expand_path '~/.animotorc'
+      config = if File.exist?(home_path)
+        YAML.load(File.read(home_path))
+      elsif File.exist?('/etc/.animotorc')
+        YAML.load(File.read('/etc/.animotorc'))
+      end
+        @key ||= config['key']
+        @secret ||= config['secret']
+        @endpoint ||= config['endpoint']
       unless @key && @secret
-        home_path = File.expand_path '~/.animotorc'
-        config = if File.exist?(home_path)
-          YAML.load(File.read(home_path))
-        elsif File.exist?('/etc/.animotorc')
-          YAML.load(File.read('/etc/.animotorc'))
-        end
-        if config
-          @key ||= config['key']
-          @secret ||= config['secret']
-        else
-          raise ArgumentError, "You must supply your key and secret"
-        end
+        raise ArgumentError, "You must supply your key and secret"
       end
+
+      @endpoint ||= API_ENDPOINT
       @format = 'json'
     end
     
@@ -140,7 +143,7 @@ module Animoto
     # @return [Hash] deserialized JSON response body
     def send_manifest manifest, endpoint, options = {}
       # request(:post, endpoint, manifest.to_json, { "Accept" => "application/#{format}", "Content-Type" => content_type_of(manifest) }, options)
-      u = URI.parse(API_ENDPOINT)
+      u = URI.parse(endpoint)
       u.path = endpoint
       request(:post, u, manifest.to_json, { "Accept" => "application/#{format}", "Content-Type" => content_type_of(manifest) }, options)
     end

data/lib/animoto.rb

@@ -1,5 +1,5 @@
 module Animoto
   def self.version
-    "0.0.0.alpha2"
+    "0.0.0.alpha3"
   end
 end

data/spec/animoto/client_spec.rb

@@ -9,7 +9,7 @@ describe Animoto::Client do
     @object ||= Object.new
   end
 
-  describe "supplying credentials" do
+  describe "supplying credentials and endpoint" do
     describe "manually" do
       it "should accept the key and secret as the first two parameters on initialization" do
         c = Animoto::Client.new "key", "secret"
@@ -17,6 +17,11 @@ describe Animoto::Client do
         c.secret.should == "secret"
       end
       
+      it "should accept an endpoint as an option" do
+        c = Animoto::Client.new "key", "secret", :endpoint => "https://api.animoto.com/"
+        c.endpoint.should == "https://api.animoto.com/"
+      end
+      
       describe "when the secret isn't specified (i.e. only 1 parameter was passed)" do
         before do
           File.stubs(:exist?).returns(false) # <= to keep it from finding our .animotorc files
@@ -26,13 +31,20 @@ describe Animoto::Client do
           lambda { Animoto::Client.new "key" }.should raise_error
         end
       end
+      
+      describe "when the endpoint isn't specified" do
+        it "should set the endpoint to the default" do
+          c = Animoto::Client.new "key", "secret"
+          c.endpoint.should == Animoto::Client::API_ENDPOINT
+        end
+      end
     end
     
     describe "automatically" do
       before do
         @home_path  = File.expand_path("~/.animotorc")
         @etc_path   = "/etc/.animotorc"
-        @config     = "key: joe\nsecret: secret"
+        @config     = "key: joe\nsecret: secret\nendpoint: https://api.animoto.com/"
       end
       
       describe "when ~/.animotorc exists" do
@@ -45,6 +57,7 @@ describe Animoto::Client do
           c = Animoto::Client.new
           c.key.should == "joe"
           c.secret.should == "secret"
+          c.endpoint.should == "https://api.animoto.com/"
         end
       end
       
@@ -63,6 +76,7 @@ describe Animoto::Client do
             c = Animoto::Client.new
             c.key.should == "joe"
             c.secret.should == "secret"
+            c.endpoint.should == "https://api.animoto.com/"
           end
         end
         
@@ -74,7 +88,7 @@ describe Animoto::Client do
       end
     end
   end
-  
+    
   describe "finding an instance by identifier" do
     before do
       @url = "https://api.animoto.com/storyboards/1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: animoto
 version: !ruby/object:Gem::Version 
-  hash: -1710980560
+  hash: -1710980559
   prerelease: true
   segments: 
   - 0
   - 0
   - 0
-  - alpha2
-  version: 0.0.0.alpha2
+  - alpha3
+  version: 0.0.0.alpha3
 platform: ruby
 authors: 
 - Animoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -04:00
+date: 2010-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency