panda 1.3.0 → 1.4.0

data/spec/video_spec.rb

@@ -2,13 +2,13 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Panda::Video 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
@@ -50,6 +50,13 @@ describe Panda::Video do
     video.source_url.should == "my_source_url"
   end
   
+  it "should raise exception if id is nil" do
+    
+    lambda {
+      Panda::Video.find(nil)
+    }.should raise_error('find method requires a correct value')
+
+  end
   
   it "should list all video's encodings" do
     video_json = "{\"source_url\":\"my_source_url\",\"id\":\"123\"}"
@@ -87,7 +94,7 @@ describe Panda::Video do
     
     lambda {
         Panda::Video.find "abc"
-    }.should raise_error("error-abc: no-abc")
+    }.should raise_error(Panda::APIError, "error-abc: no-abc")
   end
   
   it "should have an error object if something goes wrong" do
@@ -100,8 +107,7 @@ describe Panda::Video do
     obj.save
     
     obj.errors.size.should == 1
-    obj.errors.first.message.should == "no-abc"
-    obj.errors.first.error_class.should == "error-abc"
+    obj.errors.first.to_s.should == "error-abc: no-abc"
     obj.attributes.should == original_attrs
     
   end
@@ -109,11 +115,11 @@ describe Panda::Video do
   it "should connect to eu" do
 
 
-    Panda.configure do |c|
-      c.access_key = "my_access_key"
-      c.secret_key = "my_secret_key"
-      c.cloud_id = 'my_cloud_id'
-      c.region = "eu"
+    Panda.configure do
+      access_key "my_access_key"
+      secret_key "my_secret_key"
+      cloud_id 'my_cloud_id'
+      region "eu"
     end
     
     stub_http_request(:get, /api.eu.pandastream.com:443/).
@@ -127,10 +133,10 @@ describe Panda::Video do
       to_return(:body => cloud_json)
 
     Panda.configure do |c|
-      c.access_key = "my_access_key"
-      c.secret_key = "my_secret_key"
-      c.cloud_id = 'my_cloud_id'
-      c.region = "eu"
+      c.access_key "my_access_key"
+      c.secret_key "my_secret_key"
+      c.cloud_id 'my_cloud_id'
+      c.region  "eu"
     end
     
     stub_http_request(:get, /api.eu.pandastream.com:443/).
@@ -177,6 +183,20 @@ describe Panda::Video do
     video.id.should == "123"
   end
   
+  it "should create a video using class method and a block" do
+    video_json = "{\"source_url\":\"url_panda.mp4\",\"id\":\"123\"}"
+    
+    stub_http_request(:post, /api.example.com:85\/v2\/videos.json/).
+      with(:body => /source_url=url_panda.mp4/).
+        to_return(:body => video_json)
+    
+    video = Panda::Video.create do |v|
+      v.source_url = "url_panda.mp4"
+    end
+    
+    video.id.should == "123"
+  end
+  
   it "should return a json on attributes" do
     video = Panda::Video.new(:attr => "value")
     video.to_json.should == video.attributes.to_json
@@ -225,6 +245,35 @@ describe Panda::Video do
     WebMock.should have_requested(:get, /api.example.com:85\/v2\/videos\/123\/encodings.json/).once
   end
   
+  it 'should generate json of encodings' do
+    video_json = "{\"source_url\":\"url_panda.mp4\",\"id\":\"123\"}"
+    stub_http_request(:get, /api.example.com:85\/v2\/videos\/123.json/).to_return(:body => video_json)
+    video = Panda::Video.find("123")
+
+    encodings_json = "[{\"abc\":\"my_source_url\",\"id\":\"456\"}]"
+    stub_http_request(:get, /api.example.com:85\/v2\/videos\/123\/encodings.json/).to_return(:body => encodings_json)
+
+    video.encodings.to_json.should == "[{\"abc\":\"my_source_url\",\"id\":\"456\",\"cloud_id\":\"my_cloud_id\"}]"
+  end
+  
+  it "should return the video 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)
+    
+    video = Panda::Video.new({:id => "456", :extname => ".ext", :path => "abc/panda", :status => 'success'})
+    video.url.should == "http://my_bucket.s3.amazonaws.com/abc/panda.ext"
+  end
+  
+  it "should generate a screenhost array" 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)
+
+    video = Panda::Video.new({:id => "456", :extname => ".ext", :status => "success", :path => "abc/panda"})
+    video.screenshots[0].should == "http://my_bucket.s3.amazonaws.com/abc/panda_1.jpg"
+  end
+  
   it "should call the request if the scope has changed" do
     video_json = "{\"source_url\":\"url_panda.mp4\",\"id\":\"123\"}"
     stub_http_request(:get, /api.example.com:85\/v2\/videos\/123.json/).to_return(:body => video_json)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: panda
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - New Bamboo
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +00:00
+date: 2011-02-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: ruby-hmac
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +32,11 @@ dependencies:
         - 3
         - 2
         version: 0.3.2
