panda 1.2.2 → 1.3.0

data/README.md

@@ -19,19 +19,12 @@ Panda gem provides an interface to access the [Panda](http://pandastream.com) AP
       config.access_key = "panda_access_key"
       config.secret_key = "panda_secret_key"
       config.cloud_id = "panda_cloud_id"
+      # config.api_host = "api.eu.pandastream.com" ## for EU accounts
+      # config.api_port = 80 ## to use http (default 443)
     end
 
     or Panda.configure({:access_key => ....})
 
-### Creating an instance of the client for EU
-
-    Panda.configure do |config|
-      config.access_key = "panda_access_key"
-      config.secret_key = "panda_secret_key"
-      config.cloud_id = "panda_cloud_id"
-      config.api_host = "api.eu.pandastream.com"
-    end
-
 ### Creating an instance using Heroku
 
     Panda.configure(ENV['PANDASTREAM_URL'])

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.3.0

data/lib/panda/connection.rb

@@ -2,7 +2,7 @@ module Panda
   class Connection
     attr_accessor :api_host, :api_port, :access_key, :secret_key, :api_version, :cloud_id, :format
 
-    API_PORT=80
+    API_PORT=443
     US_API_HOST="api.pandastream.com"
     EU_API_HOST="api.eu.pandastream.com"
 
@@ -88,19 +88,23 @@ module Panda
 
     def signed_params(verb, request_uri, params = {}, timestamp_str = nil)
       auth_params = stringify_keys(params)
-      auth_params['cloud_id']   = @cloud_id
-      auth_params['access_key'] = @access_key
+      auth_params['cloud_id']   = cloud_id
+      auth_params['access_key'] = access_key
       auth_params['timestamp']  = timestamp_str || Time.now.iso8601(6)
 
       params_to_sign = auth_params.reject{|k,v| ['file'].include?(k.to_s)}
-      auth_params['signature']  = ApiAuthentication.generate_signature(verb, request_uri, @api_host, @secret_key, params_to_sign)
+      auth_params['signature']  = ApiAuthentication.generate_signature(verb, request_uri, api_host, secret_key, params_to_sign)
       auth_params
     end
 
     def api_url
-      "http://#{@api_host}:#{@api_port}/#{@prefix}"
+      "#{api_protocol}://#{api_host}:#{api_port}/#{@prefix}"
     end
 
+    def api_protocol
+      api_port == 443 ? 'https' : 'http'
+    end
+    
     # Shortcut to setup your bucket
     def setup_bucket(params={})
       granting_params = { 
@@ -171,7 +175,7 @@ module Panda
         @cloud_id   = heroku_uri.path[1..-1]
         @api_host   = heroku_uri.host
         @api_port   = heroku_uri.port
-        @prefix     = "v#{@api_version}"
+        @prefix     = "v#{api_version}"
       end
 
       def init_from_hash(hash_params)
@@ -182,7 +186,7 @@ module Panda
         @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}"
+        @prefix     = params["prefix_url"]  || "v#{api_version}"
       end
   end
 end

data/panda.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{panda}
-  s.version = "1.2.2"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]
-  s.date = %q{2010-12-08}
+  s.date = %q{2011-01-10}
   s.description = %q{Panda Client}
   s.email = %q{info@pandastream.com}
   s.extra_rdoc_files = [

data/spec/video_spec.rb

@@ -116,7 +116,7 @@ describe Panda::Video do
       c.region = "eu"
     end
     
-    stub_http_request(:get, /api.eu.pandastream.com:80/).
+    stub_http_request(:get, /api.eu.pandastream.com:443/).
       to_return(:body => "{\"id\":\"123\"}")
     Panda::Video.find "123"
   end
@@ -133,7 +133,7 @@ describe Panda::Video do
       c.region = "eu"
     end
     
-    stub_http_request(:get, /api.eu.pandastream.com:80/).
+    stub_http_request(:get, /api.eu.pandastream.com:443/).
       to_return(:body => "{\"id\":\"123\"}")
     Panda::Video.find "123"
   end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - New Bamboo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +00:00
+date: 2011-01-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency