panda 1.3.0 → 1.4.0

data/lib/panda/modules/updatable.rb

@@ -19,8 +19,9 @@ module Panda
     end
 
     def update
-      response = connection.put(object_url_map(self.class.one_path), @changed_attributes)
-      load_response(response) ? (@changed_attributes = {}; true) : false
+      uri = replace_pattern_with_self_variables(self.class.one_path)
+      response = connection.put(uri, @changed_attributes)
+      load_and_reset(response)
     end
 
   end

data/lib/panda/modules/video_state.rb

@@ -0,0 +1,16 @@
+module Panda
+  module VideoState
+    def success?
+      @attributes['status'] == 'success'
+    end
+
+    def processing?
+      @attributes['status'] == 'processing'
+    end
+
+    def fail?
+      @attributes['status'] == 'fail'
+    end
+
+  end
+end

data/lib/panda/modules/viewable.rb

@@ -0,0 +1,19 @@
+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

data/lib/panda/panda.rb

@@ -1,8 +1,5 @@
-require 'restclient'
-require 'forwardable'
-require 'json' unless defined?(ActiveSupport::JSON) || defined?(JSON::JSON_LOADED)
-
 module Panda
+
   extend self
   extend Forwardable
 
@@ -11,33 +8,57 @@ module Panda
 
   def_delegators :connection, :get, :post, :put, :delete, :api_url, :setup_bucket, :signed_params
 
-  def configure(auth_params=nil)
-    @clouds = {}
+  def configure(auth_params=nil, &block)
 
-    if auth_params
-      connect!(auth_params)
-    else
-      yield @connection = Connection.new
+    if !auth_params
+      configure = Config.new
+      if (block.arity > 0)
+        block.call(configure)
+      else
+        configure.instance_eval(&block)
+      end
+      
+      auth_params = configure.to_hash
+    elsif auth_params.is_a?(String)
+      auth_params = Config.new.parse_panda_url(auth_params)
     end
 
-    @connection.raise_error=true
-    @connection.format = :hash
-    @cloud = Cloud::new(:id => @connection.cloud_id)
+    configure_with_auth_params(auth_params)
+    true
+  end
+
+  def configure_heroku
+    configure_with_auth_params Config.new.parse_panda_url(ENV['PANDASTREAM_URL'])
+    true
   end
 
-  def connect!(auth_params, options={})
-    @connection = Connection.new(auth_params, options)
+  def connect!(auth_params)
+    @connection = Connection.new(auth_params)
   end
 
   def connection
-    raise "Not connected. Please connect! first." unless @connection
+    raise "Panda is not configured!" unless @connection
     @connection
   end
 
-  def version
-    open(File.join(File.dirname(__FILE__), '../../VERSION')) { |f|
-      f.read.strip
-    }
+  def adapter=(klass)
+    @adapter_class = klass
   end
 
+  def adapter
+    @adapter_class ||= default_adapter
+  end
+  
+  private
+
+  def default_adapter
+    Panda::Adapter::Faraday
+  end
+  
+  def configure_with_auth_params(auth_params)
+    connect!(auth_params)
+    @clouds = {}
+    @cloud = Cloud::new(:id => @connection.cloud_id)
+  end
+  
 end

data/lib/panda/proxies/proxy.rb

@@ -1,9 +1,11 @@
 module Panda
   class Proxy
     include Panda::Router::ClassMethods
+    include Panda::Builders::ClassMethods
+    
     include Panda::Finders::FindMany
     include Panda::Finders::FindOne
-    include Panda::Builders::CreateBuilder
+
     include Panda::CloudConnection
 
     attr_accessor :parent, :klass

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)
@@ -29,7 +29,7 @@ module Panda
       elsif object['id']
         klass.new(object.merge('cloud_id' => cloud.id))
       else
-        Error.new(object).raise!
+        raise APIError.new(object)
       end
     end
 
@@ -38,6 +38,11 @@ module Panda
       super(scoped_attrs)
     end
 
+    def create!(attributes)
+      scoped_attrs = attributes.merge(@scoped_attributes)
+      super(scoped_attrs)
+    end
+
     def all(attributes={})
       @scoped_attributes.merge!(attributes)
       trigger_request
@@ -46,42 +51,43 @@ module Panda
     def reload
       @found = trigger_request
     end
