spree_api 3.1.14 → 3.2.0.rc1

data/app/controllers/spree/api/v1/zones_controller.rb

@@ -7,7 +7,7 @@ module Spree
           authorize! :create, Zone
           @zone = Zone.new(map_nested_attributes_keys(Spree::Zone, zone_params))
           if @zone.save
-            respond_with(@zone, :status => 201, :default_template => :show)
+            respond_with(@zone, status: 201, default_template: :show)
           else
             invalid_resource!(@zone)
           end
@@ -16,7 +16,7 @@ module Spree
         def destroy
           authorize! :destroy, zone
           zone.destroy
-          respond_with(zone, :status => 204)
+          respond_with(zone, status: 204)
         end
 
         def index
@@ -31,7 +31,7 @@ module Spree
         def update
           authorize! :update, zone
           if zone.update_attributes(map_nested_attributes_keys(Spree::Zone, zone_params))
-            respond_with(zone, :status => 200, :default_template => :show)
+            respond_with(zone, status: 200, default_template: :show)
           else
             invalid_resource!(zone)
           end

data/app/helpers/spree/api/api_helpers.rb

@@ -29,7 +29,8 @@ module Spree
         :stock_movement_attributes,
         :stock_item_attributes,
         :promotion_attributes,
-        :store_attributes
+        :store_attributes,
+        :tag_attributes
       ]
 
       mattr_reader *ATTRIBUTES
@@ -161,6 +162,8 @@ module Spree
         :mail_from_address, :default_currency, :code, :default
       ]
 
+      @@tag_attributes = [:id, :name]
+
       def variant_attributes
         if @current_user_roles && @current_user_roles.include?("admin")
           @@variant_attributes + [:cost_price]

data/app/models/spree/api_configuration.rb

@@ -1,5 +1,5 @@
 module Spree
   class ApiConfiguration < Preferences::Configuration
-    preference :requires_authentication, :boolean, :default => true
+    preference :requires_authentication, :boolean, default: true
   end
 end

data/app/views/spree/api/errors/invalid_api_key.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:invalid_api_key, :key => api_key, :scope => "spree.api") }
+node(:error) { I18n.t(:invalid_api_key, key: api_key, scope: "spree.api") }

data/app/views/spree/api/errors/invalid_resource.v1.rabl

@@ -1,3 +1,3 @@
 object false
-node(:error) { I18n.t(:invalid_resource, :scope => "spree.api") }
+node(:error) { I18n.t(:invalid_resource, scope: "spree.api") }
 node(:errors) { @resource.errors.to_hash }

data/app/views/spree/api/errors/must_specify_api_key.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:must_specify_api_key, :scope => "spree.api") }
+node(:error) { I18n.t(:must_specify_api_key, scope: "spree.api") }

data/app/views/spree/api/errors/not_found.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:resource_not_found, :scope => "spree.api") }
+node(:error) { I18n.t(:resource_not_found, scope: "spree.api") }

data/app/views/spree/api/errors/unauthorized.v1.rabl

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:unauthorized, :scope => "spree.api") }
+node(:error) { I18n.t(:unauthorized, scope: "spree.api") }

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

@@ -1,5 +1,5 @@
 object @country
 attributes *country_attributes
-child :states => :states do
+child states: :states do
   attributes :id, :name, :abbr, :country_id
 end

data/app/views/spree/api/v1/line_items/show.v1.rabl

@@ -7,9 +7,9 @@ node(:total) { |li| li.total }
 child :variant do
   extends "spree/api/v1/variants/small"
   attributes :product_id
-  child(:images => :images) { extends "spree/api/v1/images/show" }
+  child(images: :images) { extends "spree/api/v1/images/show" }
 end
 
-child :adjustments => :adjustments do
+child adjustments: :adjustments do
   extends "spree/api/v1/adjustments/show"
 end

data/app/views/spree/api/v1/option_types/show.v1.rabl

@@ -1,5 +1,5 @@
 object @option_type
 attributes *option_type_attributes
-child :option_values => :option_values do
+child option_values: :option_values do
   attributes *option_value_attributes
 end

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

@@ -1,2 +1,2 @@
 object false
-node(:errors) { [I18n.t(:invalid_shipping_method, :scope => "spree.api.order")] }
+node(:errors) { [I18n.t(:invalid_shipping_method, scope: "spree.api.order")] }

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

@@ -1,3 +1,3 @@
-child :available_payment_methods => :payment_methods do
+child available_payment_methods: :payment_methods do
   attributes :id, :name, :method_type
 end

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

@@ -5,26 +5,26 @@ if lookup_context.find_all("spree/api/v1/orders/#{root_object.state}").present?
   extends "spree/api/v1/orders/#{root_object.state}"
 end
 
