spree_api 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 012d9b5279e5919cc152eba9678ca8682c1baca7b9256ff22c491db95d74de5a
-  data.tar.gz: 56e0fdb4db5ea020e7086b91fa3c401ea76527ea0b5408ca734e9a0abf72502b
+  metadata.gz: 4c9439192de12b6b1178bee80776eb695521403795e642f0a2705371046127cb
+  data.tar.gz: 22d7e3c800a68a29e4c8a6c5d9a5ec56050b32aa96c64d0a988259293b5e3c59
 SHA512:
-  metadata.gz: 8f9d2e9805651277ad363af26e8a97a10e89899336083e5b8f511d63bd99be127ab41b11c0c699fb42492c4d1f490a540273aaa6ec33ee9abcb221a36149b2e8
-  data.tar.gz: 8050de3c76e4d358a4d0198d87ea27e91ca2bc373ce8dfa61795207334b25e19751a7a1414bb17a3421c38037ae2ad51424e7a98506107c299f53acba8723ffa
+  metadata.gz: f263e4c2eceb996112faef3810743bbde167c048a21899ae32d4fd965f03c6f6666bf6587b12ad4f6fdcb2c45d0b97261dd76102f259d2a792268c12ac919fb3
+  data.tar.gz: 4b77cbc8ad82234718f992ea8482fb8c10931efb2b74e3a3aae1fe1662df862ec56f114f23a3426dda5993c102e5a0843abddb5c6fa294c5724fcac8b9e6c699

data/LICENSE.md