-
+    
     private
 
-      def initialize_scope_attributes
-        @scoped_attributes={}
-        if @parent.is_a?(Panda::Resource)
-          @scoped_attributes[parent_relation_name.to_sym] = @parent.id
-        end
+    def initialize_scope_attributes
+      @scoped_attributes={}
+      if @parent.is_a?(Panda::Resource)
+        @scoped_attributes[parent_relation_name.to_sym] = @parent.id
       end
+    end
 
-      def proxy_found
-        @found ||= trigger_request
-      end
+    def proxy_found
+      @found ||= trigger_request
+    end
 
-      def initialize_scopes
-        [].methods.each do |m|
-          unless m.to_s =~ /^__/ || non_delegate_methods.include?(m.to_sym)
-            self.class.class_eval do
-              def_delegators :proxy_found, m.to_sym
-            end
+    def initialize_scopes
+      ([].methods + [:to_json]).each do |m|
+        unless m.to_s =~ /^__/ || non_delegate_methods.include?(m.to_sym)
+          self.class.class_eval do
+            def_delegators :proxy_found, m.to_sym
           end
         end
       end
+    end
 
-      def trigger_request
-        if @parent.is_a?(Resource)
-          path = build_hash_many_path(many_path, parent_relation_name)
-        else
-          path = many_path
-        end
-
-        find_by_path(path, @scoped_attributes)
+    def trigger_request
+      if @parent.is_a?(Resource)
+        path = build_hash_many_path(many_path, parent_relation_name)
+      else
+        path = many_path
       end
 
-      def parent_relation_name
-        "#{@parent.class.sti_name.downcase}_id"
-      end
+      find_by_path(path, @scoped_attributes)
+    end
+
+    def parent_relation_name
+      "#{@parent.class.sti_name.downcase}_id"
+    end
+    
   end
 end

data/lib/panda/resources/cloud.rb

@@ -1,25 +1,27 @@
 module Panda
   class Cloud < Base
     include Panda::Updatable
+    
     attr_reader :connection
 
     def initialize(attributes={})
       super(attributes)
-      connection_params = Panda.connection.to_hash.merge!(:cloud_id => id, :format => :hash)
+      connection_params = Panda.connection.to_hash.merge!(:cloud_id => id)
       @connection = Connection.new(connection_params)
       Panda.clouds[id] = self
     end
 
     class << self
-      include Panda::Finders::FindOne
-
-      def find(id, options=nil)
-        super(id)
-      end
 
       def connection
         Panda.connection
       end
+      
+      private
+
+      def build_resource(attributes)
+        resource = Panda::Cloud.new(attributes)
+      end
     end
 
     def eu?
@@ -31,8 +33,8 @@ module Panda
     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
+      return "eu" if connection.api_host == Panda::EU_API_HOST
+      return "us" if connection.api_host == Panda::US_API_HOST
     end
 
     def videos
@@ -52,10 +54,10 @@ module Panda
       super
     end
 
-    private
-
+    private 
+    
     def lazy_load
-      @found ||= reload
+      reload unless @loaded
     end
 
   end

data/lib/panda/resources/encoding.rb

@@ -1,7 +1,8 @@
 module Panda
   class Encoding < Resource
-    include ShortStatus
-
+    include VideoState
+    include Viewable
+    
     belongs_to :video
     has_one :profile
 
@@ -11,23 +12,7 @@ module Panda
       end
     end
 
-    def url
-      get_url("#{extname}")
-    end
-
-    def error_log
-      get_url(".log") if fail?
-    end
+    def screenshots_size; 7 end
     
-    def screenshots
-      ((1..7).map{|i| get_url("_#{i}.jpg")} if success?) || []
-    end
-
-    private
-
-    def get_url(end_path)
-      "#{cloud.url}#{path}#{end_path}"
-    end
-
   end
 end

data/lib/panda/resources/resource.rb

@@ -1,6 +1,6 @@
 module Panda
   class Resource < Base
-    include Panda::Builders
+    include Panda::Destroyers
     include Panda::Associations
     include Panda::CloudConnection
 
@@ -10,7 +10,6 @@ module Panda
     end
 
     class << self
-      include Panda::Finders::FindMany
       include Panda::CloudConnection
 
       def cloud
