panda 0.2.1 → 0.3.0

data/README.md

@@ -1,6 +1,6 @@
 # Panda
 
-Panda gem provides an interface to access the [Panda](http://api.pandastream.com) API from Ruby.
+Panda gem provides an interface to access the [Panda](http://pandastream.com) API from Ruby.
 
 ## Installation
 
@@ -10,18 +10,18 @@ Panda gem provides an interface to access the [Panda](http://api.pandastream.com
 
     require 'panda'
 
-### Connecting to Panda
+### Creating an instance of the client
 
-    Panda.connect!({
+    panda = Panda.new({
       :cloud_id => 'cloud_id', 
       :access_key => 'access_key', 
       :secret_key => 'secret_key', 
-      :api_host => 'api.pandastream.com'
+      :api_host => 'api.pandastream.com' # This may change depending on the region
     })
 
 ### Posting a video
     
-    Panda.post('/videos.json', {:source_url => 'http://www.example.com/original_video.mp4'})
+    panda.post('/videos.json', {:source_url => 'http://www.example.com/original_video.mp4'})
     =>{"duration"=>nil,
      "created_at"=>"2010/01/15 14:48:42 +0000",
      "original_filename"=>"panda.mp4",
@@ -40,7 +40,7 @@ Panda gem provides an interface to access the [Panda](http://api.pandastream.com
     
 ### Getting all videos
 
-    Panda.get('/videos.json')
+    panda.get('/videos.json')
     => [{"duration"=>14010,
       "created_at"=>"2010/01/13 16:45:29 +0000",
       "original_filename"=>"panda.mp4",
@@ -59,7 +59,7 @@ Panda gem provides an interface to access the [Panda](http://api.pandastream.com
     
 ### Getting video encodings 
     
-    Panda.get('/videos/0ee6b656-0063-11df-a433-1231390041c1/encodings.json')
+    panda.get('/videos/0ee6b656-0063-11df-a433-1231390041c1/encodings.json')
     => [{"encoder_id"=>nil,
       "created_at"=>"2010/01/13 16:45:30 +0000",
       "video_id"=>"0ee6b656-0063-11df-a433-1231390041c1",
@@ -79,11 +79,11 @@ Panda gem provides an interface to access the [Panda](http://api.pandastream.com
     
 ### Deleting a video encoding
 
-    Panda.delete('/encodings/0f815986-0063-11df-a433-1231390041c1.json')
+    panda.delete('/encodings/0f815986-0063-11df-a433-1231390041c1.json')
 
 ### Deleting a video
     
-    Panda.delete('/videos/0ee6b656-0063-11df-a433-1231390041c1.json')
+    panda.delete('/videos/0ee6b656-0063-11df-a433-1231390041c1.json')
 
 Copyright
 ---------

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/panda/api_authentication.rb

@@ -1,10 +1,11 @@
+require 'rubygems'
 require 'cgi'
 require 'time'
 require 'hmac'
 require 'hmac-sha2'
 require 'base64'
 
-module Panda
+class Panda
   class ApiAuthentication
     def self.authenticate(verb, request_uri, host, secret_key, params_given={})
       # Ensure all param keys are strings

data/lib/panda/panda.rb

@@ -1,61 +1,57 @@
 require 'restclient'
 
-module Panda
-  class << self
+class Panda
+  def initialize(auth_params={})
+    params = {:api_host => 'api.pandastream.com', :api_port => 80 }.merge(auth_params)
     
-    def connect!(auth_params={})
-      params = {:api_host => 'api.pandastream.com', :api_port => 80 }.merge(auth_params)
-      
-      @api_version = 2
-      @cloud_id = params["cloud_id"] || params[:cloud_id]
-      @access_key = params["access_key"] || params[:access_key]
-      @secret_key = params["secret_key"] || params[:secret_key]
-      @api_host = params["api_host"] || params[:api_host]
-      @api_port = params["api_port"] || params[:api_port]
-      
-      @prefix = params["prefix_url"] || "v#{@api_version}"
-      
-      @connection = RestClient::Resource.new(api_url)
-    end
+    @api_version = 2
+    @cloud_id = params["cloud_id"] || params[:cloud_id]
+    @access_key = params["access_key"] || params[:access_key]
+    @secret_key = params["secret_key"] || params[:secret_key]
+    @api_host = params["api_host"] || params[:api_host]
+    @api_port = params["api_port"] || params[:api_port]
     
-    def get(request_uri, params={})
-      append_authentication_params!("GET", request_uri, params)
-      @connection[ApiAuthentication.add_params_to_request_uri(request_uri, params)].get
-    end
-
-    def post(request_uri, params)
-      append_authentication_params!("POST", request_uri, params)
-      @connection[request_uri].post(params)
-    end
+    @prefix = params["prefix_url"] || "v#{@api_version}"
+    
+    @connection = RestClient::Resource.new(api_url)
+  end
+  
+  def get(request_uri, params={})
+    append_authentication_params!("GET", request_uri, params)
+    @connection[ApiAuthentication.add_params_to_request_uri(request_uri, params)].get
+  end
 
-    def put(request_uri, params)
-      append_authentication_params!("PUT", request_uri, params)
-      @connection[request_uri].put(params)
-    end
+  def post(request_uri, params)
+    append_authentication_params!("POST", request_uri, params)
+    @connection[request_uri].post(params)
+  end
 
-    def delete(request_uri, params={})
-      append_authentication_params!("DELETE", request_uri, params)
-      @connection[ApiAuthentication.add_params_to_request_uri(request_uri, params)].delete
-    end
-    
-    def authentication_params(verb, request_uri, params)
-      auth_params = {}
-      auth_params['cloud_id'] = @cloud_id
-      auth_params['access_key'] = @access_key
-      auth_params['timestamp'] = Time.now.iso8601(6)
-      auth_params['signature'] = ApiAuthentication.authenticate(verb, request_uri, @api_host, @secret_key, params.merge(auth_params))
-      return auth_params
-    end
-    
-    def api_url
-      "http://#{@api_host}:#{@api_port}/#{@prefix}"
-    end
-    private
-    
-    def append_authentication_params!(verb, request_uri, params)
-      auth_params = authentication_params(verb, request_uri, params)
-      params.merge!(auth_params)
-    end
+  def put(request_uri, params)
+    append_authentication_params!("PUT", request_uri, params)
+    @connection[request_uri].put(params)
+  end
 
+  def delete(request_uri, params={})
+    append_authentication_params!("DELETE", request_uri, params)
+    @connection[ApiAuthentication.add_params_to_request_uri(request_uri, params)].delete
+  end
+  
+  def authentication_params(verb, request_uri, params)
+    auth_params = {}
+    auth_params['cloud_id'] = @cloud_id
+    auth_params['access_key'] = @access_key
+    auth_params['timestamp'] = Time.now.iso8601(6)
+    auth_params['signature'] = ApiAuthentication.authenticate(verb, request_uri, @api_host, @secret_key, params.merge(auth_params))
+    return auth_params
+  end
+  
+  def api_url
+    "http://#{@api_host}:#{@api_port}/#{@prefix}"
+  end
+  private
+  
+  def append_authentication_params!(verb, request_uri, params)
+    auth_params = authentication_params(verb, request_uri, params)
+    params.merge!(auth_params)
   end
 end

data/panda.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{panda}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]
-  s.date = %q{2010-01-26}
+  s.date = %q{2010-02-22}
   s.description = %q{Panda Client}
   s.email = %q{info@pandastream.com}
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/newbamboo/panda_gem}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Panda Client}
   s.test_files = [
     "spec/panda_spec.rb",

data/spec/panda_spec.rb

@@ -3,19 +3,20 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Panda do
   before(:each) do
     FakeWeb.allow_net_connect = false
-    Panda.connect!({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id' })
+    @panda = Panda.new({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id' })
+    # Panda.connect!({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id' })
     Time.stub!(:now).and_return(mock("time", :iso8601 => "2009-11-04T17:54:11+00:00"))
   end
   
   
   it "should make get request with signed request to panda server" do
     FakeWeb.register_uri(:get, "http://myapihost:85/v2/videos?timestamp=2009-11-04T17%3A54%3A11%2B00%3A00&signature=CxSYPM65SeeWH4CE%2FLcq7Ny2NtwxlpS8QOXG2BKe4p8%3D&access_key=my_access_key&cloud_id=my_cloud_id", :body => "abc")
-    Panda.get("/videos").should == "abc"
+    @panda.get("/videos").should == "abc"
   end
 
   it "should make delete request with signed request to panda server" do
     FakeWeb.register_uri(:delete, "http://myapihost:85/v2/videos/1?timestamp=2009-11-04T17%3A54%3A11%2B00%3A00&signature=t0IYclDXgjZFRYaMf0Gbg%2B5vOqp7q8QQRN8tlQ3bk8Q%3D&access_key=my_access_key&cloud_id=my_cloud_id", :query => {})
-    Panda.delete("/videos/1").should
+    @panda.delete("/videos/1").should
     FakeWeb.should have_requested(:delete, "http://myapihost:85/v2/videos/1?timestamp=2009-11-04T17%3A54%3A11%2B00%3A00&signature=t0IYclDXgjZFRYaMf0Gbg%2B5vOqp7q8QQRN8tlQ3bk8Q%3D&access_key=my_access_key&cloud_id=my_cloud_id")
   end
   

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: panda
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - New Bamboo
@@ -9,59 +14,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +00:00
+date: 2010-02-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: fakeweb-matcher
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 description: Panda Client
 email: info@pandastream.com
 executables: []
@@ -98,18 +118,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Panda Client