taobaorb 0.9.1 → 0.9.2

data/lib/rails/taobao-railtie.rb

@@ -7,7 +7,6 @@ module Taobao
         config = YAML.load_file(Rails.root.join('config', 'taobaorb.yml'))[Rails.env]
         Taobao.public_key = config['public_key']
         Taobao.private_key = config['private_key']
-        p Taobao.public_key
       rescue Errno::ENOENT
         puts 'Taobao config not found.'
         puts 'To generate one run: rails g taobao:config'

data/lib/taobao/category.rb

@@ -16,7 +16,7 @@ class Taobao::Category
   def subcategories
     return @subcategories if @subcategories
     @subcategories = category_request(parent_cid: @id).map do |cat|
-      category = self.class.new cat[:id]
+      category = self.class.new cat[:cid]
       category.to_object(cat)
       category
     end
@@ -40,7 +40,7 @@ class Taobao::Category
     begin
       result[:itemcats_get_response][:item_cats][:item_cat]
     rescue NoMethodError
-      raise Taobao::IncorrectCategoryId, 'Incorrect category ID'
+      []
     end
   end
 

data/lib/taobao/product.rb

@@ -26,6 +26,10 @@ class Taobao::Product
     end
   end
 
+  def user
+    Taobao::User.new @nick
+  end
+
   def method_missing(method_name, *args, &block)
     if @properties.include? method_name
       fetch_full_data unless @all_properties_fetched

data/lib/taobao/product_list.rb

@@ -40,12 +40,10 @@ class Taobao::ProductList < Taobao::AbstractList
 
   private
   def products
-    begin
-      products = cached_responce[:items_get_response][:items][:item]
-      get_products_as_objects(products)
-    rescue NoMethodError
-      []
-    end
+    products = cached_responce[:items_get_response][:items][:item]
+    get_products_as_objects(products)
+  rescue NoMethodError
+    []
   end
 
   def get_products_as_objects(products)

data/lib/taobao/property_list.rb

@@ -6,12 +6,10 @@ class Taobao::PropertyList < Taobao::AbstractList
 
   private
   def properties
-    begin
-      props = cached_responce[:itemprops_get_response][:item_props][:item_prop]
-      props.map { |prop| Taobao::Property.new(prop) }
-    rescue NoMethodError
-      []
-    end
+    props = cached_responce[:itemprops_get_response][:item_props][:item_prop]
+    props.map { |prop| Taobao::Property.new(prop) }
+  rescue NoMethodError
+    []
   end
 
   def retrieve_response

data/lib/taobao/user.rb

@@ -1,7 +1,7 @@
 require 'date'
 
 class Taobao::User
-
+  attr_reader :nick
   # Retrive user info by nickname
   # @param nickname [String]
   def initialize(nickname)

data/lib/taobao/version.rb

@@ -1,3 +1,3 @@
 module Taobao
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/spec/fixtures/category_without_subcategories.json

@@ -0,0 +1 @@
+{"itemcats_get_response":{}}

data/spec/fixtures/incorrect_category.json

@@ -1 +1 @@
-{"itemcats_get_response":{}}
+{"error_response":{"code":41,"msg":"Invalid arguments:cids"}}

data/spec/rspec/category_spec.rb

@@ -11,7 +11,7 @@ describe Taobao::Category do
   describe '#name' do
     it 'should returns the name of the category' do
       category = Taobao::Category.new(28)
