panda 1.4.4 → 1.5.0

data/CHANGELOG.md

@@ -1,7 +1,19 @@
+## 1.5.0 (October 17, 2011)
+
+Features:
+
+    - Faraday and Typhoeus by default
+    - MultiJson
+    - Added `urls`
+    - Removed `screenshots` on video replaced by preview_url
+    - Nicer inspect on resources
+    - Added `metadata` on video and `cancel` and `retry` on encoding
+    - Added direct access to a specific encoding using video.encodings['h264'] (if profile_name is h264)
+
 ## 1.4.4 (August 25, 2011)
 
 Features:
-    Updated the faraday interface to use typhoeus and recent faraday
+    - Updated the faraday interface to use Typhoeus and recent Faraday
 
 ## 1.4.3 (August 18, 2011)
 

data/README.md

@@ -19,8 +19,8 @@ Panda gem provides an interface to access the [Panda](http://pandastream.com) AP
       access_key "panda_access_key"
       secret_key "panda_secret_key"
       cloud_id "panda_cloud_id"
-      # api_host "api-eu.pandastream.com" ## for EU accounts
-      # api_port 80 ## to use http (default 443)
+      # Uncomment below if you have register for an EU account
+      # api_host "api-eu.pandastream.com" 
     end
 
     or Panda.configure({:access_key => ....})
@@ -50,8 +50,8 @@ The name of the profile can be found in your [Panda account](http://pandastream.
     encodings = Panda::Video.find("1234").encodings
     => [...]
     
-    mp4_encoding = encodings.find_by_profile_name("h264")
-    ogg_encoding = encodings.find_by_profile_name("ogg")
+    mp4_encoding = encodings["h264"]
+    ogg_encoding = encodings["ogg"]
     
     mp4_encoding.url
     => "http://s3.amazonaws.com/my_panda_bucket/4567.mp4"

data/lib/panda.rb

@@ -8,7 +8,6 @@ require 'panda/modules/builders'
 require 'panda/modules/destroyers'
 require 'panda/modules/associations'
 require 'panda/modules/updatable'
-require 'panda/modules/viewable'
 require 'panda/modules/video_state'
 require 'panda/modules/cloud_connection'
 require 'panda/proxies/proxy'
@@ -17,7 +16,7 @@ require 'panda/proxies/encoding_scope'
 require 'panda/proxies/video_scope'
 require 'panda/proxies/profile_scope'
 require 'panda/adapters/adapter'
-require 'panda/adapters/restclient'
+require 'panda/adapters/faraday'
 require 'panda/errors'
 require 'panda/base'
 require 'panda/resources/resource'

data/lib/panda/adapters/adapter.rb

@@ -1,3 +1,5 @@
+require 'multi_json'
+
 module Panda
   module Adapter
   end

data/lib/panda/adapters/faraday.rb

@@ -1,5 +1,4 @@
 require 'faraday'
-require 'yajl/json_gem'
 require 'typhoeus'
 
 module Panda
@@ -53,15 +52,16 @@ module Panda
       
       def connection
         @conn ||= ::Faraday.new(:url => @api_url) do |builder|
-          builder.request  :url_encoded
+          builder.request :multipart
+          builder.request :url_encoded
           builder.adapter :typhoeus
         end
       end
-      
+
       def rescue_json_parsing(&block)
         begin
-          Yajl::Parser.parse(yield)
-        rescue Yajl::ParseError => e
+          MultiJson.decode(yield)
+        rescue MultiJson::DecodeError => e
           raise(ServiceNotAvailable)
         end
       end

data/lib/panda/adapters/restclient.rb

@@ -1,5 +1,4 @@
 require 'restclient'
-require 'json' unless defined?(ActiveSupport::JSON) || defined?(JSON::JSON_LOADED)
 
 module Panda
   module Adapter
@@ -12,55 +11,43 @@ module Panda
       def get(request_uri, params)
         rescue_json_parsing do
           query = ApiAuthentication.hash_to_query(params)
-          hash_response connection[request_uri + '?' + query].get
+          connection[request_uri + '?' + query].get
         end
       end
 
       def post(request_uri, params)
         rescue_json_parsing do
-          hash_response connection[request_uri].post(params)
+          connection[request_uri].post(params)
         end
       end
 
       def put(request_uri, params)
         rescue_json_parsing do
-          hash_response connection[request_uri].put(params)
+          connection[request_uri].put(params)
         end
       end
 
       def delete(request_uri, params)
         rescue_json_parsing do
           query = ApiAuthentication.hash_to_query(params)
-          hash_response connection[request_uri + '?' + query].delete
+          connection[request_uri + '?' + query].delete
         end
       end
 
       private
-      
+
       def connection
         @conn ||= ::RestClient::Resource.new(@api_url)
       end
-      
-      def hash_response(response)
-        begin
-          if defined?(ActiveSupport::JSON)
-            ActiveSupport::JSON.decode(response)
-          else
-            JSON.parse(response)
-          end
-        rescue JSON::ParserError => e
-          raise ServiceNotAvailable.new
-        end
-      end
-      
+
       def rescue_json_parsing(&block)
         begin
-          yield
-        rescue ::RestClient::Exception => e
-          hash_response(e.http_body)
+          MultiJson.decode(yield)
+        rescue MultiJson::DecodeError => e
+          raise(ServiceNotAvailable)
         end
       end
-      
+
     end
   end
 end

data/lib/panda/base.rb

@@ -1,5 +1,4 @@
 require 'forwardable'
-
 module Panda
   class Base
     attr_accessor :attributes, :errors
@@ -9,8 +8,6 @@ module Panda
     include Panda::Builders
     include Panda::Finders
 
-    def_delegators :attributes, :to_json
-
     def initialize(attributes = {})
       clear_attributes
       load(attributes)
@@ -43,6 +40,15 @@ module Panda
       self
     end
 
+    def inspect
+      attributes_as_nice_string = self.attributes.map {|k,v| "#{k}: #{v.inspect}"}.compact.join(", ")
+      "#<#{self.class} #{attributes_as_nice_string}>"
+    end
+
+    def to_json(*args)
+      MultiJson.encode(self.attributes)
+    end
+
     private
 
     def load_and_reset(response)

data/lib/panda/panda.rb

@@ -53,7 +53,7 @@ module Panda
   private
 
   def default_adapter
-    Panda::Adapter::RestClient
+    Panda::Adapter::Faraday
   end
   
   def configure_with_auth_params(config)

data/lib/panda/proxies/encoding_scope.rb

@@ -6,7 +6,7 @@ module Panda
     end
 
     def non_delegate_methods
-      super + [:status, :profile_id, :profile_name, :video, :page, :per_page]
+      super + [:status, :profile_id, :profile_name, :video, :page, :per_page, :[]]
     end
 
     def page(this_page)
@@ -44,5 +44,13 @@ module Panda
       trigger_request.first
     end
 
+    def [](index)
+      if(index.is_a? String)
+        proxy_found.select{|e| e.profile_name == index}[0]
+      else
+        proxy_found[index]
+      end
+    end
+
   end
 end

data/lib/panda/proxies/scope.rb

@@ -19,7 +19,7 @@ module Panda
       initialize_scope_attributes
       initialize_scopes
     end
-    
+
     # Overide the function to set the cloud_id as the same as the scope
     def find_by_path(url, map={})
       object = find_object_by_path(url, map)

data/lib/panda/resources/encoding.rb

@@ -1,8 +1,7 @@
 module Panda
   class Encoding < Resource
     include VideoState
-    include Viewable
-    
+
     belongs_to :video
     has_one :profile
 
@@ -12,7 +11,31 @@ module Panda
       end
     end
 
-    def screenshots_size; 7 end
+    def url
+      full_path = "#{path}#{extname}"
+      get_url(full_path) if files.include?(full_path)
+    end
     
+    def urls
+      files.map {|f| "#{cloud.url}#{f}"}
+    end
+
+    def screenshots
+      ((1..7).map{|i| get_url("#{path}_#{i}.jpg")} if success?) || []
+    end
+
+    def cancel
+      connection.post("/encodings/#{id}/cancel.json")['canceled']
+    end
+
+    def retry
+      connection.post("/encodings/#{id}/retry.json")['retried']
+    end
+
+    private
+
+    def get_url(end_path)
+      "#{cloud.url}#{end_path}"
+    end
   end
 end

data/lib/panda/resources/video.rb

@@ -1,7 +1,6 @@
 module Panda
   class Video < Resource
     include VideoState
-    include Viewable
     has_many :encodings
 
     class << self
@@ -10,7 +9,23 @@ module Panda
       end
     end
 
-    def screenshots_size; 1 end
-    
+    def metadata
+      connection.get("/videos/#{id}/metadata.json")
+    end
+
+    def preview_url
+      get_url("#{path}_1.jpg") if success?
+    end
+
+    def url
+      get_url("#{path}#{extname}") if success?
+    end
+
+    private
+
+    def get_url(end_path)
+      "#{cloud.url}#{end_path}"
+    end
+
   end
 end

data/lib/panda/version.rb

@@ -1,3 +1,3 @@
 module Panda
-  VERSION = "1.4.4"
+  VERSION = "1.5.0"
 end

data/panda.gemspec

@@ -6,15 +6,16 @@ Gem::Specification.new do |s|
   s.name        = "panda"
   s.version     = Panda::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["New Bamboo"]
+  s.authors     = ["Pandastream"]
   s.email       = ["info@pandastream.com"]
-  s.homepage    = "http://github.com/newbamboo/panda_gem"
+  s.homepage    = "http://github.com/pandastream/panda_gem"
   s.summary     = %q{Panda Client}
   s.description = %q{Panda Client}
 
   s.add_dependency "ruby-hmac", ">= 0.3.2"
-  s.add_dependency "rest-client"
-  s.add_dependency "json"
+  s.add_dependency "faraday", ">= 0.7.0"
+  s.add_dependency "typhoeus"
+  s.add_dependency "multi_json"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "timecop"

data/spec/encoding_spec.rb

@@ -63,11 +63,11 @@ describe Panda::Encoding do
   end
   
   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/\"}" 
+    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", :status => 'success'})
+    encoding = Panda::Encoding.new({:id => "456", :extname => ".ext", :path => "abc/panda", "files" => ["abc/panda.ext"], :status => 'success'})
     encoding.url.should == "http://my_bucket.s3.amazonaws.com/abc/panda.ext"
   end
   

data/spec/video_spec.rb

@@ -225,7 +225,12 @@ describe Panda::Video do
   
   it "should return a json on attributes" do
     video = Panda::Video.new(:attr => "value")
-    video.to_json.should == video.attributes.to_json
+    
+    if(RUBY_VERSION >= "1.9")
+      video.to_json.should == "{\"attr\":\"value\",\"cloud_id\":\"my_cloud_id\"}"
+    else
+      video.to_json.should == "{\"cloud_id\":\"my_cloud_id\",\"attr\":\"value\"}"
+    end
   end
   
   it "should create an encoding using video scope" do
@@ -279,7 +284,7 @@ describe Panda::Video do
     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\"}]"
+    video.encodings.first.to_json.should == "{\"abc\":\"my_source_url\",\"id\":\"456\",\"cloud_id\":\"my_cloud_id\"}"
   end
   
   it "should return the video url" do
@@ -297,7 +302,7 @@ describe Panda::Video do
       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"
+    video.preview_url.should == "http://my_bucket.s3.amazonaws.com/abc/panda_1.jpg"
   end
   
   it "should call the request if the scope has changed" do

metadata

@@ -1,23 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: panda
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 4
-  version: 1.4.4
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
-- New Bamboo
+- Pandastream
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 Z
+date: 2011-10-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: ruby-hmac
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +31,11 @@ dependencies:
         - 3
         - 2
         version: 0.3.2
-  name: ruby-hmac
-  type: :runtime
   prerelease: false
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: faraday
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -42,12 +44,14 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        version: "0"
-  name: rest-client
-  type: :runtime
+        - 7
+        - 0
+        version: 0.7.0
   prerelease: false
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  name: typhoeus
+  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,11 +61,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json
-  type: :runtime
   prerelease: false
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  name: multi_json
+  type: :runtime
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -71,11 +75,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
-  type: :development
   prerelease: false
   requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: rake
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -85,12 +89,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: timecop
-  type: :development
   prerelease: false
   requirement: *id005
 - !ruby/object:Gem::Dependency 
+  name: timecop
+  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -101,12 +119,12 @@ dependencies:
         - 4
         - 0
         version: 2.4.0
-  name: rspec
-  type: :development
   prerelease: false
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: webmock
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,10 +133,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: webmock
-  type: :development
   prerelease: false
-  requirement: *id007
+  requirement: *id008
 description: Panda Client
 email: 
 - info@pandastream.com
@@ -153,7 +169,6 @@ files:
 - lib/panda/modules/router.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
@@ -174,7 +189,7 @@ files:
 - spec/profile_spec.rb
 - spec/spec_helper.rb
 - spec/video_spec.rb
-homepage: http://github.com/newbamboo/panda_gem
+homepage: http://github.com/pandastream/panda_gem
 licenses: []
 
 post_install_message: 

data/lib/panda/modules/viewable.rb

@@ -1,19 +0,0 @@
-module Panda
-  module Viewable
-  
-    def screenshots
-      ((1..screenshots_size||0).map{|i| get_url("_#{i}.jpg")} if success?) || []
-    end
-  
-    def url
-      get_url("#{extname}") if success?
-    end
-
-    private
-
-    def get_url(end_path)
-      "#{cloud.url}#{path}#{end_path}"
-    end
-
-  end
-end