panda 1.5.0 → 1.6.0

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+# Disabled because typhoeus is a C extension
+#  - jruby-18mode # JRuby in 1.8 mode
+#  - jruby-19mode # JRuby in 1.9 mode
+# Disabled because FFI is broken
+#  - rbx-18mode
+#  - rbx-19mode

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.6.0 (October 3, 2012)
+    - Removed RestClient adapter
+    - Removed Typhoeus gem dependency
+
+      You can use any Faraday adapter by setting the default_adapter
+      Panda.default_adapter = :excon
+
 ## 1.5.0 (October 17, 2011)
 
 Features:

data/README.md

@@ -2,7 +2,9 @@
 
 Panda gem provides an interface to access the [Panda](http://pandastream.com) API from Ruby.
 
-* [Visit panda\_gem on Github](http://github.com/newbamboo/panda_gem)
+* [Visit panda\_gem on Github](http://github.com/pandastream/panda_gem)
+* [![Build
+  Status](https://secure.travis-ci.org/pandastream/panda_gem.png?branch=master)](http://travis-ci.org/pandastream/panda_gem)
 
 ## Installation
 
@@ -13,6 +15,12 @@ Panda gem provides an interface to access the [Panda](http://pandastream.com) AP
     require 'rubygems'
     require 'panda'
 
+## Faraday Adapter
+    The gem automatically detects http libraries and sets the default adapter
+    You can just set the default Panda adapter if you are not happy with the current one.
+
+    Panda.default_adapter = :excon
+
 ### Creating an instance of the client
 
     Panda.configure do
@@ -31,7 +39,7 @@ Heroku will store your credentials as an environment variable called PANDASTREAM
 
 If you use a config file like `config/panda.yml` to support multiple environments, do the following in your `config/initializers/panda.rb` :
 
-    Panda.configure((ENV['PANDASTREAM_URL'] || YAML::load_file(File.join(File.dirname(__FILE__),"..", "panda.yml"))[RAILS_ENV]))
+    Panda.configure((ENV['PANDASTREAM_URL'] || YAML::load_file(File.join(File.dirname(__FILE__),"..", "panda.yml"))[Rails.env]))
 
 See the [Rails How-to](http://www.pandastream.com/docs/integrate_with_rails) for more details.
 
@@ -43,7 +51,7 @@ If you don't use a config file and want to simply be setup, do the following (wo
 
 ### Typical usage
 
-In most cases you will have used the [panda\_uploader](http://github.com/newbamboo/panda_uploader) jQuery plugin to upload the video (more details about this are in the [Integrating Panda with Ruby on Rails](http://pandastream.com/docs/integrate_with_rails) tutorial). Then you will want to get the video and screenshots urls of your encoding to display to your users.
+In most cases you will have used the [panda\_uploader](http://github.com/pandastream/panda_uploader) jQuery plugin to upload the video (more details about this are in the [Integrating Panda with Ruby on Rails](http://pandastream.com/docs/integrate_with_rails) tutorial). Then you will want to get the video and screenshots urls of your encoding to display to your users.
 
 The name of the profile can be found in your [Panda account](http://pandastream.com/profiles) when editing an encoding cloud's profiles.
 
@@ -394,7 +402,7 @@ The name of the profile can be found in your [Panda account](http://pandastream.
 
 ## Generating signatures
 
-  All requests to your Panda cloud are signed using HMAC-SHA256, based on a timestamp and your Panda secret key. This is handled transparently. However, sometimes you will want to generate only this signature, in order to make a request by means other than this library. This is the case when using the [JavaScript panda_uploader](http://github.com/newbamboo/panda_uploader).
+  All requests to your Panda cloud are signed using HMAC-SHA256, based on a timestamp and your Panda secret key. This is handled transparently. However, sometimes you will want to generate only this signature, in order to make a request by means other than this library. This is the case when using the [JavaScript panda_uploader](http://github.com/pandastream/panda_uploader).
 
   To do this, a method `signed_params()` is supported:
 

data/Rakefile

@@ -3,7 +3,7 @@ Bundler::GemHelper.install_tasks
 
 desc "Run all the specs"
 task :spec do
-  system "bundle exec rspec spec"
+  exec "bundle exec rspec spec"
 end
 
 task :default => :spec

data/lib/panda.rb

@@ -15,8 +15,6 @@ require 'panda/proxies/scope'
 require 'panda/proxies/encoding_scope'
 require 'panda/proxies/video_scope'
 require 'panda/proxies/profile_scope'
-require 'panda/adapters/adapter'
-require 'panda/adapters/faraday'
 require 'panda/errors'
 require 'panda/base'
 require 'panda/resources/resource'
@@ -24,4 +22,7 @@ require 'panda/resources/cloud'
 require 'panda/resources/encoding'
 require 'panda/resources/profile'
 require 'panda/resources/video'
+
 require 'panda/panda'
+require 'panda/faraday'
+

data/lib/panda/base.rb

@@ -46,7 +46,7 @@ module Panda
     end
 
     def to_json(*args)
-      MultiJson.encode(self.attributes)
+      MultiJson.dump(self.attributes)
     end
 
     private
@@ -107,4 +107,4 @@ module Panda
     end
 
   end
-end
+end

data/lib/panda/config.rb

@@ -11,7 +11,7 @@ module Panda
       config.secret_key = panda_uri.password
       config.cloud_id   = panda_uri.path[1..-1]
       config.api_host   = panda_uri.host
-      config.api_port   = API_PORT
+      config.api_port   = panda_uri.port
       config
     end
 
@@ -50,19 +50,6 @@ module Panda
     def adapter=(adapter_name)
       Panda.adapter = adapter_name
     end
-        
-    # Setup connection for Heroku
-    # @deprecated: use Config.from_panda_url(panda_url)
-    def parse_panda_url(panda_url)
-      panda_uri = URI.parse(panda_url)
-
-      config['access_key'] = panda_uri.user
-      config['secret_key'] = panda_uri.password
-      config['cloud_id']   = panda_uri.path[1..-1]
-      config['api_host']   = panda_uri.host
-      config['api_port']   = API_PORT
-      config
-    end
     
     # Set the correct api_host for US/EU
     def region(region)

data/lib/panda/connection.rb

@@ -7,34 +7,41 @@ module Panda
   class Connection
     attr_accessor :api_host, :api_port, :access_key, :secret_key, :api_version, :cloud_id
 
-    def initialize(auth_params={})
+    def initialize(auth_params={}) 
+      params = { :api_host => US_API_HOST, :api_port => API_PORT }.merge!(auth_params)
       @api_version = 2
-      init_from_hash(auth_params)
+
+      @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}"
     end
 
-    def adapter
-      @adapter ||= Panda.adapter.new(api_url)
+    def http_client
+      Panda::HttpClient::Faraday.new(api_url)
     end
     
     # Authenticated requests
     def get(request_uri, params={})
       sp = signed_params("GET", request_uri, params)
-      adapter.get(request_uri, sp)
+      http_client.get(request_uri, sp)
     end
 
     def post(request_uri, params={})
       sp = signed_params("POST", request_uri, params)
-      adapter.post(request_uri, sp)
+      http_client.post(request_uri, sp)
     end
 
     def put(request_uri, params={})
       sp = signed_params("PUT", request_uri, params)
-      adapter.put(request_uri, sp)
+      http_client.put(request_uri, sp)
     end
 
     def delete(request_uri, params={})
       sp = signed_params("DELETE", request_uri, params)
-      adapter.delete(request_uri, sp)
+      http_client.delete(request_uri, sp)
     end
 
     # Signing methods
@@ -89,16 +96,6 @@ module Panda
       end
     end
 
-    def init_from_hash(hash_params)
-      params = { :api_host => US_API_HOST, :api_port => API_PORT }.merge!(hash_params)
-
-        @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}"
-    end
   end
 end
 

data/lib/panda/errors.rb

@@ -9,9 +9,6 @@ module Panda
   end
 
   class ServiceNotAvailable < Panda::Error
-    def initialize
-      super("ServiceNotAvailable")
-    end
   end
 
   class ConfigurationError < Panda::Error

data/lib/panda/{adapters/faraday.rb → faraday.rb}

@@ -1,8 +1,8 @@
 require 'faraday'
-require 'typhoeus'
+require 'multi_json'
 
 module Panda
-  module Adapter
+  module HttpClient
     class Faraday
       
       def initialize(api_url)
@@ -11,7 +11,7 @@ module Panda
       
       def get(request_uri, params)
         rescue_json_parsing do
-          response = connection.get do |req|
+          connection.get do |req|
             req.url File.join(connection.path_prefix, request_uri), params
           end.body
         end
@@ -19,9 +19,7 @@ module Panda
 
       def post(request_uri, params)
         # multipart upload
-        if (f=params['file']) && f.is_a?(File)
-          params['file'] = ::Faraday::UploadIO.new(f.path, 'multipart/form-data')
-        end
+        params['file'] = ::Faraday::UploadIO.new(params['file'], 'multipart/form-data') if params['file']
 
         rescue_json_parsing do
           connection.post do |req|
@@ -54,18 +52,31 @@ module Panda
         @conn ||= ::Faraday.new(:url => @api_url) do |builder|
           builder.request :multipart
           builder.request :url_encoded
-          builder.adapter :typhoeus
+          builder.adapter Panda.default_adapter
         end
       end
 
       def rescue_json_parsing(&block)
         begin
-          MultiJson.decode(yield)
-        rescue MultiJson::DecodeError => e
-          raise(ServiceNotAvailable)
+          data = yield
+          MultiJson.load(data)
+        rescue MultiJson::DecodeError
+          raise ServiceNotAvailable, data
         end
       end
       
     end
   end
+end
+
+if defined?(Typhoeus)
+  Panda.default_adapter = :typhoeus
+elsif defined?(Excon)
+  Panda.default_adapter = :excon
+elsif defined?(Patron)
+  Panda.default_adapter = :patron
+elsif defined?(NetHttpPersistent)
+  Panda.default_adapter = :net_http_persisten
+else
+  Panda.default_adapter = :net_http
 end

data/lib/panda/panda.rb

@@ -42,25 +42,20 @@ module Panda
     @connection
   end
 
-  def adapter=(klass)
-    @adapter_class = klass
+  def default_adapter=(adapter_name)
+    @adapter = adapter_name.to_sym
   end
 
-  def adapter
-    @adapter_class ||= default_adapter
+  def default_adapter
+    @adapter
   end
   
   private
 
-  def default_adapter
-    Panda::Adapter::Faraday
-  end
-  
   def configure_with_auth_params(config)
     config.validate!
     connect!(config.to_hash)
     @clouds = {}
     @cloud = Cloud::new(:id => @connection.cloud_id)
   end
-  
 end

data/lib/panda/resources/cloud.rb

@@ -24,6 +24,12 @@ module Panda
       end
     end
 
+    def https_url
+      uri = URI.parse(url)
+      uri.scheme = "https"
+      uri.to_s
+    end
+
     def eu?
       region == "eu"
     end

data/lib/panda/resources/encoding.rb

@@ -11,17 +11,23 @@ module Panda
       end
     end
 
-    def url
+    def url(options={})
+      default_options = {:https => false}
+      options = default_options.merge(options)
       full_path = "#{path}#{extname}"
-      get_url(full_path) if files.include?(full_path)
+      get_url(full_path, options[:https]) if files.include?(full_path)
     end
     
-    def urls
-      files.map {|f| "#{cloud.url}#{f}"}
+    def urls(options={})
+      default_options = {:https => false}
+      options = default_options.merge(options)
+      files.map {|f| get_url(f, options[:https])}
     end
 
-    def screenshots
-      ((1..7).map{|i| get_url("#{path}_#{i}.jpg")} if success?) || []
+    def screenshots(options={})
+      default_options = {:https => false}
+      options = default_options.merge(options)
+      ((1..7).map{|i| get_url("#{path}_#{i}.jpg", options[:https])} if success?) || []
     end
 
     def cancel
@@ -34,8 +40,8 @@ module Panda
 
     private
 
-    def get_url(end_path)
-      "#{cloud.url}#{end_path}"
+    def get_url(end_path, https)
+      "#{https ? cloud.https_url : cloud.url}#{end_path}"
     end
   end
 end

data/lib/panda/resources/video.rb

@@ -13,18 +13,22 @@ module Panda
       connection.get("/videos/#{id}/metadata.json")
     end
 
-    def preview_url
-      get_url("#{path}_1.jpg") if success?
+    def preview_url(options={})
+      default_options = {:https => false}
+      options = default_options.merge(options)
+      get_url("#{path}_1.jpg", options[:https]) if success?
     end
 
-    def url
-      get_url("#{path}#{extname}") if success?
+    def url(options={})
+      default_options = {:https => false}
+      options = default_options.merge(options)
+      get_url("#{path}#{extname}", options[:https]) if success?
     end
 
     private
 
-    def get_url(end_path)
-      "#{cloud.url}#{end_path}"
+    def get_url(end_path, https)
+      "#{https ? cloud.https_url : cloud.url}#{end_path}"
     end
 
   end

data/lib/panda/version.rb

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

data/panda.gemspec

@@ -14,13 +14,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency "ruby-hmac", ">= 0.3.2"
   s.add_dependency "faraday", ">= 0.7.0"
-  s.add_dependency "typhoeus"
-  s.add_dependency "multi_json"
+  s.add_dependency "multi_json", ">= 1.3.2"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "timecop"
-  s.add_development_dependency "rspec", "2.4.0"
-  s.add_development_dependency "webmock"
+  s.add_development_dependency "rspec", ">= 2.8.0"
+  s.add_development_dependency "webmock", ">= 1.8.2"
   
   s.rubyforge_project = "panda"
 

data/spec/encoding_spec.rb

@@ -63,24 +63,33 @@ 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", "files" => ["abc/panda.ext"], :status => 'success'})
-    encoding.url.should == "http://my_bucket.s3.amazonaws.com/abc/panda.ext"
+    encoding.url.should == "http://my-bucket.s3.amazonaws.com/abc/panda.ext"
+  end
+
+  it "should return the secure 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", "files" => ["abc/panda.ext"], :status => 'success'})
+    encoding.url(:https => true).should == "https://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/\"}" 
+  it "should generate a screenshot 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)
 
     encoding = Panda::Encoding.new({:id => "456", :extname => ".ext", :status => "success", :path => "abc/panda"})
-    encoding.screenshots[0].should == "http://my_bucket.s3.amazonaws.com/abc/panda_1.jpg"
+    encoding.screenshots[0].should == "http://my-bucket.s3.amazonaws.com/abc/panda_1.jpg"
   end
 
-  it "should generate a screenhost array" do
+  it "should generate a screenshot array" do
     encoding = Panda::Encoding.new({:id => "456", :extname => ".ext", :status => "fail"})
     encoding.screenshots.should == []
   end

data/spec/heroku_spec.rb

@@ -6,7 +6,7 @@ describe Panda::Video do
     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"
+    my_heroku_url = "http://access_key:secret_key@api.example.com:443/my_cloud_id"
     ENV['PANDASTREAM_URL']= my_heroku_url
   end
   

data/spec/panda_spec.rb

@@ -3,7 +3,7 @@ require 'timecop'
 
 describe Panda do
   before(:each) do
-    new_time = Time.utc(20010, 1, 12, 1, 0, 0)
+    new_time = Time.utc(2010, 1, 12, 1, 0, 0)
     Timecop.freeze(new_time)
   end
   
@@ -70,7 +70,7 @@ describe Panda do
   shared_examples_for "Connected" do
 
     it "should make get request with signed request to panda server" do
-      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\"}")
+      stub_http_request(:get, "http://myapihost:85/v2/videos?access_key=my_access_key&cloud_id=my_cloud_id&signature=kAiCpkP52a2XKISJjRCBWzWCN5CaeLK3Nj1AT25S/Go=&timestamp=2010-01-12T01%3A00%3A00.000000Z").to_return(:body => "{\"abc\":\"d\"}")
       @panda.get("/videos").should == {'abc' => 'd'}
     end
 
@@ -81,9 +81,9 @@ describe Panda do
                                            )
       signed_params.should == {
         'access_key' => "my_access_key",
-        'timestamp' => "20010-01-12T01:00:00.000000Z",
+        'timestamp' => "2010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'aTgBGPeMrRk2Pnc13RxhK/ctWjDsL33vOFEC9qKLWV0=',
+        'signature' => '/Yu4CqImbYNXWwpNSIfHzdWeMsR5J7O6tfbSHXQO0aA=',
         'param1' => 'one',
         'param2' => 'two'
       }
@@ -92,9 +92,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' => "20010-01-12T01:00:00.000000Z",
+        'timestamp' => "2010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'g5lAh0cPC/qyUyTQb125vosvZwubQ+HgB04ORt+iw7o='
+        'signature' => 'QpQQm0guSLSEXmQ+EP2qnKT0av5llLWBUylEk9NEStU='
       }
     end
 
@@ -106,9 +106,9 @@ describe Panda do
                                            )
       signed_params.should == {
         'access_key' => "my_access_key",
-        'timestamp' => "20010-01-12T01:00:00.000000Z",
+        'timestamp' => "2010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'G6LUFGIseRyDrqnj55t+CDrAGdRWtUWSqZwMmIsuW40=',
+        'signature' => 'v7++pgmzztwOWzZ+MoflgD1TT8Jxnqzl1v8gNnEbhX8=',
         'tilde' => '~',
         'space' => ' '
       }
@@ -118,9 +118,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' => "20010-01-12T01:00:00.000000Z",
+        'timestamp' => "2010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'g5lAh0cPC/qyUyTQb125vosvZwubQ+HgB04ORt+iw7o=',
+        'signature' => 'QpQQm0guSLSEXmQ+EP2qnKT0av5llLWBUylEk9NEStU=',
         'file' => "my_file"
       }
     end
@@ -128,9 +128,9 @@ describe Panda do
     it "should stringify keys" do
       @panda.signed_params('POST', '/videos.json', { :file => "symbol_key" }).should == {
         'access_key' => "my_access_key",
-        'timestamp' => "20010-01-12T01:00:00.000000Z",
+        'timestamp' => "2010-01-12T01:00:00.000000Z",
         'cloud_id' => 'my_cloud_id',
-        'signature' => 'g5lAh0cPC/qyUyTQb125vosvZwubQ+HgB04ORt+iw7o=',
+        'signature' => 'QpQQm0guSLSEXmQ+EP2qnKT0av5llLWBUylEk9NEStU=',
         'file' => "symbol_key"
       }
     end
@@ -165,7 +165,7 @@ describe Panda do
     end
     
     it "should make get request" do
-      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\"}")
+      stub_http_request(:get, "http://myapihost:85/v2/videos?access_key=my_access_key&cloud_id=my_cloud_id&signature=kAiCpkP52a2XKISJjRCBWzWCN5CaeLK3Nj1AT25S/Go=&timestamp=2010-01-12T01%3A00%3A00.000000Z").to_return(:body => "{\"key\":\"value\"}")
       @panda.get("/videos").should == {'key' => 'value'}
     end
     
@@ -177,7 +177,7 @@ describe Panda 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")
+  #     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=2010-01-12T01%3A00%3A00.000000Z").to_return(:body => "abc")
   # 
   # 
   #     module ActiveSupport

data/spec/spec_helper.rb

@@ -14,6 +14,5 @@ RSpec.configure do |config|
   config.before(:each) do
     Panda.instance_variable_set("@connection", nil)
     Panda.instance_variable_set("@cloud", nil)
-    Time.now.stub!(:utc).and_return(mock("time", :iso8601 => "2009-11-04T17:54:11+00:00"))
   end
 end

data/spec/video_spec.rb

@@ -226,11 +226,7 @@ describe Panda::Video do
   it "should return a json on attributes" do
     video = Panda::Video.new(:attr => "value")
     
-    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
+    MultiJson.load( video.to_json ).should == {"attr" => "value", "cloud_id" => "my_cloud_id"}
   end
   
   it "should create an encoding using video scope" do
@@ -284,25 +280,43 @@ 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.first.to_json.should == "{\"abc\":\"my_source_url\",\"id\":\"456\",\"cloud_id\":\"my_cloud_id\"}"
+    MultiJson.load( 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
-    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)
     
     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"
+    video.url.should == "http://my-bucket.s3.amazonaws.com/abc/panda.ext"
+  end
+
+  it "should return the secure 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(:https => true).should == "https://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/\"}" 
+  it "should generate a screenshot 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", :status => "success", :path => "abc/panda"})
+    video.preview_url.should == "http://my-bucket.s3.amazonaws.com/abc/panda_1.jpg"
+  end
+
+  it "should generate a secure screenshot 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", :status => "success", :path => "abc/panda"})
-    video.preview_url.should == "http://my_bucket.s3.amazonaws.com/abc/panda_1.jpg"
+    video.preview_url(:https => true).should == "https://my-bucket.s3.amazonaws.com/abc/panda_1.jpg"
   end
   
   it "should call the request if the scope has changed" do
