spree_api 4.1.12 → 4.2.0.rc3

data/lib/spree/api/controller_setup.rb

@@ -6,7 +6,6 @@ module Spree
       def self.included(klass)
         klass.class_eval do
           include CanCan::ControllerAdditions
-          include Spree::Core::ControllerHelpers::Auth
 
           prepend_view_path Rails.root + 'app/views'
           append_view_path File.expand_path('../../../app/views', File.dirname(__FILE__))

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

@@ -27,6 +27,8 @@ shared_examples 'returns valid cart JSON' do
     expect(json_response['data']).to have_type('cart')
     expect(json_response['data']).to have_attribute(:number).with_value(order.number)
     expect(json_response['data']).to have_attribute(:state).with_value(order.state)
+    expect(json_response['data']).to have_attribute(:payment_state).with_value(order.payment_state)
+    expect(json_response['data']).to have_attribute(:shipment_state).with_value(order.shipment_state)
     expect(json_response['data']).to have_attribute(:token).with_value(order.token)
     expect(json_response['data']).to have_attribute(:total).with_value(order.total.to_s)
     expect(json_response['data']).to have_attribute(:item_total).with_value(order.item_total.to_s)

data/lib/spree_api.rb

@@ -1,4 +1,4 @@
 require 'spree/api'
 require 'spree/api/responders'
-require 'fast_jsonapi'
+require 'jsonapi/serializer'
 require 'doorkeeper'

data/spree_api.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.email         = ["ryan@spreecommerce.com"]
   s.summary       = %q{Spree's API}
   s.description   = %q{Spree's API}
-  s.homepage      = 'http://spreecommerce.org'
+  s.homepage      = 'https://spreecommerce.org'
   s.license       = 'BSD-3-Clause'
 
   s.metadata = {
@@ -28,6 +28,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'spree_core', s.version
   s.add_dependency 'rabl', '~> 0.14.2'
-  s.add_dependency 'fast_jsonapi', '~> 1.5'
+  s.add_dependency 'jsonapi-serializer', '~> 2.1'
   s.add_dependency 'doorkeeper', '~> 5.2', '>= 5.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 4.1.12
+  version: 4.2.0.rc3
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.12
+        version: 4.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.2
 - !ruby/object:Gem::Dependency
-  name: fast_jsonapi
+  name: jsonapi-serializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - app/controllers/spree/api/v1/variants_controller.rb
 - app/controllers/spree/api/v1/zones_controller.rb
 - app/controllers/spree/api/v2/base_controller.rb
+- app/controllers/spree/api/v2/resource_controller.rb
 - app/controllers/spree/api/v2/storefront/account/addresses_controller.rb
 - app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb
 - app/controllers/spree/api/v2/storefront/account/orders_controller.rb
@@ -169,6 +170,7 @@ files:
 - app/serializers/spree/v2/storefront/shipping_rate_serializer.rb
 - app/serializers/spree/v2/storefront/state_serializer.rb
 - app/serializers/spree/v2/storefront/stock_location_serializer.rb
+- app/serializers/spree/v2/storefront/store_credit_category_serializer.rb
 - app/serializers/spree/v2/storefront/store_credit_event_serializer.rb
 - app/serializers/spree/v2/storefront/store_credit_serializer.rb
 - app/serializers/spree/v2/storefront/store_credit_type_serializer.rb
@@ -301,14 +303,14 @@ files:
 - script/rails
 - spec/fixtures/thinking-cat.jpg
 - spree_api.gemspec
-homepage: http://spreecommerce.org
+homepage: https://spreecommerce.org
 licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.12
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc3
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.1.12
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc3
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -320,11 +322,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Spree's API