ankoder 0.0.4 → 0.0.5

data/Manifest.txt

@@ -17,7 +17,6 @@ lib/ankoder/profile.rb
 lib/ankoder/upload.rb
 lib/ankoder/version.rb
 lib/ankoder/video.rb
-log/debug.log
 script/destroy
 script/generate
 script/txt2html

data/lib/ankoder/auth.rb

@@ -44,8 +44,8 @@ module Ankoder
 		
 		# Same as initialize
 		#
-    #   Auth::create 'login', 'password'
-    def self.create(login, password, &block)
+		# Auth::create 'login', 'password'
+    def self.create(login= Configuration::auth_user, password =Configuration::auth_password, &block)
       new(:login => login, :password => password, &block)
     end
     

data/lib/ankoder/base.rb

@@ -1,6 +1,8 @@
 module Ankoder 
   # You can connect to the _ankoderapi_session service permanently
   #
+  #  Base::establish_connection! :login => "login", :password => "password"
+  #
   # You can access all the resources and manipulate the objects like in ActiveRecord
   #
   #  v = Video.find(15).update_attributes :name => "My edited title"

data/lib/ankoder/browser.rb

@@ -21,10 +21,19 @@ module Ankoder
         raise ServerError, message if code == 500
       end
 
-      def header(session=nil) #:nodoc:
+      def header(session=nil,action=nil,path=nil) #:nodoc:
         h = {}
         h.merge!({"Cookie" => "_ankoderapi_session=#{session};"}) if session
         h.merge!({"User-Agent" => "_ankoderapi_session ruby API - #{VERSION::STRING}"})
+        if !Configuration::access_key.blank? and !Configuration::private_key.blank?
+          h.merge!({"ankoder_access_key" => Configuration::access_key}) 
+          h.merge!({"ankoder_date" => Time.now.httpdate })
+          
+          salt = Digest::SHA1.hexdigest("-#{Time.now.httpdate}-#{action}-#{path}-")[0..19]
+          passkey = Base64.encode64(HMAC::SHA1::digest(Configuration::private_key, salt)).strip
+          h.merge!({"ankoder_passkey" => "#{passkey}"}) 
+        end  
+        h
       end
       
       # Login to _ankoderapi_session service. Return the session ID.
@@ -40,30 +49,30 @@ module Ankoder
       # GET on path
       def get(path, session=nil)
         path += ".#{OUT_FORMAT}" unless path.include? "."
-        res = Net::HTTP.start(HOST) {|http| http.get(path, header(session))}
+        res = Net::HTTP.start(Configuration::host,Configuration::port) {|http| http.get(path, header(session,"GET",path))}
         raise_if_response_error(res)
         res
       end
 
       # POST on path and pass the query(Hash)
       def post(path, query={}, session=nil)
-        res = Net::HTTP.start(HOST) {|http| http.post(path, query.merge(:format => OUT_FORMAT).to_a.map{|x| x.join("=")}.join("&"), self.header(session))}
+        res = Net::HTTP.start(Configuration::host,Configuration::port) {|http| http.post(path, query.merge(:format => OUT_FORMAT).to_a.map{|x| x.join("=")}.join("&"), self.header(session,"POST",path))}
         raise_if_response_error(res)
         res
       end
       
       # PUT on path and pass the query(Hash)
       def put(path, query={}, session=nil)
-        req = Net::HTTP::Put.new(path, header(session))
+        req = Net::HTTP::Put.new(path, header(session,"PUT",path))
         req.form_data = query.merge(:format => OUT_FORMAT)
-        res = Net::HTTP.new(HOST).start {|http| http.request(req) }
+        res = Net::HTTP.new(Configuration::host,Configuration::port).start {|http| http.request(req) }
         raise_if_response_error(res)
         true
       end
       
       # DELETE on path
       def delete(path, session=nil)
-        res = Net::HTTP.start(HOST) {|http| http.delete(path+"."+OUT_FORMAT, header(session))}
+        res = Net::HTTP.start(Configuration::host,Configuration::port) {|http| http.delete(path+"."+OUT_FORMAT, header(session,"DELETE",path))}
         raise_if_response_error(res)
         true
       end
@@ -75,7 +84,7 @@ module Ankoder
 
         boundary = '349832898984244898448024464570528145'
         query = params.collect {|p| '--' + boundary + "\r\n" + p}.join('') + "--" + boundary + "--\r\n"