@@ -382,4 +396,4 @@ describe Panda::Video do
     video = Panda::Video.find "123"
     video.cloud.s3_videos_bucket.should == "my_bucket"
   end
-end
+end

metadata

@@ -1,166 +1,150 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: panda
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 1.6.0
   prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 0
-  version: 1.5.0
 platform: ruby
-authors: 
+authors:
 - Pandastream
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby-hmac
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.2
+  type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
   name: faraday
-  type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         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: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
   name: multi_json
-  type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :runtime
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
   name: rake
-  type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: timecop
-  type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
   prerelease: false
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
   name: webmock
-  type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.2
+  type: :development
   prerelease: false
-  requirement: *id008
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.8.2
 description: Panda Client
-email: 
+email:
 - info@pandastream.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - 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/errors.rb
+- lib/panda/faraday.rb
 - lib/panda/modules/associations.rb
 - lib/panda/modules/builders.rb
 - lib/panda/modules/cloud_connection.rb
@@ -191,38 +175,35 @@ files:
 - spec/video_spec.rb
 homepage: http://github.com/pandastream/panda_gem
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2129573717660849291
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2129573717660849291
 requirements: []
-
 rubyforge_project: panda
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Panda Client
-test_files: 
+test_files:
 - spec/cloud_spec.rb
 - spec/encoding_spec.rb
 - spec/heroku_spec.rb

