spree_legacy_api_v2 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ad06cfe87057ca7696604c808ea23b46cb7e42a6e9619fa76e218307e64ab1
-  data.tar.gz: 3067eedec49aca26f5ef0ef30e486bcbde39e993da0679925e22da568eaf7353
+  metadata.gz: ee03551dbe1d59824af91549821dac589ed2a1fa10e29cdb1f794ecb4b45097b
+  data.tar.gz: 80b90a3eb262ad9b882bc308d99bf24bd045f6e3c287e08a2a9e8611369ab774
 SHA512:
-  metadata.gz: d5d933f75f967e8dcf40b3c7a32b1a9239bb0a3944781b12435423a56740270491da3059e6e4c121d393f795c8b44d044937aef6f696634de1f2756637f678a8
-  data.tar.gz: 03ed42ab16c493f4913f5d09b4eb1a7c3fa5da474c62a7d70d4b44ae775f484c20d76a8da18e82f8e2795fd41063ad199a265764880b36b63adb57f8c42cbe23
+  metadata.gz: 30d286f75e5f8a18e8d1df6a40640cb2bc96cfb5c019d88a07ccba1e78151ccbbc798298bc1dcbe2ec386590e1db7df00eb56534ed0a08b9d3adc35e37b063a2
+  data.tar.gz: d3b36d049f776dee02da6bbf9a132f159653fc5bb2daf00064725cfe549c7a3367560d8b77f1f015e3fb17d36ffcd88f60ef9332751f3a59a51861145bd8190a

data/Rakefile

@@ -20,4 +20,7 @@ desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'spree_legacy_api_v2'
   Rake::Task['extension:test_app'].invoke
+
+  system({ 'BUNDLE_GEMFILE' => File.expand_path('Gemfile', __dir__) }, 'rails g spree_posts:install')
+  system({ 'BUNDLE_GEMFILE' => File.expand_path('Gemfile', __dir__) }, 'rails g spree_legacy_product_properties:install')
 end

data/app/controllers/spree/api/v2/data_feeds/google_controller.rb

@@ -4,7 +4,8 @@ module Spree
       module DataFeeds
         class GoogleController < ::Spree::Api::V2::BaseController
           def rss_feed
-            send_data data_feeds_google_rss_service.value[:file], filename: 'products.rss', type: 'text/xml'
+            presenter = settings.class.presenter_class.new(settings)
+            send_data presenter.call, filename: 'products.rss', type: 'text/xml'
           end
 
           private
@@ -12,13 +13,8 @@ module Spree
           def settings
             @settings ||= Spree::DataFeed::Google.find_by!(store: current_store, slug: params[:slug], active: true)
           end
-
-          def data_feeds_google_rss_service
-            Spree.data_feeds_google_rss_service.new.call(settings)
-          end
         end
       end
     end
   end
 end
-

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

@@ -31,13 +31,13 @@ module Spree
           end
 
           def scope_includes
-            node_includes = %i[icon parent taxonomy]
+            node_includes = %i[parent taxonomy]
 
             {
               parent: node_includes,
               children: node_includes,
               taxonomy: [root: node_includes],
-              icon: [attachment_attachment: :blob]
+              image_attachment: :blob
             }
           end
 

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

@@ -25,6 +25,10 @@ module Spree
             Spree::PostCategory
           end
 
+          def scope
+            model_class.for_store(current_store)
+          end
+
           def serializer_params
             super.merge(include_posts: action_name == 'show')
           end

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

@@ -6,25 +6,33 @@ module Spree
           protected
 
           def sorted_collection
-            collection_sorter.new(collection, params, allowed_sort_attributes).call
+            sorter = Spree.api.storefront_posts_sorter
+            if sorter
+              sorter.new(collection, params, allowed_sort_attributes).call
+            else
+              super
+            end
           end
 
           def collection
-            @collection ||= collection_finder.new(scope: scope, params: finder_params).execute
+            @collection ||= begin
+              finder = Spree.api.storefront_posts_finder
+              if finder
+                finder.new(scope: scope, params: finder_params).execute
+              else
+                result = scope
+                result = result.search_by_title(params[:q]) if params[:q].present?
+                result = result.where(post_category_id: params.dig(:filter, :category_ids).split(',')) if params.dig(:filter, :category_ids).present?
+                result = result.tagged_with(params.dig(:filter, :tags).split(','), any: true) if params.dig(:filter, :tags).present?
+                result
+              end
+            end
           end
 
           def resource
             @resource ||= find_with_fallback_default_locale { scope.friendly.find(params[:id]) } || scope.friendly.find(params[:id])
           end
 
-          def collection_finder
-            Spree.api.storefront_posts_finder
-          end
-
-          def collection_sorter
-            Spree.api.storefront_posts_sorter
-          end
-
           def collection_serializer
             Spree::V2::Storefront::PostSerializer
           end
@@ -38,7 +46,7 @@ module Spree
           end
 
           def scope
-            super.published.includes(:post_category, image_attachment: :blob)
+            model_class.for_store(current_store).published.includes(:post_category, image_attachment: :blob)
           end
 
           def allowed_sort_attributes

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

@@ -30,14 +30,13 @@ module Spree
           end
 
           def scope_includes
-            node_includes = %i[icon parent taxonomy translations]
+            node_includes = %i[parent taxonomy]
 
             {
               parent: node_includes,
               children: node_includes,
               taxonomy: [root: node_includes],
-              icon: [attachment_attachment: :blob],
-              translations: []
+              image_attachment: :blob
             }
           end
 

