spree_api 3.7.14.1 → 4.0.0.beta

data/app/controllers/spree/api/v2/storefront/order_status_controller.rb

@@ -5,8 +5,6 @@ module Spree
         class OrderStatusController < ::Spree::Api::V2::BaseController
           include Spree::Api::V2::Storefront::OrderConcern
 
-          before_action :ensure_order_token
-
           def show
             render_serialized_payload { serialize_resource(resource) }
           end
@@ -27,10 +25,6 @@ module Spree
           def resource_serializer
             Spree::Api::Dependencies.storefront_cart_serializer.constantize
           end
-
-          def ensure_order_token
-            raise ActiveRecord::RecordNotFound unless order_token.present?
-          end
         end
       end
     end

data/app/controllers/spree/api/v2/storefront/products_controller.rb

@@ -44,7 +44,7 @@ module Spree
           end
 
           def scope
-            Spree::Product.accessible_by(current_ability, :read).includes(scope_includes)
+            Spree::Product.accessible_by(current_ability, :show).includes(scope_includes)
           end
 
           def scope_includes

data/app/controllers/spree/api/v2/storefront/taxons_controller.rb

@@ -40,7 +40,7 @@ module Spree
           end
 
           def scope
-            Spree::Taxon.accessible_by(current_ability, :read).includes(scope_includes)
+            Spree::Taxon.accessible_by(current_ability, :show).includes(scope_includes)
           end
 
           def scope_includes

data/config/initializers/doorkeeper.rb

@@ -18,3 +18,15 @@ Doorkeeper.configure do
 
   access_token_methods :from_bearer_authorization, :from_access_token_param
 end
+
+Doorkeeper::AccessGrant.class_eval do
+  self.table_name = 'spree_oauth_access_grants'
+end
+
+Doorkeeper::AccessToken.class_eval do
+  self.table_name = 'spree_oauth_access_tokens'
+end
+
+Doorkeeper::Application.class_eval do
+  self.table_name = 'spree_oauth_applications'
+end

data/config/initializers/rabl_rails6_fix.rb