-child :billing_address => :bill_address do
+child billing_address: :bill_address do
   extends "spree/api/v1/addresses/show"
 end
 
-child :shipping_address => :ship_address do
+child shipping_address: :ship_address do
   extends "spree/api/v1/addresses/show"
 end
 
-child :line_items => :line_items do
+child line_items: :line_items do
   extends "spree/api/v1/line_items/show"
 end
 
-child :payments => :payments do
+child payments: :payments do
   attributes *payment_attributes
 
-  child :payment_method => :payment_method do
+  child payment_method: :payment_method do
     attributes :id, :name
   end
 
-  child :source => :source do
+  child source: :source do
     if @current_user_roles.include?('admin')
       attributes *payment_source_attributes + [:gateway_customer_profile_id, :gateway_payment_profile_id]
     else
@@ -33,11 +33,11 @@ child :payments => :payments do
   end
 end
 
-child :shipments => :shipments do
+child shipments: :shipments do
   extends "spree/api/v1/shipments/small"
 end
 
-child :adjustments => :adjustments do
+child adjustments: :adjustments do
   extends "spree/api/v1/adjustments/show"
 end
 
@@ -46,6 +46,6 @@ node :permissions do
   { can_update: current_ability.can?(:update, root_object) }
 end
 
-child :valid_credit_cards => :credit_cards do
+child valid_credit_cards: :credit_cards do
   extends "spree/api/v1/credit_cards/show"
 end

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

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:credit_over_limit, :limit => @payment.credit_allowed, :scope => 'spree.api.payment') }
+node(:error) { I18n.t(:credit_over_limit, limit: @payment.credit_allowed, scope: 'spree.api.payment') }

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

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:update_forbidden, :state => @payment.state, :scope => 'spree.api.payment') }
+node(:error) { I18n.t(:update_forbidden, state: @payment.state, scope: 'spree.api.payment') }

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

@@ -7,23 +7,23 @@ node(:display_price) { |p| p.display_price.to_s }
 node(:has_variants) { |p| p.has_variants? }
 node(:taxon_ids) { |p| p.taxon_ids }
 
-child :master => :master do
+child master: :master do
   extends "spree/api/v1/variants/small"
 end
 
-child :variants => :variants do
+child variants: :variants do
   extends "spree/api/v1/variants/small"
 end
 
-child :option_types => :option_types do
+child option_types: :option_types do
   attributes *option_type_attributes
 end
 
-child :product_properties => :product_properties do
+child product_properties: :product_properties do
   attributes *product_property_attributes
 end
 
-child :classifications => :classifications do
+child classifications: :classifications do
   attributes :taxon_id, :position
 
   child(:taxon) do

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

@@ -1,2 +1,2 @@
 object false
-node(:error) { I18n.t(:cannot_ready, :scope => "spree.api.shipment") }
+node(:error) { I18n.t(:cannot_ready, scope: "spree.api.shipment") }

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

@@ -4,27 +4,27 @@ attributes *shipment_attributes
 node(:order_id) { |shipment| shipment.order.number }
 node(:stock_location_name) { |shipment| shipment.stock_location.name }
 
-child :shipping_rates => :shipping_rates do
+child shipping_rates: :shipping_rates do
   extends "spree/api/v1/shipping_rates/show"
 end
 
-child :selected_shipping_rate => :selected_shipping_rate do
+child selected_shipping_rate: :selected_shipping_rate do
   extends "spree/api/v1/shipping_rates/show"
 end
 
-child :shipping_methods => :shipping_methods do
+child shipping_methods: :shipping_methods do
   attributes :id, :name
-  child :zones => :zones do
+  child zones: :zones do
     attributes :id, :name, :description
   end
 
-  child :shipping_categories => :shipping_categories do
+  child shipping_categories: :shipping_categories do
     attributes :id, :name
   end
 end
 
-child :manifest => :manifest do
-  child :variant => :variant do
+child manifest: :manifest do
+  child variant: :variant do
     extends "spree/api/v1/variants/small"
   end
   node(:quantity) { |m| m.quantity }

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

@@ -5,33 +5,33 @@ attributes *shipment_attributes
 node(:order_id) { |shipment| shipment.order.number }
 node(:stock_location_name) { |shipment| shipment.stock_location.name }
 
-child :shipping_rates => :shipping_rates do
+child shipping_rates: :shipping_rates do
   extends "spree/api/v1/shipping_rates/show"
 end
 
-child :selected_shipping_rate => :selected_shipping_rate do
+child selected_shipping_rate: :selected_shipping_rate do
   extends "spree/api/v1/shipping_rates/show"
 end
 
-child :shipping_methods => :shipping_methods do
+child shipping_methods: :shipping_methods do
   attributes :id, :code, :name
-  child :zones => :zones do
+  child zones: :zones do
     attributes :id, :name, :description
   end
 