data/app/helpers/spree/api/v2/store_media_serializer_images_concern.rb

@@ -19,10 +19,6 @@ module Spree
           attribute :mailer_logo do |store|
             store_image_url_for store, :mailer_logo
           end
-
-          attribute :favicon_path do |store|
-            store_image_url_for store, :favicon_image
-          end
         end
       end
     end

data/app/serializers/spree/api/v2/platform/taxon_serializer.rb

@@ -34,12 +34,6 @@ module Spree
           has_many   :products, record_type: :product,
                                 serializer: Spree.api.platform_product_serializer,
                                 if: proc { |_taxon, params| params && params[:include_products] == true }
-
-          has_one    :image,
-                     object_method_name: :icon,
-                     id_method_name: :icon_id,
-                     record_type: :taxon_image,
-                     serializer: Spree.api.platform_taxon_image_serializer
         end
       end
     end

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

@@ -43,12 +43,6 @@ module Spree
         has_many   :children, record_type: :taxon, serializer: Spree.api.storefront_taxon_serializer
         has_many   :products, record_type: :product, serializer: Spree.api.storefront_product_serializer,
                               if: proc { |_taxon, params| params && params[:include_products] == true }
-
-        has_one    :image,
-                   object_method_name: :icon,
-                   id_method_name: :icon_id,
-                   record_type: :taxon_image,
-                   serializer: Spree.api.storefront_taxon_image_serializer
       end
     end
   end

data/lib/spree_legacy_api_v2/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SpreeLegacyApiV2
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   def gem_version
     Gem::Version.new(VERSION)

data/lib/spree_legacy_api_v2.rb

@@ -3,5 +3,7 @@
 require 'spree'
 require 'doorkeeper'
 require 'jsonapi/serializer'
+require 'spree_posts'
+require 'spree_legacy_product_properties'
 
 require 'spree_legacy_api_v2/engine'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_legacy_api_v2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ryan Bigg
@@ -87,14 +87,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0.alpha
+        version: 5.4.0.beta8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0.alpha
+        version: 5.4.0.beta8
+- !ruby/object:Gem::Dependency
+  name: spree_posts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: spree_legacy_product_properties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Legacy API v2 endpoints for Spree Commerce.
 email:
 - hello@spreecommerce.org
@@ -186,7 +214,6 @@ files:
 - app/serializers/concerns/spree/api/v2/image_transformation_concern.rb
 - app/serializers/concerns/spree/api/v2/public_metafields_concern.rb
 - app/serializers/concerns/spree/api/v2/resource_serializer_concern.rb
-- app/serializers/concerns/spree/api/v2/taxon_image_transformation_concern.rb
 - app/serializers/spree/api/v2/base_serializer.rb
 - app/serializers/spree/api/v2/platform/address_serializer.rb
 - app/serializers/spree/api/v2/platform/adjustment_serializer.rb
@@ -251,7 +278,6 @@ files:
 - app/serializers/spree/api/v2/platform/store_serializer.rb
 - app/serializers/spree/api/v2/platform/tax_category_serializer.rb
 - app/serializers/spree/api/v2/platform/tax_rate_serializer.rb
-- app/serializers/spree/api/v2/platform/taxon_image_serializer.rb
 - app/serializers/spree/api/v2/platform/taxon_serializer.rb
 - app/serializers/spree/api/v2/platform/taxonomy_serializer.rb
 - app/serializers/spree/api/v2/platform/user_serializer.rb
@@ -294,7 +320,6 @@ files:
 - app/serializers/spree/v2/storefront/store_credit_serializer.rb
 - app/serializers/spree/v2/storefront/store_credit_type_serializer.rb
 - app/serializers/spree/v2/storefront/store_serializer.rb
-- app/serializers/spree/v2/storefront/taxon_image_serializer.rb
 - app/serializers/spree/v2/storefront/taxon_serializer.rb
 - app/serializers/spree/v2/storefront/taxonomy_serializer.rb
 - app/serializers/spree/v2/storefront/user_serializer.rb
@@ -336,9 +361,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_legacy_api_v2/issues
-  changelog_uri: https://github.com/spree/spree_legacy_api_v2/releases/tag/v1.0.0
+  changelog_uri: https://github.com/spree/spree_legacy_api_v2/releases/tag/v1.0.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_legacy_api_v2/tree/v1.0.0
+  source_code_uri: https://github.com/spree/spree_legacy_api_v2/tree/v1.0.1
 rdoc_options: []
 require_paths:
 - lib

data/app/serializers/concerns/spree/api/v2/taxon_image_transformation_concern.rb

@@ -1,15 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module TaxonImageTransformationConcern
-        extend ActiveSupport::Concern
-
-        def self.included(base)
-          base.attribute :transformed_url do |image, params|
-            image.generate_url(size: params.dig(:taxon_image_transformation, :size))
-          end
-        end
-      end
-    end
-  end
-end

data/app/serializers/spree/api/v2/platform/taxon_image_serializer.rb

@@ -1,15 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Platform
-        class TaxonImageSerializer < BaseSerializer
-          include ::Spree::Api::V2::TaxonImageTransformationConcern
-
-          set_type :taxon_image
-
-          attributes :alt, :created_at, :updated_at, :original_url
-        end
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module Spree
-  module V2
-    module Storefront
-      class TaxonImageSerializer < BaseSerializer
-        include ::Spree::Api::V2::TaxonImageTransformationConcern
-
-        set_type   :taxon_image
-
-        attributes :styles, :alt, :original_url
-      end
-    end
-  end
-end