shopkit 0.1.4 → 0.1.5

data/README.md

@@ -52,4 +52,4 @@ $ gem install shopkit
 
     ERROR:  Using beta/unreleased version of rubygems. Not pushing
 
-请尝试使用 VPN 连接网络，推荐 vpncup(免费)
+请尝试使用 VPN 连接网络，推荐 [vpncup](http://vcup.in/Ecz)

data/lib/shopkit/client/products.rb

@@ -3,7 +3,9 @@ module Shopkit
     module Products
 
       def products(options={})
-        get('/products', options)['products']
+        traversal(options) do
+          get('/products', options)['products']
+        end
       end
 
       def product(id, options={})

data/lib/shopkit/configuration.rb

@@ -18,6 +18,7 @@ module Shopkit
     DEFAULT_API_VERSION    = 1
     DEFAULT_USER_AGENT     = "Shopkit Ruby Gem #{Shopkit::VERSION}".freeze
     DEFAULT_AUTO_TRAVERSAL = false
+    DEFAULT_PER_PAGE       = 30
 
     attr_accessor(*VALID_OPTIONS_KEYS)
 
@@ -41,6 +42,7 @@ module Shopkit
       self.password       = nil
       self.user_agent     = DEFAULT_USER_AGENT
       self.auto_traversal = DEFAULT_AUTO_TRAVERSAL
+      self.per_page       = DEFAULT_PER_PAGE
     end
   end
 end

data/lib/shopkit/traversal.rb

@@ -2,9 +2,11 @@ module Shopkit
   module Traversal
 
     def traversal(options) # 遍历所有页面
+      options[:page] ||= 1
+      options[:per_page] ||= per_page
+      options[:per_page] = 100 if auto_traversal
       list = yield(options)
       if auto_traversal and !list.empty?
-        options[:page] ||= 1
         options[:page] += 1
         list += traversal(options) do
           yield(options)

data/lib/shopkit/version.rb

@@ -1,3 +1,3 @@
 module Shopkit
-  VERSION = "0.1.4" unless defined?(Shopkit::VERSION)
+  VERSION = "0.1.5" unless defined?(Shopkit::VERSION)
 end

data/shopkit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "shopkit"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["saberma"]

data/spec/shopkit/client/orders_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Shopkit::Client::Orders do
 
   it 'should get orders' do
-    fake_web "orders"
+    fake_web "orders", query: {per_page: 30, page: 1}
     Shopkit.orders.size.should_not eql 0
   end
 

data/spec/shopkit/client/products_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Shopkit::Client::Products do
 
   before do
-    fake_web "products"
+    fake_web "products", query: {per_page: 30, page: 1}
   end
 
   it 'should get products' do

data/spec/shopkit/shopkit_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Shopkit do
 
   before do
-    fake_web "orders", query: {per_page: 1, page: 1}
-    fake_web "orders", query: {per_page: 1, page: 2}, json_file: "orders_page_2"
-    fake_web "orders", query: {per_page: 1, page: 3}, json_file: "orders_page_3"
-    fake_web "orders", query: {per_page: 1, page: 4}, json_file: "orders_empty"
     Shopkit.auto_traversal = true
+    fake_web "orders", query: {per_page: 100, page: 1}
+    fake_web "orders", query: {per_page: 100, page: 2}, json_file: "orders_page_2"
+    fake_web "orders", query: {per_page: 100, page: 3}, json_file: "orders_page_3"
+    fake_web "orders", query: {per_page: 100, page: 4}, json_file: "orders_empty"
   end
 
   after do
@@ -15,7 +15,7 @@ describe Shopkit do
   end
 
   it 'should be auto_traversal' do
-    Shopkit.orders(per_page: 1, page: 1).size.should eql 3
+    Shopkit.orders(page: 1).size.should eql 3
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopkit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 474065761
+      hash: -1020168515
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: