dm_cloud 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/dm_cloud.gemspec

@@ -0,0 +1,78 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "dm_cloud"
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jeremy Mortelette"]
+  s.date = "2012-11-26"
+  s.description = "This gem will simplify usage of DailyMotion Cloud API, it represent api in ruby style, with automated handler for search and upload files"
+  s.email = ["mortelette.jeremy@gmail.com"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "dm_cloud.gemspec",
+    "lib/dm_cloud.rb",
+    "lib/dm_cloud/builder/media.rb",
+    "lib/dm_cloud/media.rb",
+    "lib/dm_cloud/request.rb",
+    "lib/dm_cloud/signing.rb",
+    "lib/dm_cloud/streaming.rb",
+    "lib/dm_cloud/version.rb",
+    "spec/dm_cloud/media_spec.rb",
+    "spec/dm_cloud/signing_spec.rb",
+    "spec/dm_cloud/streaming_spec.rb",
+    "spec/dm_cloud_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/vcr_cassettes/dm_cloud/dm_cloud_streaming.yml",
+    "spec/vcr_cassettes/dm_cloud_media.yml"
+  ]
+  s.homepage = ""
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Simplify DailyMotion Cloud API usage"
+  s.test_files = ["spec/dm_cloud/media_spec.rb", "spec/dm_cloud/signing_spec.rb", "spec/dm_cloud/streaming_spec.rb", "spec/dm_cloud_spec.rb", "spec/spec_helper.rb", "spec/vcr_cassettes/dm_cloud/dm_cloud_streaming.yml", "spec/vcr_cassettes/dm_cloud_media.yml"]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<vcr>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<vcr>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<vcr>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
+  end
+end
+

data/lib/dm_cloud/builder/media.rb

@@ -45,14 +45,15 @@ module DmCloud
             fields[:assets].each { |value| request << "assets.#{name}.#{value.to_s}" }
           end
         end
-        puts "request fields = #{request.to_yaml}"
         request
       end
       
-      def self.list(fields = {})
+      def self.list(page = 1, per_page = 10, fields = {})
         # raise StandardError, "missing :media_id in params" unless media_id
         request = Hash.new
 
+        request[:page] = page
+        request[:per_page] = per_page
         request[:fields] = []
         # requested media meta datas
         fields[:meta] = ['title'] unless fields[:meta]
@@ -68,16 +69,16 @@ module DmCloud
         # request['stats'][COUNTRY_CODE][TIME_INTERVAL] : the statistics on the number of views in a specific country (eg: stats.fr.total, stats.us.last_week, etc...)
         # request['extended_stats'][COUNTRY_CODE][TIME_INTERVAL]
         
-         assets_names = ['source'] if assets_names.nil?
-          if not fields[:assets]
-            request = all_assets_fields(request, assets_names)
-          else
-            assets_names.each do |name|
-              fields[:assets].each { |value| request[:fields] << "assets.#{name}.#{value.to_s}" }
-            end
+        assets_names = ['source'] if assets_names.nil?
+        if not fields[:assets]
+          request = all_assets_fields(request, assets_names)
+        else
+          assets_names.each do |name|
+            fields[:assets].each { |value| request[:fields] << "assets.#{name}.#{value.to_s}" }
           end
+        end
 
-          request
+        request
       end
 
 
@@ -111,7 +112,6 @@ module DmCloud
           end
           request
         end
-
     end
   end
 end

data/lib/dm_cloud/media.rb

@@ -71,17 +71,12 @@ module DmCloud
     #     per_page (Integer) – (optional) the number of objet per page, default: 10
     #     Returns:
     #     an object with information for the pagination and the result of the query.
-    def self.list(options = {})
+    def self.list(page = 1, per_page = 10, fields = {})
       call_type = "media.list"
 
-      page = options[:page] ? options[:page] : 1
-      per_page = options[:per_page] ? options[:per_page] : 10
-
       params = {
         :call =>  call_type,
-        args: DmCloud::Builder::Media.list(options),
-        :page => page,
-        :per_page => per_page
+        args: DmCloud::Builder::Media.list( page, per_page, fields)
       }
       DmCloud.config[:auto_call] == true ? DmCloud::Request.execute(call_type, params) : {call: call_type, params: params}
     end