-        res = Net::HTTP.start(HOST) {|http| http.post(path, query, header(session).merge("Content-Type" => "multipart/form-data; boundary=" + boundary))}
+        res = Net::HTTP.start(Configuration::host,Configuration::port) {|http| http.post(path, query, header(session,"POST",path).merge("Content-Type" => "multipart/form-data; boundary=" + boundary))}
         raise_if_response_error(res)
         res
       end

data/lib/ankoder/download.rb

@@ -3,7 +3,6 @@ module Ankoder
 
   class Download < Base   
     # Download file from the given URL
-    #
     #  Download.create('url' => 'http://host.com/file.avi', :postback_url => 'http://your_own_host.com/postback/download')
     # 
     #  the return result would be the Video record that you can save for further checking

data/lib/ankoder/ext.rb

@@ -63,7 +63,7 @@ module Ankoder
       
       # Select Ankoder#Base object containing the conditions
       #
-      #   Profile.find(:all).find_with_conditions(:name => "aaa")
+      #   Profile.find(:all).find_with_conditions(:name => "bar")
       def find_with_conditions(conditions={})
         return self if conditions.nil? or conditions.empty?
         res = []

data/lib/ankoder/job.rb

@@ -6,13 +6,12 @@ module Ankoder
     #
     #   Video_ID is the video id that get from Ankoder::Download
     #   Profile_ID is selected from the list of Ankoder::Profile.find(:all)
-    #
+    # 
     #   Job.create(:original_file_id => "Video_ID", :profile_id => "Profile_ID", 
     #              :postback_url => 'http://your_own_host.com/postback/job')
-    def self.create(attributes={}, &block)
+    def self.create(attributes={})
       job = super
       return job 
     end
-    
   end
 end

data/lib/ankoder/upload.rb

@@ -7,4 +7,3 @@ module Ankoder
 
   end
 end
-

data/lib/ankoder/version.rb

@@ -2,7 +2,7 @@ module Ankoder #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/ankoder/video.rb

@@ -7,7 +7,10 @@ module Ankoder
   # Videos.find(video_id)
   #
   class Video < Base
-    
-    
+    def self.url_for(video_id, expires_in = nil)
+      message = {:access_key => Configuration::access_key, :expires => expires(expires_in)}.to_json
+      encoded_message = Base64.encode64(HMAC::SHA1::digest(Configuration::private_key, message)).strip
+      "http://#{Configuration::host}/video/#{video_id}/download/?message=#{CGI.escape(message)}&signature=#{encoded_message}"
+    end
   end
 end

data/lib/ankoder.rb

@@ -1,10 +1,8 @@
-$:.unshift File.dirname(__FILE__)
-
 require "xmlsimple"
 require "cgi"
 
 module Ankoder
-	HOST = "api.ankoder.com" unless const_defined? :HOST
+	
 	OUT_FORMAT = "xml" unless const_defined? :OUT_FORMAT
   RESOURCES = %w{job profile download video account upload} unless const_defined? :RESOURCES
   DEFAULT_EXPIRY = 300 unless const_defined? :DEFAULT_EXPIRY
@@ -33,6 +31,26 @@ module Ankoder
   class ServerError < RuntimeError; end
   class SessionNotFound < RuntimeError; end
   
+  class Configuration
+    cattr_accessor :private_key , :access_key , :auth_user , :auth_password , :host , :port
+  end
+  
+  def self.load_config
+    begin
+      globe_config = YAML::load(ERB.new((IO.read("#{RAILS_ROOT}/config/ankoder.yml"))).result)
+      auth_config = globe_config["#{RAILS_ENV}"]
+      Configuration::private_key   = auth_config["private_key"] 
+      Configuration::access_key    = auth_config["access_key"] 
+      Configuration::auth_user     = auth_config["auth_user"]
+      Configuration::auth_password = auth_config["auth_password"]
+      Configuration::host          = auth_config["host"] || "api.ankoder.com"
+      Configuration::port          = auth_config["port"] || "80"
+    rescue
+      raise $!, " Ankoder: problems trying to load '\"#{RAILS_ROOT}/config/ankoder.yml\")}'"
+      raise
+    end
+  end
+  
   # Convert the XML response into Hash
   def self.response(xml)
     XmlSimple.xml_in(xml, {'ForceArray' => false})
