panda 1.0.0 → 1.1.0

data/README.md

@@ -2,6 +2,8 @@
 
 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)
+
 ## Installation
 
     gem install panda
@@ -19,7 +21,7 @@ Panda gem provides an interface to access the [Panda](http://pandastream.com) AP
       config.cloud_id = "panda_cloud_id"
     end
 
-    or Panda.configure ({:access_key => ....})
+    or Panda.configure({:access_key => ....})
 
 ### Creating an instance of the client for EU
 
@@ -27,14 +29,22 @@ 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.region = "eu"
+      config.api_host = "api.eu.pandastream.com"
     end
 
 ### Creating an instance using Heroku
 
-    Panda.configure do |config|
-      config.heroku = ENV['PANDASTREAM_URL']
-    end
+    Panda.configure(ENV['PANDASTREAM_URL'])
+
+### Inside a Rails app with a main account or using Heroku
+
+Config is stored in `config/panda.yml` or you must set an the PANDASTREAM_URL environment variable in your `/.bashrc` file (see the [Heroku config variable docs](http://docs.heroku.com/config-vars)).
+
+Use 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]))
+
+See the [Rails How-to](http://www.pandastream.com/docs/integrate_with_rails) for more details.
 
 ### Typical usage
 
@@ -482,7 +492,5 @@ Since Panda 0.6, PandaGem returns a Hash by default. If you want PandaGem to ret
     bundler install
     rake spec
 
-Copyright
----------
 
 Copyright (c) 2009-2010 New Bamboo. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/panda/modules/builders.rb

@@ -8,19 +8,22 @@ module Panda
 
     module CreateBuilder
 
-       def create(attributes)
-         if attr_id=(attributes[:id] || attributes['id'])
-           raise "Can't create attribute. Already have an id=#{attr_id}"
-         end
-
-         response = connection.post(full_object_url(many_path), attributes)
-         Panda::const_get("#{end_class_name}").new(response)
-       end
+      def create(attributes)       
+       resource = build_resource(attributes)
+       resource.create
+       resource
+      end
 
-       def create!(attributes)
-         create(attributes) || raise(self.error.first.to_s)
-       end
+      def create!(attributes)
+        resource = build_resource(attributes)
+        resource.create!
+        resource
+      end
 
+      private
+      def build_resource(attributes)
+        Panda::const_get("#{end_class_name}").new(attributes.merge(:cloud_id => cloud.id))
+      end
     end
 
     module DeleteBuilder

data/lib/panda/modules/finders.rb

@@ -19,7 +19,7 @@ module Panda
 
         if object.is_a?(Array)
           object.map{|o| kclass.new(o)}
-        elsif object["id"]
+        elsif object['id']
           kclass.new(object)
         else
           Error.new(object).raise!

data/lib/panda/panda.rb

@@ -3,36 +3,41 @@ require 'forwardable'
 require 'json' unless defined?(ActiveSupport::JSON)
 
 module Panda
-  class << self
-    extend Forwardable
+  extend self
+  extend Forwardable
 
-    attr_reader :cloud, :clouds
-    attr_reader :connection
+  attr_reader :cloud, :clouds
+  attr_reader :connection
 
-    def_delegators :connection, :get, :post, :put, :delete, :api_url, :setup_bucket, :signed_params
+  def_delegators :connection, :get, :post, :put, :delete, :api_url, :setup_bucket, :signed_params
 
-    def configure(auth_params=nil)
-      @clouds = {}
+  def configure(auth_params=nil)
+    @clouds = {}
 
-      if auth_params
-        connect!(auth_params)
-      else
-        yield @connection = Connection.new
-      end
-
-      @connection.raise_error=true
-      @connection.format = :hash
-      @cloud = Cloud::new(:id => @connection.cloud_id)
+    if auth_params
+      connect!(auth_params)
+    else
+      yield @connection = Connection.new
     end
 
-    def connect!(auth_params, options={})
-      @connection = Connection.new(auth_params, options)
-    end
+    @connection.raise_error=true
+    @connection.format = :hash
+    @cloud = Cloud::new(:id => @connection.cloud_id)
+  end
 
-    def connection
-      raise "Not connected. Please connect! first." unless @connection
-      @connection
-    end
+  def connect!(auth_params, options={})
+    @connection = Connection.new(auth_params, options)
+  end
+
+  def connection
+    raise "Not connected. Please connect! first." unless @connection
+    @connection
+  end
 
+  def version
+    open(File.join(File.dirname(__FILE__), '../../VERSION')) { |f|
+      f.read.strip
+    }
   end
+
 end

data/lib/panda/proxies/scope.rb

@@ -25,9 +25,9 @@ module Panda
       object = find_object_by_path(url, map)
 
       if object.is_a?(Array)
-        object.map{|o| klass.new(o.merge("cloud_id" => cloud.id))}
-      elsif object["id"]
-        klass.new(object.merge("cloud_id" => cloud.id))
+        object.map{|o| klass.new(o.merge('cloud_id' => cloud.id))}
+      elsif object['id']
+        klass.new(object.merge('cloud_id' => cloud.id))
       else
         Error.new(object).raise!
       end

data/lib/panda/resources/cloud.rb

@@ -22,6 +22,19 @@ module Panda
       end
     end
 
+    def eu?
+      region == "eu"
+    end
+
+    def us?
+      region == "us"
+    end
+
+    def region
+      return "eu" if connection.api_host == Panda::Connection::EU_API_HOST
+      return "us" if connection.api_host == Panda::Connection::US_API_HOST
+    end
+
     def videos
       VideoScope.new(self)
     end

data/lib/panda/resources/encoding.rb

@@ -5,25 +5,28 @@ module Panda
     belongs_to :video
     has_one :profile
 
+    class << self
+      def first
+        EncodingScope.new(self).per_page(1).first
+      end
+    end
+
     def url
-      "http://s3.amazonaws.com/#{cloud.s3_videos_bucket}/#{id}#{extname}"
+      get_url("#{extname}")
     end
 
+    def error_log
+      get_url(".log") if fail?
+    end
+    
     def screenshots
-      @screenshots ||=
-        if status == 'success'
-          (1..7).map do |i|
-            "http://s3.amazonaws.com/#{cloud.s3_videos_bucket}/#{id}_#{i}.jpg"
-          end
-        else
-          []
-        end
+      ((1..7).map{|i| get_url("_#{i}.jpg")} if success?) || []
     end
 
-    class << self
-      def first
-        EncodingScope.new(self).per_page(1).first
-      end
+    private
+
+    def get_url(end_path)
+      "#{cloud.url}#{path}#{end_path}"
     end
 
   end

data/panda.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{panda}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["New Bamboo"]
-  s.date = %q{2010-08-05}
+  s.date = %q{2010-10-19}
   s.description = %q{Panda Client}
   s.email = %q{info@pandastream.com}
   s.extra_rdoc_files = [
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/newbamboo/panda_gem}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Panda Client}
   s.test_files = [
     "spec/cloud_spec.rb",
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<rest-client>, [">= 1.4"])
       s.add_runtime_dependency(%q<json>, [">= 1.2"])

