top4r 0.0.39 → 0.1.0

data/README

@@ -9,12 +9,20 @@ TOP4R封装了淘宝开发平台的接口，帮助你快速构建基于TOP的应
  
 == FEATURES/PROBLEMS:
  
-* 待续...
+* [09/25/10] TOP API 2.0支持
+* 商品
+* 物流
+* 店铺
+* 收费
+* 淘宝客
+* 交易
+* 用户
  
 == REQUIREMENTS:
  
 * rubygems
+* json
  
 == INSTALL:
  
-sudo gem install nowa-top4r -s http://gems.github.com
+sudo gem install top4r

data/lib/top4r/client/base.rb

@@ -75,6 +75,7 @@ class Top4R::Client
       end
       
       map = JSON.parse(response.body)
+      # API 1.0
       if 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"],
@@ -87,6 +88,15 @@ class Top4R::Client
                                     :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..."
+        raise Top4R::RESTError.new(:code => map["error_response"]["code"],
+                                    :message => map["error_response"]["msg"],
+                                    :sub_code => map["error_response"]["sub_code"], 
+                                    :sub_msg => map["error_response"]["sub_msg"], 
+                                    :error => map["error_response"],
+                                    :uri => uri)
       end
     end
   
@@ -124,7 +134,7 @@ class Top4R::Client
         :format => "#{@@config.format}",
         :app_key => @app_key
       })
-      params[:v] = "1.0" unless params[:v]
+      params[:v] = "2.0" unless params[:v]
       params = params.merge({
         :sign => Digest::MD5.hexdigest(params.sort {|a,b| "#{a[0]}"<=>"#{b[0]}"}.flatten.unshift(@app_secret).join).upcase
       })
@@ -146,4 +156,8 @@ class Top4R::Client
       path = (params.size > 0) ? "#{uri}?#{params.to_http_str}" : uri
       Net::HTTP::Delete.new(path, http_header)
     end
+    
+    def rsp(api)
+      "#{api.split('.')[1..-1].join('_')}_response"
+    end
 end

data/lib/top4r/client/item.rb

@@ -8,9 +8,15 @@ class Top4R::Client
     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)}
-    items = Top4R::Item.unmarshal(JSON.parse(response.body)["rsp"]["items"])
-    items.each {|item| bless_model(item); yield item if block_given?}
-    @total_results = JSON.parse(response.body)["rsp"]["totalResults"].to_i
+    result = JSON.parse(response.body)[rsp(@@ITEM_METHODS[method])]
+    if 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
 end

data/lib/top4r/client/shipping.rb

@@ -4,7 +4,7 @@ class Top4R::Client
   }
   
   @@LOGISTIC_COMPANY_METHODS = {
-    :list => 'taobao.logisticcompanies.get'
+    :list => 'taobao.logistics.companies.get'
   }
   
   @@DELIVERY_METHODS = {
@@ -15,8 +15,13 @@ class Top4R::Client
     valid_method(method, @@AREA_METHODS, :area)
     params = {:fields => Top4R::Area.fields}.merge(options)
     response = http_connect {|conn| create_http_get_request(@@AREA_METHODS[method], params)}
-    areas = Top4R::Area.unmarshal(JSON.parse(response.body)["rsp"]["areas"])
-    areas.each {|area| bless_model(area); yield area if block_given?}
+    result = JSON.parse(response.body)[rsp(@@AREA_METHODS[method])]
+    if result["areas"]
+      areas = Top4R::Area.unmarshal(result["areas"]["area"])
+      areas.each {|area| bless_model(area); yield area if block_given?}
+    else
+      areas = []
+    end
     areas
   end
   
@@ -24,8 +29,13 @@ class Top4R::Client
     valid_method(method, @@LOGISTIC_COMPANY_METHODS, :logistic_company)
     params = {:fields => Top4R::LogisticCompany.fields}.merge(options)
     response = http_connect {|conn| create_http_get_request(@@LOGISTIC_COMPANY_METHODS[method], params)}
-    logistic_companies = Top4R::LogisticCompany.unmarshal(JSON.parse(response.body)["rsp"]["logistic_companies"])
-    logistic_companies.each {|logistic_company| bless_model(logistic_company); yield logistic_company if block_given?}
+    result = JSON.parse(response.body)[rsp(@@LOGISTIC_COMPANY_METHODS[method])]
+    if result["logistics_companies"]
+      logistic_companies = Top4R::LogisticCompany.unmarshal(result["logistics_companies"]["logistics_company"])
+      logistic_companies.each {|logistic_company| bless_model(logistic_company); yield logistic_company if block_given?}
+    else
+      logistic_companies = []
+    end
     logistic_companies
   end
   
@@ -40,6 +50,6 @@ class Top4R::Client
     end
     response = http_connect {|conn| create_http_get_request(@@DELIVERY_METHODS[method], params)}
     json = JSON.parse(response.body)
-    json.is_a?(Hash) ? json["rsp"]["is_success"] : false
+    json.is_a?(Hash) ? json[rsp(@@DELIVERY_METHODS[method])]["shipping"]["is_success"] : false
   end
 end

data/lib/top4r/client/shop.rb

@@ -9,8 +9,13 @@ class Top4R::Client
     u = u.nick if u.is_a?(Top4R::User)
     params = options.merge(:nick => u)
     response = http_connect {|conn| create_http_get_request(@@SHOP_METHODS[method], params)}
-    seller_cats = Top4R::SellerCat.unmarshal(JSON.parse(response.body)["rsp"]["seller_cats"])
-    seller_cats.each {|cat| bless_model(cat); yield cat if block_given?}
+    result = JSON.parse(response.body)[rsp(@@SHOP_METHODS[method])]
+    if result["seller_cats"]
+      seller_cats = Top4R::SellerCat.unmarshal(result["seller_cats"]["seller_cat"])
+      seller_cats.each {|cat| bless_model(cat); yield cat if block_given?}
+    else
+      seller_cats = []
+    end
     # puts "\nsuites: #{suites.inspect}"
     seller_cats
   end
@@ -20,7 +25,7 @@ class Top4R::Client
     u = u.nick if u.is_a?(Top4R::User)
     params = {:fields => Top4R::Shop.fields}.merge(options).merge(:nick => u)
     response = http_connect {|conn| create_http_get_request(@@SHOP_METHODS[method], params)}
-    shops = Top4R::Shop.unmarshal(JSON.parse(response.body)["rsp"]["shops"])
-    method == :shop_info ? bless_model(shops.first) : bless_models(shops)
+    shop = Top4R::Shop.unmarshal(JSON.parse(response.body)[rsp(@@SHOP_METHODS[method])]["shop"])
+    bless_model(shop)
   end
 end

data/lib/top4r/client/suite.rb

@@ -8,16 +8,21 @@ class Top4R::Client
     u = u.nick if u.is_a?(Top4R::User)
     params = {:service_code => service_code}.merge(options).merge(:nick => u)
     response = http_connect {|conn| create_http_get_request(@@SUITE_METHODS[method], params)}
-    if response.body == "{\"rsp\":{}}"
+    if response.body == "{\"suites_get_response\":{}}"
       raise Top4R::SuiteNotOrderedError.new(:code => 630,
                                     :message => "没有#{service_code}的订购记录",
                                     :error => "{}",
                                     :uri => @@SUITE_METHODS[method])
     end
-    suites = Top4R::Suite.unmarshal(JSON.parse(response.body)["rsp"]["suites"])
-    suites.each {|suite| bless_model(suite); yield suite if block_given?}
-    # puts "\nsuites: #{suites.inspect}"
-    @total_results = JSON.parse(response.body)["rsp"]["totalResults"].to_i
+    result = JSON.parse(response.body)[rsp(@@SUITE_METHODS[method])]
+    if result["suites"]
+      suites = Top4R::Suite.unmarshal(result["suites"]["suite"])
+      suites.each {|suite| bless_model(suite); yield suite if block_given?}
+      @total_results = result["total_results"].to_i
+    else
+      @total_results = 0
+      suites = []
+    end
     suites
   end
 end

data/lib/top4r/client/taobaokeitem.rb

@@ -8,10 +8,15 @@ class Top4R::Client
     options = {:keyword => q}.merge(options) if q
     params = {:fields => Top4R::TaobaokeItem.fields, :v => "2.0"}.merge(options)
     response = http_connect {|conn| create_http_get_request(@@TAOBAOKEITEM_METHODS[method], params)}
-    
-    items = Top4R::TaobaokeItem.unmarshal(JSON.parse(response.body)["taobaoke_items_get_response"]["taobaoke_items"]["taobaoke_item"])
-    items.each {|item| bless_model(item); yield item if block_given?}
-    @total_results = JSON.parse(response.body)["taobaoke_items_get_response"]["total_results"].to_i
+    result = JSON.parse(response.body)[rsp(@@TAOBAOKEITEM_METHODS[method])]
+    if result["taobaoke_items"]
+      items = Top4R::TaobaokeItem.unmarshal(result["taobaoke_items"]["taobaoke_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
 end

data/lib/top4r/client/trade.rb

@@ -19,10 +19,15 @@ class Top4R::Client
       params = {:start_modified => (now - 24.hours).strftime("%Y-%m-%d %H:%M:%S"), :end_modified => now.strftime("%Y-%m-%d %H:%M:%S")}.merge(params)
     end
     response = http_connect {|conn| create_http_get_request(@@TRADE_METHODS[method], params)}
-    trades = Top4R::Trade.unmarshal(JSON.parse(response.body)["rsp"]["trades"])
-    trades.each {|trade| bless_model(trade); yield trade if block_given?}
-    # puts "\ntrades: #{trades.inspect}"
-    @total_results = JSON.parse(response.body)["rsp"]["totalResults"].to_i
+    result = JSON.parse(response.body)[rsp(@@TRADE_METHODS[method])]
+    if result["trades"]
+      trades = Top4R::Trade.unmarshal(result["trades"]["trade"])
+      trades.each {|trade| bless_model(trade); yield trade if block_given?}
+      @total_results = result["total_results"].to_i
+    else
+      @total_results = 0
+      trades = []
+    end
     trades
   end
   
@@ -34,15 +39,15 @@ class Top4R::Client
     parsed_body = JSON.parse(response.body)
     
     if [:info, :fullinfo].member?(method)
-      trades = Top4R::Trade.unmarshal(parsed_body["rsp"]["trades"])
+      trades = Top4R::Trade.unmarshal(parsed_body[rsp(@@TRADE_METHODS[method])]["trade"])
       bless_model(trades.first)
     elsif method == :confirmfee
-      confirmfees = Top4R::TradeConfirmFee.unmarshal(parsed_body["rsp"]["confirmFees"])
+      confirmfees = Top4R::TradeConfirmFee.unmarshal(parsed_body[rsp(@@TRADE_METHODS[method])]["trade_confirm_fee"])
       bless_models(confirmfees)
     elsif [:close, :update_memo].member?(method)
-      parsed_body["rsp"]["modified"]
+      parsed_body[rsp(@@TRADE_METHODS[method])]["trade"]["modified"]
     elsif method == :add_memo
-      parsed_body["rsp"]["created"]
+      parsed_body[rsp(@@TRADE_METHODS[method])]["trade"]["created"]
     end
   end
 end

data/lib/top4r/client/user.rb

@@ -24,8 +24,15 @@ class Top4R::Client
   protected
   
     def user_request(u, method, options)
-      params = {:fields => Top4R::User.fields}.merge(options).merge(:nick => u)
+      @@logger.info "u: #{u}"
+      params = {:fields => Top4R::User.fields}.merge(options).merge((method == :info ? :nick : :nicks) => u)
       response = http_connect {|conn| create_http_get_request(@@USER_METHODS[method], params)}
-      Top4R::User.unmarshal(JSON.parse(response.body)["rsp"]["users"])
+      @@logger.info "rsp: #{rsp(@@USER_METHODS[method])}"
+      
+      if method == :info
+        return [Top4R::User.unmarshal(JSON.parse(response.body)[rsp(@@USER_METHODS[method])]["user"])]
+      else
+        return Top4R::User.unmarshal(JSON.parse(response.body)[rsp(@@USER_METHODS[method])]["users"]["user"])
+      end
     end
 end

data/lib/top4r/client.rb

@@ -11,7 +11,7 @@ class Top4R::Client
       :list => 'taobao.areas.get'
     },
     :logistic_company => {
-      :list => 'taobao.logisticcompanies.get'
+      :list => 'taobao.logistics.companies.get'
     },
     :shop => {
       :cats_list => 'taobao.sellercats.list.get', 

data/lib/top4r/config.rb

@@ -66,7 +66,7 @@ module Top4R
       :application_key => '12000224',
       :application_secret => '2f26cb1a99570aa72daee12a1db88e63',
       :application_version => Top4R::Version.to_version,
-      :application_url => 'http://top4r.nowa.me',
+      :application_url => 'http://top4r.labs.nowa.me',
       :user_agent => 'default',
       :source => 'top4r',
       :logger => nil,

data/lib/top4r/core.rb

@@ -33,7 +33,7 @@ module Top4R
   
   class RESTError < RuntimeError
     include ClassUtilMixin
-    @@ATTRIBUTES = [:code, :message, :uri, :error]
+    @@ATTRIBUTES = [:code, :message, :uri, :error, :sub_code, :sub_msg]
     attr_accessor *@@ATTRIBUTES
 
     # Returns string in following format:
@@ -41,7 +41,7 @@ module Top4R
     # For example,
     # "HTTP 404: Resource Not Found at /i_am_crap.json"
     def to_s
-      "HTTP #{@code}: #{@message} at #{@uri}"
+      "HTTP #{@code}: #{@message} at #{@uri}, sub_code: #{@sub_code}, sub_msg: #{@sub_msg}"
     end
   end # RESTError
   

data/lib/top4r/model/item.rb

@@ -2,7 +2,7 @@ module Top4R
   # ItemImg Model
   class ItemImg
     include ModelMixin
-    @@ATTRIBUTES = [:id, :url, :position]
+    @@ATTRIBUTES = [:id, :url, :position, :created]
     attr_accessor *@@ATTRIBUTES
 
     class << self
@@ -13,7 +13,7 @@ module Top4R
   # PropImg Model
   class PropImg
     include ModelMixin
-    @@ATTRIBUTES = [:id, :url, :properties, :position]
+    @@ATTRIBUTES = [:id, :url, :properties, :position, :created]
     attr_accessor *@@ATTRIBUTES
 
     class << self
@@ -39,7 +39,7 @@ module Top4R
   # Video Model
   class Video
     include ModelMixin
-    @@ATTRIBUTES = [:id, :video_id, :url, :created, :modified]
+    @@ATTRIBUTES = [:id, :video_id, :url, :created, :modified, :iid, :num_iid]
     attr_accessor *@@ATTRIBUTES
     
     class << self
@@ -54,9 +54,10 @@ module Top4R
       :seller_cids, :props, :input_pids, :input_str, :desc, :pic_path, :num, :valid_thru, 
       :list_time, :delist_time, :stuff_status, :location, :price, :post_fee, :express_fee, 
       :ems_fee, :has_discount, :freight_payer, :has_invoice, :has_warranty, :has_showcase, 
-      :modified, :increment, :auto_repost, :approve_status, :postage_id, :product_id, :auction_point, 
+      :modified, :increment, :approve_status, :postage_id, :product_id, :auction_point, 
       :property_alias, :item_imgs, :prop_imgs, :skus, :outer_id, :is_virtual, :is_taobao, 
-      :is_ex, :videos, :is_3D, :score, :volume, :one_station]
+      :is_ex, :is_timing, :videos, :is_3D, :score, :volume, :one_station, :second_kill, 
+      :auto_fill, :props_name, :violation, :created, :is_prepay, :ww_status, :promoted_service]
     attr_accessor *@@ATTRIBUTES
     
     class << self
@@ -80,16 +81,16 @@ module Top4R
       else
         @location = nil
       end
-      if @item_imgs.is_a?(Array) && @item_imgs.size > 0
-        @item_imgs.map {|img| ItemImg.new(img)}
-      else
-        @item_imgs = []
-      end
-      if @prop_imgs.is_a?(Array) && @prop_imgs.size > 0
-        @prop_imgs.map {|img| PropImg.new(img)}
-      else
-        @prop_imgs = []
-      end
+      # if @item_imgs.is_a?(Array) && @item_imgs.size > 0
+      #         @item_imgs.map {|img| ItemImg.new(img)}
+      #       else
+      #         @item_imgs = []
+      #       end
+      #       if @prop_imgs.is_a?(Array) && @prop_imgs.size > 0
+      #         @prop_imgs.map {|img| PropImg.new(img)}
+      #       else
+      #         @prop_imgs = []
+      #       end
       
       self
     end

data/lib/top4r/model/shipping.rb

@@ -2,41 +2,31 @@ module Top4R
   # Area model
   class Area
     include ModelMixin
-    @@ATTRIBUTES = [:id, :area_id, :area_type, :area_name, :parent_id, :zip]
+    @@ATTRIBUTES = [:id, :type, :name, :parent_id, :zip]
     attr_accessor *@@ATTRIBUTES
     
     class << self
       def attributes; @@ATTRIBUTES; end
       
       def default_public_fields
-        ["area_id", "area_type", "area_name", "parent_id", "zip"]
+        ["id", "type", "name", "parent_id", "zip"]
       end
     end
-    
-    def unmarshal_other_attrs
-      @id = @area_id
-      self
-    end
   end
   
   # LogisticCompany model
   class LogisticCompany
     include ModelMixin
-    @@ATTRIBUTES = [:id, :company_id, :company_code, :company_name]
+    @@ATTRIBUTES = [:id, :code, :name]
     attr_accessor *@@ATTRIBUTES
     
     class << self
       def attributes; @@ATTRIBUTES; end
       
       def default_public_fields
-        ["company_id", "company_code", "company_name"]
+        ["id", "code", "name"]
       end
     end
-    
-    def unmarshal_other_attrs
-      @id = @company_id
-      self
-    end
   end
   
   # Delivery model
@@ -56,7 +46,7 @@ module Top4R
     include ModelMixin
     @@ATTRIBUTES = [:id, :tid, :seller_nick, :buyer_nick, :delivery_start, :delivery_end, 
       :out_sid, :item_title, :receiver_name, :receiver_phone, :receiver_mobile, :receiver_location, 
-      :status, :type, :freight_payer, :seller_confirm, :company_name]
+      :status, :type, :freight_payer, :seller_confirm, :company_name, :is_success, :created, :modified]
     attr_accessor *@@ATTRIBUTES
     
     class << self

