solidus_sample 4.7.2 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c687ee43071b93a7602f68bc1a7f89436c935158906df60b4223776ddb4f1938
-  data.tar.gz: d99baa4d375a92e94f304915bc835e4c0ea615d224283008952501e76b8402c9
+  metadata.gz: c07e22c80ab8197674c8d3d63fe28f6d55e37a1a0330094ff5821d4ce43ab9c3
+  data.tar.gz: 52d0d3e269bcdf51df19e271c3d98e957919094a8bb7b00083aa17f8139673c1
 SHA512:
-  metadata.gz: aeeb7812e4bc5a5620bf80a1ce65defdd291a29e2653544ef5021acd8c54713e1399f11fcad9848d2fbdc62ffb87c63796349cca670c2d8e1ca4bc58d144e67d
-  data.tar.gz: ffe4e2739b5b57793ce649abc0488e3c2986b7fbc7ead5b280f936fce67c07cda3c3c516b4c92369e4ab50238090bba6863f0f785eb4c51eadcfa596163baaa6
+  metadata.gz: fd73c0950043860b0b7927c071966210b4ebb6350c16fd97d43c0190f04e21be7008c9009abf60ded81023b0305074a1849eb16f8ce42865a17d9b9a8cf0101e
+  data.tar.gz: 38dcde6a2c3c3d270058fc9605f824a5237d0795cc2170303e89d64470bc046b1c47629e4686cbd6159df7e3e2bc8bc5b5793844e774de0159f17afb8adc8fd1

data/LICENSE

@@ -1,6 +1,9 @@
 Copyright (c) 2007-2014, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
+Copyright (c) 2015-2026, Solidus 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:
 

data/db/samples/addresses.rb