data/spec/cloud_spec.rb

@@ -1,6 +1,36 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe Panda::Video do
+describe Panda::Cloud do
+  
+  describe "region" do
+    it "should tell the region" do
+      Panda.configure do |c|
+        c.access_key = "my_access_key"
+        c.secret_key = "my_secret_key"
+        c.api_host = "api.pandastream.com"
+        c.cloud_id = 'my_cloud_id'
+        c.api_port = 85
+      end
+      
+      Panda.cloud.region.should == "us"
+      Panda.cloud.us?.should == true
+    end
+    
+    it "should tell the region" do
+      Panda.configure do |c|
+        c.access_key = "my_access_key"
+        c.secret_key = "my_secret_key"
+        c.api_host = "api.eu.pandastream.com"
+        c.cloud_id = 'my_cloud_id'
+        c.api_port = 85
+      end
+      
+      Panda.cloud.region.should == "eu"
+      Panda.cloud.eu?.should == true
+    end
+    
+  end
+  
   describe "Using configure bloc" do
     before(:each) do
       Panda.configure do |c|
@@ -48,7 +78,7 @@ describe Panda::Video do
         video.id.should == "123"
       end
 
-      it "should find all video with params" do
+      it "should create a video using cloud" do
         videos_json = "{\"source_url\":\"my_source_url\",\"id\":\"123\"}"
         stub_http_request(:post, /api.example.com:85\/v2\/videos.json/).
           with{|r| r.body =~ /cloud_id=cloud1/}.

data/spec/encoding_spec.rb

@@ -63,21 +63,21 @@ describe Panda::Encoding do
   end
   
   it "should return the video_url" do    
-    cloud_json = "{\"s3_videos_bucket\":\"my_bucket\",\"id\":\"my_cloud_id\"}" 
+    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"})
-    encoding.url.should == "http://s3.amazonaws.com/my_bucket/456.ext"
+    encoding = Panda::Encoding.new({:id => "456", :extname => ".ext", :path => "abc/panda"})
+    encoding.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\"}" 
+    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"})
-    encoding.screenshots[0].should == "http://s3.amazonaws.com/my_bucket/456_1.jpg"
+    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"
   end
 
   it "should generate a screenhost array" do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: panda
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - New Bamboo
@@ -9,39 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 +01:00
+date: 2010-10-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
         version: "1.4"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Panda Client
 email: info@pandastream.com
 executables: []
@@ -100,21 +122,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Panda Client