panda 1.3.0 → 1.4.0

data/spec/cloud_spec.rb

@@ -4,12 +4,12 @@ describe Panda::Cloud do
   
   describe "region" do
     it "should tell the region" do
-      Panda.configure do |c|
-        c.access_key = "my_access_key"
-        c.secret_key = "my_secret_key"
-        c.api_host = "api.pandastream.com"
-        c.cloud_id = 'my_cloud_id'
-        c.api_port = 85
+      Panda.configure do
+        access_key "my_access_key"
+        secret_key "my_secret_key"
+        api_host "api.pandastream.com"
+        cloud_id 'my_cloud_id'
+        api_port 85
       end
       
       Panda.cloud.region.should == "us"
@@ -17,12 +17,12 @@ describe Panda::Cloud do
     end
     
     it "should tell the region" do
-      Panda.configure do |c|
-        c.access_key = "my_access_key"
-        c.secret_key = "my_secret_key"
-        c.api_host = "api.eu.pandastream.com"
-        c.cloud_id = 'my_cloud_id'
-        c.api_port = 85
+      Panda.configure do
+        access_key "my_access_key"
+        secret_key "my_secret_key"
+        api_host "api.eu.pandastream.com"
+        cloud_id 'my_cloud_id'
+        api_port 85
       end
       
       Panda.cloud.region.should == "eu"
@@ -31,14 +31,17 @@ describe Panda::Cloud do
     
   end
   
+  
+
+  
   describe "Using configure bloc" do
     before(:each) do
-      Panda.configure do |c|
-        c.access_key = "my_access_key"
-        c.secret_key = "my_secret_key"
-        c.api_host = "api.example.com"
-        c.cloud_id = 'my_cloud_id'
-        c.api_port = 85
+      Panda.configure do
+        access_key "my_access_key"
+        secret_key "my_secret_key"
+        api_host "api.example.com"
+        cloud_id 'my_cloud_id'
+        api_port 85
       end
     end
 
@@ -85,26 +88,32 @@ describe Panda::Cloud do
           to_return(:body => videos_json)
         @cloud.videos.create(:source_url => "my_source_url")
       end
-    end
-    
-    describe "Using options on find" do
       
-      it "should find a cloud" do
-        cloud_json = "{\"s3_videos_bucket\":\"my_bucket\",\"id\":\"my_cloud_id\"}"
-        stub_http_request(:get, /http:\/\/api.example.com:85\/v2\/clouds\/my_cloud_id.json/).
-          to_return(:body => cloud_json)
-        
-        @cloud = Panda::Cloud.find "my_cloud_id", {
-          "access_key" => "my_access_key", 
-          "secret_key" => "my_secret_key", 
-          "api_host" => "api.example.com", 
-          "api_port" => 85, 
-          "format" => "json" 
-        }
-        
-        @cloud.s3_videos_bucket.should == "my_bucket"
+      it "should find return all cloud" do
+        clouds_json = "[{\"s3_videos_bucket\":\"my_bucket1\",\"id\":\"cloud1\"},{\"s3_videos_bucket\":\"my_bucket2\",\"id\":\"cloud2\"}]"
+
+        stub_http_request(:get, /api.example.com:85\/v2\/clouds.json/).to_return(:body => clouds_json)
+
+        cloud = Panda::Cloud.all
+        cloud.first.id.should == 'cloud1'
+        cloud.first.s3_videos_bucket.should == "my_bucket1"
+        cloud.size.should == 2
       end
     end
     
+    
+    it "should create a cloud" do
+      cloud_json = "{\"s3_videos_bucket\":\"videobucket\",\"id\":\"my_cloud_id\"}"
+      stub_http_request(:post, /http:\/\/api.example.com:85\/v2\/clouds.json/).
+        with{|r| r.body =~ /s3_videos_bucket=videobucket/ &&  r.body =~ /user_aws_key=myaccesskey/ &&  r.body =~ /user_aws_secret=mysecretkey/ }.
+        to_return(:body => cloud_json)
+      
+      @cloud = Panda::Cloud.create(:s3_videos_bucket => 'videobucket', :user_aws_key => 'myaccesskey', :user_aws_secret => 'mysecretkey')
+      @cloud.s3_videos_bucket.should == "videobucket"
+    end
+
   end
+  
+  
+  
 end

data/spec/encoding_spec.rb

@@ -3,12 +3,12 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Panda::Encoding do
   before(:each) do
 
