dmcloud 1.2 → 1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGJiOWVmMGRkMDMwMDIxYWQ5ZjA5NDQwN2E4NTM5YTFjOGRiM2IyYw==
+    OTU5NTY4ZTZlNDMwMDNhODc4NGQyMmNhYzZhMWJhYjJjYTliZWZiOA==
   data.tar.gz: !binary |-
-    NTQzMzhmYjlmZmM4MTJlNzAxZDliODVmMmEzNzYyZDljY2ZhMDdjMA==
+    NzViZjAyYWE4ODEyNWUyYmEyMWIxNDYwNTZlMmM5MjQ4MjVlMTU5Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGY4ZjU4Y2ZjODVhMDZhODgxYzQzZmIyNTdkYmVjN2UwYzg2MmU0OWNjNGYy
-    ZDcxMmE4NzZmODJkYjdjYTc0MWMxYjg4NjI5ZDRlYjA0NzNhNGU4MWQ2ZDBl
-    OGUzYWUxNjFkYWI3YWZhZGM2NDJkMzIwMTBjNzNjMjMxNDdiYzY=
+    NjgxMjI3ODczMjc2YmNjZTUzMDVlNGM0MmU0YjI5OGRkM2U3ZjlkNmZmOWQ2
+    OGJiOTVmMmU5ZjE5MDg0OTM2ZTk5ZDllMzExNTUxZDIxOThkYTYwYTA5NGI2
+    MmQ3YTE5M2RlMzBhN2IwZjhjOTdiZGVmMGQ0YWVmOGI3ZWQwYTk=
   data.tar.gz: !binary |-
-    MWI3ODk4YmNlMWIxZjJmNDRkZDRlZDFmYzc2Mjg1NGVlN2Q3ZThmNzEwMWZj
-    NmM0MjZjYzFmN2MwMzE0YTVjNmExMmIyYmYyMWNhZGFiODg4YmQwMzM1YTg1
-    ZGI2YWJlOTYyYzcyN2Q0ODQzZGZmZGRhYTZhNDAzODZlYWVjMDc=
+    Yzk4Y2I3NmZiN2U0YTBjZjVhMmQwYzdmZTJkMWNiYTk1Y2U0YTBiMWRiNWZl
+    Y2VmNjE0ODlhMjdmNjg1MDRhMDAyNTNkNGE3ZGYxMzU0NWJiZDI0YTU1MGU3
+    MzdkZjQ5MjYwNTQwODdiMjk3MGUwMzAyMzlmNzhkZDQzM2UxNDQ=

data/dmcloud.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dmcloud"
-  s.version = "1.2"
+  s.version = "1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ritik Malhotra", "Tanooj Luthra"]
-  s.date = "2013-06-15"
+  s.date = "2013-06-27"
   s.description = "This gem will simplify usage of DailyMotion Cloud API. Originally authored by Jeremy Mortelette, modified by us to fix the bugs."
   s.email = ["ritikmalhotra@gmail.com"]
   s.extra_rdoc_files = [

data/lib/dm_cloud/builder/media.rb

@@ -17,7 +17,7 @@ module DmCloud
         request.rehash
       end
 
-      def self.info(media_id, assets_names = ['source'], fields = {})
+      def self.info(media_id, assets_names = ['source'], fields = {}, authToken = false)
         raise StandardError, "missing :media_id in params" unless media_id
         request = Hash.new
 
@@ -28,10 +28,12 @@ module DmCloud
         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']
-
+        if not authToken
+          request[:fields] += ['id', 'created', 'embed_url', 'frame_ratio']
+        end
         # the worldwide statistics on the number of views
         # request['fields'] << 'stats.global.last_week' if fields[:stats][:global]
+        # request['fields'] << 'assets.all.progress'
 
         # TODO: handle statistics request per country
         # fields[:stats].each { |key| request << "meta.#{key.to_s}" } if fields[:meta].present?
@@ -110,6 +112,7 @@ module DmCloud
             request[:fields] << "assets.#{name}.created"
             request[:fields] << "assets.#{name}.file_extension"
             request[:fields] << "assets.#{name}.file_size"
+            request[:fields] << "assets.#{name}.progress"
           end
           request
         end

data/lib/dm_cloud/media.rb

@@ -49,16 +49,20 @@ module DmCloud
     #   fields (Array) – (required) the list of fields to retrieve.
     # Returns:
     #   a multi-level structure containing about the media related to the requested fields.
-    def self.info(media_id, assets_names = ['source'], fields = {})
+    def self.info(media_id, assets_names = ['source'], authToken = false, fields = {})
       raise StandardError, "missing :media_id in params" unless media_id
       call_type = "media.info"
 
       params = {
         :call =>  call_type,
-        args: DmCloud::Builder::Media.info(media_id, assets_names, fields)
+        args: DmCloud::Builder::Media.info(media_id, assets_names, fields, authToken)
       }
 
-      DmCloud.config[:auto_call] == true ? DmCloud::Request.execute(call_type, params) : {call: call_type, params: params}
+      if authToken
+        return DmCloud::Signing.identify(params)
+      else
+        DmCloud.config[:auto_call] == true ? DmCloud::Request.execute(call_type, params) : {call: call_type, params: params}
+      end
     end
 
     # Returns a paginated list of media info structures.

data/lib/dm_cloud/request.rb

@@ -11,7 +11,6 @@ module DmCloud
     def self.execute(call, params = {})
       url = define(call)
       params['auth'] = DmCloud::Signing.identify(params)
-
       result = send_request(params)
       parse_response(result)
     end
@@ -25,7 +24,10 @@ module DmCloud
       request.content_type = 'application/json'
       request.body = params.to_json
 
-      # puts 'request (YAML format ): ' + request.to_yaml + "\n" + '-' * 80
+      #puts "Request body in send_request:"
+      #puts request.body
+
+      #puts 'request (YAML format ): ' + request.to_yaml + "\n" + '-' * 80
 
       http.request(request).body
     end

data/lib/dm_cloud/signing.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'digest'
 
 module DmCloud
   class Signing
@@ -12,12 +13,13 @@ module DmCloud
       user_id  = DmCloud.config[:user_key]
       api_key  = DmCloud.config[:secret_key]
 
+      #puts request
       normalized_request = normalize(request).to_s
-      # puts 'identify:: normalized_values : ' + normalized_request + "\n" + '-' * 80
+      #puts 'identify:: normalized_values : ' + normalized_request + "\n" + '-' * 80
 
       params = user_id + normalized_request + api_key
 
-      # puts 'identify:: Values before MD5 encrypt  : ' + params + "\n" + '-' * 80
+      #puts 'identify:: Values before MD5 encrypt  : ' + params + "\n" + '-' * 80
 
       checksum = Digest::MD5.hexdigest(params)
       auth_token = user_id + ':' + checksum

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dmcloud
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.4'
 platform: ruby
 authors:
 - Ritik Malhotra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec