panda 1.4.2 → 1.4.3

data/.gitignore

@@ -17,5 +17,6 @@ tmtags
 coverage
 rdoc
 pkg
+Gemfile.lock
 
 ## PROJECT::SPECIFIC

data/README.md

@@ -45,7 +45,7 @@ If you don't use a config file and want to simply be setup, do the following (wo
 
 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.
 
-The name of the profile can be found in your [Panda account](http://pandastream.com/encoders) when editing an encoding cloud's profiles.
+The name of the profile can be found in your [Panda account](http://pandastream.com/profiles) when editing an encoding cloud's profiles.
 
     encodings = Panda::Video.find("1234").encodings
     => [...]

data/lib/panda/config.rb

@@ -2,7 +2,27 @@ require 'uri'
 
 module Panda
   class Config
-    
+
+    def self.from_panda_url(panda_url)
+      panda_uri = URI.parse(panda_url)
+
+      config = new
+      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
+
+    def self.from_hash(auth_params)
+      config = new
+      auth_params.each_key do |key|
+        config.send("#{key}=", auth_params[key])
+      end
+      config
+    end
+
     def config
       @config ||= {}
     end
@@ -32,6 +52,7 @@ module Panda
     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)
 
@@ -53,6 +74,27 @@ module Panda
         raise "Region Unknown"
       end
     end
-    
+
+    def validate!
+      errs = validation_errors
+      raise Panda::ConfigurationError, errs.join(', ') if errs.any?
+      true
+    end
+
+    def valid?
+      validation_errors.empty?
+    end
+
+    def validation_errors
+      err = []
+      if config["access_key"].to_s.empty?
+        err << "access_key is missing"
+      end
+      if config["secret_key"].to_s.empty?
+        err << "secret_key is missing"
+      end
+      err
+    end
+
   end
 end

data/lib/panda/errors.rb

@@ -14,4 +14,7 @@ module Panda
     end
   end
 
-end
+  class ConfigurationError < Panda::Error
+  end
+
+end

data/lib/panda/panda.rb

@@ -9,26 +9,27 @@ module Panda
   def_delegators :connection, :get, :post, :put, :delete, :api_url, :setup_bucket, :signed_params
 
   def configure(auth_params=nil, &block)
+    raise ArgumentError, "missing auth params or block" unless auth_params || block_given?
 
     if !auth_params
-      configure = Config.new
+      config = Config.new
       if (block.arity > 0)
-        block.call(configure)
+        block.call(config)
       else
-        configure.instance_eval(&block)
+        config.instance_eval(&block)
       end
-      
-      auth_params = configure.to_hash
     elsif auth_params.is_a?(String)
-      auth_params = Config.new.parse_panda_url(auth_params)
+      config = Config.from_panda_url(auth_params)
+    else
+      config = Config.from_hash(auth_params)
     end
 
-    configure_with_auth_params(auth_params)
+    configure_with_auth_params(config)
     true
   end
 
   def configure_heroku
-    configure_with_auth_params Config.new.parse_panda_url(ENV['PANDASTREAM_URL'])
+    configure_with_auth_params Config.from_panda_url(ENV['PANDASTREAM_URL'])
     true
   end
 
@@ -37,7 +38,7 @@ module Panda
   end
 
   def connection
-    raise "Panda is not configured!" unless @connection
+    raise Panda::ConfigurationError, "Panda is not configured!" unless @connection
     @connection
   end
 
@@ -55,8 +56,9 @@ module Panda
     Panda::Adapter::RestClient
   end
   
-  def configure_with_auth_params(auth_params)
-    connect!(auth_params)
+  def configure_with_auth_params(config)
+    config.validate!
+    connect!(config.to_hash)
     @clouds = {}
     @cloud = Cloud::new(:id => @connection.cloud_id)
   end

data/lib/panda/version.rb

@@ -1,3 +1,3 @@
 module Panda
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/panda.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rest-client"
   s.add_dependency "json"
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "timecop"
   s.add_development_dependency "rspec", "2.4.0"
   s.add_development_dependency "webmock"

data/spec/panda_spec.rb

@@ -3,7 +3,7 @@ require 'timecop'
 
 describe Panda do
   before(:each) do
-    new_time = Time.local(20010, 1, 12, 1, 0, 0)
+    new_time = Time.utc(20010, 1, 12, 1, 0, 0)
     Timecop.freeze(new_time)
   end
   
@@ -13,12 +13,60 @@ describe Panda do
       it "should raise error for #{method}" do
         lambda {
           Panda.send(method, nil, nil)
-        }.should raise_error("Panda is not configured!")
+        }.should raise_error(Panda::ConfigurationError, "Panda is not configured!")
       end
     end
     
   end
 
+  describe "root configuration with hash" do
+    it "should not fail is access_key and secret_key are given" do
+      proc do
+        Panda.configure({:access_key => "bar", :secret_key => "baz"})
+      end.should_not raise_error(Panda::ConfigurationError)
+    end
+
+    it "should fail if access_key or secret_key are missing" do
+      proc do
+        Panda.configure({:secret_key => "baz"})
+      end.should raise_error(Panda::ConfigurationError)
+      proc do
+        Panda.configure({:access_key => "bar"})
+      end.should raise_error(Panda::ConfigurationError)
+      proc do
+        Panda.configure({})
+      end.should raise_error(Panda::ConfigurationError)
+    end
+  end
+
+  describe "root configuration with block" do
+    it "should not fail is access_key and secret_key are given" do
+      proc do
+        Panda.configure do
+          access_key "bar"
+          secret_key "baz"
+        end
+      end.should_not raise_error(Panda::ConfigurationError)
+    end
+
+    it "should fail if access_key or secret_key are missing" do
+      proc do
+        Panda.configure do
+          secret_key "baz"
+        end
+      end.should raise_error(Panda::ConfigurationError)
+      proc do
+        Panda.configure do
+          access_key "bar"
+        end
+      end.should raise_error(Panda::ConfigurationError)
+      proc do
+        Panda.configure do
+        end
+      end.should raise_error(Panda::ConfigurationError)
+    end
+  end
+
   shared_examples_for "Connected" do
 
     it "should make get request with signed request to panda server" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: panda
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - New Bamboo
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +00:00
-default_executable: 
+date: 2011-08-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
@@ -63,7 +62,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: timecop
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,9 +76,23 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: timecop
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -91,11 +104,11 @@ dependencies:
         - 0
         version: 2.4.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,7 +118,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Panda Client
 email: 
 - info@pandastream.com
@@ -161,7 +174,6 @@ files:
 - spec/profile_spec.rb
 - spec/spec_helper.rb
 - spec/video_spec.rb
-has_rdoc: true
 homepage: http://github.com/newbamboo/panda_gem
 licenses: []
 
@@ -191,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: panda
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Panda Client