spree_core 5.4.0.beta → 5.4.0.beta2

data/app/finders/spree/posts/find.rb

@@ -1,137 +0,0 @@
-module Spree
-  module Posts
-    class Find < Spree::BaseFinder
-      def initialize(scope:, params:)
-        super(scope: scope, params: params)
-        @scope = scope
-        @query = params[:q].presence&.strip
-        @ids = String(params.dig(:filter, :ids)).split(',')
-        @slugs = String(params.dig(:filter, :slugs)).split(',')
-        @category_ids = String(params.dig(:filter, :category_ids)).split(',')
-        @author_ids = String(params.dig(:filter, :author_ids)).split(',')
-        @tags = params.dig(:filter, :tags).to_s.split(',').compact_blank
-        @sort_by = params[:sort_by]
-        @published = params.dig(:filter, :published)
-      end
-
-      def execute
-        posts = by_ids(scope)
-        posts = by_slugs(posts)
-        posts = by_query(posts)
-        posts = by_category_ids(posts)
-        posts = by_author_ids(posts)
-        posts = by_tags(posts)
-        posts = by_published(posts)
-        posts = ordered(posts)
-
-        posts.distinct
-      end
-
-      private
-
-      attr_reader :scope, :query, :ids, :slugs, :category_ids, :author_ids, :tags, :sort_by, :published
-
-      def query?
-        query.present?
-      end
-
-      def ids?
-        ids.present?
-      end
-
-      def slugs?
-        slugs.present?
-      end
-
-      def category_ids?
-        category_ids.present?
-      end
-
-      def author_ids?
-        author_ids.present?
-      end
-
-      def tags?
-        tags.present?
-      end
-
-      def published?
-        published.present?
-      end
-
-      def sort_by?
-        sort_by.present?
-      end
-
-      def by_query(posts)
-        return posts unless query?
-
-        posts.search_by_title(query)
-      end
-
-      def by_ids(posts)
-        return posts unless ids?
-
-        posts.where(id: ids)
-      end
-
-      def by_slugs(posts)
-        return posts unless slugs?
-
-        posts.where(slug: slugs)
-      end
-
-      def by_category_ids(posts)
-        return posts unless category_ids?
-
-        posts.where(post_category_id: category_ids)
-      end
-
-      def by_author_ids(posts)
-        return posts unless author_ids?
-
-        posts.where(author_id: author_ids)
-      end
-
-      def by_tags(posts)
-        return posts if tags.empty?
-
-        posts.tagged_with(tags, any: true)
-      end
-
-      def by_published(posts)
-        return posts unless published?
-
-        case published.to_s
-        when 'true'
-          posts.published
-        when 'false'
-          posts.where(published_at: nil)
-        else
-          posts
-        end
-      end
-
-      def ordered(posts)
-        return posts unless sort_by?
-
-        case sort_by
-        when 'newest-first'
-          posts.by_newest
-        when 'oldest-first'
-          posts.order(created_at: :asc)
-        when 'published-newest'
-          posts.order(published_at: :desc)
-        when 'published-oldest'
-          posts.order(published_at: :asc)
-        when 'title-a-z'
-          posts.order(title: :asc)
-        when 'title-z-a'
-          posts.order(title: :desc)
-        else
-          posts
-        end
-      end
-    end
-  end
-end

data/app/finders/spree/product_properties/find_available.rb

@@ -1,20 +0,0 @@
-module Spree
-  module ProductProperties
-    class FindAvailable
-      include ProductFilterable
-
-      def initialize(scope: ProductProperty.spree_base_scopes, products_scope: Product.spree_base_scopes)
-        @scope = scope
-        @products_scope = products_scope
-      end
-
-      def execute
-        find_available(scope, products_scope).includes(:translations)
-      end
-
-      private
-
-      attr_reader :scope, :products_scope
-    end
-  end
-end

data/app/helpers/spree/mail_helper.rb

