viddler-ruby 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    viddler-ruby (0.0.1)
+    viddler-ruby (0.0.3)
       activesupport (> 2.3.0)
       json
       rest-client

data/README.md

@@ -1,6 +1,39 @@
 viddler-ruby
 ============
 
+viddler-ruby is the officially supported gem for [Viddler's V2 API](http://developers.viddler.com/documentation/api-v2/).
+
+Installation
+------------
+
+    $ gem install viddler-ruby
+    
+### Rails 2
+
+Add the following to your `config/environment.rb`:
+
+    config.gem 'viddler-ruby'
+    
+Make sure to run `rake gems:install` afterwards.
+
+### Rails 3 and Bundler
+
+Add the following to your Gemfile:
+
+    gem 'viddler-ruby'
+    
+Make sure to run `bundle install` afterwards
+
+### Other
+
+To use in a regular Ruby project:
+
+    require 'rubygems'
+    require 'viddler-ruby'
+
+Usage
+-----
+
 viddler-ruby provides a simple interface to [Viddler](http://viddler.com)'s API.  To use, just instantiate an instance of Viddler::Client and call the `#get` and `#post` methods. For example, to get the details of a video:
 
     viddler = Viddler::Client.new('your api key')
@@ -9,9 +42,10 @@ viddler-ruby provides a simple interface to [Viddler](http://viddler.com)'s API.
     puts video['title'] # => "My video"
     puts video['id']    # => "abc123"
     
-For an authenticated client, just pass a username and password:
+For an authenticated client, just call `authenticate!` on the client:
 
-    viddler = Viddler::Client.new('your api key', 'username', 'password')
+    viddler = Viddler::Client.new('your api key')
+    viddler.authenticate! 'username', 'password'
     
 Then, any calls made on `viddler` will be done using the correct session id.
 

data/lib/viddler/client.rb

@@ -117,6 +117,9 @@ module Viddler
     # Returns a Hash containing the API response.
     # Raises ApiException if an error is returned from the API
     def upload(file, arguments)
+      # Call prepareUpload first, to get upload endpoint
+      endpoint = get('viddler.videos.prepareUpload')["upload"]["endpoint"]
+      
       # Need to use OrderedHash, because the API needs the file argument last
       ordered_arguments = ActiveSupport::OrderedHash.new
       
@@ -126,7 +129,7 @@ module Viddler
       ordered_arguments[:sessionid] = sessionid
       ordered_arguments[:file]      = file
       
-      JSON.parse RestClient.post(DEFAULT_ENDPOINT + 'viddler.videos.upload.json', ordered_arguments)
+      JSON.parse RestClient.post(endpoint, ordered_arguments)
     end
   end
 end

data/lib/viddler/version.rb

@@ -1,3 +1,3 @@
 module Viddler
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/client_spec.rb

@@ -120,13 +120,19 @@ describe Viddler::Client, "#upload" do
   before(:each) do
     @client = Viddler::Client.new('abc123')
     @file   = mock(File)
-    
     @client.sessionid = 'mysess'
+    
     RestClient.stub!(:post).and_return('{"response":["hello","howdy"]}')
+    @client.stub!(:get).and_return({"upload" => {"endpoint" => "http://upload.viddler.com/upload.json"}})
+  end
+  
+  it "calls get with viddler.videos.prepareUpload" do
+    @client.should_receive(:get).with('viddler.videos.prepareUpload')
+    @client.upload @file, :param1 => 'asdf', :param2 => true
   end
   
-  it "calls RestClient.post with params and file" do
-    RestClient.should_receive(:post).with('http://api.viddler.com/api/v2/viddler.videos.upload.json', hash_including(:param1 => 'asdf', :param2 => true, :file => @file))
+  it "calls RestClient.post with endpoint, params, and file" do
+    RestClient.should_receive(:post).with('http://upload.viddler.com/upload.json', hash_including(:param1 => 'asdf', :param2 => true, :file => @file))
     @client.upload @file, :param1 => 'asdf', :param2 => true
   end
   

data/spec/spec_helper.rb

@@ -3,4 +3,4 @@ require 'rspec'
 require 'rspec/autorun'
 
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-require 'viddler'
+require 'viddler-ruby'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: viddler-ruby
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kyle Slattery