dm_cloud 0.0.4 → 0.0.5

data/dm_cloud.gemspec

@@ -16,4 +16,5 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.add_dependency 'curb', "~> 0.8.0"
 end

data/lib/dm_cloud/builder/media.rb

@@ -26,16 +26,10 @@ module DMCloud
         request['fields'] = []
 
         # requested media meta datas
-        fields[:meta].each { |value| request['fields'] << "meta.#{value}" } if fields[:meta].present?
+        fields[:meta] = [ 'title']  unless fields[:meta]
+        fields[:meta].each { |value| request['fields'] << "meta.#{value.to_s}" }
+        request['fields'] += ['id', 'created', 'embed_url', 'frame_ratio']
 
-        #the creation date as a unix timestamp
-        request['fields'] << 'created' if fields[:created]
-
-        # the url of the embed player
-        request['fields'] << 'embed_url' if fields[:embed_url]
-
-        # the ratio of the video frame as a float (eg: 16/9, 4/3, etc).
-        request['fields'] << 'frame_ratio' if fields[:frame_ratio]
         # the worldwide statistics on the number of views
         # request['fields'] << 'stats.global.last_week' if fields[:stats][:global]
 
@@ -46,7 +40,7 @@ module DMCloud
 
         assets_names = ['source'] if assets_names.nil?
         if not fields[:assets]
-          request = all_assets_fields(request, assets_names)
+          # request = all_assets_fields(request, assets_names)
         else
           assets_names.each do |name|
             fields[:assets].each { |value| request << "assets.#{name}.#{value.to_s}" }
@@ -62,16 +56,9 @@ module DMCloud
 
         request['fields'] = []
         # requested media meta datas
-        fields[:meta].each { |key| request << "meta.#{key.to_s}" } if fields[:meta].present?
-
-        #the creation date as a unix timestamp
-        request['fields'] << 'created' if fields[:created]
-
-        # the url of the embed player
-        request['fields'] << 'embed_url' if fields[:embed_url]
-
-        # the ratio of the video frame as a float (eg: 16/9, 4/3, etc).
-        request['fields'] << 'frame_ratio' if fields[:frame_ratio]
+        fields[:meta] = [ 'title']  unless fields[:meta].present?
+        fields[:meta].each { |value| request['fields'] << "meta.#{value.to_s}" }
+        request['fields'] += ['id', 'created', 'embed_url', 'frame_ratio']
 
         # TODO: handle global statistics request in another module
         # the worldwide statistics on the number of views
@@ -84,10 +71,10 @@ module DMCloud
         
          assets_names = ['source'] if assets_names.nil?
           if not fields[:assets]
-            request = all_assets_fields(request, assets_names)
+            # request = all_assets_fields(request, assets_names)
           else
             assets_names.each do |name|
-              fields[:assets].each { |value| request << "assets.#{name}.#{value.to_s}" }
+              fields[:assets].each { |value| request['fields'] << "assets.#{name}.#{value.to_s}" }
             end
           end
 

data/lib/dm_cloud/media.rb

@@ -72,8 +72,8 @@ module DMCloud
     def self.list(options = {})
       call_type = "media.list"
 