data/lib/top4r/model/shop.rb

@@ -2,7 +2,7 @@ module Top4R
   # SellerCat Model
   class SellerCat
     include ModelMixin
-    @@ATTRIBUTES = [:id, :cid, :parent_cid, :name, :pict_url, :sort_order]
+    @@ATTRIBUTES = [:id, :cid, :parent_cid, :name, :pict_url, :sort_order, :created, :modified]
     attr_accessor *@@ATTRIBUTES
     
     class << self
@@ -15,10 +15,26 @@ module Top4R
     end
   end
   
+  # ShopScore Model
+  class ShopScore
+    include ModelMixin
+    @@ATTRIBUTES = [:item_score, :service_score, :delivery_score]
+    attr_accessor *@@ATTRIBUTES
+    
+    class << self
+      def attributes; @@ATTRIBUTES; end
+    end
+    
+    def unmarshal_other_attrs
+      @id = 0
+      self
+    end
+  end
+  
   # Shop Model
   class Shop
     include ModelMixin
-    @@ATTRIBUTES = [:id, :sid, :cid, :nick, :title, :desc, :bulletin, :pic_path, :created, :modified]
+    @@ATTRIBUTES = [:id, :sid, :cid, :nick, :title, :desc, :bulletin, :pic_path, :created, :modified, :shop_score, :remain_count]
     attr_accessor *@@ATTRIBUTES
     
     class << self
