open_taobao 0.1.0 → 0.2.0

data/.rspec

@@ -1 +1,2 @@
 require 'autotest/bundler'
+--debug

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.2"
   - "1.9.3"
-  - rbx-18mode
-  - rbx-19mode
+  - "2.0.0"
 # uncomment this line if your project needs to run something other than `rake`:
 script: bundle exec rspec spec

data/CHNAGELOG.md

@@ -1,3 +1,10 @@
+## 2013-08-25 - v0.2.0 released.
+
+* Besides HTTP `get`, `post` is supported.
+* `get!`, `post!` added, these methods will raise OpenTaobao::Error when get an `error_response`.
+* Remove `json` dependency in favor of `multi_json`.
+* Remove `active_support` dependency, add a ActiveSupport compatible Hash hack to converted to http parameters
+
 ## 2013-05-12
 
 pid is not required in config file, but will be loaded to config for back compatibility.

data/README.md

@@ -38,7 +38,7 @@ Open the file and configure it with your taobao info.
 
 Notice: `app_key`, `secret_key`, `endpoint` must be included in your YAML file, otherwise OpenTaobao.load will fail.
 
-call `OpenTaobao.get`，with taobao parameters：
+call `OpenTaobao.get` or `OpenTaoboa.post`，with taobao parameters：
 
     hash = OpenTaobao.get(
       :method => "taobao.itemcats.get",
@@ -48,6 +48,8 @@ call `OpenTaobao.get`，with taobao parameters：
 
 The return data will be converted to a Hash automatically.
 
+Also `OpenTaobao.get!` and `OpenTaobao.post!` are avaliable, which will raise an `OpenTaobao::Error` if a `error_response` receieved.
+
 ### plain ruby
 
     OpenTaobao.config = {

data/lib/open_taobao.rb

@@ -1,10 +1,10 @@
-require 'active_support/core_ext/object'
 require 'digest'
 require 'faraday'
-require 'json'
-require 'open_taobao/version'
+require 'multi_json'
 require 'yaml'
 
+require 'open_taobao/version'
+require 'open_taobao/hash_ext'
 require 'open_taobao/open_taobao'
 
 require 'open_taobao/railtie' if defined? Rails

data/lib/open_taobao/hash_ext.rb

@@ -0,0 +1,7 @@
+require 'cgi'
+
+class Hash
+  def to_query
+    self.map { |k, v| "#{k.to_s}=#{CGI::escape(v.to_s)}" }.join('&')
+  end
+end

data/lib/open_taobao/open_taobao.rb

@@ -26,6 +26,8 @@ module OpenTaobao
   API_VERSION = '2.0'
   USER_AGENT = "open_taobao-v#{VERSION}"
 
+  class Error < StandardError; end
+
   class << self
     attr_accessor :config, :session
 
@@ -93,8 +95,9 @@ module OpenTaobao
       Digest::MD5::hexdigest(wrap_with_secret sorted_option_string(params)).upcase
     end
 
+    # wrapped with secret_key
     def wrap_with_secret(s)
-      config['secret_key'] + s + config['secret_key']
+      "#{config['secret_key']}#{s}#{config['secret_key']}"
     end
 
     # Return sorted request parameter by request key
@@ -125,11 +128,15 @@ module OpenTaobao
       }.merge params
     end
 
-    # Retrun query string with signature.
-    def query_string(params)
+    def query_hash(params)
       params = full_options params
       params[:sign] = sign params
-      "?" + params.to_query
+      params
+    end
+
+    # Retrun query string with signature.
+    def query_string(params)
+      "?" + query_hash(params).to_query
     end
 
     # Return full url with signature.
@@ -139,14 +146,35 @@ module OpenTaobao
 
     # Return a parsed JSON object.
     def parse_result(data)
-      JSON.parse(data)
+      MultiJson.decode(data)
     end
 
-    # Return response in JSON format
+    # Request by get method and return result in JSON format
     def get(params)
       path = query_string(params)
       parse_result session.get(path).body
     end
+
+    # Request by get method and return result in JSON format
+    # Raise OpenTaobao::Error if returned with error_response
+    def get!(params)
+      response = get params
+      raise Error.new(response['error_response']) if response.has_key?('error_response')
+      response
+    end
+
+    # Request by post method and return result in JSON format
+    def post(params)
+      parse_result session.post('', query_hash(params).to_query).body
+    end
+
+    # Request by post method and return result in JSON format
+    # Raise OpenTaobao::Error if returned with error_response
+    def post!(params)
+      response = post params
+      raise Error.new(response['error_response']) if response.has_key?('error_response')
+      response
+    end
   end
 end
 

data/lib/open_taobao/version.rb

@@ -1,3 +1,3 @@
 module OpenTaobao
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/open_taobao.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OpenTaobao::VERSION
 
-  gem.add_dependency "activesupport"
-  gem.add_dependency "json"
+  gem.add_dependency "multi_json"
   gem.add_dependency "faraday"
   gem.add_development_dependency "rspec"
+  gem.add_development_dependency "debugger"
   gem.add_development_dependency "autotest"
   gem.add_development_dependency "rake"
 end

data/spec/open_taobao_spec.rb

@@ -146,6 +146,65 @@ describe OpenTaobao do
 
     OpenTaobao.get(params)['itemcats_get_response']['item_cats']['item_cat'].should be_a(Array)
   end
+
+  it "should support get! method" do
+    OpenTaobao.initialize_session
+    params = {
+      :method => "taobao.itemcats.get",
+      :fields => "cid,parent_id,name,is_parent",
+      :parent_cid => 0
+    }
+
+    OpenTaobao.get!(params)['itemcats_get_response']['item_cats']['item_cat'].should be_a(Array)
+  end
+
+  it "should raise error by get! method" do
+    OpenTaobao.initialize_session
+    params = {
+      :method => "taobao.itemcats.no-method",
+      :fields => "cid,parent_id,name,is_parent",
+      :parent_cid => 0
+    }
+
+    expect {
+      OpenTaobao.get!(params)
+    }.to raise_error OpenTaobao::Error
+  end
+
+  it "should support post method" do
+    OpenTaobao.initialize_session
+    params = {
+      :method => "taobao.itemcats.get",
+      :fields => "cid,parent_id,name,is_parent",
+      :parent_cid => 0
+    }
+
+    OpenTaobao.post(params)['itemcats_get_response']['item_cats']['item_cat'].should be_a(Array)
+  end
+
+  it "should support post! method" do
+    OpenTaobao.initialize_session
+    params = {
+      :method => "taobao.itemcats.get",
+      :fields => "cid,parent_id,name,is_parent",
+      :parent_cid => 0
+    }
+
+    OpenTaobao.post!(params)['itemcats_get_response']['item_cats']['item_cat'].should be_a(Array)
+  end
+
+  it "should raise error by post! method" do
+    OpenTaobao.initialize_session
+    params = {
+      :method => "taobao.itemcats.no-method",
+      :fields => "cid,parent_id,name,is_parent",
+      :parent_cid => 0
+    }
+
+    expect {
+      OpenTaobao.post!(params)
+    }.to raise_error OpenTaobao::Error
+  end
 end
 
 # OpenTaobao.load(File.expand_path('../taobao.yml',__FILE__))

metadata

@@ -1,97 +1,110 @@
 --- !ruby/object:Gem::Specification
 name: open_taobao
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - wongyouth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 淘宝开放平台ruby版，支持Rails3~
@@ -112,6 +125,7 @@ files:
 - lib/generators/open_taobao/install_generator.rb
 - lib/generators/templates/taobao.yml
 - lib/open_taobao.rb
+- lib/open_taobao/hash_ext.rb
 - lib/open_taobao/open_taobao.rb
 - lib/open_taobao/railtie.rb
 - lib/open_taobao/version.rb
@@ -120,27 +134,29 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/wongyouth/open_taobao
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Open Taobao API for ruby
 test_files:
 - spec/open_taobao_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a0d2cd1f2224327805d2a53d744fa6a2e48bde17
-  data.tar.gz: 902d65b7f744defc6380de2ac0f66037a20d17c4
-SHA512:
-  metadata.gz: 281732d45349bbaf20424eb940c272d7494571d19f74605328e95dc37342040b4107c10e7d8868d30cb1136002f53aef10706d7c09f645502f2fedea8cc7873f
-  data.tar.gz: aefdde07064cc319103cf3203e371c233c8e142a3db835f800c6846a28aa3d0aaf0b137566531b1a67174000c61bbc4a96fc9d7a41f7416f8bf072226cd9303d