@@ -1,27 +0,0 @@
-module Spree
-  module MailHelper
-    include Spree::BaseHelper
-    include Spree::ImagesHelper
-
-    def variant_image_url(variant)
-      image = variant.default_image
-      image.present? && image.attached? ? spree_image_url(image, variant: :mini) : image_url('noimage/small.png')
-    end
-
-    def name_for(order)
-      order.name || Spree.t('customer')
-    end
-
-    def store_logo
-      @store_logo ||= current_store&.mailer_logo || current_store&.logo
-    end
-
-    def logo_path
-      Spree::Deprecation.warn('logo_path is deprecated and will be removed in Spree 5.5. Please use Active Storage URL helpers instead.')
-
-      return main_app.cdn_image_url(store_logo.variant(resize_to_limit: [244, 104])) if store_logo&.variable?
-
-      return main_app.cdn_image_url(store_logo) if store_logo&.image?
-    end
-  end
-end

data/app/jobs/spree/api_key_touch_job.rb

@@ -1,9 +0,0 @@
-module Spree
-  class ApiKeyTouchJob < Spree::BaseJob
-    queue_as Spree.queues.api_keys
-
-    def perform(api_key_id)
-      Spree::ApiKey.find_by(id: api_key_id)&.touch(:last_used_at)
-    end
-  end
-end

data/app/mailers/spree/test_mailer.rb

@@ -1,8 +0,0 @@
-module Spree
-  class TestMailer < BaseMailer
-    def test_email(email)
-      subject = "#{Spree::Store.default.name} #{Spree.t('test_mailer.test_email.subject')}"
-      mail(to: email, from: from_address, reply_to: reply_to_address, subject: subject)
-    end
-  end
-end

data/app/models/action_text/video_embed.rb

@@ -1,13 +0,0 @@
-module ActionText
-  class VideoEmbed < ApplicationRecord
-    include ActionText::Attachable
-
-    validates :url, :raw_html, :thumbnail_url, presence: true
-
-    # `to_partial_path` for the storefront render is by default "action_text/video_embeds/video_embed"
-
-    def to_trix_content_attachment_partial_path
-      'action_text/video_embeds/thumbnail'
-    end
-  end
-end

data/app/models/concerns/spree/has_one_link.rb

@@ -1,42 +0,0 @@
-module Spree
-  module HasOneLink
-    extend ActiveSupport::Concern
-
-    included do
-      has_one :link, ->(ps) { ps.links }, class_name: 'Spree::PageLink', as: :parent, dependent: :destroy, inverse_of: :parent
-      accepts_nested_attributes_for :link
-
-      def allowed_linkable_types
-        [
-          [Spree.t(:page), 'Spree::Page'],
-          [Spree.t(:product), 'Spree::Product'],
-          [Spree.t(:post), 'Spree::Post'],
-          [Spree.t(:taxon), 'Spree::Taxon'],
-          [Spree.t(:policy), 'Spree::Policy'],
-          [Spree.t(:url), nil]
-        ]
-      end
-
-      def default_linkable_type
-        'Spree::Page'
-      end
-
-      def default_linkable_resource
-        @default_linkable_resource ||= theme_or_parent.pages.find_by(type: 'Spree::Pages::Homepage')
-      end
-
-      def default_links
-        @default_links.presence || [
-          Spree::PageLink.new(
-            label: Spree.t(:shop_all),
-            linkable: theme_or_parent.pages.find_by(type: 'Spree::Pages::ShopAll')
-          )
-        ]
-      end
-
-      def theme_or_parent
-        theme.preview? ? theme.parent : theme
-      end
-    end
-  end
-end

data/app/models/concerns/spree/linkable.rb

@@ -1,9 +0,0 @@
-module Spree
-  module Linkable
-    extend ActiveSupport::Concern
-
-    included do
-      has_many :page_links, as: :linkable, class_name: 'Spree::PageLink', dependent: :destroy
-    end
-  end
-end

data/app/models/concerns/spree/previewable.rb

@@ -1,17 +0,0 @@
-module Spree
-  module Previewable
-    extend ActiveSupport::Concern
-
-    included do |base|
-      belongs_to :parent, class_name: base.name, optional: true, foreign_key: :parent_id
-      has_many :previews, class_name: base.name, dependent: :destroy_async, foreign_key: :parent_id
-
-      scope :without_previews, -> { where(parent_id: nil) }
-      scope :only_previews, -> { where.not(parent_id: nil) }
-    end
-
-    def preview?
-      parent.present?
-    end
-  end
-end