data/lib/panda/adapters/adapter.rb

@@ -1,6 +0,0 @@
-require 'multi_json'
-
-module Panda
-  module Adapter
-  end
-end

data/lib/panda/adapters/restclient.rb

@@ -1,54 +0,0 @@
-require 'restclient'
-
-module Panda
-  module Adapter
-    class RestClient
-      
-      def initialize(api_url)
-        @api_url = api_url
-      end
-      
-      def get(request_uri, params)
-        rescue_json_parsing do
-          query = ApiAuthentication.hash_to_query(params)
-          connection[request_uri + '?' + query].get
-        end
-      end
-
-      def post(request_uri, params)
-        rescue_json_parsing do
-          connection[request_uri].post(params)
-        end
-      end
-
-      def put(request_uri, params)
-        rescue_json_parsing do
-          connection[request_uri].put(params)
-        end
-      end
-
-      def delete(request_uri, params)
-        rescue_json_parsing do
-          query = ApiAuthentication.hash_to_query(params)
-          connection[request_uri + '?' + query].delete
-        end
-      end
-
-      private
-
-      def connection
-        @conn ||= ::RestClient::Resource.new(@api_url)
-      end
-
-      def rescue_json_parsing(&block)
-        begin
-          MultiJson.decode(yield)
-        rescue MultiJson::DecodeError => e
-          raise(ServiceNotAvailable)
-        end
-      end
-
-    end
-  end
-end
-