-    Panda.configure do |c|
-      c.access_key = "my_access_key"
-      c.secret_key = "my_secret_key"
-      c.api_host = "api.example.com"
-      c.cloud_id = 'my_cloud_id'
-      c.api_port = 85
+    Panda.configure do
+      access_key "my_access_key"
+      secret_key "my_secret_key"
+      api_host "api.example.com"
+      cloud_id 'my_cloud_id'
+      api_port 85
     end
     
   end
@@ -62,12 +62,12 @@ describe Panda::Encoding do
     encodings.first.id.should == "456"
   end
   
-  it "should return the video_url" do    
+  it "should return the encoding url" do    
     cloud_json = "{\"s3_videos_bucket\":\"my_bucket\",\"id\":\"my_cloud_id\", \"url\":\"http://my_bucket.s3.amazonaws.com/\"}" 
     stub_http_request(:get, /api.example.com:85\/v2\/clouds\/my_cloud_id.json/).
       to_return(:body => cloud_json)
     
-    encoding = Panda::Encoding.new({:id => "456", :extname => ".ext", :path => "abc/panda"})
+    encoding = Panda::Encoding.new({:id => "456", :extname => ".ext", :path => "abc/panda", :status => 'success'})
     encoding.url.should == "http://my_bucket.s3.amazonaws.com/abc/panda.ext"
   end
   
@@ -104,6 +104,25 @@ describe Panda::Encoding do
     encoding.profile_id.should == "901"
   end
   
+  it "should create an encoding through the association" do
+    video_json = "{\"source_url\":\"my_source_url\",\"id\":\"123\"}"
+    encoding_json = "{\"abc\":\"efg\",\"id\":\"456\", \"video_id\":\"123\", \"profile_id\":\"901\"}"
+
+    stub_http_request(:get, /api.example.com:85\/v2\/videos\/123.json/).
+      to_return(:body => video_json)
+
+    stub_http_request(:post, /api.example.com:85\/v2\/encodings.json/).
+        with{|r| r.body =~ /video_id=123/ && r.body =~ /profile_id=901/}.
+          to_return(:body => encoding_json)
+
+    video = Panda::Video.find("123")
+    
+    encoding = video.encodings.create!(:profile_id => "901")
+    encoding.id.should == "456"
+    encoding.profile_id.should == "901"
+  end
+  
+  
   it "should filter the profile name after triggering the request" do
     video_json = "{\"source_url\":\"my_source_url\",\"id\":\"123\"}"
     encodings_1_json = "[{\"id\":\"456\", \"video_id\":\"123\", \"profile_name\":\"h264\"}]"
@@ -195,7 +214,7 @@ describe Panda::Encoding do
     stub_http_request(:get, /api.example.com:85\/v2\/encodings\/456.json/).
       to_return(:body => encoding_json)
     
-    Panda::Encoding.id("456")
+    Panda::Encoding.find("456")
   end
   
   it "should tell if the encoding is success" do

data/spec/heroku_spec.rb

@@ -3,20 +3,30 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Panda::Video do
   before(:each) do
     cloud_json = "{\"s3_videos_bucket\":\"my_bucket\",\"id\":\"my_cloud_id\"}"
-    stub_http_request(:get, /api.example.com:85\/v2\/clouds\/my_cloud_id.json/).
+    stub_http_request(:get, /api.example.com:443\/v2\/clouds\/my_cloud_id.json/).
       to_return(:body => cloud_json)
 
     my_heroku_url = "http://access_key:secret_key@api.example.com:85/my_cloud_id"
-    Panda.configure do |c|
-      c.heroku = my_heroku_url
-    end
+    ENV['PANDASTREAM_URL']= my_heroku_url
   end
   
   it "should get all videos" do
+    Panda.configure_heroku
+    
     videos_json = "[]"
-    stub_http_request(:get, /api.example.com:85\/v2\/videos.json/).to_return(:body => videos_json)
+    stub_http_request(:get, /api.example.com:443\/v2\/videos.json/).to_return(:body => videos_json)
     
     Panda::Video.all.should be_empty
   end
   
+  it "should get all videos" do
+    Panda.configure ENV['PANDASTREAM_URL']
+    
+    videos_json = "[]"
+    stub_http_request(:get, /api.example.com:443\/v2\/videos.json/).to_return(:body => videos_json)
+    
+    Panda::Video.all.should be_empty
+  end
+  
+  
 end

