spree_api 3.0.10 → 3.1.0.rc1

data/app/views/spree/api/{shipments → v1/shipments}/mine.v1.rabl

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

data/app/views/spree/api/{shipments → v1/shipments}/show.v1.rabl

@@ -5,11 +5,11 @@ node(:order_id) { |shipment| shipment.order.number }
 node(:stock_location_name) { |shipment| shipment.stock_location.name }
 
 child :shipping_rates => :shipping_rates do
-  extends "spree/api/shipping_rates/show"
+  extends "spree/api/v1/shipping_rates/show"
 end
 
 child :selected_shipping_rate => :selected_shipping_rate do
-  extends "spree/api/shipping_rates/show"
+  extends "spree/api/v1/shipping_rates/show"
 end
 
 child :shipping_methods => :shipping_methods do
@@ -25,7 +25,7 @@ end
 
 child :manifest => :manifest do
   child :variant => :variant do
-    extends "spree/api/variants/small"
+    extends "spree/api/v1/variants/small"
   end
   node(:quantity) { |m| m.quantity }
   node(:states) { |m| m.states }

data/app/views/spree/api/{shipments → v1/shipments}/small.v1.rabl

@@ -6,11 +6,11 @@ node(:order_id) { |shipment| shipment.order.number }
 node(:stock_location_name) { |shipment| shipment.stock_location.name }
 
 child :shipping_rates => :shipping_rates do
-  extends "spree/api/shipping_rates/show"
+  extends "spree/api/v1/shipping_rates/show"
 end
 
 child :selected_shipping_rate => :selected_shipping_rate do
-  extends "spree/api/shipping_rates/show"
+  extends "spree/api/v1/shipping_rates/show"
 end
 
 child :shipping_methods => :shipping_methods do
@@ -33,5 +33,5 @@ child :manifest => :manifest do
 end
 
 child :adjustments => :adjustments do
-  extends "spree/api/adjustments/show"
+  extends "spree/api/v1/adjustments/show"
 end

data/app/views/spree/api/{stock_items → v1/stock_items}/index.v1.rabl

@@ -1,6 +1,6 @@
 object false
 child(@stock_items => :stock_items) do
-  extends 'spree/api/stock_items/show'
+  extends 'spree/api/v1/stock_items/show'
 end
 node(:count) { @stock_items.count }
 node(:current_page) { params[:page] || 1 }

data/app/views/spree/api/{stock_items → v1/stock_items}/show.v1.rabl

@@ -1,5 +1,5 @@
 object @stock_item
 attributes *stock_item_attributes
 child(:variant) do
-  extends "spree/api/variants/small"
+  extends "spree/api/v1/variants/small"
 end

data/app/views/spree/api/{stock_locations → v1/stock_locations}/index.v1.rabl

@@ -1,6 +1,6 @@
 object false
 child(@stock_locations => :stock_locations) do
-  extends 'spree/api/stock_locations/show'
+  extends 'spree/api/v1/stock_locations/show'
 end
 node(:count) { @stock_locations.count }
 node(:current_page) { params[:page] || 1 }

data/app/views/spree/api/{stock_movements → v1/stock_movements}/index.v1.rabl

@@ -1,6 +1,6 @@
 object false
 child(@stock_movements => :stock_movements) do
-  extends 'spree/api/stock_movements/show'
+  extends 'spree/api/v1/stock_movements/show'
 end
 node(:count) { @stock_movements.count }
 node(:current_page) { params[:page] || 1 }

data/app/views/spree/api/{stock_movements → v1/stock_movements}/show.v1.rabl

@@ -1,5 +1,5 @@
 object @stock_movement
 attributes *stock_movement_attributes
 child :stock_item do
-  extends "spree/api/stock_items/show"
+  extends "spree/api/v1/stock_items/show"
 end

data/app/views/spree/api/{taxonomies → v1/taxonomies}/index.v1.rabl

@@ -1,6 +1,6 @@
 object false
 child(@taxonomies => :taxonomies) do
-  extends "spree/api/taxonomies/show"
+  extends "spree/api/v1/taxonomies/show"
 end
 node(:count) { @taxonomies.count }
 node(:current_page) { params[:page] || 1 }

data/app/views/spree/api/{taxonomies → v1/taxonomies}/nested.v1.rabl

