spree_core 5.4.0.beta → 5.4.0.beta3

data/lib/spree/permitted_attributes.rb

@@ -39,15 +39,11 @@ module Spree
       :payment_session_attributes,
       :payment_setup_session_attributes,
       :policy_attributes,
-      :post_attributes,
-      :post_category_attributes,
       :price_list_attributes,
       :product_attributes,
       :promotion_attributes,
       :promotion_rule_attributes,
       :promotion_action_attributes,
-      :product_properties_attributes,
-      :property_attributes,
       :refund_attributes,
       :refund_reason_attributes,
       :reimbursement_attributes,
@@ -97,7 +93,7 @@ module Spree
 
     @@checkout_attributes = [
       :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,
-      :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account, :currency,
+      :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account, :currency, :locale,
       :internal_note
     ]
 
@@ -140,7 +136,7 @@ module Spree
 
     @@invitation_attributes = [:email, :expires_at, :role_id]
 
-    @@line_item_attributes = [:id, :variant_id, :quantity]
+    @@line_item_attributes = [:id, :variant_id, :quantity, { metadata: {} }]
 
     @@market_attributes = [:name, :currency, :default_locale, :supported_locales,
                            :tax_inclusive, :default, :position, country_ids: []]
@@ -177,14 +173,8 @@ module Spree
 
     @@policy_attributes = [:name, :slug, :body]
 
-    @@post_attributes = [:title, :meta_title, :meta_description, :slug, :author_id, :post_category_id, :published_at, :content, :excerpt, :image, tag_list: []]
-
-    @@post_category_attributes = [:title, :slug, :description]
-
     @@price_list_attributes = [:name, :description, :match_policy, :starts_at, :ends_at, :status, :position]
 
