jingdong_fu 1.0 → 1.1

data/README.markdown

@@ -1,3 +1,3 @@
 USAGE:
 
-    JingdongFu.get method: '360buy.order.search', param: {order_state:'WAIT_SELLER_STOCK_OUT', page:1, page_size:10}
+    JingdongFu.get method: '360buy.order.search', order_state:'WAIT_SELLER_STOCK_OUT', page:1, page_size:10

data/lib/generators/jingdong_fu/templates/config/jingdong.yml

@@ -6,14 +6,11 @@ defaults: &defaults
 development:
   <<: *defaults
   is_sandbox: false # If true, it will work under the sandbox environment(tbsandbox.com, not taobao.com).
-  use_curl: false   # If true, it will use gem "patron" as the REST client.
 
 test:
   <<: *defaults
   is_sandbox: ture
-  use_curl: false
 
 production:
   <<: *defaults
-  is_sandbox: false
-  use_curl: true
+  is_sandbox: false

data/lib/jingdong_fu.rb

@@ -15,7 +15,7 @@ module JingdongFu
 
   SANDBOX = 'http://gw.api.sandbox.360buy.com/routerjson?'
   PRODBOX = 'http://gw.api.360buy.com/routerjson?'
-  USER_AGENT = 'jingdong_fu/1.0.0.alpha'
+  USER_AGENT = 'jingdong_fu/1.1'
   REQUEST_TIMEOUT = 10
   API_VERSION = 2.0
   SIGN_ALGORITHM = 'md5'
@@ -29,36 +29,18 @@ module JingdongFu
     end
 
     def apply_settings
-      ENV['TAOBAO_API_KEY']    = @settings['app_key'].to_s
-      ENV['TAOBAO_SECRET_KEY'] = @settings['secret_key']
-      ENV['TAOBAOKE_PID']      = @settings['taobaoke_pid']
-      @base_url                = @settings['is_sandbox'] ? SANDBOX : PRODBOX
-
-      initialize_session if @settings['use_curl']
-    end
-
-    def initialize_session
-      @sess = Patron::Session.new
-      @sess.base_url = @base_url
-      @sess.headers['User-Agent'] = USER_AGENT
-      @sess.timeout = REQUEST_TIMEOUT
+      @base_url = @settings['is_sandbox'] ? SANDBOX : PRODBOX
     end
 
     def switch_to(sandbox_or_prodbox)
       @base_url = sandbox_or_prodbox
-      @sess.base_url = @base_url if @sess
     end
 
     def get(options = {})
-      if @sess
-        @response = @sess.get(generate_query_string(sorted_params(options))).body
-      else
-        @response = TaobaoFu::Rest.get(@base_url, generate_query_vars(sorted_params(options)))
-      end
+      @response = TaobaoFu::Rest.get(@base_url, generate_query_vars(sorted_params(options)))
       parse_result @response
     end
 
-    # http://toland.github.com/patron/
     def post(options = {})
     end
 
@@ -68,17 +50,19 @@ module JingdongFu
     def delete(options = {})
     end
 
-    def sorted_params(options)
-      param = options.delete(:param)
-      options['360buy_param_json'] = param.to_json
+    def sorted_params(params)
+      method = params.delete(:method)
+      param_json = Hash[params.sort_by { |k,v| k.to_s }.map { |k, v| [k.to_s, v.to_s] }].to_json
       {
-        :app_key      => @settings['app_key'],
-        :access_token => @settings['access_token'],
-        :format       => OUTPUT_FORMAT,
-        :v            => API_VERSION,
-        :sign_method  => SIGN_ALGORITHM,
-        :timestamp    => Time.now.strftime("%Y-%m-%d %H:%M:%S")
-      }.merge!(options)
+        :app_key             => @settings['app_key'],
+        :access_token        => @settings['access_token'],
+        :format              => OUTPUT_FORMAT,
+        :v                   => API_VERSION,
+        :sign_method         => SIGN_ALGORITHM,
+        :timestamp           => Time.now.strftime("%Y-%m-%d %H:%M:%S"),
+        :method              => method,
+        :'360buy_param_json' => param_json
+      }
     end
 
     def generate_query_vars(params)
@@ -86,21 +70,12 @@ module JingdongFu
       params
     end
 
-    def generate_query_string(params)
-      sign_token = generate_sign(params_array.flatten.join)
-      total_param = params_array.map { |key, value| key.to_s+"="+value.to_s } + ["sign=#{sign_token}"]
-      URI.escape(total_param.join("&"))
-    end
-
     def generate_sign(param_string)
-      puts param_string
       Digest::MD5.hexdigest(@settings['secret_key'] + param_string + @settings['secret_key']).upcase
     end
 
     def parse_result(data)
       Crack::JSON.parse(data)
     end
-
   end
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jingdong_fu
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &70304697158500 !ruby/object:Gem::Requirement
+  requirement: &70302411868120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70304697158500
+  version_requirements: *70302411868120
 description: Ruby client for JOS platform.
 email: info@networking.io
 executables: []