@@ -6,6 +6,6 @@ child :root => :root do
   child :children => :taxons do
     attributes *taxon_attributes
 
-    extends "spree/api/taxons/taxons"
+    extends "spree/api/v1/taxons/taxons"
   end
 end

data/app/views/spree/api/{taxonomies → v1/taxonomies}/show.v1.rabl

@@ -1,14 +1,14 @@
 object @taxonomy
 
 if params[:set] == 'nested'
-  extends "spree/api/taxonomies/nested"
+  extends "spree/api/v1/taxonomies/nested"
 else
   attributes *taxonomy_attributes
 
-  child :root => :root do
-      attributes *taxon_attributes
+  child root: :root do
+    attributes *taxon_attributes
 
-    child :children => :taxons do
+    child children: :taxons do
       attributes *taxon_attributes
     end
   end

data/app/views/spree/api/{taxons → v1/taxons}/index.v1.rabl

@@ -7,6 +7,6 @@ node(:pages) { @taxons.num_pages }
 child @taxons => :taxons do
   attributes *taxon_attributes
   unless params[:without_children]
-    extends "spree/api/taxons/taxons"
+    extends "spree/api/v1/taxons/taxons"
   end
 end

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

@@ -0,0 +1,5 @@
+attributes *taxon_attributes
+
+node :taxons do |t|
+  t.children.map { |c| partial("spree/api/v1/taxons/taxons", :object => c) }
+end

data/app/views/spree/api/{users → v1/users}/index.v1.rabl

@@ -1,6 +1,6 @@
 object false
 child(@users => :users) do
-  extends "spree/api/users/show"
+  extends "spree/api/v1/users/show"
 end
 node(:count) { @users.count }
 node(:current_page) { params[:page] || 1 }

data/app/views/spree/api/{users → v1/users}/show.v1.rabl

@@ -2,9 +2,9 @@ object @user
 
 attributes *user_attributes
 child(:bill_address => :bill_address) do
-  extends "spree/api/addresses/show"
+  extends "spree/api/v1/addresses/show"
 end
 
 child(:ship_address => :ship_address) do
-  extends "spree/api/addresses/show"
+  extends "spree/api/v1/addresses/show"
 end

data/app/views/spree/api/{variants → v1/variants}/big.v1.rabl

@@ -2,7 +2,7 @@ object @variant
 
 cache [I18n.locale, @current_user_roles.include?('admin'), 'big_variant', root_object]
 
-extends "spree/api/variants/small"
+extends "spree/api/v1/variants/small"
 
 child(:stock_items => :stock_items) do
   attributes :id, :count_on_hand, :stock_location_id, :backorderable

data/app/views/spree/api/{variants → v1/variants}/index.v1.rabl

@@ -5,5 +5,5 @@ node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:pages) { @variants.num_pages }
 
 child(@variants => :variants) do
-  extends "spree/api/variants/big"
+  extends "spree/api/v1/variants/big"
 end

data/app/views/spree/api/{variants → v1/variants}/show.v1.rabl

@@ -1,3 +1,3 @@
 object @variant
 cache [I18n.locale, @current_user_roles.include?('admin'), 'show', root_object]
-extends "spree/api/variants/big"
+extends "spree/api/v1/variants/big"

data/app/views/spree/api/{variants → v1/variants}/small.v1.rabl

@@ -14,4 +14,4 @@ child :option_values => :option_values do
   attributes *option_value_attributes
 end
 
-child(:images => :images) { extends "spree/api/images/show" }
+child(:images => :images) { extends "spree/api/v1/images/show" }

data/app/views/spree/api/{zones → v1/zones}/index.v1.rabl

@@ -1,6 +1,6 @@
 object false
 child(@zones => :zones) do
-  extends 'spree/api/zones/show'
+  extends 'spree/api/v1/zones/show'
 end
 node(:count) { @zones.count }
 node(:current_page) { params[:page] || 1 }

data/config/routes.rb

@@ -1,124 +1,121 @@
 Spree::Core::Engine.add_routes do
-  namespace :admin do
-    resources :users do
-      member do
-        put :generate_api_key
-        put :clear_api_key
-      end
-    end
-  end
-
   namespace :api, defaults: { format: 'json' } do