data/lib/dm_cloud/signing.rb

@@ -40,7 +40,7 @@ module DmCloud
     #     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 
-    #   <url>?auth=<expires>-<sec>-<nonce>-<md5sum>[-<pub-sec-data>]
+    #   <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])
@@ -50,7 +50,7 @@ module DmCloud
         :sec_level => sec_level,
         :url_no_query => stream,
         :expires => 1.hours.from_now.to_i,
-        :nonce => SecureRandom.hex(16)[0,8],
+        :nonce => SecureRandom.hex(16)[0,16],
         :secret => DmCloud.config[:secret_key]
       }
       base.merge!(:sec_data => sec_data, :pub_sec_data => sec_data) unless sec_data.nil?

data/lib/dm_cloud/streaming.rb

@@ -8,9 +8,9 @@ require 'digest/md5'
 module DmCloud
   class Streaming
       # Default URL to get embed content ou direct url
-      DIRECT_STREAM = '[PROTOCOL]://cdn.DmCloud.net/route/[USER_ID]/[MEDIA_ID]/[ASSET_NAME].[ASSET_EXTENSION]'
-      EMBED_STREAM = '[PROTOCOL]://api.DmCloud.net/embed/[USER_ID]/[MEDIA_ID]?auth=[AUTH_TOKEN]&skin=[SKIN_ID]'
-      EMBED_IFRAME = '<iframe width=[WIDTH] height=[HEIGHT] frameborder="0" scrolling="no" src="[EMBED_URL]"></iframe>'
+      DIRECT_STREAM = "[PROTOCOL]://cdn.dmcloud.net/route/[USER_ID]/[MEDIA_ID]/[ASSET_NAME].[ASSET_EXTENSION]"
+      EMBED_STREAM = "[PROTOCOL]://api.dmcloud.net/embed/[USER_ID]/[MEDIA_ID]"
+      EMBED_IFRAME = '<iframe width="[WIDTH]" height="[HEIGHT]" frameborder="0" scrolling="no" src="[EMBED_URL]"></iframe>'
       
       # Get embeded player
       # Params :
@@ -26,21 +26,22 @@ module DmCloud
         raise StandardError, "missing :media_id in params" unless media_id
         
         skin_id = options[:skin_id] ? options[:skin_id]  : 'modern1'
-        width   = options[:width]   ? options[:width]    : '848'
-        height  = options[:height]  ? options[:height]   : '480'
+        width   = options[:width]   ? options[:width].to_s    : '848'
+        height  = options[:height]  ? options[:height].to_s   : '480'
         
         stream = EMBED_STREAM
         stream.gsub!('[PROTOCOL]', DmCloud.config[:protocol])
         stream.gsub!('[USER_ID]', DmCloud.config[:user_key])
         stream.gsub!('[MEDIA_ID]', media_id)
-        stream.gsub!('[SKIN_ID]', skin_id)
-        stream += '?auth=[AUTH_TOKEN]'.gsub!('[AUTH_TOKEN]', DmCloud::Signing.sign(stream))
+        signed_url = DmCloud::Signing.sign(stream)
+        signed_url = stream + "?auth=#{signed_url}"
 
         frame = EMBED_IFRAME
         frame.gsub!('[WIDTH]', width)
         frame.gsub!('[HEIGHT]', height)
-        frame.gsub!('[EMBED_URL]', stream)
-        frame
+        frame.gsub!('[EMBED_URL]', signed_url)
+
+        frame.html_safe
       end
       
       # Get media url for direct link to the file on DailyMotion Cloud

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm_cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-25 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -139,6 +139,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- dm_cloud.gemspec
 - lib/dm_cloud.rb
 - lib/dm_cloud/builder/media.rb
 - lib/dm_cloud/media.rb
@@ -167,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4229416292724513702
+      hash: 963216337890652206
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: