goca-spree-api 3.1.14.rails.5.0 → 3.1.14.rails.5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '017008a6e01cd473ce0ae66f63d77d694d567dac'
-  data.tar.gz: 50c0d18d0e5fb4d58eb8f64dd03641edd6deceeb
+  metadata.gz: 6623724aa3c899065985208abbad40c12beba9b1
+  data.tar.gz: 8d90deec2e1a7cf7dc574ca2c5dc78203cd5cd00
 SHA512:
-  metadata.gz: a2b8942053b8005824019e90b6985789d2e1dc1d7b891e8120b7fa54a06513c1ab7a682bdb38c91f3a64a8eb179e8a8a01e9bd3b2a79c9066c66b5cbeebecfa1
-  data.tar.gz: 0115a87496fd609a4a6e01fe4aeda894355bc18fc38fbaca3653de03c7a130a9c525712c307cd59858618c2e4e8001989e2b925a29b1a9743153e6ea95648032
+  metadata.gz: 80df57b099bb807074928af5ea75424130360e0d697d42dfe70ec52478aaa86915f338874c3e9ce997a5db24b3e3d3dc2639afbcac51d55211c06a3821d3ef75
+  data.tar.gz: c5bae5d1fefec26517c1a7c0d03cb6b08adb3886e6abdb25b01816ddbf2f8667dfca4e4573ac80ceaeb1542b6f25a197b7e7dd7eee3f1b368c4db1e501ccca07

data/Gemfile

@@ -1,5 +1,7 @@
 eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
 
-gem 'spree_core', :path => '../core'
+gem 'spree_core', path: '../core'
+
+gem 'rabl'
 
 gemspec

data/app/controllers/spree/api/base_controller.rb

@@ -25,7 +25,7 @@ module Spree
 
       def map_nested_attributes_keys(klass, attributes)
         nested_keys = klass.nested_attributes_options.keys
-        attributes.inject({}) do |h, (k,v)|
+        attributes.to_h.inject({}) do |h, (k,v)|
           key = nested_keys.include?(k.to_sym) ? "#{k}_attributes" : k
           h[key] = v
           h
@@ -89,7 +89,7 @@ module Spree
       end
 
       def unprocessable_entity(message)
-        render text: { exception: message }.to_json, status: 422
+        render plain: { exception: message }.to_json, status: 422
       end
 
       def gateway_error(exception)

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

@@ -15,7 +15,7 @@ module Spree
           @address = find_address
 
           if @address.update_attributes(address_params)
-            respond_with(@address, :default_template => :show)
+            respond_with(@address, default_template: :show)
           else
             invalid_resource!(@address)
           end

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

@@ -12,7 +12,7 @@ module Spree
           # Because position we get back is 0-indexed.
           # acts_as_list is 1-indexed.
           classification.insert_at(params[:position].to_i + 1)
-          render nothing: true
+          head :ok
         end
       end
     end

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

@@ -12,6 +12,9 @@ module Spree
           respond_with(@image)
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Image
           @image = scope.images.new(image_params)

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

@@ -15,7 +15,7 @@ module Spree
           inventory_unit.transaction do
             if inventory_unit.update_attributes(inventory_unit_params)
               fire
-              render :show, :status => 200
+              render :show, status: 200
             else
               invalid_resource!(inventory_unit)
             end
@@ -35,8 +35,8 @@ module Spree
 
           unless inventory_unit.respond_to?(can_event) &&
                  inventory_unit.send(can_event)
-            render :text => { :exception => "cannot transition to #{@event}" }.to_json,
-                   :status => 200
+            render plain: { exception: "cannot transition to #{@event}" }.to_json,
+                   status: 200
             false
           end
         end

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

@@ -6,6 +6,9 @@ module Spree
 
         self.line_item_options = []
 
+        def new
+        end
+
         def create
           variant = Spree::Variant.find(params[:line_item][:variant_id])
           @line_item = order.contents.add(

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

@@ -3,11 +3,17 @@ module Spree
     module V1
       class OptionTypesController < Spree::Api::BaseController
         def index
-          if params[:ids]
-            @option_types = Spree::OptionType.includes(:option_values).accessible_by(current_ability, :read).where(id: params[:ids].split(','))
-          else
-            @option_types = Spree::OptionType.includes(:option_values).accessible_by(current_ability, :read).load.ransack(params[:q]).result
-          end
+          @option_types =  if params[:ids]
+                             Spree::OptionType.
+                               includes(:option_values).
+                               accessible_by(current_ability, :read).
+                               where(id: params[:ids].split(','))
+                           else
+                             Spree::OptionType.
+                               includes(:option_values).
+                               accessible_by(current_ability, :read).
+                               load.ransack(params[:q]).result
+                           end
           respond_with(@option_types)
         end
 
@@ -16,11 +22,14 @@ module Spree
           respond_with(@option_type)
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Spree::OptionType
           @option_type = Spree::OptionType.new(option_type_params)
           if @option_type.save
-            render :show, :status => 201
+            render :show, status: 201
           else
             invalid_resource!(@option_type)
           end
@@ -38,7 +47,7 @@ module Spree
         def destroy
           @option_type = Spree::OptionType.accessible_by(current_ability, :destroy).find(params[:id])
           @option_type.destroy
-          render :text => nil, :status => 204
+          render plain: nil, status: 204
         end
 
         private

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

@@ -4,7 +4,7 @@ module Spree
       class OptionValuesController < Spree::Api::BaseController
         def index
           if params[:ids]
-            @option_values = scope.where(:id => params[:ids])
+            @option_values = scope.where(id: params[:ids])
           else
             @option_values = scope.ransack(params[:q]).result.distinct
           end
@@ -16,11 +16,14 @@ module Spree
           respond_with(@option_value)
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Spree::OptionValue
           @option_value = scope.new(option_value_params)
           if @option_value.save
-            render :show, :status => 201
+            render :show, status: 201
           else
             invalid_resource!(@option_value)
           end
@@ -38,7 +41,7 @@ module Spree
         def destroy
           @option_value = scope.accessible_by(current_ability, :destroy).find(params[:id])
           @option_value.destroy
-          render :text => nil, :status => 204
+          render plain: nil, status: 204
         end
 
         private

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

@@ -58,7 +58,7 @@ module Spree
         def empty
           authorize! :update, @order, order_token
           @order.empty!
-          render text: nil, status: 204
+          render plain: nil, status: 204
         end
 
         def index

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

@@ -11,14 +11,14 @@ module Spree
           end
 
           @products = @products.distinct.page(params[:page]).per(params[:per_page])
-          expires_in 15.minutes, :public => true
+          expires_in 15.minutes, public: true
           headers['Surrogate-Control'] = "max-age=#{15.minutes}"
           respond_with(@products)
         end
 
         def show
           @product = find_product(params[:id])
-          expires_in 15.minutes, :public => true
+          expires_in 15.minutes, public: true
           headers['Surrogate-Control'] = "max-age=#{15.minutes}"
           headers['Surrogate-Key'] = "product_id=1"
           respond_with(@product)
@@ -57,6 +57,9 @@ module Spree
         #     shipping_category: "Free Shipping Items"
         #   }
         #
+        def new
+        end
+
         def create
           authorize! :create, Product
           params[:product][:available_on] ||= Time.current
@@ -66,7 +69,7 @@ module Spree
           @product = Core::Importer::Product.new(nil, product_params, options).create
 
           if @product.persisted?
-            respond_with(@product, :status => 201, :default_template => :show)
+            respond_with(@product, status: 201, default_template: :show)
           else
             invalid_resource!(@product)
           end
@@ -80,7 +83,7 @@ module Spree
           @product = Core::Importer::Product.new(@product, product_params, options).update
 
           if @product.errors.empty?
-            respond_with(@product.reload, :status => 200, :default_template => :show)
+            respond_with(@product.reload, status: 200, default_template: :show)
           else
             invalid_resource!(@product)
           end
@@ -90,7 +93,7 @@ module Spree
           @product = find_product(params[:id])
           authorize! :destroy, @product
           @product.destroy
-          respond_with(@product, :status => 204)
+          respond_with(@product, status: 204)
         end
 
         private

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

@@ -64,7 +64,7 @@ module Spree
         end
 
         def scope
-          includes = {:variant => [{ :option_values => :option_type }, :product] }
+          includes = { variant: [{ option_values: :option_type }, :product] }
           @stock_location.stock_items.accessible_by(current_ability, :read).includes(includes)
         end
 

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

@@ -34,7 +34,7 @@ module Spree
         def destroy
           authorize! :destroy, stock_location
           stock_location.destroy
-          respond_with(stock_location, :status => 204)
+          respond_with(stock_location, status: 204)
         end
 
         private

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

@@ -16,11 +16,14 @@ module Spree
           show
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Taxonomy
           @taxonomy = Taxonomy.new(taxonomy_params)
           if @taxonomy.save
-            respond_with(@taxonomy, :status => 201, :default_template => :show)
+            respond_with(@taxonomy, status: 201, default_template: :show)
           else
             invalid_resource!(@taxonomy)
           end
@@ -29,7 +32,7 @@ module Spree
         def update
           authorize! :update, taxonomy
           if taxonomy.update_attributes(taxonomy_params)
-            respond_with(taxonomy, :status => 200, :default_template => :show)
+            respond_with(taxonomy, status: 200, default_template: :show)
           else
             invalid_resource!(taxonomy)
           end
@@ -38,13 +41,13 @@ module Spree
         def destroy
           authorize! :destroy, taxonomy
           taxonomy.destroy
-          respond_with(taxonomy, :status => 204)
+          respond_with(taxonomy, status: 204)
         end
 
         private
 
         def taxonomies
-          @taxonomies = Taxonomy.accessible_by(current_ability, :read).order('name').includes(:root => :children).
+          @taxonomies = Taxonomy.accessible_by(current_ability, :read).order('name').includes(root: :children).
                         ransack(params[:q]).result.
                         page(params[:page]).per(params[:per_page])
         end

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

@@ -26,6 +26,9 @@ module Spree
           show
         end
 
+        def new
+        end
+
         def create
           authorize! :create, Taxon
           @taxon = Spree::Taxon.new(taxon_params)
@@ -33,7 +36,7 @@ module Spree
           taxonomy = Spree::Taxonomy.find_by(id: params[:taxonomy_id])
 
           if taxonomy.nil?
-            @taxon.errors[:taxonomy_id] = I18n.t(:invalid_taxonomy_id, scope: 'spree.api')
+            @taxon.errors.add(:taxonomy_id, I18n.t('spree.api.invalid_taxonomy_id'))
             invalid_resource!(@taxon) and return
           end
 

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

@@ -7,6 +7,8 @@ module Spree
 
         def index
           @users = Spree.user_class.accessible_by(current_ability,:read).ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          expires_in 15.minutes, public: true
+          headers['Surrogate-Control'] = "max-age=#{15.minutes}"
           respond_with(@users)
         end
 
@@ -21,7 +23,7 @@ module Spree
           authorize! :create, Spree.user_class
           @user = Spree.user_class.new(user_params)
           if @user.save
-            respond_with(@user, :status => 201, :default_template => :show)
+            respond_with(@user, status: 201, default_template: :show)
           else
             invalid_resource!(@user)
           end
@@ -30,7 +32,7 @@ module Spree
         def update
           authorize! :update, user
           if user.update_attributes(user_params)
-            respond_with(user, :status => 200, :default_template => :show)
+            respond_with(user, status: 200, default_template: :show)
           else
             invalid_resource!(user)
           end
@@ -39,7 +41,7 @@ module Spree
         def destroy
           authorize! :destroy, user
           user.destroy
-          respond_with(user, :status => 204)
+          respond_with(user, status: 204)
         end
 
         private

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
@@ -98,7 +99,7 @@ module Spree
 
       @@taxon_attributes = [
         :id, :name, :pretty_name, :permalink, :parent_id,
-        :taxonomy_id
+        :taxonomy_id, :meta_title, :meta_description
       ]
 
       @@inventory_unit_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/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/lib/spree/api/engine.rb

@@ -1,4 +1,5 @@
 require 'rails/engine'
+require 'versioncake'
 
 module Spree
   module Api
@@ -16,7 +17,18 @@ module Spree
         config.json_engine = ActiveSupport::JSON
       end
 
-      initializer "spree.api.environment", :before => :load_config_initializers do |app|
+      initializer "spree.api.versioncake" do |_app|
+        VersionCake.setup do |config|
+          config.resources do |r|
+            r.resource %r{.*}, [], [], [1]
+          end
+
+          config.missing_version = 1
+          config.extraction_strategy = :http_header
+        end
+      end
+
+      initializer "spree.api.environment", before: :load_config_initializers do |app|
         Spree::Api::Config = Spree::ApiConfiguration.new
       end
 

data/lib/spree/api/responders/rabl_template.rb

@@ -4,7 +4,7 @@ module Spree
       module RablTemplate
         def to_format
           if template
-            render template, :status => options[:status] || 200
+            render template, status: options[:status] || 200
           else
             super
           end

data/lib/spree/api/testing_support/caching.rb

@@ -1,9 +1,9 @@
 RSpec.configure do |config|
-  config.before(:each, :caching => true) do 
+  config.before(:each, caching: true) do 
     ActionController::Base.perform_caching = true
   end
   
-  config.after(:each, :caching => true) do
+  config.after(:each, caching: true) do
     ActionController::Base.perform_caching = false
     Rails.cache.clear
   end

data/spree_api.gemspec

@@ -16,5 +16,6 @@ Gem::Specification.new do |s|
   s.version       = Spree.version
 
   s.add_dependency 'goca-spree-core', s.version
-  s.add_dependency 'rabl', '~> 0.12.0'
+  s.add_dependency 'rabl', '~> 0.13.1'
+  s.add_dependency 'versioncake', '~> 3.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goca-spree-api
 version: !ruby/object:Gem::Version
-  version: 3.1.14.rails.5.0
+  version: 3.1.14.rails.5.0.1
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goca-spree-core
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.14.rails.5.0
+        version: 3.1.14.rails.5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.14.rails.5.0
+        version: 3.1.14.rails.5.0.1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.1
+- !ruby/object:Gem::Dependency
+  name: versioncake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: Spree's API
 email:
 - ryan@spreecommerce.com