topdmc-client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ed01182cd07bb9100ee5b6a19808f6ad8143f4
-  data.tar.gz: 618400e0b881b5ba4e7a09f095c4857b0d436a0e
+  metadata.gz: 40bfa35d8f3341250b9b0a0c31006a6995fd87b1
+  data.tar.gz: f45805d469d746a19132f01ef44b687708ad7f45
 SHA512:
-  metadata.gz: 7ba7e0d34b0a02615d9cc8ebd3508ab62c5f57ccb16ab8801d3a526966e1ef18270dafebcafa84ee241b8af767b4d7bc00592863135033c325586fd7880e7177
-  data.tar.gz: 81ad2e88428ffb4ff3dddaddb7de0b4b19dcc6f6814599226833ccf0e62adedb0159f49ea279b87ba0eddff1100a3ee3aafe22179f689c21aba3b3d86d75bc88
+  metadata.gz: bd29ee75bd138797275f0b0481dc233e47fdb473199ecd41fb8459c4f9da560e31bb8f97da6c6fbaa7032580a22895937137a6ee1f8d3ecd0e255aa27608e0a9
+  data.tar.gz: c6e5de351cc88e6bbd7f739b78d623eb5ebf7b50ad45ab9d7c322a7d481d7387e8582a128e72d384e4971514769a63807a2ce95ae19c6f23ad903dbda85f5df6

data/lib/topdmc/resources/base.rb

@@ -29,26 +29,7 @@ module TopDMC
           base_params.merge! params
         end
 
-        # 对参数名称和参数值进行URL编码
-        encoded_params = base_params.map do |key, value|
-          [key, URI.encode_www_form_component(value.to_s)]
-        end
-
-        # 按参数名进行升序排列,如果key值相同之后按照value进行排序
-        sorted_params = encoded_params.sort
-
-        # 参数名和参数值之间用 “=” 号连接，参数和参数之间用 “＆” 号连接
-        normalized = sorted_params.map do |item|
-          item.join('=')
-        end
-
-        sign_str = [request_method,
-                    URI.encode_www_form_component(path),
-                    URI.encode_www_form_component(normalized.join('&'))
-        ].join('&')
-
-        sign = hmac_sha1_signature(@client.client_secure, sign_str)
-        base_params[:sign] = sign
+        base_params[:sign] = sign(request_method,path,base_params,@client.client_secure)
 
         # 处理请求地址
         path = "#{@client.url}#{path}"

data/lib/topdmc/resources/client.rb

@@ -1,4 +1,7 @@
 require 'topdmc/resources/artist'
+require 'topdmc/resources/search'
+require 'topdmc/resources/album'
+require 'topdmc/resources/track'
 require "topdmc/resources/version"
 
 module TopDMC
@@ -26,6 +29,10 @@ module TopDMC
       TopDMC::Resources::Album.new(self)
     end
 
+    def track
+      TopDMC::Resources::Track.new(self)
+    end
+
     def search
       TopDMC::Resources::Search.new(self)
     end

data/lib/topdmc/resources/search.rb

@@ -1,7 +1,6 @@
 require 'topdmc/resources/base'
 
 module TopDMC
-  module Client
     module Resources
       class Search < Base
         def initialize(client)
@@ -12,6 +11,5 @@ module TopDMC
           perform_request('GET', "/v1/search", query)
         end
       end
-    end
   end
 end

data/lib/topdmc/resources/track.rb

@@ -1,7 +1,7 @@
 require 'topdmc/resources/base'
 
 module TopDMC
-  module Client
+  module Resources
       class Track < Base
         def initialize(client)
           super(client)
@@ -30,6 +30,23 @@ module TopDMC
         def update_offline_play_count(id, params)
           perform_request('PUT', "/v1/tracks/#{id}", params)
         end
+
+        def authorize_url(track_id,params={})
+          base_params ={
+              timestamp: Time.now.to_i,
+              nonce: nonce,
+              client_id: @client.client_id
+          }
+
+          params.merge! base_params
+          params[:sign] = sign('GET',"/v1/tracks/#{track_id}/authorize",params,@client.client_secure)
+
+          query = params.map { |key, value|
+            [key, URI.encode_www_form_component(value.to_s)]
+          }.sort.map { |item| item.join('=') }.join('&')
+
+          "#{@client.url}/v1/tracks/#{track_id}/authorize?#{query}"
+        end
     end
   end
 end

data/lib/topdmc/resources/utils.rb

@@ -1,20 +1,35 @@
 require 'base64'
 require 'openssl'
-require 'cgi'
+require 'uri'
 
 module TopDMC
-    module Resources
-      module Utils
-        def hmac_sha1_signature(key, signature_string)
-          digest = OpenSSL::Digest::Digest.new( 'sha1' )
-          hmac = OpenSSL::HMAC.digest( digest, key, signature_string  )
-          Base64.encode64( hmac ).chomp.gsub( /\n/, '' )
-        end
+  module Resources
+    module Utils
+      def hmac_sha1_signature(key, signature_string)
+        digest = OpenSSL::Digest::Digest.new('sha1')
+        hmac = OpenSSL::HMAC.digest(digest, key, signature_string)
+        Base64.encode64(hmac).chomp.gsub(/\n/, '')
+      end
+
+      def nonce
+        rand(10 ** 30).to_s.rjust(30, '0')
+      end
+
+      def sign(method, path, params, key)
+
+        normalized = params.map { |key, value|
+          [key, URI.encode_www_form_component(value.to_s)]
+        }.sort.map { |item| item.join('=') }
+
+        sign_str = [method,
+                    URI.encode_www_form_component(path),
+                    URI.encode_www_form_component(normalized.join('&'))
+        ].join('&')
 
-        def nonce
-          rand(10 ** 30).to_s.rjust(30,'0')
-        end
+        #return sign string
+        hmac_sha1_signature(key, sign_str)
       end
+    end
   end
 end
 

data/lib/topdmc/resources/version.rb

@@ -1,5 +1,5 @@
 module TopDMC
   module Resources
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: topdmc-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - liangyali