data/spec/panda_spec.rb

@@ -1,7 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'timecop'
 
 describe Panda do
   before(:each) do
+    new_time = Time.local(20010, 1, 12, 1, 0, 0)
+    Timecop.freeze(new_time)
   end
   
   describe "when not connected" do
@@ -10,17 +13,17 @@ describe Panda do
       it "should raise error for #{method}" do
         lambda {
           Panda.send(method, nil, nil)
-        }.should raise_error("Not connected. Please connect! first.")
+        }.should raise_error("Panda is not configured!")
       end
     end
     
   end
 
-  describe "Connected", :shared => true do
+  shared_examples_for "Connected" do
 
     it "should make get request with signed request to panda server" 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 => "abc")
-      @panda.get("/videos").should == "abc"
+      stub_http_request(:get, "http://myapihost:85/v2/videos?access_key=my_access_key&cloud_id=my_cloud_id&signature=DYpg2K6d7kGo%2FuWPO%2FaQgtQmY3BPtFEtQgdQhVe8teM%3D&timestamp=20010-01-12T01%3A00%3A00.000000Z").to_return(:body => "{\"abc\":\"d\"}")
+      @panda.get("/videos").should == {'abc' => 'd'}
     end
 
     it "should create a signed version of the parameters" do
@@ -30,9 +33,9 @@ describe Panda do
                                            )
       signed_params.should == {
         'access_key' => "my_access_key",
-        'timestamp' => "2009-11-04T17:54:11+00:00",
+        'timestamp' => "20010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'w66goW6Ve5CT9Ibbx3ryvq4XM8OfIfSZe5oapgZBaUs=',
+        'signature' => 'aTgBGPeMrRk2Pnc13RxhK/ctWjDsL33vOFEC9qKLWV0=',
         'param1' => 'one',
         'param2' => 'two'
       }
@@ -41,9 +44,9 @@ describe Panda do
     it "should create a signed version of the parameters without additional arguments" do
       @panda.signed_params('POST', '/videos.json').should == {
         'access_key' => "my_access_key",
-        'timestamp' => "2009-11-04T17:54:11+00:00",
+        'timestamp' => "20010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'TI2n/dsSllxFhxcEShRGKWtDSqxu+kuJUPs335NavMo='
+        'signature' => 'g5lAh0cPC/qyUyTQb125vosvZwubQ+HgB04ORt+iw7o='
       }
     end
 
@@ -55,9 +58,9 @@ describe Panda do
                                            )
       signed_params.should == {
         'access_key' => "my_access_key",
-        'timestamp' => "2009-11-04T17:54:11+00:00",
+        'timestamp' => "20010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'w5P9+xPpQpRlweTh0guFYqQOmF+ZuTKXCmaKpUP3sH0=',
+        'signature' => 'G6LUFGIseRyDrqnj55t+CDrAGdRWtUWSqZwMmIsuW40=',
         'tilde' => '~',
         'space' => ' '
       }
@@ -67,9 +70,9 @@ describe Panda do
     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",
+        'timestamp' => "20010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'TI2n/dsSllxFhxcEShRGKWtDSqxu+kuJUPs335NavMo=',
+        'signature' => 'g5lAh0cPC/qyUyTQb125vosvZwubQ+HgB04ORt+iw7o=',
         'file' => "my_file"
       }
     end
@@ -77,63 +80,32 @@ describe Panda do
     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",
+        'timestamp' => "20010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'TI2n/dsSllxFhxcEShRGKWtDSqxu+kuJUPs335NavMo=',
+        'signature' => 'g5lAh0cPC/qyUyTQb125vosvZwubQ+HgB04ORt+iw7o=',
         '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)
-
-      e = RestClient::Exception.new({:body => "abc", :code => 400})
-      e.stub!(:http_body).and_return("abc")
-
-      resource.stub!(:get).and_raise(e)
-
-      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" })
-      panda.get("/videos").should == "abc"
-    end
   end
-  
-  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', "format" => "json")
-    end
     
-    it_should_behave_like "Connected"
-  end
-  
   describe "Panda.connect " do
     before(:each) do