data/app/models/spree/data_feed/google.rb

@@ -1,15 +0,0 @@
-require_dependency 'spree/data_feed'
-
-module Spree
-  class DataFeed::Google < DataFeed
-    class << self
-      def label
-        'Google Merchant Center Feed'
-      end
-
-      def provider_name
-        'google'
-      end
-    end
-  end
-end

data/app/models/spree/data_feed.rb

@@ -1,42 +0,0 @@
-module Spree
-  class DataFeed < Spree.base_class
-    has_prefix_id :df
-
-    belongs_to :store, class_name: 'Spree::Store', foreign_key: 'store_id'
-
-    scope :for_store, ->(store) { where(store: store) }
-
-    before_validation :generate_slug
-
-    with_options presence: true do
-      validates :store
-      validates :name, uniqueness: true
-      validates :slug, uniqueness: { scope: :store_id }
-    end
-
-    def formatted_url
-      "#{store.formatted_url}/api/v2/data_feeds/#{self.class.provider_name}/#{slug}.rss"
-    end
-
-    private
-
-    def generate_slug
-      new_slug = slug.blank? ? SecureRandom.uuid : slug.parameterize
-      write_attribute(:slug, new_slug)
-    end
-
-    class << self
-      def label
-        raise NotImplementedError
-      end
-
-      def provider_name
-        raise NotImplementedError
-      end
-
-      def available_types
-        Spree.data_feed_types
-      end
-    end
-  end
-end

data/app/models/spree/gateway/bogus_simple.rb

@@ -1,24 +0,0 @@
-# Bogus Gateway that doesn't support payment profiles
-module Spree
-  class Gateway::BogusSimple < Gateway::Bogus
-    def payment_profiles_supported?
-      false
-    end
-
-    def authorize(_money, credit_card, _options = {})
-      if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
-      else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', { message: 'Bogus Gateway: Forced failure' }, test: true)
-      end
-    end
-
-    def purchase(_money, credit_card, _options = {})
-      if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345', avs_result: { code: 'A' })
-      else
-        ActiveMerchant::Billing::Response.new(false, 'Bogus Gateway: Forced failure', message: 'Bogus Gateway: Forced failure', test: true)
-      end
-    end
-  end
-end

data/app/models/spree/post.rb

@@ -1,108 +0,0 @@
-module Spree
-  class Post < Spree.base_class
-    has_prefix_id :post
-
-    include Spree::SingleStoreResource
-    include Spree::Metafields
-    extend FriendlyId
-
-    publishes_lifecycle_events
-
-    friendly_id :slug_candidates, use: %i[slugged scoped history], scope: %i[store_id deleted?]
-    acts_as_paranoid
-    acts_as_taggable_on :tags
-    acts_as_taggable_tenant :store_id
-
-    if defined?(PgSearch)
-      include PgSearch::Model
-      pg_search_scope :search_by_title, against: :title
-    else
-      scope :search_by_title, ->(query) { where('title LIKE ?', "%#{query}%") }
-    end
-
-    #
-    # Ransack filtering
-    #
-    self.whitelisted_ransackable_attributes = %w[author_id post_category_id published_at]
-    self.whitelisted_ransackable_associations = %w[author post_category]
-    self.whitelisted_ransackable_scopes = %w[search_by_title]
-
-    #
-    # Attachments
-    #
-    has_one_attached :image, service: Spree.public_storage_service_name
-
-    #
-    # Rich Text
-    #
-    has_rich_text :content
-    has_rich_text :excerpt
-
-    #
-    # Associations
-    #
-    belongs_to :author, class_name: Spree.admin_user_class.to_s, optional: true
-    belongs_to :store, class_name: 'Spree::Store', inverse_of: :posts
-    belongs_to :post_category, class_name: 'Spree::PostCategory', optional: true, touch: true, inverse_of: :posts
-    alias category post_category
-
-    #
-    # Validations
-    #
-    validates :title, :store, presence: true
-    validates :slug, presence: true, uniqueness: { scope: :store_id, conditions: -> { where(deleted_at: nil) } }
-    validates :meta_title, length: { maximum: 160 }, allow_blank: true
-    validates :meta_description, length: { maximum: 320 }, allow_blank: true
-    validates :image, content_type: Rails.application.config.active_storage.web_image_content_types
-
-    #
-    # Scopes
-    #
-    scope :published, -> { where(published_at: [..Time.current]) }
-    scope :by_newest, -> { order(created_at: :desc) }
-
-    delegate :name, to: :author, prefix: true, allow_nil: true
-    delegate :title, to: :post_category, prefix: true, allow_nil: true
-
-    def should_generate_new_friendly_id?
-      slug.blank? || (persisted? && title_changed?)
-    end
-
-    def slug_candidates
-      [
-        :title,
-        [:title, :id]
-      ]
-    end
-
-    def published?
-      published_at.present?
-    end
-
-    def publish(date = nil)
-      update(published_at: date || Time.current)
-    end
-
-    def unpublish
-      update(published_at: nil)
-    end
-
-    def description
-      excerpt.to_plain_text.presence || content.to_plain_text
-    end
-
-    def shortened_description
-      desc = excerpt.to_plain_text.presence || content.to_plain_text
-      desc.length > 320 ? "#{desc[0...320]}..." : desc
-    end
-
-    def self.to_tom_select_json
-      pluck(:id, :title).map do |id, title|
-        {
-          id: id,
-          name: title
-        }
-      end.as_json
-    end
-  end
-end