-    @@product_properties_attributes = [:property_name, :property_id, :value, :position, :_destroy]
-
     @@product_attributes = [
       :name, :description, :available_on, :make_active_at, :discontinue_on, :permalink, :meta_description,
       :meta_keywords, :meta_title, :price, :sku, :deleted_at, :prototype_id,
@@ -210,8 +200,6 @@ module Spree
 
     @@promotion_action_attributes = [:type, :calculator_type, calculator_attributes: {}, promotion_action_line_items_attributes: [:id, :promotion_action_id, :variant_id, :quantity, :_destroy]]
 
-    @@property_attributes = [:name, :presentation, :position, :kind, :display_on]
-
     @@refund_attributes = [:amount, :refund_reason_id]
 
     @@refund_reason_attributes = [:name, :active, :mutable]

data/lib/spree/testing_support/factories/order_factory.rb

@@ -5,6 +5,7 @@ FactoryBot.define do
     completed_at { nil }
     email        { user&.email }
     currency     { 'USD' }
+    locale       { 'en' }
 
     transient do
       line_items_price { BigDecimal(10) }

data/lib/spree/testing_support/factories/payment_method_factory.rb

@@ -23,12 +23,7 @@ FactoryBot.define do
     name { 'Credit Card' }
   end
 
-  # authorize.net was moved to spree_gateway.
-  # Leaving this factory in place with bogus in case anyone is using it.
-  factory :simple_credit_card_payment_method, parent: :payment_method, class: Spree::Gateway::BogusSimple do
-    type { 'Spree::Gateway::BogusSimple' }
-    name { 'Credit Card' }
-  end
+  factory :simple_credit_card_payment_method, parent: :credit_card_payment_method
 
   factory :store_credit_payment_method, parent: :payment_method, class: Spree::PaymentMethod::StoreCredit do
     type          { 'Spree::PaymentMethod::StoreCredit' }

data/lib/spree/testing_support/factories/product_factory.rb

@@ -50,13 +50,6 @@ FactoryBot.define do
       factory :product_with_option_types do
         after(:create) { |product| create(:product_option_type, product: product) }
       end
-      factory :product_with_properties do
-        after(:create) do |product|
-          property = create(:property, :brand)
-          create(:product_property, product: product, property: property, value: 'Epsilon')
-        end
-      end
-
       factory :digital_product do
         track_inventory { false }
         shipping_category { |r| Spree::ShippingCategory.digital || r.association(:digital_shipping_category) }

data/lib/spree/testing_support/factories/prototype_factory.rb

@@ -1,11 +1,9 @@
 FactoryBot.define do
   factory :prototype, class: Spree::Prototype do
     name       { 'Baseball Cap' }
-    properties { [build(:property)] }
   end
   factory :prototype_with_option_types, class: Spree::Prototype do
     name         { 'Baseball Cap' }
-    properties   { [build(:property)] }
     option_types { [build(:option_type)] }
   end
 end

data/lib/tasks/cli.rake

@@ -0,0 +1,50 @@
+namespace :spree do
+  namespace :cli do
+    desc 'Ensure a default publishable API key exists and print its token'
+    task ensure_api_key: :environment do
+      store = Spree::Store.default
+      key = store.api_keys.active.publishable.first ||
+            store.api_keys.create!(name: 'Default', key_type: 'publishable')
+      print key.plaintext_token
+    end
+
+    desc 'Create an API key'
+    task create_api_key: :environment do
+      name = ENV.fetch('NAME')
+      key_type = ENV.fetch('KEY_TYPE')
+      store = Spree::Store.default
+      key = store.api_keys.create!(name: name, key_type: key_type)
+      print key.plaintext_token
+    end
+
+    desc 'List API keys (pipe-delimited)'
+    task list_api_keys: :environment do
+      Spree::Store.default.api_keys.order(created_at: :desc).each do |k|
+        status = k.revoked_at ? 'revoked' : 'active'
+        token = k.secret? ? k.token_prefix : k.token
+        puts [k.prefixed_id, k.name, k.key_type, token, k.created_at.strftime('%Y-%m-%d %H:%M'), status].join('|')
+      end
+    end
+
+    desc 'Revoke an API key by prefixed ID'
+    task revoke_api_key: :environment do
+      id = ENV.fetch('ID')
+      key = Spree::Store.default.api_keys.find_by_prefix_id!(id)
+      key.revoke!
+      print key.name
+    end
+
+    desc 'Create an admin user'
+    task create_admin: :environment do
+      email = ENV.fetch('EMAIL')
+      password = ENV.fetch('PASSWORD')
+      admin = Spree.admin_user_class.create!(
+        email: email,
+        password: password,
+        password_confirmation: password
+      )
+      admin.add_role('admin', Spree::Store.default)
+      print admin.email
+    end
+  end
+end

data/lib/tasks/core.rake

@@ -1,190 +1,6 @@
 require 'active_record'
 
 namespace :db do
-  desc %q{Loads a specified fixture file:
-use rake db:load_file[/absolute/path/to/sample/filename.rb]}
-
-  task :load_file, [:file, :dir] => :environment do |_t, args|
-    file = Pathname.new(args.file)
-
-    puts "loading ruby #{file}"
-    load file
-  end
-
-  desc 'Loads fixtures from the the dir you specify using rake db:load_dir[loadfrom]'
-  task :load_dir, [:dir] => :environment do |_t, args|
-    dir = args.dir
-    dir = File.join(Rails.root, 'db', dir) if Pathname.new(dir).relative?
-
-    ruby_files = {}
-    Dir.glob(File.join(dir, '**/*.{rb}')).each do |fixture_file|
-      ext = File.extname fixture_file
-      ruby_files[File.basename(fixture_file, '.*')] = fixture_file
-    end
-    ruby_files.sort.each do |fixture, ruby_file|
-      # If file exists within application it takes precedence.
-      if File.exist?(File.join(Rails.root, 'db/default/spree', "#{fixture}.rb"))
-        ruby_file = File.expand_path(File.join(Rails.root, 'db/default/spree', "#{fixture}.rb"))
-      end
-      # an invoke will only execute the task once
-      Rake::Task['db:load_file'].execute(Rake::TaskArguments.new([:file], [ruby_file]))
-    end
-  end
-
-  desc 'Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!'
-  task remigrate: :environment do
-    require 'highline/import'
-
-    if ENV['SKIP_NAG'] || ENV['OVERWRITE'].to_s.casecmp('true').zero? || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
-
-      # Drop all tables
-      ActiveRecord::Base.connection.tables.each { |t| ActiveRecord::Base.connection.drop_table t }
-
-      # Migrate upward
-      Rake::Task['db:migrate'].invoke
-
-      # Dump the schema
-      Rake::Task['db:schema:dump'].invoke
-    else
-      say 'Task cancelled.'
-      exit
-    end
-  end
-
-  desc 'Bootstrap is: migrating, loading defaults, sample data and seeding (for all extensions) and load_products tasks'
-  task :bootstrap do
-    require 'highline/import'
-
-    # remigrate unless production mode (as safety check)
-    if %w[demo development test].include? Rails.env
-      if ENV['AUTO_ACCEPT'] || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
-        ENV['SKIP_NAG'] = 'yes'
-        Rake::Task['db:create'].invoke
-        Rake::Task['db:remigrate'].invoke
-      else
-        say 'Task cancelled, exiting.'
-        exit
-      end
-    else
-      say 'NOTE: Bootstrap in production mode will not drop database before migration'
-      Rake::Task['db:migrate'].invoke
-    end
-
-    ActiveRecord::Base.send(:subclasses).each(&:reset_column_information)
-
-    load_defaults = Spree::Country.count == 0
-    load_defaults ||= agree('Countries present, load sample data anyways? [y/n]: ')
-    Rake::Task['db:seed'].invoke if load_defaults
-
-    if Rails.env.production? && Spree::Product.count > 0
-      load_sample = agree('WARNING: In Production and products exist in database, load sample data anyways? [y/n]:')
-    else
-      load_sample = true if ENV['AUTO_ACCEPT']
-      load_sample ||= agree('Load Sample Data? [y/n]: ')
-    end
-
-    if load_sample
-      # Reload models' attributes in case they were loaded in old migrations with wrong attributes
-      ActiveRecord::Base.descendants.each(&:reset_column_information)
-      Rake::Task['spree_sample:load'].invoke
-    end
-
-    puts "Bootstrap Complete.\n\n"
-  end
-
-  desc 'Fix orphan line items after upgrading to Spree 3.1: only needed if you have line items attached to deleted records with Slug (product) and SKU (variant) duplicates of non-deleted records.'
-  task fix_orphan_line_items: :environment do |_t, _args|
-    def get_input
-      STDOUT.flush
-      input = STDIN.gets.chomp
-      case input.upcase
-      when 'Y'
-        return true
-
-      when 'N'
-        puts 'aborting .....'
-        return false
-      else
-        return true
-      end
-    end
-
-    puts 'WARNING: This task will re-associate any line_items associated with deleted variants to non-deleted variants with matching SKUs. Because other attributes and product associations may switch during the re-association, this may have unintended side-effects. If this task finishes successfully, line items for old order should no longer be orphaned from their variants. You should run this task after you have already run the db migratoin AddDiscontinuedToProductsAndVariants. If the db migration did not warn you that it was leaving deleted records in place because of duplicate SKUs, then you do not need to run this rake task.'
-    puts 'Are you sure you want to continue? (Y/n):'
-
-    if get_input
-      puts 'looping through all your deleted variants ...'
-
-      # first verify that I can really fix all of your line items
-
-      no_live_variants_found = []
-      variants_to_fix = []
-
-      Spree::Variant.deleted.each do |variant|
-        # check if this variant has any line items at all
-        next if variant.line_items.none?
-
-        variants_to_fix << variant
-        dup_variant = Spree::Variant.find_by(sku: variant.sku)
-        if dup_variant
-          # this variant is OK
-        else
-          no_live_variants_found << variant
-        end
-      end
-
-      if variants_to_fix.none?
-        abort('ABORT: You have no deleted variants that are associated to line items. You do not need to run this raks task.')
-      end
-
-      if no_live_variants_found.any?
-        puts "ABORT: Unfortunately, I found some deleted variants in your database that do not have matching non-deleted variants to replace them with. This script can only be used to cleanup deleted variants that have SKUs that match non-deleted variants. To continue, you must either (1) un-delete these variants (hint: mark them 'discontinued' instead) or (2) create new variants with a matching SKU for each variant in the list below."
-        no_live_variants_found.each do |deleted_variant|
-          puts "variant id #{deleted_variant.id} (sku is '#{deleted_variant.sku}') ... no match found"
-        end
-        abort
-      end
-
-      puts 'Ready to fix...'
-      variants_to_fix.each do |variant|
-        dup_variant = Spree::Variant.find_by(sku: variant.sku)
-        puts "Changing all line items for #{variant.sku} variant id #{variant.id} (deleted) to variant id #{dup_variant.id} (not deleted) ..."
-        Spree::LineItem.unscoped.where(variant_id: variant.id).update_all(variant_id: dup_variant.id)
-      end
-
-      puts 'DONE !   Your database should no longer have line items that are associated with deleted variants.'
-    end
-  end
-
-  desc 'Migrates taxon icons to spree assets after upgrading to Spree 3.4: only needed if you used taxons icons.'
-  task migrate_taxon_icons: :environment do |_t, _args|
-    Spree::Taxon.where.not(icon_file_name: nil).find_each do |taxon|
-      taxon.create_icon(attachment_file_name: taxon.icon_file_name,
-                        attachment_content_type: taxon.icon_content_type,
-                        attachment_file_size: taxon.icon_file_size,
-                        attachment_updated_at: taxon.icon_updated_at)
-    end
-  end
-
-  desc 'Migrates taxon icons to taxon images after upgrading to Spree 3.7: only needed if you used taxons icons.'
-  task migrate_taxon_icons_to_images: :environment do |_t, _args|
-    Spree::Asset.where(type: 'Spree::TaxonIcon').update_all(type: 'Spree::TaxonImage')
-  end
-
-  desc 'Ensure all Order associated with Store after upgrading to Spree 3.7'
-  task associate_orders_with_store: :environment do |_t, _args|
-    Spree::Order.where(store_id: nil).update_all(store_id: Spree::Store.default.id)
-  end
-
-  desc 'Ensure all Order has currency present after upgrading to Spree 3.7'
-  task ensure_order_currency_presence: :environment do |_t, _args|
-    Spree::Order.where(currency: nil).find_in_batches do |orders|
-      orders.each do |order|
-        order.update!(currency: order.store.default_currency)
-      end
-    end
-  end
-
   task migrate_admin_users_to_role_users: :environment do |_t, _args|
     default_store = Spree::Store.default
     Spree::RoleUser.where(resource: nil).each do |role_user|
@@ -218,89 +34,8 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
         puts "Migrated #{policy_slug} to store #{store.id}"
       end
     end
-
-    Spree::PageLink.where(linkable_type: 'ActionText::RichText').each do |page_link|
-      # Check if this page link is attached to ActionText content
-      # Find the ActionText record
-      action_text = ActionText::RichText.find_by(id: page_link.linkable_id)
-      next unless action_text
-
-      # Check if the ActionText belongs to a store policy
-      if action_text.record_type == 'Spree::Store' && action_text.name.to_s.include?('policy')
-        # Find the corresponding policy in the new policies system
-        store = action_text.record
-        policy_name = derive_policy_name.call(action_text.name)
-
-        policy = store.policies.find_by(name: Spree.t(policy_name))
-
-        if policy
-          # Update the page link to point to the policy instead
-          page_link.update!(
-            linked_resource_type: 'Spree::Policy',
-            linked_resource_id: policy.id
-          )
-
-          puts "Migrated #{policy_name} to store #{store.id}"
-        end
-      end
-    end
   end
 
-  desc 'Migrate product properties to metafields'
-  task migrate_product_properties_to_metafields: :environment do |_t, _args|
-    Spree::Property.find_each do |property|
-      metafield_definition = Spree::MetafieldDefinition.find_or_initialize_by(
-        namespace: 'properties',
-        key: property.name,
-        resource_type: 'Spree::Product'
-      )
-      metafield_definition.assign_attributes(
-        metafield_type: property.kind_to_metafield_type,
-        display_on: property.display_on
-      )
-      metafield_definition.save!
-
-      property.product_properties.includes(:product).find_each do |product_property|
-        product_property.product.set_metafield("properties.#{property.name}", product_property.value)
-        puts "Migrated #{property.name} to product #{product_property.product.id}"
-      end
-    end
-  end
-
-  desc 'Migrate product details sections to PDP 2.0 with blocks and metafields'
-  task migrate_product_details_pages: :environment do |_t, _args|
-    Spree::PageSections::ProductDetails.find_each do |section|
-      next if section.blocks.any?
-
-      if defined?(SpreeMultiTenant)
-        SpreeMultiTenant.with_tenant(section.tenant) do
-          section.send(:create_blocks)
-        end
-      else
-        section.send(:create_blocks)
-      end
-    end
-
-    Spree::Pages::ProductDetails.find_each do |page|
-      next if page.sections.exists?(type: 'Spree::PageSections::Breadcrumbs')
-
-      block = proc do
-        breadcrumbs = page.sections.create!(type: 'Spree::PageSections::Breadcrumbs')
-        breadcrumbs.move_to_top
-
-        page_details = page.sections.find_by(type: 'Spree::PageSections::ProductDetails')
-        if page_details.present?
-          page_details.update!(preferred_top_padding: 0, preferred_top_border_width: 0)
-        end
-      end
-
-      if defined?(SpreeMultiTenant)
-        SpreeMultiTenant.with_tenant(page.tenant, &block)
-      else
-        block.call
-      end
-    end
-  end
 end
 
 namespace :core do