-  child :shipping_categories => :shipping_categories do
+  child shipping_categories: :shipping_categories do
     attributes :id, :name
   end
 end
 
-child :manifest => :manifest do
+child manifest: :manifest do
   glue(:variant) do
-    attribute :id => :variant_id
+    attribute id: :variant_id
   end
   node(:quantity) { |m| m.quantity }
   node(:states) { |m| m.states }
 end
 
-child :adjustments => :adjustments do
+child adjustments: :adjustments do
   extends "spree/api/v1/adjustments/show"
 end

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

@@ -0,0 +1,9 @@
+object false
+node(:count) { @tags.count }
+node(:total_count) { @tags.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) { @tags.total_pages }
+child(@tags => :tags) do
+  attributes :name, :id
+end

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

@@ -1,8 +1,8 @@
 object false
 node(:data) { @taxonomy.root.name }
 node(:attr) do
-  { :id => @taxonomy.root.id,
-    :name => @taxonomy.root.name
+  { id: @taxonomy.root.id,
+    name: @taxonomy.root.name
   }
 end
 node(:state) { "closed" }

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

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

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

@@ -1,8 +1,8 @@
-collection @taxon.children, :object_root => false
+collection @taxon.children, object_root: false
 node(:data) { |taxon| taxon.name }
 node(:attr) do |taxon|
-  { :id => taxon.id,
-    :name => taxon.name
+  { id: taxon.id,
+    name: taxon.name
   }
 end
 node(:state) { "closed" }

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

@@ -1,6 +1,6 @@
 object @taxon
 attributes *taxon_attributes
 
-child :children => :taxons do
+child children: :taxons do
   attributes *taxon_attributes
 end

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

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

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

@@ -1,10 +1,11 @@
 object @user
+cache [I18n.locale, root_object]
 
 attributes *user_attributes
-child(:bill_address => :bill_address) do
+child(bill_address: :bill_address) do
   extends "spree/api/v1/addresses/show"
 end
 
-child(:ship_address => :ship_address) do
+child(ship_address: :ship_address) do
   extends "spree/api/v1/addresses/show"
 end

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

@@ -4,11 +4,11 @@ cache [I18n.locale, @current_user_roles.include?('admin'), 'big_variant', root_o
 
 extends "spree/api/v1/variants/small"
 
-child(:stock_items => :stock_items) do
+child(stock_items: :stock_items) do
   attributes :id, :count_on_hand, :stock_location_id, :backorderable
-  attribute :available? => :available
+  attribute available?: :available
 
   glue(:stock_location) do
-    attribute :name => :stock_location_name
+    attribute name: :stock_location_name
   end
 end

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

@@ -7,11 +7,12 @@ node(:options_text) { |v| v.options_text }
 node(:track_inventory) { |v| v.should_track_inventory? }
 node(:in_stock) { |v| v.in_stock? }
 node(:is_backorderable) { |v| v.is_backorderable? }
+node(:is_orderable) { |v| v.is_backorderable? || v.in_stock? }
 node(:total_on_hand) { |v| v.total_on_hand }
 node(:is_destroyed) { |v| v.destroyed? }
 
-child :option_values => :option_values do
+child option_values: :option_values do
   attributes *option_value_attributes
 end
 
-child(:images => :images) { extends "spree/api/v1/images/show" }
+child(images: :images) { extends "spree/api/v1/images/show" }

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

@@ -1,6 +1,6 @@
 object @zone
 attributes :id, :name, :description
 
-child :zone_members => :zone_members do
+child zone_members: :zone_members do
   attributes :id, :name, :zoneable_type, :zoneable_id
 end

data/config/routes.rb

@@ -111,18 +111,16 @@ Spree::Core::Engine.add_routes do
       resources :stock_items, only: [:index, :update, :destroy]
       resources :stores
 
+      resources :tags, only: :index
+
       put '/classifications', to: 'classifications#update', as: :classifications
       get '/taxons/products', to: 'taxons#products', as: :taxon_products
     end
 
-    spree_path = Rails.application.routes.url_helpers.try(:spree_path, trailing_slash: true) || '/'
-    match 'v:api/*path', to: redirect("#{spree_path}api/v1/%{path}"), via: [:get, :post, :put, :patch, :delete]
+    match 'v:api/*path', to: redirect("/api/v1/%{path}"), via: [:get, :post, :put, :patch, :delete]
 
     match '*path', to: redirect{ |params, request|
-      format = ".#{params[:format]}" unless params[:format].blank?
-      query  = "?#{request.query_string}" unless request.query_string.blank?
-
-      "#{spree_path}api/v1/#{params[:path]}#{format}#{query}"
+      "/api/v1/#{params[:path]}?#{request.query_string}"
     }, via: [:get, :post, :put, :patch, :delete]
   end
 end