data/app/models/spree/post_category.rb

@@ -1,46 +0,0 @@
-module Spree
-  class PostCategory < Spree.base_class
-    has_prefix_id :pcat
-
-    include Spree::SingleStoreResource
-    include Spree::Metafields
-    extend FriendlyId
-
-    publishes_lifecycle_events
-
-    friendly_id :slug_candidates, use: %i[slugged scoped history], scope: %i[store_id]
-
-    #
-    # Associations
-    #
-    belongs_to :store, class_name: 'Spree::Store', inverse_of: :post_categories
-    has_many :posts, class_name: 'Spree::Post', dependent: :nullify, inverse_of: :post_category
-
-    #
-    # Validations
-    #
-    validates :title, :store, presence: true
-    validates :slug, presence: true, uniqueness: { scope: :store_id }
-
-    #
-    # ActionText
-    #
-    has_rich_text :description
-
-    #
-    # Ransack
-    #
-    self.whitelisted_ransackable_attributes = %w[title slug]
-
-    def should_generate_new_friendly_id?
-      slug.blank? || title_changed?
-    end
-
-    def slug_candidates
-      [
-        :title,
-        [:title, :id]
-      ]
-    end
-  end
-end

data/app/models/spree/product_property.rb

@@ -1,51 +0,0 @@
-module Spree
-  class ProductProperty < Spree.base_class
-    include Spree::FilterParam
-    include Spree::TranslatableResource
-
-    if Spree.always_use_translations?
-      TRANSLATABLE_FIELDS = %i[value filter_param].freeze
-      translates(*TRANSLATABLE_FIELDS)
-    else
-      TRANSLATABLE_FIELDS = %i[value].freeze
-      translates(*TRANSLATABLE_FIELDS, column_fallback: true)
-    end
-
-    self::Translation.class_eval do
-      normalizes :value, with: ->(value) { value&.to_s&.squish&.presence }
-    end
-
-    normalizes :value, with: ->(value) { value&.to_s&.squish&.presence }
-
-    acts_as_list scope: :product
-
-    with_options inverse_of: :product_properties do
-      belongs_to :product, touch: true, class_name: 'Spree::Product'
-      belongs_to :property, touch: true, class_name: 'Spree::Property'
-    end
-
-    validates :property, presence: true
-    validates :property_id, uniqueness: { scope: :product_id }
-    validates :value, presence: true
-
-    default_scope { order(:position) }
-
-    scope :filterable, -> { joins(:property).where(Property.table_name => { filterable: true }) }
-    scope :for_products, ->(products) { where(product_id: products) }
-    scope :sort_by_property_position, -> {
-      unscope(:order).joins(:property).order(Spree::Property.table_name => { position: :asc })
-    }
-
-    self.whitelisted_ransackable_attributes = ['value', 'filter_param']
-    self.whitelisted_ransackable_associations = ['property']
-
-    # virtual attributes for use with AJAX completion stuff
-    delegate :name, :presentation, to: :property, prefix: true, allow_nil: true
-
-    protected
-
-    def param_candidate
-      value
-    end
-  end
-end