@@ -31,6 +47,13 @@ module Top4R
     
     def unmarshal_other_attrs
       @id = @sid
+      
+      if @shop_score && @shop_score.size > 0
+        @shop_score = ShopScore.new(@shop_score)
+      else
+        @shop_score = nil
+      end
+      
       self
     end
   end

data/lib/top4r/model/trade.rb

@@ -3,9 +3,10 @@ module Top4R
   class Order
     include ModelMixin
     @@ATTRIBUTES = [:id, :iid, :sku_id, :sku_properties_name, :item_meal_name, :num, :title, 
-      :price, :pic_path, :seller_nick, :buyer_nick, :type, :created, :refund_status, :tid, 
+      :price, :pic_path, :seller_nick, :buyer_nick, :type, :created, :refund_status, :oid, 
       :outer_iid, :outer_sku_id, :total_fee, :payment, :discount_fee, :adjust_fee, :status, 
-      :snapshot_url, :timeout_action_time]
+      :snapshot_url, :snapshot, :timeout_action_time, :buyer_rate, :seller_rate, :refund_id, 
+      :seller_type, :modified, :num_iid]
     attr_accessor *@@ATTRIBUTES
     
     class << self
@@ -30,7 +31,7 @@ module Top4R
   # TradeConfirmFee model
   class TradeConfirmFee
     include ModelMixin