@@ -0,0 +1,57 @@
+# License
+
+Copyright © 2024-present, Vendo Connect Inc.
+
+Copyright © 2015-2024, Spark Solutions Sp. z o.o.
+
+Copyright © 2007-2015, Spree Commerce Inc.
+
+Spree Commerce is a free, open-source eCommerce framework giving you full control and customizability.
+
+For **Spree Commerce versions 4.10** and later in the [spree/spree](https://github.com/spree/spree) repository two licenses apply simultaneously and users are required to comply with the terms of these two licenses at the same time:
+
+* [AGPL-3.0](https://opensource.org/license/agpl-v3) - for all contributions from version 4.10 onwards
+
+* [BSD-3-Clause](https://opensource.org/license/bsd-3-clause) - for all other contributions predating version 4.10
+Effectively, for versions 4.10 and upwards **AGPL-3.0** license applies.
+
+**Spree Commerce versions 4.9** and earlier in the [spree/spree](https://github.com/spree/spree) repository are available under the **BSD-3-Clause** license and users are required to comply with its terms.
+
+If you’d like to use Spree Commerce without the AGPL-3.0 restrictions e.g. for a **SaaS** business, please talk to us about obtaining a [Commercial License](#commercial-license).
+
+All third party components incorporated into this software are licensed under the original license provided by the owner of the applicable component.
+
+Please refer to our [Licensing FAQ](https://spreecommerce.org/why-spree-is-changing-its-open-source-license-to-agpl-3-0-and-introducing-a-commercial-license/) in case of questions.
+
+## AGPL-3.0 License - Spree 4.10 upwards
+
+If you decide to accept the AGPL-3.0 license by using Spree Commerce version 4.10 or later, you must comply with the following terms:
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/).
+
+## BSD 3-Clause License
+
+If you decide to accept the BSD-3-Clause license by using Spree Commerce, you must comply with the following terms:
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of Spree Commerce Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,     THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR                CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,              PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF         LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## Commercial License
+
+Should you decide to use Spree Commerce version 4.10 or later for commercial redistribution (eg. SaaS) - also known as Commercial Distribution - you must do so in accordance with the terms and conditions contained in a separate written agreement between you and [Vendo Connect Inc.](https://www.getvendo.com/).
+
+For more information about the Commercial License (CL) please contact [sales@getvendo.com](mailto:sales@getvendo.com).
+
+Please refer to our [Licensing FAQ](https://spreecommerce.org/why-spree-is-changing-its-open-source-license-to-agpl-3-0-and-introducing-a-commercial-license/) in case of questions.

data/app/controllers/concerns/spree/api/v2/caching.rb

@@ -5,13 +5,10 @@ module Spree
         extend ActiveSupport::Concern
 
         def collection_cache_key(collection)
-          # Calling reselect('*') is a workaround for the joined translations table
-          collection_cache_key = collection.unscope(:includes).unscope(:order).unscope(:group).reselect('*').cache_key_with_version
-
           params.delete(:page) if params[:page] == 1
 
           cache_key_parts = [
-            collection_cache_key,
+            collection.cache_key_with_version,
             resource_includes,
             sparse_fields,
             serializer_params_cache_key,

data/app/controllers/spree/api/v2/platform/resource_controller.rb

@@ -88,7 +88,7 @@ module Spree
           end
 
           # if using a user oAuth token we need to check CanCanCan abilities
-          # defined in https://github.com/spree/spree/blob/master/core/app/models/spree/ability.rb
+          # defined in https://github.com/spree/spree/blob/main/core/app/models/spree/ability.rb
           def authorize_spree_user
             return if spree_current_user.nil?
 

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

@@ -36,7 +36,7 @@ module Spree
             result = update_service.call(
               order: spree_current_order,
               params: params,
-              # defined in https://github.com/spree/spree/blob/master/core/lib/spree/core/controller_helpers/strong_parameters.rb#L19
+              # defined in https://github.com/spree/spree/blob/main/core/lib/spree/core/controller_helpers/strong_parameters.rb#L19
               permitted_attributes: permitted_checkout_attributes,
               request_env: request.headers.env
             )

data/app/serializers/spree/v2/storefront/credit_card_serializer.rb

@@ -4,7 +4,7 @@ module Spree
       class CreditCardSerializer < BaseSerializer
         set_type :credit_card
 
-        attributes :cc_type, :last_digits, :month, :year, :name, :default, :public_metadata
+        attributes :cc_type, :last_digits, :month, :year, :name, :default, :gateway_payment_profile_id, :public_metadata
 
         belongs_to :payment_method
       end

data/spree_api.gemspec

@@ -3,12 +3,12 @@ require_relative '../core/lib/spree/core/version'
 Gem::Specification.new do |s|
   s.name          = 'spree_api'
   s.version       = Spree.version
-  s.authors       = ['Ryan Bigg']
-  s.email         = ['ryan@spreecommerce.com']
+  s.authors       = ['Ryan Bigg', 'Spark Solutions Sp. z o.o.', 'Vendo Connect Inc.']
+  s.email         = ['hello@spreecommerce.org']
   s.summary       = %q{Spree's API}
   s.description   = %q{Spree's API}
   s.homepage      = 'https://spreecommerce.org'
-  s.license       = 'BSD-3-Clause'
+  s.licenses       = ['AGPL-3.0-or-later', 'BSD-3-Clause']
 
   s.metadata = {
     'bug_tracker_uri' => 'https://github.com/spree/spree/issues',

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.0
 platform: ruby
 authors:
 - Ryan Bigg
+- Spark Solutions Sp. z o.o.
+- Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -114,24 +116,24 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.10.0
 description: Spree's API
 email:
-- ryan@spreecommerce.com
+- hello@spreecommerce.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE
+- LICENSE.md
 - Rakefile
 - app/controllers/concerns/spree/api/v2/caching.rb
 - app/controllers/concerns/spree/api/v2/coupon_codes_helper.rb
@@ -403,12 +405,13 @@ files:
 - spree_api.gemspec
 homepage: https://spreecommerce.org
 licenses:
+- AGPL-3.0-or-later
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.9.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.10.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.9.0
+  source_code_uri: https://github.com/spree/spree/tree/v4.10.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/LICENSE

@@ -1,26 +0,0 @@
-Copyright (c) 2007-2015, Spree Commerce, Inc. and other contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
-      endorse or promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.