top4r 0.2.2 → 0.2.3

data/CHANGES

@@ -1,3 +1,8 @@
+=== 0.2.3 / 2013-01-09
+
+Add: taobao.items.inventory.get 获取当前用户的库存商品列表
+Mod: 与master merge，现在开始不再维护bm分支
+
 === 0.2.2 / 2013-01-09
 
 Add: taobao.items.list.get 的支持

data/README.textile

@@ -0,0 +1,26 @@
+h1. Top4R
+
+Top4R 封装了 "淘宝开放平台":http://open.taobao.com 的 Ruby 接口，帮助你快速构建基于TOP的应用程序。
+
+h2. 功能
+
+* [09/25/10] TOP API 2.0支持
+* 商品
+* 物流
+* 店铺
+* 收费
+* 淘宝客
+* 交易
+* 用户
+
+h2. 安装
+
+	$ gem install top4r
+
+h2. Authors
+
+* "Nowa Zhu":http://nowa.me <nowazhu@gmail.com>
+
+h3. Thanks 
+
+* Twitter4R <"http://twitter4r.rubyforge.org":http://twitter4r.rubyforge.org>.

data/lib/top4r.rb

@@ -16,6 +16,7 @@ require 'json'
 require 'yaml'
 require 'iconv'
 require 'timeout'
+require 'base64'
 
 require_local('top4r/ext')
 require_local('top4r/version')

data/lib/top4r/client/base.rb

@@ -6,7 +6,7 @@ class Top4R::Client
   
   def inspect
     s = old_inspect
-    s.gsub!(/@app_secret=".*?"/, '@app_secret="XXXX"')
+    s.gsub!(/@app_secret=".*?"/, '@app_secret="******"')
   end
   
   def init
@@ -70,27 +70,35 @@ class Top4R::Client
     end
   
     def handle_rest_response(response, uri = nil)
-      unless response.is_a?(Net::HTTPSuccess)
+      if !response.is_a?(Net::HTTPSuccess)
         raise_rest_error(response, uri)
       end
-      
+
       map = JSON.parse(response.body)
+
       # API 1.0
-      if map["error_rsp"].is_a?(Hash) and map["error_rsp"]["code"].to_s == "630"
+      if !map["error_response"].blank? and map["error_response"]["code"].to_s == "27"
+        puts "[Top4R]--#{map.inspect}"
+        @@logger.info "Login session expired."
+        raise Top4R::LoginRequiredError.new
+      elsif !map["error_response"].blank? and map["error_response"]["code"].to_s == "560"
+         @@logger.info "Shop not exist."
+          raise Top4R::ShopNotExistError.new(:code => map["error_response"]["code"])
+      elsif map["error_rsp"].is_a?(Hash) and map["error_rsp"]["code"].to_s == "630"
         @@logger.info "Raising SuiteNotOrderedError..."
         raise Top4R::SuiteNotOrderedError.new(:code => map["error_rsp"]["code"],
                                       :message => map["error_rsp"]["msg"],
                                       :error => map["error_rsp"],
                                       :uri => uri)
       elsif map["error_rsp"].is_a?(Hash)
-        @@logger.info "Raising RESTError..."
+        @@logger.info "Raising RESTError [error_rsp not hash]..."
         raise Top4R::RESTError.new(:code => map["error_rsp"]["code"],
                                     :message => map["error_rsp"]["msg"],
                                     :error => map["error_rsp"],
                                     :uri => uri)
       # API 2.0
       elsif map["error_response"].is_a?(Hash)
-        @@logger.info "Raising RESTError..."
+        @@logger.info "Raising RESTError [error_response not hash]..."
         raise Top4R::RESTError.new(:code => map["error_response"]["code"],
                                     :message => map["error_response"]["msg"],
                                     :sub_code => map["error_response"]["sub_code"], 
@@ -129,13 +137,12 @@ class Top4R::Client
     
     def append_top_params(params)
       params = params.merge({
-        # :session => @session,
         :timestamp => Time.now.strftime("%Y-%m-%d %H:%M:%S"),
         :format => "#{@@config.format}",
         :app_key => @app_key
       })
       if !@session.nil? and !@session.blank?
-        params[:session] = @session
+        params = params.merge({ :session => @session })
       end
       params[:v] = "2.0" unless params[:v]
       params = params.merge({

data/lib/top4r/client/item.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Top4R::Client
   @@ITEM_METHODS = {
+    :inventory_list => 'taobao.items.inventory.get',
     :onsale_list => 'taobao.items.onsale.get', 
     :item_info => 'taobao.item.get', 
     :items_info => 'taobao.items.list.get', 
@@ -25,21 +26,47 @@ class Top4R::Client
     items
   end
   
+  # 得到当前会话用户库存中的商品列表
+  def items_inventory(q = nil, options = {}, &block)
+    method = :inventory_list
+    valid_method(method, @@ITEM_METHODS, :item)
+    options = {:q => q}.merge(options) if q
+    params = {:fields => Top4R::Item.fields}.merge(options)
+    response = http_connect {|conn| create_http_get_request(@@ITEM_METHODS[method], params)}
+    result = JSON.parse(response.body)[rsp(@@ITEM_METHODS[method])]
+    if result.is_a?(Hash) and result['items']
+      items = Top4R::Item.unmarshal(result["items"]["item"])
+      items.each {|item| bless_model(item); yield item if block_given?}
+      @total_results = result["total_results"].to_i
+    else
+      @total_results = 0
+      items = []
+    end
+    items
+  end
+  
   def item_info(iid = nil, options = {}, &block)
     method = :item_info
     valid_method(method, @@ITEM_METHODS, :item)
     options = {:num_iid => iid}.merge(options) if iid
     params = {:fields => Top4R::Item.fields}.merge(options)
     response = http_connect {|conn| create_http_get_request(@@ITEM_METHODS[method], params)}
-    item = Top4R::Item.unmarshal(JSON.parse(response.body)[rsp(@@ITEM_METHODS[method])]["item"])
-    bless_model(item)
+    result = JSON.parse(response.body)[rsp(@@ITEM_METHODS[method])]
+    if result.is_a?(Hash) and result['item']
+      item = Top4R::Item.unmarshal(result["item"])
+      item = bless_model(item)
+    else
+      item = nil
+    end
+    item
   end
 
   def items_info(iid = nil, options = {}, &block)
     method = :items_info
     valid_method(method, @@ITEM_METHODS, :item)
-    iid = [iid] if !iid.is_a?(Array)
-    options = {:num_iids => iid}.merge(options) if iid
+    # 为了兼容老的items_list接口，先split，后面再join
+    iid = iid.split(',') if !iid.is_a?(Array)
+    options = {:num_iids => iid.join(',')}.merge(options) if iid
     params = {:fields => Top4R::Item.fields}.merge(options)
     response = http_connect {|conn| create_http_get_request(@@ITEM_METHODS[method], params)}
     result = JSON.parse(response.body)[rsp(@@ITEM_METHODS[method])]
@@ -53,4 +80,7 @@ class Top4R::Client
     end
     items
   end
+
+  alias_method :item, :item_info
+  alias_method :items_list, :items_info
 end

data/lib/top4r/config.rb

@@ -56,10 +56,6 @@ module Top4R
       :test_rest_uri => '/router/rest',
       :test_port => 80,
       :test_protocol => :http,
-      # :staging_host => '192.168.208.110',
-      #       :staging_rest_uri => '/top/private/services/rest',
-      #       :staging_port => '8080',
-      #       :staging_protocol => :http,
       :proxy_host => nil,
       :proxy_port => nil,
       :format => :json,

data/lib/top4r/core.rb

@@ -7,6 +7,8 @@ module Top4R
     end
     
     module InstanceMethods
+      attr_accessor :raw
+      
       def initialize(params = {})
         others = {}
         params.each do |key,val|
@@ -16,6 +18,7 @@ module Top4R
             others[key] = val
           end
         end
+        self.send("raw=",params)
         self.send("#{:other_attrs}=", others) if self.respond_to? :other_attrs and others.size > 0
         self.send(:init) if self.respond_to? :init
       end
@@ -61,4 +64,14 @@ module Top4R
       "#{@method} method at model #{@model} requires you to be logged in first"
     end
   end # LoginRequiredError
+
+  class ShopNotExistError < RESTError
+    include ClassUtilMixin
+    @@ATTRIBUTES = [:model, :method]
+    attr_accessor *@@ATTRIBUTES
+    
+    def to_s
+      "#{@method} method at model #{@model} 错误,错误代号#{@code}，用户没有开通店铺！"
+    end
+  end # ShopNotExistError
 end

data/lib/top4r/model/item.rb

@@ -76,7 +76,7 @@ module Top4R
     end
     
     def unmarshal_other_attrs
-      @id = @iid
+      @id = @num_iid
       if @location && @location.size > 0
         @location = Location.new(@location)
       else

data/lib/top4r/model/user.rb

@@ -77,7 +77,7 @@ module Top4R
 
       def default_public_fields
         ["user_id", "nick", "sex", "buyer_credit", "seller_credit", 
-          "location.city", "location.state", "location.country", "created", "last_visit", "type"]
+          "location.city", "location.state", "email", "location.country", "created", "last_visit", "type"]
       end
 
       def default_private_fields

data/lib/top4r/version.rb

@@ -2,7 +2,7 @@
 module Top4R::Version
   MAJOR = 0
   MINOR = 2
-  REVISION = 2
+  REVISION = 3
   
   class << self
     # Returns X.Y.Z formatted version string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: top4r
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -33,7 +33,7 @@ executables:
 - top4rsh
 extensions: []
 extra_rdoc_files:
-- README
+- README.textile
 - CHANGES
 - TODO
 - MIT-LICENSE
@@ -66,12 +66,12 @@ files:
 - lib/top4r/model.rb
 - lib/top4r/version.rb
 - lib/top4r.rb
-- README
+- README.textile
 - CHANGES
 - TODO
 - MIT-LICENSE
 - bin/top4rsh
-homepage: http://top4r.labs.nowa.me
+homepage: https://github.com/nowa/top4r
 licenses: []
 post_install_message: 
 rdoc_options: []

data/README

@@ -1,28 +0,0 @@
-= TOP4R
- 
-* http://top4r.labs.nowa.me
-* Thanks Twitter4R <http://twitter4r.rubyforge.org>.
- 
-== DESCRIPTION:
- 
-TOP4R封装了淘宝开发平台的接口，帮助你快速构建基于TOP的应用程序。
- 
-== FEATURES/PROBLEMS:
- 
-* [09/25/10] TOP API 2.0支持
-* 商品
-* 物流
-* 店铺
-* 收费
-* 淘宝客
-* 交易
-* 用户
- 
-== REQUIREMENTS:
- 
-* rubygems
-* json
- 
-== INSTALL:
- 
-sudo gem install top4r