-    @@ATTRIBUTES = [:id, :confirm_fee, :confirm_post_fee, :is_last_detail_order]
+    @@ATTRIBUTES = [:id, :confirm_fee, :confirm_post_fee, :is_last_order]
     attr_accessor *@@ATTRIBUTES
     
     class << self
@@ -43,18 +44,30 @@ module Top4R
     end
   end
   
+  # PromotionDetail model
+  class PromotionDetail
+    include ModelMixin
+    @@ATTRIBUTES = [:id, :promotion_name, :discount_fee]
+    attr_accessor *@@ATTRIBUTES
+    
+    class << self
+      def attributes; @@ATTRIBUTES; end
+    end
+  end
+  
   # Trade model
   class Trade
     include ModelMixin
     @@ATTRIBUTES = [:id, :seller_nick, :buyer_nick, :title, :type, :created, :iid, :price, 
-      :pic_path, :num, :tid, :buyer_message, :sid, :shipping_type, :alipay_no, :payment, 
-      :discount_fee, :adjust_fee, :snapshot_url, :status, :seller_rate, :buyer_rate, 
-      :buyer_memo, :seller_memo, :pay_time, :end_time, :modified, :buyer_obtain_point_fee, 
+      :pic_path, :num, :tid, :buyer_message, :shipping_type, :alipay_no, :payment, 
+      :discount_fee, :adjust_fee, :snapshot_url, :snapshot, :status, :seller_rate, :buyer_rate, 
+      :buyer_memo, :seller_memo, :trade_memo, :pay_time, :end_time, :modified, :buyer_obtain_point_fee, 
       :point_fee, :real_point_fee, :total_fee, :post_fee, :buyer_alipay_no, :receiver_name,
       :receiver_state, :receiver_city, :receiver_district, :receiver_address, :receiver_zip, 
       :receiver_mobile, :receiver_phone, :consign_time, :buyer_email, :commission_fee, 
       :seller_alipay_no, :seller_mobile, :seller_phone, :seller_name, :seller_email, 
-      :available_confirm_fee, :has_postFee, :received_payment, :cod_fee, :timeout_action_time, :orders]
+      :available_confirm_fee, :has_post_fee, :received_payment, :cod_fee, :timeout_action_time, 
+      :is_3D, :buyer_flag, :seller_flag, :num_iid, :promotion, :promotion_details, :invoice_name, :orders]
     attr_accessor *@@ATTRIBUTES
     
     class << self