-      page = options[:page].present? ? options[:page] : 1
-      per_page = options[:per_page].present? ? options[:per_page] : 10
+      page = options[:page] ? options[:page] : 1
+      per_page = options[:per_page] ? options[:per_page] : 10
 
       params = {
         :call =>  call_type,

data/lib/dm_cloud/request.rb

@@ -4,6 +4,8 @@ module DMCloud
   class Request
     
     DAILYMOTION_API = 'http://api.dmcloud.net/api'
+    DAILYMOTION_STATIC = 'http://api.dmcloud.net/api'
+    
     
     def self.send_request(params)
       puts 'body request params : ' + params.to_json + "\n" + '-' * 80
@@ -23,8 +25,9 @@ module DMCloud
     end
     
     def self.execute(call, params = {})
-      request = DMCloud::Signing.identify(params)
-      params['auth'] = request
+      url = define(call)
+      params['auth'] = DMCloud::Signing.identify(params)
+
       result = send_request(params)
       parse_response(result)
     end
@@ -33,6 +36,8 @@ module DMCloud
       puts 'result : ' + result.to_yaml
     end
     
-    
+    def self.define(action)
+      DAILYMOTION_API 
+    end
   end
 end

data/lib/dm_cloud/signing.rb

@@ -11,11 +11,11 @@ module DMCloud
       api_key  = DMCloud.config[:secret_key]
       
       normalized_request = normalize(request).to_s
-      puts 'normalized_values : ' + normalized_request + "\n" + '-' * 80
+      puts 'identify:: normalized_values : ' + normalized_request + "\n" + '-' * 80
       
       params = user_id + normalized_request + api_key
       
-      puts '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
@@ -39,20 +39,21 @@ module DMCloud
     # Result :
     #   return a string which contain the signed url like 
     #   <url>?auth=<expires>-<sec>-<nonce>-<md5sum>[-<pub-sec-data>]
-    def self.sign(stream)
+    def self.sign(stream, security_datas = nil)
       raise StandardError, "missing :stream in params" unless stream
-      security = security(DMCloud.config[:security_level])
-      sec_data = security_data(DMCloud.config[:security_level])
+      sec_level = security(DMCloud.config[:security_level])
+      sec_data = security_data(DMCloud.config[:security_level], security_datas) unless security_datas.nil?
 
       base = { 
-        :sec_level => security(DMCloud.config[:security_level]),
+        :sec_level => sec_level,
         :url_no_query => stream,
         :expires => (Time.now + 1.hour).to_i,
         :nonce => SecureRandom.hex(16)[0,8],
         :secret => DMCloud.config[:secret_key]
       }
+      
       base.merge!(:sec_data => sec_data, :pub_sec_data => sec_data) unless sec_data.nil?
-      puts base
+
       digest_struct = build_digest_struct(base)
 
       check_sum = Digest::MD5.hexdigest(digest_struct)
@@ -111,7 +112,7 @@ module DMCloud
       type = :none unless type
       type = type.to_sym if type.class == String
       
-      result = case type
+      case type
         when :none
           0 # None
         when :delegate
@@ -129,13 +130,12 @@ module DMCloud
         when :referer
           1 << 6  # A list of URL prefixes separated by spaces stored in the pub-sec-data component (ex: rf=http;//domain.com/a/+http:/domain.com/b/).
       end
-      result
     end
 
     def self.security_data(type, value = nil)
       type = type.to_sym if type.class == String
-      
-      result = case type
+
+      case type
         when :asnum
           "as=#{value}"  # The number part of the end-user AS prefixed by the ‘AS’ string (ie: as=AS41690)
         when :ip
@@ -149,13 +149,12 @@ module DMCloud
         else
           nil
       end
-      result
     end
 
     def self.security_pub_sec_data(type, value)
       type = type.to_sym if type.class == String
       
-      result = case type
+      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
         when :referer
@@ -163,13 +162,23 @@ module DMCloud
         else
           nil
       end
-      result
     end
     
-    def self.normalize(params)
-      str = params.to_json.to_s
-      str.gsub!(/[^A-Za-z0-9]/, '')
-      str
-    end
+    def self.normalize params
+          case params
+          when Array
+            params.collect { |element| normalize(element) }.join('')
+          when Hash
+            params.to_a.sort_by {|a,b| a.to_s }.collect {|array| array.first.to_s + normalize(array.last)}.join('')
+          else
+            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

data/lib/dm_cloud/streaming.rb

@@ -3,6 +3,8 @@ require "openssl"
 require "base64"
 require 'digest/md5'
 
+# This module generate methods to generate video's fluxes
+# before signing it and request it.
 module DMCloud
   class Streaming
       # Default URL to get embed content ou direct url

data/lib/dm_cloud/version.rb

@@ -1,3 +1,3 @@
 module DMCloud
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/dm_cloud.rb

@@ -1,9 +1,17 @@
 require "dm_cloud/version"
 require 'yaml'
-  
+
+# This gem's comments come from DailyMotion Cloud API,
+# that's the better way to see changes on new version and logic.
+# For parts more generals and not representating DailyMotion Cloud API,
+# I add some about my own opinion.
 module DMCloud
   
   # Configuration defaults
+  # I used this parts from Slainer68 paybox_system gem.
+  # I liked the concept and how he handle this part.
+  # Thx Slainer68, I created my first gem, 
+  # and next one will be an update to your paybox_system gem.
   @@config = {
     :security_level =>  'none',
     :protocol => 'http'
@@ -18,6 +26,7 @@ module DMCloud
   end
 
   # Configure through yaml file
+  # for ruby scripting usage
   def self.configure_with(yaml_file_path = nil)
     yaml_file_path = YAML_INITIALIZER_PATH  unless yaml_file_path
     begin
@@ -31,46 +40,19 @@ module DMCloud
     configure(config)
   end
 
+  # Access to config variables (security level, user_id and api_key)
+  # NOTE: The unless @@config is not really interesting, 
+  #   this mean we should loose user credentials to API.
   def self.config
     @@config = configure unless @@config
     @@config
   end
-  
-  def self.create_has_library(library)
-      define_singleton_method("has_#{library}?") do
-        cv="@@#{library}"
-        if !class_variable_defined? cv
-          begin 
-            require library.to_s
-            class_variable_set(cv,true)
-          rescue LoadError
-            class_variable_set(cv,false)
-          end
-        end
-        class_variable_get(cv)
-      end
-    end
-  
-    create_has_library :streaming
-    create_has_library :media
-  
-    class << self
-      # Load a object saved on a file.
-      def load(filename)
-        if File.exists? filename
-          o=false
-          File.open(filename,"r") {|fp| o=Marshal.load(fp) }
-          o
-        else
-          false
-        end
-      end
-    end
-  
+
+  # Loading classes to easier access
+  # NOTE: I like this way to handle my classes,
+  #   sexiest than using require 'my_class_file' everywhere
   autoload(:Streaming, 'dm_cloud/streaming')
   autoload(:Media, 'dm_cloud/media')
   autoload(:Request, 'dm_cloud/request')
   autoload(:Signing, 'dm_cloud/signing')
-end
-
-# Dir.glob('dm_cloud/**/*.rb').each{ |m| require File.dirname(__FILE__) + '/dm_cloud/' + m }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm_cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
-dependencies: []
+date: 2012-10-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: This gem will simplify usage of DailyMotion Cloud API, it represent api
   in ruby style, with automated handler for search and upload files
 email: