spree_api 3.1.0.rc3 → 3.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad1a70b65803e3fdadfe590772372e4b6c70f995
-  data.tar.gz: 4f81e8c47eca898ccddea3ee5ecec454aebc1627
+  metadata.gz: e6b38169627bbc652ea97ce7eb4f8f6028569092
+  data.tar.gz: f2946553e646d6fda4cc3e87b53afe92fd98414b
 SHA512:
-  metadata.gz: 1c004af78108fcf634358640a8f024faacaa9b22f5735d39da56acaf898237bb0a9fb14ae54b28f4810d58b0d623f568a7804114236853109f7bf815f7a48c38
-  data.tar.gz: 045ab91a3a81d213f1cfab5a25a82999116ea6735dbf78fa25ac2b15a54823293c23bf24d397838e71ae14bcea003f144ee08bc540db68ecf58af6738775250a
+  metadata.gz: f142d81af69491af58e5cde805000b6619605fa318fd9464f0860f9feb981a218428c362ffb0e91a5b45ac7910095b108546a6e3efe5137c8d7a1c365a9122cf
+  data.tar.gz: 847d8ebc93a8e01930df338d79676d6ae91a09d5e9b7089e3910d3863991e561b659afce71c508806d5bddd7ea670baaa3864cfd3115421fc86da21835c2bc7e

data/app/views/spree/api/v1/countries/index.v1.rabl

@@ -4,4 +4,4 @@ child(@countries => :countries) do
 end
 node(:count) { @countries.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @countries.num_pages }
+node(:pages) { @countries.total_pages }

data/app/views/spree/api/v1/orders/index.v1.rabl

@@ -4,4 +4,4 @@ child(@orders => :orders) do
 end
 node(:count) { @orders.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @orders.num_pages }
+node(:pages) { @orders.total_pages }

data/app/views/spree/api/v1/orders/mine.v1.rabl

@@ -6,4 +6,4 @@ end
 
 node(:count) { @orders.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @orders.num_pages }
+node(:pages) { @orders.total_pages }

data/app/views/spree/api/v1/payments/index.v1.rabl

@@ -4,4 +4,4 @@ child(@payments => :payments) do
 end
 node(:count) { @payments.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @payments.num_pages }
+node(:pages) { @payments.total_pages }

data/app/views/spree/api/v1/product_properties/index.v1.rabl

@@ -4,4 +4,4 @@ child(@product_properties => :product_properties) do
 end
 node(:count) { @product_properties.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @product_properties.num_pages }
+node(:pages) { @product_properties.total_pages }

data/app/views/spree/api/v1/products/index.v1.rabl

@@ -3,7 +3,7 @@ node(:count) { @products.count }
 node(:total_count) { @products.total_count }
 node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
-node(:pages) { @products.num_pages }
+node(:pages) { @products.total_pages }
 child(@products => :products) do
   extends "spree/api/v1/products/show"
 end

data/app/views/spree/api/v1/properties/index.v1.rabl

@@ -4,4 +4,4 @@ child(@properties => :properties) do
 end
 node(:count) { @properties.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @properties.num_pages }
+node(:pages) { @properties.total_pages }

data/app/views/spree/api/v1/return_authorizations/index.v1.rabl

@@ -4,4 +4,4 @@ child(@return_authorizations => :return_authorizations) do
 end
 node(:count) { @return_authorizations.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @return_authorizations.num_pages }
+node(:pages) { @return_authorizations.total_pages }

data/app/views/spree/api/v1/shipments/mine.v1.rabl

@@ -2,7 +2,7 @@ object false
 
 node(:count) { @shipments.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @shipments.num_pages }
+node(:pages) { @shipments.total_pages }
 
 child(@shipments => :shipments) do
   extends "spree/api/v1/shipments/big"

data/app/views/spree/api/v1/states/index.v1.rabl

@@ -7,8 +7,8 @@ child(@states => :states) do
   attributes *state_attributes
 end
 
-if @states.respond_to?(:num_pages)
+if @states.respond_to?(:total_pages)
   node(:count) { @states.count }
   node(:current_page) { params[:page] || 1 }
-  node(:pages) { @states.num_pages }
+  node(:pages) { @states.total_pages }
 end

data/app/views/spree/api/v1/stock_items/index.v1.rabl

@@ -4,4 +4,4 @@ child(@stock_items => :stock_items) do
 end
 node(:count) { @stock_items.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @stock_items.num_pages }
+node(:pages) { @stock_items.total_pages }

data/app/views/spree/api/v1/stock_locations/index.v1.rabl

@@ -4,4 +4,4 @@ child(@stock_locations => :stock_locations) do
 end
 node(:count) { @stock_locations.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @stock_locations.num_pages }
+node(:pages) { @stock_locations.total_pages }

data/app/views/spree/api/v1/stock_movements/index.v1.rabl

@@ -4,4 +4,4 @@ child(@stock_movements => :stock_movements) do
 end
 node(:count) { @stock_movements.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @stock_movements.num_pages }
+node(:pages) { @stock_movements.total_pages }

data/app/views/spree/api/v1/taxonomies/index.v1.rabl

@@ -4,4 +4,4 @@ child(@taxonomies => :taxonomies) do
 end
 node(:count) { @taxonomies.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @taxonomies.num_pages }
+node(:pages) { @taxonomies.total_pages }

data/app/views/spree/api/v1/taxons/index.v1.rabl

@@ -3,7 +3,7 @@ node(:count) { @taxons.count }
 node(:total_count) { @taxons.total_count }
 node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
-node(:pages) { @taxons.num_pages }
+node(:pages) { @taxons.total_pages }
 child @taxons => :taxons do
   attributes *taxon_attributes
   unless params[:without_children]

data/app/views/spree/api/v1/users/index.v1.rabl

@@ -4,4 +4,4 @@ child(@users => :users) do
 end
 node(:count) { @users.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @users.num_pages }
+node(:pages) { @users.total_pages }

data/app/views/spree/api/v1/variants/index.v1.rabl

@@ -2,7 +2,7 @@ object false
 node(:count) { @variants.count }
 node(:total_count) { @variants.total_count }
 node(:current_page) { params[:page] ? params[:page].to_i : 1 }
-node(:pages) { @variants.num_pages }
+node(:pages) { @variants.total_pages }
 
 child(@variants => :variants) do
   extends "spree/api/v1/variants/big"

data/app/views/spree/api/v1/zones/index.v1.rabl

@@ -4,4 +4,4 @@ child(@zones => :zones) do
 end
 node(:count) { @zones.count }
 node(:current_page) { params[:page] || 1 }
-node(:pages) { @zones.num_pages }
+node(:pages) { @zones.total_pages }

data/config/routes.rb

@@ -116,6 +116,9 @@ Spree::Core::Engine.add_routes do
     end
 
     match 'v:api/*path', to: redirect("/api/v1/%{path}"), via: [:get, :post, :put, :patch, :delete]
-    match '*path', to: redirect("/api/v1/%{path}"), via: [:get, :post, :put, :patch, :delete]
+
+    match '*path', to: redirect{ |params, request|
+      "/api/v1/#{params[:path]}?#{request.query_string}"
+    }, via: [:get, :post, :put, :patch, :delete]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc3
+  version: 3.1.0.rc4
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc3
+        version: 3.1.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.rc3
+        version: 3.1.0.rc4
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement