dmcloud 1.1 → 1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmU0YWI4Mjk2YzQ1ZjIwN2NjMzU3YzkyODE3ZDJjMWNjYmUzYWZjMQ==
+    MGJiOWVmMGRkMDMwMDIxYWQ5ZjA5NDQwN2E4NTM5YTFjOGRiM2IyYw==
   data.tar.gz: !binary |-
-    MTkwMzMzZGI5YWI3YTY0MmE5ODk4NDRlY2EyNTk5Njc4ZDFmYjA4OA==
+    NTQzMzhmYjlmZmM4MTJlNzAxZDliODVmMmEzNzYyZDljY2ZhMDdjMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWNmOGIxY2JmYjNkZjA1Y2FhNmJjNDc1OTIyYjFjNzE4YjU0NThjODQxMGZl
-    NGEzZDZjODIzN2YyMTI3YTZhOGJlYzZlODc5MjdlYjZkZjE0ZGU3NWEyZWZk
-    NDUzYjViMTNkOWI3Y2YzMWQzZWY1ZGJmM2E1ZDVkYWM5NjQzMzI=
+    MGY4ZjU4Y2ZjODVhMDZhODgxYzQzZmIyNTdkYmVjN2UwYzg2MmU0OWNjNGYy
+    ZDcxMmE4NzZmODJkYjdjYTc0MWMxYjg4NjI5ZDRlYjA0NzNhNGU4MWQ2ZDBl
+    OGUzYWUxNjFkYWI3YWZhZGM2NDJkMzIwMTBjNzNjMjMxNDdiYzY=
   data.tar.gz: !binary |-
-    NjI5MjdhZGZmY2RkOGI2MjBmZDE4MWRhNmY0NGIzMzQyMDJlNTZkNWU1OGM5
-    NzE5ZWQxMmVkNTk4ZjYyZmM0MDYzZTMzZWU0ODUzNWIzYmEwNzhkNjM3ZGYy
-    MWU3Y2QwOWM5MWVkZjAyMjA0OTkzMWQ3YjljYjk1NDliODcwNjI=
+    MWI3ODk4YmNlMWIxZjJmNDRkZDRlZDFmYzc2Mjg1NGVlN2Q3ZThmNzEwMWZj
+    NmM0MjZjYzFmN2MwMzE0YTVjNmExMmIyYmYyMWNhZGFiODg4YmQwMzM1YTg1
+    ZGI2YWJlOTYyYzcyN2Q0ODQzZGZmZGRhYTZhNDAzODZlYWVjMDc=

data/dmcloud.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dmcloud"
-  s.version = "1.1"
+  s.version = "1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ritik Malhotra", "Tanooj Luthra"]

data/lib/dm_cloud/builder/media.rb

@@ -22,9 +22,10 @@ module DmCloud
         request = Hash.new
 
         # the media id
-        request[:fields] = []
+        request[:id] = media_id
 
         # requested media meta datas
+        request[:fields] = []
         fields[:meta] = ['title'] unless fields[:meta]
         fields[:meta].each { |value| request[:fields] << "meta.#{value.to_s}" }
         request[:fields] += ['id', 'created', 'embed_url', 'frame_ratio']

data/lib/dm_cloud/media.rb

@@ -57,6 +57,7 @@ module DmCloud
         :call =>  call_type,
         args: DmCloud::Builder::Media.info(media_id, assets_names, fields)
       }
+
       DmCloud.config[:auto_call] == true ? DmCloud::Request.execute(call_type, params) : {call: call_type, params: params}
     end
 
@@ -81,5 +82,22 @@ module DmCloud
       DmCloud.config[:auto_call] == true ? DmCloud::Request.execute(call_type, params) : {call: call_type, params: params}
     end
 
+    # Gets a URL pointer to the actual file...
+    def self.url(media_id, asset_name)
+      raise StandardError, "missing :media_id in params" unless media_id
+      raise StandardError, "missing :asset_name in params" unless asset_name
+      fields = { :assets => ["download_url"] }
+
+      self.info(media_id, [asset_name], fields)["result"]["assets"][asset_name]["download_url"]
+    end
+
+    # Gets the real URL that points to the download link on DMCloud's specific server
+    def self.download_url(media_id, asset_name)
+      download_url = self.url(media_id, asset_name)
+      response = Net::HTTP.get_response(URI.parse(download_url))
+      download_url = response.header["location"]
+
+      download_url
+    end
   end
 end

data/lib/dm_cloud/request.rb

@@ -3,10 +3,10 @@ require 'json'
 
 module DmCloud
   class Request
-    
+
     DAILYMOTION_API = 'http://api.DmCloud.net/api'
     DAILYMOTION_STATIC = 'http://api.DmCloud.net/api'
-    
+
     # This method control signing for Media calls and handle request and response.
     def self.execute(call, params = {})
       url = define(call)
@@ -15,8 +15,8 @@ module DmCloud
       result = send_request(params)
       parse_response(result)
     end
-    
-    
+
+
     def self.send_request(params)
       @uri = URI.parse(DAILYMOTION_API)
 
@@ -24,20 +24,20 @@ module DmCloud
       request = Net::HTTP::Post.new(@uri.request_uri)
       request.content_type = 'application/json'
       request.body = params.to_json
-      
+
       # puts 'request (YAML format ): ' + request.to_yaml + "\n" + '-' * 80
-      
+
       http.request(request).body
     end
-    
 
-    
+
+
     def self.parse_response(result)
       JSON.parse(result)
     end
-    
+
     def self.define(action)