-      @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" })
+      @panda = Panda.connect!({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id'})
     end
    it_should_behave_like "Connected"
   end
 
   describe "Panda.connect with symbols" do
     before(:each) do
-      @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" })
+      @panda = Panda.connect!({:access_key => "my_access_key", :secret_key => "my_secret_key", :api_host => "myapihost", :api_port => 85, :cloud_id => 'my_cloud_id'})
     end
     
    it_should_behave_like "Connected"
   end
-
-
-  describe "Panda.connect with PANDASTREAM_URL" do
-     before(:each) do
-       @panda = Panda.connect!('http://my_access_key:my_secret_key@myapihost:85/my_cloud_id', "format" => "json")
-     end
-    it_should_behave_like "Connected"
-  end
   
   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', "format" => "json" })
+       @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_behave_like "Connected"
   end
@@ -145,34 +117,35 @@ describe Panda do
     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\"}")
+      stub_http_request(:get, "http://myapihost:85/v2/videos?access_key=my_access_key&cloud_id=my_cloud_id&signature=DYpg2K6d7kGo%2FuWPO%2FaQgtQmY3BPtFEtQgdQhVe8teM%3D&timestamp=20010-01-12T01%3A00%3A00.000000Z").to_return(:body => "{\"key\":\"value\"}")
       @panda.get("/videos").should == {'key' => 'value'}
     end
     
   end
-
-  describe "ActiveSupport::JSON parsing" do
-
-    it "should use active support if it has been defined" do
-      @panda = Panda::Connection.new('http://my_access_key:my_secret_key@myapihost:85/my_cloud_id')
-      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")
-
-
-      module ActiveSupport
-        class JSON; end
-      end
-
-      ActiveSupport::JSON.should_receive(:decode).with("abc").and_return("blah")
-      @panda.get("/videos").should == "blah"
-      
-      Object.send :remove_const, :ActiveSupport
-    end
-  end
+  
+  # describe "ActiveSupport::JSON parsing" do
+  # 
+  #   it "should use active support if it has been defined and if restclient is used " 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.adapter = 'restclient'
+  #     
+  #     stub_http_request(:get, "http://myapihost:85/v2/videos?access_key=my_access_key&cloud_id=my_cloud_id&signature=DYpg2K6d7kGo%2FuWPO%2FaQgtQmY3BPtFEtQgdQhVe8teM%3D&timestamp=20010-01-12T01%3A00%3A00.000000Z").to_return(:body => "abc")
+  # 
+  # 
+  #     module ActiveSupport
+  #       class JSON; end
+  #     end
+  # 
+  #     ActiveSupport::JSON.should_receive(:decode).with("abc").and_return("blah")
+  #     @panda.get("/videos").should == "blah"
+  #     
+  #     Object.send :remove_const, :ActiveSupport
+  #   end
+  # end
   
   describe "parsing" do
     it "should raise an error if the response is not JSON parsable" do
       @connection = Panda::Connection.new({"access_key" => "my_access_key", "secret_key" => "my_secret_key", "api_host" => "myapihost", "api_port" => 85, "cloud_id" => 'my_cloud_id' })
-      @connection.raise_error=true
       
       stub_http_request(:get, //).to_return(:body => "blahblah")
             

data/spec/profile_spec.rb

@@ -6,12 +6,12 @@ describe Panda::Profile do
     stub_http_request(:get, /api.example.com:85\/v2\/clouds\/my_cloud_id.json/).
       to_return(:body => cloud_json)
 
-    Panda.configure do |c|
-      c.access_key = "my_access_key"
-      c.secret_key = "my_secret_key"
-      c.api_host = "api.example.com"
-      c.cloud_id = 'my_cloud_id'
-      c.api_port = 85
+    Panda.configure do
+      access_key "my_access_key"
+      secret_key "my_secret_key"
+      api_host "api.example.com"
+      cloud_id 'my_cloud_id'
+      api_port 85
     end
     
   end

data/spec/spec_helper.rb

@@ -1,8 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'panda'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
 require 'webmock/rspec'
 include WebMock::API
@@ -11,10 +10,10 @@ def hputs(*args)
   puts ERB::Util.html_escape(args.join("\n")).gsub(/\r?\n/, '<br/>') + '<br/>'
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:each) do
     Panda.instance_variable_set("@connection", nil)
     Panda.instance_variable_set("@cloud", nil)
-    Time.stub!(:now).and_return(mock("time", :iso8601 => "2009-11-04T17:54:11+00:00"))
+    Time.now.stub!(:utc).and_return(mock("time", :iso8601 => "2009-11-04T17:54:11+00:00"))
   end
 end