-      fixture = 'category.json'.json_fixture
+      fixture = 'category'.json_fixture
       args = {
         method: 'taobao.itemcats.get',
         fields: 'cid,parent_cid,name,is_parent',
@@ -21,35 +21,30 @@ describe Taobao::Category do
       category.name.should == 'ZIPPO/瑞士军刀/眼镜'
     end
     it 'should throws an exception if the category ID is incorrect' do
-      fixture = 'incorrect_category.json'.json_fixture
-      args = {
-        method: 'taobao.itemcats.get',
-        fields: 'cid,parent_cid,name,is_parent',
-        cids: -20
-      }
-      Taobao.stub(:api_request).with(args).and_return(fixture)
+      Net::HTTP.stub(:post_form).and_return 'incorrect_category'.to_response
       category = Taobao::Category.new(-20)
       expect {
         category.name
-      }.to raise_error Taobao::IncorrectCategoryId, 'Incorrect category ID'
+      }.to raise_error Taobao::ApiError, 'Invalid arguments:cids'
     end
   end
 
   describe '#subcategories' do
-    category = Taobao::Category.new(28)
-    fixture = 'subcategories.json'.json_fixture
-    args = {
-      method: 'taobao.itemcats.get',
-      fields: 'cid,parent_cid,name,is_parent',
-      parent_cid: 28
-    }
+    before :each do
+      @category = Taobao::Category.new(28)
+    end
     it 'should returns subcategories if they are exists' do
-      Taobao.stub(:api_request).with(args).and_return(fixture)
-      category.subcategories.should have_at_least(1).subcategory
+      Taobao.stub(:api_request).and_return 'subcategories'.json_fixture
+      @category.subcategories.should have_at_least(1).subcategory
+    end
+    it 'should returns empty array if subcategories do not exist' do
+      Taobao.stub(:api_request).and_return 'category_without_subcategories'.json_fixture
+      @category.subcategories.should be_empty
     end
     it 'each subcategory should be an object of Taobao::Category class' do
-      Taobao.stub(:api_request).with(args).and_return(fixture)
-      category.subcategories[0].should be_a_kind_of(Taobao::Category)
+      Taobao.stub(:api_request).and_return 'subcategories'.json_fixture
+      @category.subcategories[0].should be_a_kind_of(Taobao::Category)
+      @category.subcategories[0].id.should be > 0
     end
   end
 

data/spec/rspec/product_list_spec.rb

@@ -6,7 +6,7 @@ describe Taobao::ProductList do
   describe 'init with default options and category id' do
     pl = Taobao::ProductList.new(cid: 28)
 