@@ -33,20 +32,11 @@ module Panda
       Panda.clouds[cloud_id]
     end
 
-    def create
-      raise "Can't create attribute. Already have an id=#{attributes['id']}" if attributes['id']
-      response = connection.post(object_url_map(self.class.many_path), attributes)
-      load_response(response) ? (@changed_attributes = {}; true) : false
-    end
-
-    def create!
-      create || errors.last.raise!
-    end
-
     def reload
       perform_reload("cloud_id" => cloud_id)
       reset_associations
       self
     end
+
   end
 end

data/lib/panda/resources/video.rb

@@ -1,6 +1,7 @@
 module Panda
   class Video < Resource
-    include ShortStatus
+    include VideoState
+    include Viewable
     has_many :encodings
 
     class << self
@@ -9,5 +10,7 @@ module Panda
       end
     end
 
+    def screenshots_size; 1 end
+    
   end
 end

data/lib/panda/version.rb

@@ -0,0 +1,3 @@
+module Panda
+  VERSION = "1.4.0"
+end

data/panda.gemspec

@@ -1,112 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "panda/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{panda}
-  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{2011-01-10}
+  s.name        = "panda"
+  s.version     = Panda::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["New Bamboo"]
+  s.email       = ["info@pandastream.com"]
+  s.homepage    = "http://github.com/newbamboo/panda_gem"
+  s.summary     = %q{Panda Client}
   s.description = %q{Panda Client}
-  s.email = %q{info@pandastream.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    "Gemfile",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/panda.rb",
-    "lib/panda/api_authentication.rb",
-    "lib/panda/base.rb",
-    "lib/panda/connection.rb",
-    "lib/panda/error.rb",
-    "lib/panda/modules/associations.rb",
-    "lib/panda/modules/builders.rb",
-    "lib/panda/modules/cloud_connection.rb",
-    "lib/panda/modules/finders.rb",
-    "lib/panda/modules/router.rb",
-    "lib/panda/modules/short_status.rb",
-    "lib/panda/modules/updatable.rb",
-    "lib/panda/panda.rb",
-    "lib/panda/proxies/encoding_scope.rb",
-    "lib/panda/proxies/profile_scope.rb",
-    "lib/panda/proxies/proxy.rb",
-    "lib/panda/proxies/scope.rb",
-    "lib/panda/proxies/video_scope.rb",
-    "lib/panda/resources/cloud.rb",
-    "lib/panda/resources/encoding.rb",
-    "lib/panda/resources/profile.rb",
-    "lib/panda/resources/resource.rb",
-    "lib/panda/resources/video.rb",
-    "panda.gemspec",
-    "spec/cloud_spec.rb",
-    "spec/encoding_spec.rb",
-    "spec/heroku_spec.rb",
-    "spec/panda_spec.rb",
-    "spec/profile_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "spec/video_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/newbamboo/panda_gem}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Panda Client}
-  s.test_files = [
-    "spec/cloud_spec.rb",
-    "spec/encoding_spec.rb",
-    "spec/heroku_spec.rb",
-    "spec/panda_spec.rb",
-    "spec/profile_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/video_spec.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "ruby-hmac", ">= 0.3.2"
+  s.add_dependency "yajl-ruby"
+  s.add_dependency "faraday"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<ruby-hmac>, [">= 0.3.2"])
-      s.add_development_dependency(%q<rest-client>, [">= 0"])
-      s.add_development_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["= 1.3.1"])
-      s.add_development_dependency(%q<webmock>, ["= 1.6.1"])
-      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"])
-    else
-      s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["= 1.3.1"])
-      s.add_dependency(%q<webmock>, ["= 1.6.1"])
-      s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
-      s.add_dependency(%q<rest-client>, [">= 1.4"])
-      s.add_dependency(%q<json>, [">= 1.2"])
-    end
-  else
-    s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["= 1.3.1"])
-    s.add_dependency(%q<webmock>, ["= 1.6.1"])
-    s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
-    s.add_dependency(%q<rest-client>, [">= 1.4"])
-    s.add_dependency(%q<json>, [">= 1.2"])
-  end
-end
+  s.add_development_dependency "timecop"
+  s.add_development_dependency "rspec", "2.4.0"
+  s.add_development_dependency "webmock"
+  
+  s.rubyforge_project = "panda"
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end