@@ -0,0 +1,16 @@
+# https://github.com/nesquena/rabl/pull/723
+module ActionView
+  module Template::Handlers
+    class Rabl
+      class_attribute :default_format, default: :json
+
+      def self.call(_template, source)
+        %{ ::Rabl::Engine.new(#{source.inspect}).
+            apply(self, assigns.merge(local_assigns)).
+            render }
+      end
+    end
+  end
+end
+
+ActionView::Template.register_template_handler :rabl, ActionView::Template::Handlers::Rabl

data/config/routes.rb

@@ -122,8 +122,6 @@ 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

data/docs/v2/storefront/index.yaml

@@ -12,7 +12,15 @@ info:
       intefaces either in JavaScript frameworks or native mobile libraries.
     </p>
     <p>
-      Please read our introduction to the API v2 [insert link here]
+      Please read our <a href="https://guides.spreecommerce.org/api/v2/">
+        introduction to the API v2
+      </a>
+    </p>
+    <p>
+      Download our
+      <a href="https://github.com/spree/spree-storefront-api-v2-js-sdk">
+        official JavaScript & TypeScript SDK
+      </a>
     </p>
     <p>
       <a href="https://raw.githubusercontent.com/spree/spree/master/api/docs/v2/storefront/index.yaml" target="_blank" rel="noopener">
@@ -154,8 +162,6 @@ paths:
         - $ref: '#/components/parameters/OrderParam'
         - $ref: '#/components/parameters/CartIncludeParam'
         - $ref: '#/components/parameters/SparseFieldsParam'
-      security:
-        - orderToken: []
   '/cart':
     post:
       description: >-
@@ -345,7 +351,7 @@ paths:
       operationId: 'Apply Coupon Code'
       responses:
         '200':
-          description: Cuopon code was applied successfully
+          description: Coupon code was applied successfully
           content:
             application/vnd.api+json:
               schema:
@@ -375,15 +381,15 @@ paths:
 
   '/cart/remove_coupon_code/{coupon_code}':
     delete:
-      description: Removes a coupon code from the Cart
+      description: Removes a coupon code from the Cart. If no `coupon_code` parameter is passed will remove all applied coupon codes.
       tags:
         - Cart
       operationId: 'Remove Coupon Code'
       parameters:
         - name: coupon_code
           in: path
-          required: true
-          description: Coupon code applied to Order
+          required: false
+          description: Selected Coupon code for removal
           schema:
             type: string
           example: 'DISCOUNT10'
@@ -450,28 +456,24 @@ paths:
           order: {
             email: 'john@snow.org',
             bill_address_attributes: {
-              {
-                firstname: 'John',
-                lastname: 'Snow',
-                address1: '7735 Old Georgetown Road',
-                city: 'Bethesda',
-                phone: '3014445002',
-                zipcode: '20814',
-                state_name: 'MD',
-                country_iso: 'US'
-              }
+              firstname: 'John',
+              lastname: 'Snow',
+              address1: '7735 Old Georgetown Road',
+              city: 'Bethesda',
+              phone: '3014445002',
+              zipcode: '20814',
+              state_name: 'MD',
+              country_iso: 'US'
             },
             ship_address_attributes: {
-              {
-                firstname: 'John',
-                lastname: 'Snow',
-                address1: '7735 Old Georgetown Road',
-                city: 'Bethesda',
-                phone: '3014445002',
-                zipcode: '20814',
-                state_name: 'MD',
-                country_iso: 'US'
-              }
+              firstname: 'John',
+              lastname: 'Snow',
+              address1: '7735 Old Georgetown Road',
+              city: 'Bethesda',
+              phone: '3014445002',
+              zipcode: '20814',
+              state_name: 'MD',
+              country_iso: 'US'
             }
           }
         </pre>
@@ -493,9 +495,12 @@ paths:
         <br />
         <pre>
           order: {
-            shipments_attributes: {
-              '0' => { selected_shipping_rate_id: 1, id: 1}
-            }
+            shipments_attributes: [
+              {
+                id: 1,
+                selected_shipping_rate_id: 1
+              }
+            ]
           }
         </pre>
         <br />
@@ -517,7 +522,7 @@ paths:
               ]
             },
             payment_source: {
-              '1' => {
+              1: {
                 number: '4111111111111111',
                 month: '01',
                 year: '2022',

data/lib/spree/api/engine.rb

@@ -1,5 +1,4 @@
 require 'rails/engine'
-require 'versioncake'
 
 module Spree
   module Api
@@ -17,17 +16,6 @@ module Spree
         config.json_engine = ActiveSupport::JSON
       end
 
-      initializer 'spree.api.versioncake' do |_app|
-        VersionCake.setup do |config|
-          config.resources do |r|
-            r.resource %r{.*}, [], [], [1, 2]
-          end
-
-          config.missing_version = 1
-          config.extraction_strategy = :http_header
-        end
-      end
-
       # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
       initializer 'spree.assets.precompile', group: :all do |app|
         app.config.assets.precompile += %w[
@@ -44,13 +32,6 @@ module Spree
         Migrations.new(config, engine_name).check
       end
 
-      def self.activate
-        Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
-          Rails.configuration.cache_classes ? require(c) : load(c)
-        end
-      end
-      config.to_prepare &method(:activate).to_proc
-
       def self.root
         @root ||= Pathname.new(File.expand_path('../../..', __dir__))
       end

data/lib/spree/api/testing_support/v2/base.rb

@@ -4,7 +4,7 @@ shared_context 'API v2 tokens' do
   let(:headers_order_token) { { 'X-Spree-Order-Token' => order.token } }
 end
 
-[200, 201, 400, 401, 404, 403, 422].each do |status_code|
+[200, 201, 400, 404, 403, 422].each do |status_code|
   shared_examples "returns #{status_code} HTTP status" do
     it "returns #{status_code}" do
       expect(response.status).to eq(status_code)

data/lib/spree_api.rb

@@ -1,5 +1,4 @@
 require 'spree/api'
 require 'spree/api/responders'
-require 'versioncake'
 require 'fast_jsonapi'
 require 'doorkeeper'

data/spree_api.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.homepage      = 'http://spreecommerce.org'
   s.license       = 'BSD-3-Clause'
 
-  s.required_ruby_version = '>= 2.3.3'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.files         = `git ls-files`.split($\).reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -20,8 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'jsonapi-rspec'
 
   s.add_dependency 'spree_core', s.version
-  s.add_dependency 'rabl', '~> 0.13.1'
-  s.add_dependency 'versioncake', '~> 3.4.0'
+  s.add_dependency 'rabl', '~> 0.14.1'
   s.add_dependency 'fast_jsonapi', '~> 1.5'
   s.add_dependency 'doorkeeper', '~> 5.0'
 end