@@ -5,8 +5,7 @@ new_york = Spree::State.find_by!(name: "New York")
 
 names = ["Sterling Torp", "Jennette Vandervort", "Salome Stroman", "Lyla Lang",
   "Lola Zulauf", "Cheree Bruen", "Hettie Torp", "Barbie Gutmann",
-  "Amelia Renner", "Marceline Bergstrom", "Keeley Sauer", "Mi Gaylord",
-  "Karon Mills", "Jessika Daugherty", "Emmy Stark"]
+  "Amelia Renner", "Marceline Bergstrom"]
 street_addresses = ["7377 Jacobi Passage", "4725 Serena Ridges",
   "79832 Hamill Creek", "0746 Genoveva Villages",
   "86717 D'Amore Hollow", "8529 Delena Well",
@@ -24,15 +23,15 @@ phone_numbers = ["(392)859-7319 x670", "738-831-3210 x6047",
   "(855)317-6523", "1-529-214-7315 x90865",
   "(662)877-7894 x703", "689.578.8564 x72399"]
 
-2.times do
-  Spree::Address.create!(
-    name: names.sample,
-    address1: street_addresses.sample,
-    address2: secondary_addresses.sample,
-    city: cities.sample,
+names.length.times do |i|
+  Spree::Address.find_or_create_by!(
+    name: names[i],
+    address1: street_addresses[i],
+    address2: secondary_addresses[i],
+    city: cities[i],
     state: new_york,
     zipcode: 16_804,
     country: united_states,
-    phone: phone_numbers.sample
+    phone: phone_numbers[i]
   )
 end

data/db/samples/assets.rb

@@ -97,9 +97,17 @@ images = {
   ]
 }
 
+def available_image_count(key, color)
+  index = 1
+  index += 1 while image("#{key}_#{color}_#{index}", "png")
+  index - 1
+end
+
 products.each do |key, product|
   product.reload.variants.each do |variant|
     color = variant.option_value("clothing-color").downcase
+    next if variant.images.count >= available_image_count(key, color)
+
     index = 1
 
     loop do
@@ -116,6 +124,8 @@ products.each do |key, product|
 end
 
 images.each do |variant, attachments|
+  next if variant.images.count >= attachments.length
+
   shell.say_status :sample, "images for #{variant.product.name}"
   attachments.each do |attachment|
     File.open(attachment[:attachment]) do |f|

data/db/samples/option_types.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Spree::OptionType.create!([
+[
   {
     name: "clothing-size",
     presentation: "Size",
@@ -11,4 +11,8 @@ Spree::OptionType.create!([
     presentation: "Color",
     position: 2
   }
-])
+].each do |attrs|
+  Spree::OptionType.find_or_create_by!(name: attrs[:name]) do |option_type|
+    option_type.assign_attributes(attrs)
+  end
+end

data/db/samples/option_values.rb

@@ -5,7 +5,7 @@ Spree::Sample.load_sample("option_types")
 size = Spree::OptionType.find_by!(presentation: "Size")
 color = Spree::OptionType.find_by!(presentation: "Color")
 
-Spree::OptionValue.create!([
+[
   {
     name: "Small",
     presentation: "S",
@@ -54,4 +54,8 @@ Spree::OptionValue.create!([
     position: 4,
     option_type: color
   }
-])
+].each do |attrs|
+  Spree::OptionValue.find_or_create_by!(name: attrs[:name], option_type: attrs[:option_type]) do |option_value|
+    option_value.assign_attributes(attrs)
+  end
+end

data/db/samples/orders.rb

@@ -8,42 +8,44 @@ store = Spree::Store.first!
 
 orders = []
 
-orders << Spree::Order.create!(
-  number: "R123456789",
-  email: "spree@example.com",
-  item_total: 150.95,
-  adjustment_total: 150.95,
-  total: 301.90,
-  ship_address: Spree::Address.first,
-  bill_address: Spree::Address.last
-)
-
-orders << Spree::Order.create!(
-  number: "R987654321",
-  email: "spree@example.com",
-  item_total: 15.95,
-  adjustment_total: 15.95,
-  total: 31.90,
-  ship_address: Spree::Address.first,
-  bill_address: Spree::Address.last
-)
-
-orders[0].line_items.create!(
-  variant: Spree::Product.find_by!(name: "Solidus Water Bottle").master,
-  quantity: 1,
-  price: 15.99
-)
-
-orders[1].line_items.create!(
-  variant: Spree::Product.find_by!(name: "Solidus cap").master,
-  quantity: 1,
-  price: 22.99
-)
+orders << Spree::Order.find_or_create_by!(number: "R123456789") do |order|
+  order.email = "spree@example.com"
+  order.item_total = 150.95
+  order.adjustment_total = 150.95
+  order.total = 301.90
+  order.ship_address = Spree::Address.first
+  order.bill_address = Spree::Address.last
+end
+
+orders << Spree::Order.find_or_create_by!(number: "R987654321") do |order|
+  order.email = "spree@example.com"
+  order.item_total = 15.95
+  order.adjustment_total = 15.95
+  order.total = 31.90
+  order.ship_address = Spree::Address.first
+  order.bill_address = Spree::Address.last
+end
+
+orders[0].line_items.find_or_create_by!(
+  variant: Spree::Product.find_by!(name: "Solidus Water Bottle").master
+) do |line_item|
+  line_item.quantity = 1
+  line_item.price = 15.99
+end
+
+orders[1].line_items.find_or_create_by!(
+  variant: Spree::Product.find_by!(name: "Solidus cap").master
+) do |line_item|
+  line_item.quantity = 1
+  line_item.price = 22.99
+end
 
 orders.each do |order|
-  order.payments.create!(payment_method:)
+  order.payments.find_or_create_by!(payment_method:)
   order.update(store:)
 
-  order.next! until order.can_complete?
-  order.complete!
+  unless order.completed?
+    order.next! until order.can_complete?
+    order.complete!
+  end
 end

data/db/samples/payment_methods.rb

@@ -1,17 +1,11 @@
 # frozen_string_literal: true
 
-Spree::PaymentMethod::BogusCreditCard.create!(
-  {
-    name: "Credit Card",
-    description: "Bogus payment gateway",
-    active: true
-  }
-)
+Spree::PaymentMethod::BogusCreditCard.find_or_create_by!(name: "Credit Card") do |payment_method|
+  payment_method.description = "Bogus payment gateway"
+  payment_method.active = true
+end
 
-Spree::PaymentMethod::Check.create!(
-  {
-    name: "Check",
-    description: "Pay by check.",
-    active: true
-  }
-)
+Spree::PaymentMethod::Check.find_or_create_by!(name: "Check") do |payment_method|
+  payment_method.description = "Pay by check."
+  payment_method.active = true
+end

data/db/samples/payments.rb

@@ -7,11 +7,17 @@ method = Spree::PaymentMethod.where(name: "Credit Card", active: true).first
 # reference it as such. Make it explicit here that this table has been renamed.
 Spree::CreditCard.table_name = "spree_credit_cards"
 
-creditcard = Spree::CreditCard.create(cc_type: "visa", month: 12, year: 2.years.from_now.year, last_digits: "1111",
-  name: "Sean Schofield", gateway_customer_profile_id: "BGS-1234")
+creditcard = Spree::CreditCard.find_or_create_by!(cc_type: "visa", last_digits: "1111", name: "Sean Schofield") do |cc|
+  cc.month = 12
+  cc.year = 2.years.from_now.year
+  cc.gateway_customer_profile_id = "BGS-1234"
+end
 
 Spree::Order.all.each_with_index do |order, _index|
   order.recalculate
-  payment = order.payments.create!(amount: order.total, source: creditcard.clone, payment_method: method)
-  payment.update_columns(state: "pending", response_code: "12345")
+  payment = order.payments.find_or_create_by!(payment_method: method) do |p|
+    p.amount = order.total
+    p.source = creditcard.clone
+  end
+  payment.update_columns(state: "pending", response_code: "12345") if payment.previously_new_record?
 end

data/db/samples/products.rb

@@ -181,15 +181,17 @@ products = [
 ]
 
 products.each do |product_attrs|
+  next if Spree::Product.exists?(name: product_attrs[:name])
+
   eur_price = product_attrs.delete(:eur_price)
-  Spree::Config[:currency] = "USD"
+  Spree::Config.currency = "USD"
 
   product = Spree::Product.create!(default_attrs.merge(product_attrs))
-  Spree::Config[:currency] = "EUR"
+  Spree::Config.currency = "EUR"
   product.reload
   product.price = eur_price
   product.shipping_category = shipping_category
   product.save!
 end
 
-Spree::Config[:currency] = "USD"
+Spree::Config.currency = "USD"

data/db/samples/reimbursements.rb

@@ -16,31 +16,46 @@ end
 # Mark the order paid and shipped
 order.payments.pending.each(&:complete)
 order.shipments.each do |shipment|
+  next if shipment.shipped?
+
   shipment.suppress_mailer = false
   shipment.ship!
 end
+inventory_unit.reload
 
 # Create a return authorization
-return_item = Spree::ReturnItem.new(
-  inventory_unit:,
-  preferred_reimbursement_type:
-)
+return_authorization = order.return_authorizations.first
+
+if return_authorization.nil?
+  return_item = Spree::ReturnItem.new(
+    inventory_unit:,
+    preferred_reimbursement_type:
+  )
+
+  return_authorization = order.return_authorizations.create!(
+    reason: return_reason,
+    return_items: [return_item],
+    stock_location:
+  )
+end
 
-order.return_authorizations.create!(
-  reason: return_reason,
-  return_items: [return_item],
-  stock_location:
-)
+return_item = return_authorization.return_items.first
 
 # Create a customer return and mark it as received
-customer_return = Spree::CustomerReturn.create!(
-  return_items: [return_item],
-  stock_location:
-)
-return_item.reload
-return_item.receive!
-customer_return.process_return!
+customer_return = return_item&.customer_return
+
+if customer_return.nil?
+  customer_return = Spree::CustomerReturn.create!(
+    return_items: [return_item],
+    stock_location:
+  )
+  return_item.reload
+  return_item.receive! unless return_item.received?
+  customer_return.process_return!
+end
 
 # Accept the customer return and reimburse it
-reimbursement = Spree::Reimbursement.build_from_customer_return(customer_return)
-reimbursement.return_all(created_by: admin_user)
+if customer_return.reimbursements.empty?
+  reimbursement = Spree::Reimbursement.build_from_customer_return(customer_return)
+  reimbursement.return_all(created_by: admin_user)
+end

data/db/samples/shipping_methods.rb

@@ -12,43 +12,42 @@ tax_category = Spree::TaxCategory.find_by!(name: "Default")
 europe_vat = Spree::Zone.find_by!(name: "EU_VAT")
 shipping_category = Spree::ShippingCategory.find_or_create_by!(name: "Default")
 
-Spree::ShippingMethod.create!([
+[
   {
     name: "UPS Ground (USD)",
     zones: [north_america],
-    calculator: Spree::Calculator::Shipping::FlatRate.create!,
     tax_category:,
     shipping_categories: [shipping_category]
   },
   {
     name: "UPS Two Day (USD)",
     zones: [north_america],
-    calculator: Spree::Calculator::Shipping::FlatRate.create!,
     tax_category:,
     shipping_categories: [shipping_category]
   },
   {
     name: "UPS One Day (USD)",
     zones: [north_america],
-    calculator: Spree::Calculator::Shipping::FlatRate.create!,
     tax_category:,
     shipping_categories: [shipping_category]
   },
   {
     name: "UPS Ground (EU)",
     zones: [europe_vat],
-    calculator: Spree::Calculator::Shipping::FlatRate.create!,
     tax_category:,
     shipping_categories: [shipping_category]
   },
   {
     name: "UPS Ground (EUR)",
     zones: [europe_vat],
-    calculator: Spree::Calculator::Shipping::FlatRate.create!,
     tax_category:,
     shipping_categories: [shipping_category]
   }
-])
+].each do |attrs|
+  Spree::ShippingMethod.find_or_create_by!(name: attrs[:name]) do |shipping_method|
+    shipping_method.assign_attributes(attrs.merge(calculator: Spree::Calculator::Shipping::FlatRate.create!))
+  end
+end
 
 {
   "UPS Ground (USD)" => [5, "USD"],

data/db/samples/stock.rb

@@ -7,8 +7,12 @@ location = Spree::StockLocation.first_or_create! name: "default", address1: "Exa
 location.active = true
 location.save!
 
+initial_stock_quantity = 10
+
 Spree::Variant.all.find_each do |variant|
   variant.stock_items.each do |stock_item|
-    Spree::StockMovement.create(quantity: 10, stock_item:)
+    next if stock_item.stock_movements.exists?
+
+    Spree::StockMovement.create!(quantity: initial_stock_quantity, stock_item:)
   end
 end

data/db/samples/tax_rates.rb

@@ -2,14 +2,15 @@
 
 north_america = Spree::Zone.find_by!(name: "North America")
 clothing = Spree::TaxCategory.find_by!(name: "Default")
-tax_rate = Spree::TaxRate.create(
-  name: "North America",
-  zone: north_america,
-  amount: 0.05
-)
-tax_rate.calculator = Spree::Calculator::DefaultTax.create!
-tax_rate.save!
-Spree::TaxRateTaxCategory.create!(
+tax_rate = Spree::TaxRate.find_or_initialize_by(name: "North America", zone: north_america)
+
+if tax_rate.new_record?
+  tax_rate.amount = 0.05
+  tax_rate.calculator = Spree::Calculator::DefaultTax.create!
+  tax_rate.save!
+end
+
+Spree::TaxRateTaxCategory.find_or_create_by!(
   tax_rate:,
   tax_category: clothing
 )

data/db/samples/taxonomies.rb

@@ -6,5 +6,5 @@ taxonomies = [
 ]
 
 taxonomies.each do |taxonomy_attrs|
-  Spree::Taxonomy.create!(taxonomy_attrs)
+  Spree::Taxonomy.find_or_create_by!(taxonomy_attrs)
 end

data/db/samples/taxons.rb

@@ -119,7 +119,13 @@ taxons = [
 
 taxons.each do |taxon_attrs|
   if taxon_attrs[:parent]
-    taxon_attrs[:parent] = Spree::Taxon.find_by!(name: taxon_attrs[:parent])
-    Spree::Taxon.create!(taxon_attrs)
+    # parent lookup is scoped to the taxonomy to avoid ambiguity between same-named taxons
+    taxon_attrs[:parent] = taxon_attrs[:taxonomy].taxons.find_by!(name: taxon_attrs[:parent])
+    products = taxon_attrs.delete(:products) || []
+
+    taxon = Spree::Taxon.find_or_create_by!(taxon_attrs.slice(:name, :taxonomy, :parent)) do |t|
+      t.assign_attributes(taxon_attrs)
+    end
+    taxon.products |= products
   end
 end

data/db/samples/variants.rb

@@ -322,7 +322,11 @@ masters = {
   }
 }
 
-Spree::Variant.create!(variants)
+variants.each do |variant_attrs|
+  Spree::Variant.find_or_create_by!(sku: variant_attrs[:sku]) do |variant|
+    variant.assign_attributes(variant_attrs)
+  end
+end
 
 masters.each do |product, variant_attrs|
   product.master.update!(variant_attrs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_sample
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.8.0
 platform: ruby
 authors:
 - Solidus Team
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.2
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.2
+        version: 4.8.0
 description: Sample data (including images) for use with Solidus.
 email: contact@solidus.io
 executables: []
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Sample data (including images) for use with Solidus.
 test_files: []