-    fixture = 'items.json'.json_fixture
+    fixture = 'items'.json_fixture
     args = {
       method: 'taobao.items.get',
       fields: 'num_iid,title,nick,pic_url,cid,price,type,delist_time,post_fee,score,volume',
@@ -32,7 +32,7 @@ describe Taobao::ProductList do
       .per_page(10)
       .order_by_price
 
-    fixture = 'items_page15.json'.json_fixture
+    fixture = 'items_page15'.json_fixture
     args = {
       method: 'taobao.items.get',
       fields: 'num_iid,title,nick,pic_url,cid,price,type,delist_time,post_fee,score,volume',
@@ -60,7 +60,7 @@ describe Taobao::ProductList do
   describe 'category without items' do
     it 'should return 0 items' do
       pl = Taobao::ProductList.new(cid: 283333)
-      fixture = 'no_items.json'.json_fixture
+      fixture = 'no_items'.json_fixture
       args = {
         method: 'taobao.items.get',
         fields: 'num_iid,title,nick,pic_url,cid,price,type,delist_time,post_fee,score,volume',

data/spec/rspec/product_spec.rb

@@ -2,8 +2,7 @@
 require 'spec_helper'
 
 describe Taobao::Product do
-  describe 'initialize with id' do
-    fixture = 'product.json'.json_fixture
+  before(:each) do
     args = {
       method: 'taobao.item.get',
       fields: 'cid,num_iid,title,nick,price,pic_url,type,score,delist_time,' +
@@ -15,33 +14,38 @@ describe Taobao::Product do
               'property_alias,item_img,prop_img,sku,video,outer_id,is_virtual',
       num_iid: '2997802325'
     }
+    fixture = 'product'.json_fixture
+    Taobao.stub(:api_request).with(args).and_return(fixture)
+    @product = Taobao::Product.new(2997802325)
+  end
 
+  describe 'initialize with id' do
     it 'should returns product' do
-      Taobao.stub(:api_request).with(args).and_return(fixture)
-      product = Taobao::Product.new(2997802325)
+      @product.cid.should == 1512
+      @product.nick.should == '奇迹shouji'
+      @product.num_iid.should == 2997802325
+      @product.pic_url.should == 'http://img03.taobaocdn.com/bao/uploaded/i3/T1YsfeXbxkXXXpZak._110941.jpg'
+      @product.price.should == 4300.00
+      @product.title.should == '可完美越狱 Apple/苹果 iPhone 4S 正品 装软件 未拆封 未激活'
 
-      product.cid.should == 1512
-      product.nick.should == '奇迹shouji'
-      product.num_iid.should == 2997802325
-      product.pic_url.should == 'http://img03.taobaocdn.com/bao/uploaded/i3/T1YsfeXbxkXXXpZak._110941.jpg'
-      product.price.should == 4300.00
-      product.title.should == '可完美越狱 Apple/苹果 iPhone 4S 正品 装软件 未拆封 未激活'
-
-      product.approve_status.should == 'onsale'
-      product.auction_point.should == 0
-      product.delist_time.should == '2012-06-01 22:41:44'
-      product.type.should == 'fixed'
+      @product.approve_status.should == 'onsale'
+      @product.auction_point.should == 0
+      @product.delist_time.should == '2012-06-01 22:41:44'
+      @product.type.should == 'fixed'
     end
 
     describe 'get unknown product property' do
       it 'should raise an exception' do
-        Taobao.stub(:api_request).with(args).and_return(fixture)
-        product = Taobao::Product.new(2997802325)
         expect {
-          product.unknown_property
+          @product.unknown_property
         }.to raise_error NoMethodError
       end
     end
+  end
 
+  describe '#user' do
+    it 'should returns Taobao::User object' do
+      @product.user.should be_a_kind_of Taobao::User
+    end
   end
 end

data/spec/rspec/property_list_spec.rb

@@ -7,7 +7,7 @@ describe Taobao::PropertyList do
     it 'should returns property' do
       property_list = Taobao::PropertyList.new(cid: 1512)
 
-      fixture = 'category_properties.json'.json_fixture
+      fixture = 'category_properties'.json_fixture
       args = {
         method: 'taobao.itemprops.get',
         fields: 'pid,name,prop_values,must,multi,is_color_prop,is_key_prop,is_enum_prop,is_input_prop,is_sale_prop,is_item_prop',
@@ -23,7 +23,7 @@ describe Taobao::PropertyList do
     it 'should returns 0 properties' do
       property_list = Taobao::PropertyList.new(cid: 0)
 
-      fixture = 'top_category_properties.json'.json_fixture
+      fixture = 'top_category_properties'.json_fixture
       args = {
         method: 'taobao.itemprops.get',
         fields: 'pid,name,prop_values,must,multi,is_color_prop,is_key_prop,is_enum_prop,is_input_prop,is_sale_prop,is_item_prop',

data/spec/rspec/property_spec.rb

@@ -5,7 +5,7 @@ describe Taobao::Property do
   describe 'initialize' do
     describe 'with correct data' do
       it 'should create Property object' do
-        property_response = 'property.json'.json_fixture
+        property_response = 'property'.json_fixture
         property = Taobao::Property.new(property_response)
 
         property.multi.should be_false

data/spec/rspec/search_spec.rb

@@ -6,7 +6,7 @@ describe Taobao do
   describe 'search method returns product list' do
     search = Taobao::search('iPhone')
 
-    fixture = 'search.json'.json_fixture
+    fixture = 'search'.json_fixture
     args = {
       method: 'taobao.items.get',
       fields: 'num_iid,title,nick,pic_url,cid,price,type,delist_time,post_fee,score,volume',

data/spec/rspec/taobao_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-Response = Struct.new('Responce', :body)
-
 describe Taobao do
   describe 'set the public API key' do
     it 'should have rw access' do
@@ -18,8 +16,7 @@ describe Taobao do
   end
   describe 'API request' do
     it 'should always return a Hash object' do
-      fixture = Response.new('category.json'.str_fixture)
-      Net::HTTP.stub(:post_form).and_return(fixture)
+      Net::HTTP.stub(:post_form).and_return 'category'.to_response
       result = Taobao.api_request(method: 'taobao.itemcats.get',
         fields: 'cid,parent_cid,name,is_parent', cids: 0)
       result.should be_a_kind_of(Hash)
@@ -27,8 +24,7 @@ describe Taobao do
   end
   describe 'failed API request' do
     it 'should throws an exception' do
-      fixture = Response.new('error.json'.str_fixture)
-      Net::HTTP.stub(:post_form).and_return(fixture)
+      Net::HTTP.stub(:post_form).and_return 'error'.to_response
       expect { Taobao.api_request({}) }
         .to raise_error(Taobao::ApiError, 'Invalid arguments:cid')
     end

data/spec/rspec/user_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Taobao::User do
   describe 'getting user by valid nickname' do
     it 'should returns valid user info' do
-      fixture = 'user.json'.json_fixture
+      fixture = 'user'.json_fixture
       args = {
         method: 'taobao.user.get',
         fields: 'user_id,uid,nick,sex,buyer_credit,seller_credit,location,' +
@@ -16,6 +16,7 @@ describe Taobao::User do
 
       user = Taobao::User.new('喜客多2008')
 
+      user.nick.should == '喜客多2008'
       user.good_purchases_count.should == 1292
       user.buyer_level.should == 8
       user.buyer_score.should == 1292
@@ -41,7 +42,7 @@ describe Taobao::User do
   end
   describe 'getting user who does not specify his/her sex' do
     it 'should returns :unknown value' do
-      fixture = 'user_unknown_sex.json'.json_fixture
+      fixture = 'user_unknown_sex'.json_fixture
       args = {
         method: 'taobao.user.get',
         fields: 'user_id,uid,nick,sex,buyer_credit,seller_credit,location,' +
@@ -57,7 +58,7 @@ describe Taobao::User do
 
   describe 'getting non-existent user' do
     it 'should throws an exception' do
-      fixture = 'absent_user.json'.json_fixture
+      fixture = 'absent_user'.json_fixture
       args = {
         method: 'taobao.user.get',
         fields: 'user_id,uid,nick,sex,buyer_credit,seller_credit,location,' +

data/spec/spec_helper.rb

@@ -8,13 +8,19 @@ end
 
 require 'taobaorb'
 
+Response = Struct.new('Responce', :body)
+
 class String
-  def str_fixture
-    open("spec/fixtures/#{self}").read
+  def to_response
+    Response.new get_fixture_as_text
   end
 
   def json_fixture
-    contents = open("spec/fixtures/#{self}").read
-    JSON.parse contents, {symbolize_names: true}
+    JSON.parse get_fixture_as_text, {symbolize_names: true}
+  end
+
+  private
+  def get_fixture_as_text
+    open("spec/fixtures/#{self}.json").read
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taobaorb
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Ruby wrapper for the Taobao API
 email: a741su@gmail.com
@@ -38,6 +38,7 @@ files:
 - spec/fixtures/absent_user.json
 - spec/fixtures/category.json
 - spec/fixtures/category_properties.json
+- spec/fixtures/category_without_subcategories.json
 - spec/fixtures/error.json
 - spec/fixtures/incorrect_category.json
 - spec/fixtures/items.json
@@ -75,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1557645060868365656
+      hash: -1342558535374082704
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1557645060868365656
+      hash: -1342558535374082704
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24