data/app/models/spree/property.rb

@@ -1,86 +0,0 @@
-module Spree
-  class Property < Spree.base_class
-    include Spree::FilterParam
-    include Spree::Metadata
-    include Spree::ParameterizableName
-    include Spree::UniqueName
-    include Spree::DisplayOn
-    include Spree::TranslatableResource
-
-    TRANSLATABLE_FIELDS = %i[presentation].freeze
-    translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
-
-    self::Translation.class_eval do
-      normalizes :presentation, with: ->(value) { value&.to_s&.squish&.presence }
-    end
-
-    acts_as_list
-
-    has_many :property_prototypes, class_name: 'Spree::PropertyPrototype'
-    has_many :prototypes, through: :property_prototypes, class_name: 'Spree::Prototype'
-
-    has_many :product_properties, dependent: :delete_all, inverse_of: :property
-    has_many :products, through: :product_properties
-
-    validates :name, :presentation, presence: true
-
-    default_scope { order(:position) }
-    scope :sorted, -> { order(:name) }
-    scope :filterable, -> { where(filterable: true) }
-
-    KIND_OPTIONS = { short_text: 0, long_text: 1, number: 2, rich_text: 3 }.freeze
-    enum :kind, KIND_OPTIONS
-
-    DEPENDENCY_UPDATE_FIELDS = [:presentation, :name, :kind, :filterable, :display_on, :position].freeze
-
-    after_touch :touch_all_products
-    after_update :touch_all_products, if: -> { DEPENDENCY_UPDATE_FIELDS.any? { |field| saved_changes.key?(field) } }
-    after_save :ensure_product_properties_have_filter_params
-
-    self.whitelisted_ransackable_attributes = ['presentation', 'filterable']
-
-    def uniq_values(product_properties_scope: nil)
-      with_uniq_values_cache_key(product_properties_scope) do
-        properties = product_properties
-        properties = properties.where(id: product_properties_scope) if product_properties_scope.present?
-        properties.where('value IS NOT NULL AND value != ?', '').pluck(:filter_param, :value).uniq
-      end
-    end
-
-    # Returns the metafield type for the property kind
-    # @return [String] eg. 'Spree::Metafields::ShortText'
-    def kind_to_metafield_type
-      case kind
-      when 'short_text'
-        'Spree::Metafields::ShortText'
-      when 'long_text'
-        'Spree::Metafields::LongText'
-      when 'number'
-        'Spree::Metafields::Number'
-      when 'rich_text'
-        'Spree::Metafields::RichText'
-      else
-        'Spree::Metafields::ShortText'
-      end
-    end
-
-    private
-
-    def touch_all_products
-      products.touch_all
-    end
-
-    def with_uniq_values_cache_key(product_properties_scope, &block)
-      return block.call if product_properties_scope.present?
-
-      uniq_values_cache_key = ['property-uniq-values', cache_key_with_version]
-      Rails.cache.fetch(uniq_values_cache_key) { block.call }
-    end
-
-    def ensure_product_properties_have_filter_params
-      return unless filterable?
-
-      product_properties.where(filter_param: [nil, '']).where('value IS NOT NULL AND value != ?', '').find_each(&:save)
-    end
-  end
-end

data/app/models/spree/property_prototype.rb

@@ -1,9 +0,0 @@
-module Spree
-  class PropertyPrototype < Spree.base_class
-    belongs_to :prototype, class_name: 'Spree::Prototype'
-    belongs_to :property, class_name: 'Spree::Property'
-
-    validates :prototype, :property, presence: true
-    validates :prototype_id, uniqueness: { scope: :property_id }
-  end
-end