panda 0.5.0 → 0.6.0

data/README.md

@@ -8,6 +8,7 @@ Panda gem provides an interface to access the [Panda](http://pandastream.com) AP
 
 ## How to use it
 
+    require 'rubygems'
     require 'panda'
 
 ### Creating an instance of the client
@@ -21,7 +22,7 @@ Panda gem provides an interface to access the [Panda](http://pandastream.com) AP
 
 ### Posting a video
 
-    Panda.post('/videos.json', {:file => File.open("panda.mp4")}) # Note that you will need a movie file to test this. You can grab http://panda-test-harness-videos.s3.amazonaws.com/panda.mp4
+    Panda.post('/videos.json', {:file => File.new("panda.mp4")}) # Note that you will need a movie file to test this. You can grab http://panda-test-harness-videos.s3.amazonaws.com/panda.mp4
 
     Panda.post('/videos.json', {:source_url => 'http://www.example.com/original_video.mp4'})
     =>{"duration"=>nil,
@@ -31,7 +32,6 @@ Panda gem provides an interface to access the [Panda](http://pandastream.com) AP
      "source_url"=>"http://www.example.com/original_video.mp4",
      "id"=>"12fce296-01e5-11df-ae37-12313902cc92",
      "extname"=>".mp4",
-     "thumbnail_position"=>nil,
      "audio_codec"=>nil,
      "height"=>nil,
      "upload_redirect_url"=>nil,
@@ -47,10 +47,9 @@ Panda gem provides an interface to access the [Panda](http://pandastream.com) AP
       "created_at"=>"2010/01/13 16:45:29 +0000",
       "original_filename"=>"panda.mp4",
       "updated_at"=>"2010/01/13 16:45:35 +0000",
-     "source_url"=>"http://www.example.com/original_video.mp4",
+      "source_url"=>"http://www.example.com/original_video.mp4",
       "id"=>"0ee6b656-0063-11df-a433-1231390041c1",
       "extname"=>".mp4",
-      "thumbnail_position"=>nil,
       "audio_codec"=>"aac",
       "height"=>240,
       "upload_redirect_url"=>nil,
@@ -65,11 +64,10 @@ Panda gem provides an interface to access the [Panda](http://pandastream.com) AP
     => [{"encoder_id"=>nil,
       "created_at"=>"2010/01/13 16:45:30 +0000",
       "video_id"=>"0ee6b656-0063-11df-a433-1231390041c1",
-      "video_url"=>
-       "http://s3.amazonaws.com/panda-videos/0f815986-0063-11df-a433-1231390041c1.flv",
+      "video_url"=> 
+          "http://s3.amazonaws.com/panda-videos/0f815986-0063-11df-a433-1231390041c1.flv",
       "started_encoding_at"=>"2010/01/13 16:47:35 +0000",
       "updated_at"=>"2010/01/13 16:47:40 +0000",
-      "lock_version"=>7,
       "extname"=>".flv",
       "encoding_progress"=>87,
       "encoding_time"=>3,

data/Rakefile

@@ -11,8 +11,7 @@ begin
     gem.homepage = "http://github.com/newbamboo/panda_gem"
     gem.authors = ["New Bamboo"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "fakeweb"
-    gem.add_development_dependency "fakeweb-matcher"
+    gem.add_development_dependency "webmock"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.add_dependency "ruby-hmac", ">= 0.3.2" 
     gem.add_dependency "rest-client", ">= 1.5"

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/panda/panda.rb

@@ -1,8 +1,10 @@
 require 'restclient'
+require 'json'
 
 class Panda
-  def self.connect!(auth_params)
-    @@connection = Connection.new(auth_params)
+  
+  def self.connect!(auth_params, options={})
+    @@connection = Connection.new(auth_params, options)
   end
   
   def self.get(request_uri, params={})    
@@ -44,23 +46,33 @@ class Panda
   end
   
   class Connection
-    attr_reader :api_host, :api_port, :access_key, :secret_key, :api_version
+    attr_reader :api_host, :api_port, :access_key, :secret_key, :api_version, :format
   
     DEFAULT_API_PORT=80
     DEFAULT_API_HOST="api.pandastream.com"
   
-    def initialize(auth_params)
+    def initialize(auth_params, options={})
       @api_version = 2
-
+      @format = "hash"
+      
       if auth_params.class == String
+        self.format = options["format"]
         init_from_url(auth_params)
       else
+        self.format = auth_params["format"]
         init_from_hash(auth_params)
       end
-    
+      
       @connection = RestClient::Resource.new(api_url)
     end
 
+    def format=(ret_format)
+      if ret_format 
+        raise "Format unknown" if !["json", "hash"].include?(ret_format.to_s)
+        @format = ret_format
+      end
+    end
+    
     def get(request_uri, params={})
       rescue_restclient_exception do
         query = signed_query("GET", request_uri, params)
@@ -92,7 +104,7 @@ class Panda
     end
     
     def signed_params(verb, request_uri, params = {}, timestamp_str = nil)
-      auth_params = params
+      auth_params = stringify_keys(params)
       auth_params['cloud_id']   = @cloud_id
       auth_params['access_key'] = @access_key
       auth_params['timestamp']  = timestamp_str || Time.now.iso8601(6)
@@ -112,21 +124,36 @@ class Panda
     end
 
     private
-
+      def stringify_keys(params)
+        params.inject({}) do |options, (key, value)|
+          options[key.to_s] = value
+          options
+        end
+      end
+      
       def rescue_restclient_exception(&block)
         begin
           yield
         rescue RestClient::Exception => e
-          e.http_body
+          format_to(e.http_body)
         end
       end
 
       # API change on rest-client 1.4
       def body_of(response)
-        response.respond_to?(:body) ? response.body : response
+        json_response = response.respond_to?(:body) ? response.body : response
+        format_to(json_response)
       end
-
-
+      
+      def format_to(response)
+        puts self.format
+        if self.format == "json"
+          return response
+        else
+          JSON.parse(response)
+        end
+      end
+      
       def init_from_url(url)
         params = url.scan(/http:\/\/([^:@]+):([^:@]+)@([^:@]+)(:[\d]+)?\/([^:@]+)$/).flatten
         @access_key = params[0]

data/panda.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{panda}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-06-08}
   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.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Panda Client}
   s.test_files = [
     "spec/panda_spec.rb",
@@ -47,21 +47,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb-matcher>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<rest-client>, [">= 1.5"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<fakeweb-matcher>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
       s.add_dependency(%q<rest-client>, [">= 1.5"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<fakeweb-matcher>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
     s.add_dependency(%q<rest-client>, [">= 1.5"])
   end

data/spec/panda_spec.rb

@@ -2,7 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Panda do
   before(:each) do
-    FakeWeb.allow_net_connect = false
     Time.stub!(:now).and_return(mock("time", :iso8601 => "2009-11-04T17:54:11+00:00"))
   end
   
@@ -21,16 +20,10 @@ describe Panda do
   describe "Connected", :shared => true do
 
     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")
+      stub_http_request(:get, "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").to_return(:body => "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
-      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
-
     it "should create a signed version of the parameters" do
       signed_params = @panda.signed_params('POST',
                                            '/videos.json',
@@ -70,10 +63,31 @@ describe Panda do
         'space' => ' '
       }
     end
+    
+    
+    it "should not include file inside the signature" do
+      @panda.signed_params('POST', '/videos.json', { "file" => "my_file" }).should == {
+        'access_key' => "my_access_key",
+        'timestamp' => "2009-11-04T17:54:11+00:00",
+        'cloud_id' => 'my_cloud_id',
+        'signature' => 'TI2n/dsSllxFhxcEShRGKWtDSqxu+kuJUPs335NavMo=',
+        'file' => "my_file"
+      }
+    end
 
-    it "should return a json file for every http code" 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")
+    it "should stringify keys" do
+      @panda.signed_params('POST', '/videos.json', { :file => "symbol_key" }).should == {
+        'access_key' => "my_access_key",
+        'timestamp' => "2009-11-04T17:54:11+00:00",
+        'cloud_id' => 'my_cloud_id',
+        'signature' => 'TI2n/dsSllxFhxcEShRGKWtDSqxu+kuJUPs335NavMo=',
+        'file' => "symbol_key"
+      }
+    end
 
+    it "should return a json file for every http code" do
+      stub_http_request(: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").to_return(:body => "abc")
+      
       resource = RestClient::Resource.new("http://myapihost:85/v2")
       RestClient::Resource.stub!(:new).and_return(resource)
 
@@ -89,7 +103,7 @@ describe Panda do
   
   describe "Connected with a string url" do
     before(:each) do
-      @panda = Panda::Connection.new('http://my_access_key:my_secret_key@myapihost:85/my_cloud_id')
+      @panda = Panda::Connection.new('http://my_access_key:my_secret_key@myapihost:85/my_cloud_id', "format" => "json")
     end
     
     it_should_behave_like "Connected"
@@ -97,15 +111,14 @@ describe Panda do
   
   describe "Panda.connect " do
     before(:each) do
-      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
+      @panda = Panda.connect!({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id', "format" => "json" })
     end
    it_should_behave_like "Connected"
   end
 
   describe "Panda.connect with PANDASTREAM_URL" do
      before(:each) do
-       Panda.connect!('http://my_access_key:my_secret_key@myapihost:85/my_cloud_id')
+       Panda.connect!('http://my_access_key:my_secret_key@myapihost:85/my_cloud_id', "format" => "json")
        @panda = Panda
      end
     it_should_behave_like "Connected"
@@ -113,9 +126,22 @@ describe Panda do
   
   describe "Panda::Connection.new" do
      before(:each) do
-       @panda = Panda::Connection.new({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id' })
+       @panda = Panda::Connection.new({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id', "format" => "json" })
      end
     it_should_behave_like "Connected"
   end
   
+  describe "Using hash as a return format" do
+    before(:each) do
+      @panda = Panda::Connection.new({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id' })
+    end
+    
+    it "should make get request" do
+      stub_http_request(:get, "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").to_return(:body => "{\"key\":\"value\"}")
+      @panda.get("/videos").should == {'key' => 'value'}
+    end
+    
+  end
+  
+  
 end

data/spec/spec_helper.rb

@@ -4,8 +4,9 @@ require 'panda'
 require 'spec'
 require 'spec/autorun'
 
-require 'fakeweb'
-require 'fakeweb_matcher'
+require 'webmock/rspec'
+include WebMock
+
 
 Spec::Runner.configure do |config|
   

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: panda
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - New Bamboo
@@ -14,74 +9,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +01:00
+date: 2010-06-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
-  type: :development
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  name: webmock
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fakeweb-matcher
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 2
         version: 0.3.2
-  type: :runtime
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
         version: "1.5"
-  type: :runtime
-  version_requirements: *id005
+    version: 
 description: Panda Client
 email: info@pandastream.com
 executables: []
@@ -118,20 +88,18 @@ 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.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Panda Client