@@ -59,6 +77,7 @@ end
 
 $: << File.dirname(File.expand_path(__FILE__))
 
+Ankoder.load_config if defined?(RAILS_ROOT)
 require "ankoder/ext"
 require "ankoder/version"
 require "ankoder/browser"

data/website/index.html

@@ -33,40 +33,36 @@
     <h1>ankoder</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/ankoder"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/ankoder" class="numbers">0.0.2</a>
+      <a href="http://rubyforge.org/projects/ankoder" class="numbers">0.0.5</a>
     </div>
     <h1>&#x2192; &#8216;ankoder&#8217;</h1>
 
 
 	<h2>What</h2>
-	<p>ankoder is a service provided by rorcraft that allows you convert a Video of any format (YouTube's videos,etc) to MPEG4 (AVI/MOV/MP4/MP3/3GP) or FLV file online. And this gem is to provide  the API for you to send request to our video encoding server.</p>
-  <h2>Installing</h2>
-
-
-<pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">ankoder</span></pre>
-<h2>The basics</h2>
-<p>As this service is still in private beta stage, for every developer start to use this api , have to apply for the private testing account. To apply the testing account, please fill in the form in <a href="http://free.ankoder.com/">http://free.ankoder.com/</a> .</p>
-<h2>Demonstration of usage</h2>
-<p>After we have approved the application , we will assign the username and password to login the service, for example, api_user as username , and api_passowrd as password.</p>
-<h4>Add the following lines to ApplicationController</h4>
-<p>require &quot;ankoder&quot;<br />
-  include &quot;Ankoder&quot;</p>
-<h4>To create a user session<br />
-</h4>
-<p>user = Auth.create(&quot;api_user&quot;, &quot;api_password&quot;)</p>
-<h4>To list out the available converting profile</h4>
-<p>profiles = user.profiles.find(:all)</p>
-<h4>To download a video from Youtube</h4>
-<p>download = user.downloads.create('url' =&gt;&quot;http://www.youtube.com/watch?v=Sex4w4h7Tqk&quot;) </p>
-<h4>To create a job to convert a video file</h4>
-<p>convert_job.create(:video_id =&gt;download.id , :profile_id =&gt; profile.id )</p>
-<h2>Forum</h2>
+
+
+	<h2>Installing</h2>
+
+
+	<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">ankoder</span></pre></p>
+
+
+	<h2>The basics</h2>
+
+
+	<h2>Demonstration of usage</h2>
+
+
+	<h2>Forum</h2>
 
 
 	<p><a href="http://groups.google.com/group/ankoder">http://groups.google.com/group/ankoder</a></p>
-	<h2>Our development Blog</h2>
-	<p><a href="http://devblog.rorcraft.com/">http://devblog.rorcraft.com/</a></p>
-  <h2>How to submit patches</h2>
+
+
+	<p><span class="caps">TODO</span> &#8211; create Google Group &#8211; ankoder</p>
+
+
+	<h2>How to submit patches</h2>
 
 
 	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
@@ -84,12 +80,11 @@
 	<h2>Contact</h2>
 
 
-	<p>Comments are welcome. Send an email to <a href="mailto:info@rorcraft.com">info@rorcraft.com</a></span> or via the <a href="http://groups.google.com/group/ankoder">forum</a></p>
+	<p>Comments are welcome. Send an email to <a href="mailto:FIXME"><span class="caps">FIXME</span> full name</a> email via the <a href="http://groups.google.com/group/ankoder">forum</a></p>
     <p class="coda">
-      <a href="FIXME email"></a>Ankoder, a service by RoRCraft Limited,<br />
-      Last Updated : 
-      27th February 2008<br>
-      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a> </p>
+      <a href="FIXME email">FIXME full name</a>, 30th April 2008<br>
+      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
+    </p>
 </div>
 
 <!-- insert site tracking codes here, like Google Urchin -->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ankoder
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ""
 authors: 
 - RoRCraft.com
@@ -30,7 +30,7 @@ cert_chain:
   iplROzUF++Prmx2JGuO6kA==
   -----END CERTIFICATE-----
 
-date: 2008-04-02 00:00:00 +08:00
+date: 2008-04-30 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -67,7 +67,6 @@ files:
 - lib/ankoder/upload.rb
 - lib/ankoder/version.rb
 - lib/ankoder/video.rb
-- log/debug.log
 - script/destroy
 - script/generate
 - script/txt2html