@@ -94,8 +107,8 @@ module Top4R
     
     def unmarshal_other_attrs
       @id = @tid
-      if @orders.is_a?(Array)
-        @orders = @orders.map{|order| Order.new(order)}
+      if @orders.is_a?(Hash)
+        @orders = @orders["order"].map{|order| Order.new(order)}
       end
       self
     end

data/lib/top4r/model/user.rb

@@ -13,8 +13,12 @@ module Top4R
         @client.items_onsale(q, :onsale_list, options)
       end
       
-      def cats
-        @client.seller_cats(self.nick)
+      def cats(options = {})
+        @client.seller_cats(self.nick, :cats_list, options)
+      end
+      
+      def shop(options = {})
+        @client.shop(self.nick, :shop_info, options)
       end
     end
 
@@ -46,6 +50,17 @@ module Top4R
       def attributes; @@ATTRIBUTES; end
     end
   end # UserCredit model
+  
+  # UserSubscribe Model
+  class UserSubscribe
+    include ModelMixin
+    @@ATTRIBUTES = [:status, :start_date, :end_date, :version_no]
+    attr_accessor *@@ATTRIBUTES
+
+    class << self
+      def attributes; @@ATTRIBUTES; end
+    end
+  end # UserCredit model
 
   # User Model
   class User
@@ -53,7 +68,7 @@ module Top4R
     @@ATTRIBUTES = [:id, :user_id, :nick, :sex, :buyer_credit, :seller_credit, :location, 
       :created, :last_visit, :birthday, :type, :has_more_pic, :item_img_num, :item_img_size, 
       :prop_img_num, :prop_img_size, :auto_repost, :promoted_type, :status, :alipay_bind, 
-      :consumer_protection, :other_attrs]
+      :consumer_protection, :alipay_account, :alipay_no, :email, :magazine_subscribe, :vertical_market]
     attr_accessor *@@ATTRIBUTES
 
     class << self

data/lib/top4r/version.rb

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

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: top4r
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 39
-  version: 0.0.39
+  version: 0.1.0
 platform: ruby
 authors: 
 - Nowa Zhu
-autorequire: 
+autorequire: top4r
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +08:00
+date: 2010-09-25 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,8 +36,8 @@ dependencies:
   version_requirements: *id001
 description: 
 email: nowazhu@gmail.com
-executables: 
-- top4rsh
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -76,7 +76,6 @@ files:
 - CHANGES
 - TODO
 - MIT-LICENSE
-- bin/top4rsh
 has_rdoc: true
 homepage: http://top4r.labs.nowa.me
 licenses: []
@@ -91,10 +90,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 51
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 2
+      version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -104,8 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       segments: 
       - 0
       version: "0"
-requirements: []
-
+requirements: 
+- Ruby 1.8.4+
 rubyforge_project: top4r
 rubygems_version: 1.3.7
 signing_key: 

data/bin/top4rsh

@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-