edm 0.0.5 → 0.0.6

data/lib/edm.rb

@@ -1,30 +1,33 @@
 require "edm/version"
 require "net/http"
-
 module Edm
   class EdmClient
-    def initialize(account, key)
+    DOMAIN = 'http://edm.demohour.com'
+    def initialize(account, secret)
       @account = account
-      @key = key
+      @secret = secret
     end
 
-    attr_accessor :account, :key
+    attr_accessor :account, :secret
 
-    def api_request(url, http_method, options = {})
+    def request(url, http_method, options = {})
       sign = generate_sign(options)
-      options["sign"] = sign
-      result = remote_request(http_method, 'http://edm.demohour.com' + url, options)
+      options[:sign] = sign
+      options[:account_key] = self.account
+      result = remote_request(http_method, url, options)
       return result.body
     end
 
     def generate_sign(options = {})
       if options.length > 0
+        secret = self.secret
         str = options.to_a.sort.map { |c| "#{c[0]}=#{c[1]}" }.join('&')
-        sign = Digest::SHA1.hexdigest("#{str}#{key}")
+        sign = Digest::SHA1.hexdigest("#{str}#{secret}")
       end
     end
 
     def remote_request(http_method, url, options = {})
+      url = DOMAIN + url
       case http_method
       when 'post'
         Net::HTTP.post_form(URI.parse(url), options)

data/lib/edm/version.rb

@@ -1,3 +1,3 @@
 module Edm
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spec
-  requirement: &70232421145860 !ruby/object:Gem::Requirement
+  requirement: &70245374460660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232421145860
+  version_requirements: *70245374460660
 description: demohour edm api
 email:
 - lijiping@demohour.com