-    resources :promotions, only: [:show]
-
-    resources :products do
-      resources :images
-      resources :variants
-      resources :product_properties
-    end
+    namespace :v1 do
+      resources :promotions, only: [:show]
 
-    concern :order_routes do
-      member do
-        put :cancel
-        put :empty
-        put :apply_coupon_code
+      resources :products do
+        resources :images
+        resources :variants
+        resources :product_properties
       end
 
-      resources :line_items
-      resources :payments do
+      concern :order_routes do
         member do
-          put :authorize
-          put :capture
-          put :purchase
-          put :void
-          put :credit
+          put :approve
+          put :cancel
+          put :empty
+          put :apply_coupon_code
         end
-      end
 
-      resources :addresses, only: [:show, :update]
+        resources :line_items
+        resources :payments do
+          member do
+            put :authorize
+            put :capture
+            put :purchase
+            put :void
+            put :credit
+          end
+        end
 
-      resources :return_authorizations do
-        member do
-          put :add
-          put :cancel
-          put :receive
+        resources :addresses, only: [:show, :update]
+
+        resources :return_authorizations do
+          member do
+            put :add
+            put :cancel
+            put :receive
+          end
         end
       end
-    end
 
-    resources :checkouts, only: [:update], concerns: :order_routes do
-      member do
-        put :next
-        put :advance
+      resources :checkouts, only: [:update], concerns: :order_routes do
+        member do
+          put :next
+          put :advance
+        end
       end
-    end
 
-    resources :variants do
-      resources :images
-    end
+      resources :variants do
+        resources :images
+      end
 
-    resources :option_types do
+      resources :option_types do
+        resources :option_values
+      end
       resources :option_values
-    end
-    resources :option_values
 
-    resources :option_values, only: :index
+      resources :option_values, only: :index
 
-    get '/orders/mine', to: 'orders#mine', as: 'my_orders'
-    get "/orders/current", to: "orders#current", as: "current_order"
+      get '/orders/mine', to: 'orders#mine', as: 'my_orders'
+      get "/orders/current", to: "orders#current", as: "current_order"
 
-    resources :orders, concerns: :order_routes
+      resources :orders, concerns: :order_routes
 
-    resources :zones
-    resources :countries, only: [:index, :show] do
-      resources :states, only: [:index, :show]
-    end
-
-    resources :shipments, only: [:create, :update] do
-      collection do
-        post 'transfer_to_location'
-        post 'transfer_to_shipment'
-        get :mine
+      resources :zones
+      resources :countries, only: [:index, :show] do
+        resources :states, only: [:index, :show]
       end
 
-      member do
-        put :ready
-        put :ship
-        put :add
-        put :remove
-      end
-    end
-    resources :states, only: [:index, :show]
+      resources :shipments, only: [:create, :update] do
+        collection do
+          post 'transfer_to_location'
+          post 'transfer_to_shipment'
+          get :mine
+        end
 
-    resources :taxonomies do
-      member do
-        get :jstree
+        member do
+          put :ready
+          put :ship
+          put :add
+          put :remove
+        end
       end
-      resources :taxons do
+      resources :states, only: [:index, :show]
+
+      resources :taxonomies do
         member do
           get :jstree
         end
+        resources :taxons do
+          member do
+            get :jstree
+          end
+        end
       end
-    end
 
-    resources :taxons, only: [:index]
+      resources :taxons, only: [:index]
 
-    resources :inventory_units, only: [:show, :update]
+      resources :inventory_units, only: [:show, :update]
 
-    resources :users do
-      resources :credit_cards, only: [:index]
-    end
+      resources :users do
+        resources :credit_cards, only: [:index]
+      end
 
-    resources :properties
-    resources :stock_locations do
-      resources :stock_movements
-      resources :stock_items
-    end
+      resources :properties
+      resources :stock_locations do
+        resources :stock_movements
+        resources :stock_items
+      end
 
-    resources :stock_items, only: [:index, :update, :destroy]
-    resources :stores
+      resources :stock_items, only: [:index, :update, :destroy]
+      resources :stores
+
+      put '/classifications', to: 'classifications#update', as: :classifications
+      get '/taxons/products', to: 'taxons#products', as: :taxon_products
+    end
 
-    put '/classifications', to: 'classifications#update', as: :classifications
-    get '/taxons/products', to: 'taxons#products', as: :taxon_products
+    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]
   end
 end