-      DAILYMOTION_API 
+      DAILYMOTION_API
     end
   end
-end
+end

data/lib/dm_cloud/signing.rb

@@ -24,7 +24,7 @@ module DmCloud
 
       auth_token
     end
-    
+
     # To sign a URL, the client needs a secret shared with Dailymotion Cloud.
     # This secret is call client secret and is available in the back-office interface.
     # Params:
@@ -34,22 +34,22 @@ module DmCloud
     #   nonce: A 8 characters-long random alphanumeric lowercase string to make the signature unique.
     #   secret: The client secret.
     #   sec-data: If sec-level doesn’t have the DELEGATED bit activated,
-    #     this component contains concatenated informations 
+    #     this component contains concatenated informations
     #     for all activated sec levels.
     #   pub-sec-data: Some sec level data have to be passed in clear in the signature.
     #     To generate this component the parameters are serialized using x-www-form-urlencoded, compressed with gzip and encoded in base64.
     # Result :
-    #   return a string which contain the signed url like 
+    #   return a string which contain the signed url like
     #   <expires>-<sec>-<nonce>-<md5sum>[-<pub-sec-data>]
     def self.sign(stream, security_datas = nil)
       raise StandardError, "missing :stream in params" unless stream
       sec_level = security(DmCloud.config[:security_level])
       sec_data = security_data(DmCloud.config[:security_level], security_datas) unless security_datas.nil?
 
-      base = { 
+      base = {
         :sec_level => sec_level,
         :url_no_query => stream,
-        :expires => 1.hours.from_now.to_i,
+        :expires => Time.now + 1*60*60, # 1 hour from now
         :nonce => SecureRandom.hex(16)[0,16],
         :secret => DmCloud.config[:secret_key]
       }
@@ -60,13 +60,13 @@ module DmCloud
 
       signed_url = [base[:expires], base[:sec_level], base[:nonce], check_sum].compact
       signed_url.merge!(:pub_sec_data => sec_data) unless sec_data.nil?
-      
+
       # puts signed_url
-      
+
       signed_url = signed_url.join('-')
       signed_url
     end
-    
+
     # Prepare datas for signing
     # Params :
     #   base : contains media id and others for url signing
@@ -89,29 +89,29 @@ module DmCloud
     #       This security level may wrongly block some users
     #       which have their internet access load-balanced between several proxies.
     #       This is the case in some office network or some ISPs.
-    #     User-Agent: Used in addition to one of the two former levels, 
+    #     User-Agent: Used in addition to one of the two former levels,
     #       this level a limit on the exact user-agent of the end-user.
     #       This is more secure but in some specific condition may lead to wrongly blocked users.
     #     Use Once: The signed URL will only be usable once.
     #       Note: should not be used with stream URLs.
     #     Country: The URL can only be queried from specified countrie(s).
     #       The rule can be reversed to allow all countries except some.
-    #     Referer: The URL can only be queried 
+    #     Referer: The URL can only be queried
     #       if the Referer HTTP header contains a specified value.
     #       If the URL contains a Referer header with a different value,
     #       the request is refused. If the Referer header is missing,
-    #       the request is accepted in order to prevent from false positives as some browsers, 
+    #       the request is accepted in order to prevent from false positives as some browsers,
     #       anti-virus or enterprise proxies may remove this header.
-    #     Delegate: This option instructs the signing algorithm 
+    #     Delegate: This option instructs the signing algorithm
     #       that security level information won’t be embeded into the signature
     #       but gathered and lock at the first use.
     # Result :
-    #   Return a string which contain the signed url like 
+    #   Return a string which contain the signed url like
     #   http://cdn.DmCloud.net/route/<user_id>/<media_id>/<asset_name>.<asset_extension>?auth=<auth_token>
     def self.security(type = nil)
       type = :none unless type
       type = type.to_sym if type.class == String
-      
+
       case type
         when :none
           0 # None
@@ -153,7 +153,7 @@ module DmCloud
 
     def self.security_pub_sec_data(type, value)
       type = type.to_sym if type.class == String
-      
+
       case type
         when :country
           "cc=#{value}"  # A list of 2 characters long country codes in lowercase by comas. If the list starts with a dash, the rule is inverted (ie: cc=fr,gb,de or cc=-fr,it). This data have to be stored in pub-sec-data component
@@ -163,10 +163,10 @@ module DmCloud
           nil
       end
     end
-    
-    
+
+
     # This block comes from Cloudkey gem.
-    # I discovered this gem far after I start this one 
+    # I discovered this gem far after I start this one
     # and I will try to add file upload from http or ftp.
     # (Missing in their gem)
     def self.normalize params
@@ -179,11 +179,11 @@ module DmCloud
             params.to_s
           end
         end
-    
+
     # def self.normalize(params)
     #       str = params.to_json.to_s
     #       str.gsub!(/[^A-Za-z0-9]/, '')
     #       str
     #     end
   end
-end
+end

data/lib/dm_cloud/streaming.rb

@@ -67,14 +67,5 @@ module DmCloud
         stream += '?auth=[AUTH_TOKEN]'.gsub!('[AUTH_TOKEN]', DmCloud::Signing.sign(stream, security))
         stream
       end
-
-      # Gets the real URL that points to the download link on DMCloud's specific server
-      def self.download_url(media_id, asset_name, asset_extension = nil, security = {})
-        download_url = self.url(media_id, asset_name, asset_extension, security)
-        response = Net::HTTP.get_response(URI.parse(download_url))
-        download_url = response.header["location"]
-
-        download_url
-      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dmcloud
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Ritik Malhotra