-  type: :development
-  name: ruby-hmac
-  prerelease: false
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,11 +46,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: rest-client
-  prerelease: false
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: faraday
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,11 +60,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: json
-  prerelease: false
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: timecop
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,128 +75,72 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: jeweler
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
+        - 2
+        - 4
         - 0
-        version: "0"
+        version: 2.4.0
   type: :development
-  name: rake
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
-  type: :development
-  name: rspec
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
-  type: :development
   name: webmock
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 2
-        version: 0.3.2
-  type: :runtime
-  name: ruby-hmac
-  prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  type: :runtime
-  name: rest-client
-  prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
-  type: :runtime
-  name: json
-  prerelease: false
-  version_requirements: *id010
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Panda Client
-email: info@pandastream.com
+email: 
+- info@pandastream.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - lib/panda.rb
+- lib/panda/adapters/adapter.rb
+- lib/panda/adapters/faraday.rb
+- lib/panda/adapters/restclient.rb
 - lib/panda/api_authentication.rb
 - lib/panda/base.rb
+- lib/panda/config.rb
 - lib/panda/connection.rb
-- lib/panda/error.rb
+- lib/panda/errors.rb
 - lib/panda/modules/associations.rb
 - lib/panda/modules/builders.rb
 - lib/panda/modules/cloud_connection.rb
+- lib/panda/modules/destroyers.rb
 - lib/panda/modules/finders.rb
 - lib/panda/modules/router.rb
-- lib/panda/modules/short_status.rb
 - lib/panda/modules/updatable.rb
+- lib/panda/modules/video_state.rb
+- lib/panda/modules/viewable.rb
 - lib/panda/panda.rb
 - lib/panda/proxies/encoding_scope.rb
 - lib/panda/proxies/profile_scope.rb
@@ -206,13 +152,13 @@ files:
 - lib/panda/resources/profile.rb
 - lib/panda/resources/resource.rb
 - lib/panda/resources/video.rb
+- lib/panda/version.rb
 - panda.gemspec
 - spec/cloud_spec.rb
 - spec/encoding_spec.rb
 - spec/heroku_spec.rb
 - spec/panda_spec.rb
 - spec/profile_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/video_spec.rb
 has_rdoc: true
@@ -244,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: panda
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/VERSION

@@ -1 +0,0 @@
-1.3.0

data/lib/panda/error.rb

@@ -1,29 +0,0 @@
-module Panda
-  class Error
-    attr_reader :message
-    attr_reader :error_class
-    attr_reader :original_hash
-
-    def initialize(options)
-     @original_hash = options
-     @message = options['message']
-     @error_class = options['error']
-    end
-
-    def raise!
-      raise(self.to_s)
-    end
-
-    def to_s
-      "#{@error_class}: #{@message}"
-    end
-
-  end
-
-  class ServiceNotAvailable < StandardError
-    def initialize
-      super("ServiceNotAvailable")
-    end
-  end
-
-end

data/lib/panda/modules/short_status.rb

@@ -1,13 +0,0 @@
-module ShortStatus
-  def success?
-    @attributes['status'] == 'success'
-  end
-
-  def processing?
-    @attributes['status'] == 'processing'
-  end
-
-  def fail?
-    @attributes['status'] == 'fail'
-  end
-end