spree_sample 3.5.0 → 3.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 91671528fff304c0c25a1470cbf5e5403bc73d84
-  data.tar.gz: 6816c82f505b0752047739d254c3c19c089e4958
+SHA256:
+  metadata.gz: 4c26831ae4064ae77d73f1dee1ef9c58b6b130ffca1a589eb16042706ef9f7b1
+  data.tar.gz: 875091811939c84887d2b90a3126b5f0bb47c6efba25e65c81f42b8e55eba8f7
 SHA512:
-  metadata.gz: 5ca3c783683f042135dded713b53056713fa7c9350efc1aedb9c06f2ddc9eccf960e29d23772ebfdb8308513d064280cfcf85ed312929f0add5494159cae0aa3
-  data.tar.gz: bbb418f7f8788cbb05058076c843c3da0a4500408118f22ed7ef6bb77dd0ff2dee556464952f79067c80984ef01ef3662a8686155941918ecd8a8fd326626dc0
+  metadata.gz: a8ee152c2ea08268208fcb41bec8145578cd827ce418f3d0d67900d2cb0944749523fb8621fa1e42e7d0f94a8784d3a1c3f6301fb26919059a73c6e4c1c41c7c
+  data.tar.gz: 805ed9b71b26b978007a409cdb3a1aaffae49c5142bb1c8aad0767cf4aa88a9812a454812814c74d915a52fe3420308a45ca49c6b7b8927b630a45ea23636016

data/db/samples.rb

@@ -1,2 +1,2 @@
-Spree::Sample.load_sample("payment_methods")
-Spree::Sample.load_sample("shipping_categories")
+Spree::Sample.load_sample('payment_methods')
+Spree::Sample.load_sample('shipping_categories')

data/db/samples/addresses.rb

@@ -1,5 +1,5 @@
-united_states = Spree::Country.find_by!(iso: "US")
-new_york = Spree::State.find_by!(name: "New York")
+united_states = Spree::Country.find_by!(iso: 'US')
+new_york = Spree::State.find_by!(name: 'New York')
 
 # Billing address
 Spree::Address.create!(
@@ -11,9 +11,10 @@ Spree::Address.create!(
   state: new_york,
   zipcode: 16804,
   country: united_states,
-  phone: FFaker::PhoneNumber.phone_number)
+  phone: FFaker::PhoneNumber.phone_number
+)
 
-#Shipping address
+# Shipping address
 Spree::Address.create!(
   firstname: FFaker::Name.first_name,
   lastname: FFaker::Name.last_name,
@@ -23,4 +24,5 @@ Spree::Address.create!(
   state: new_york,
   zipcode: 16804,
   country: united_states,
-  phone: FFaker::PhoneNumber.phone_number)
+  phone: FFaker::PhoneNumber.phone_number
+)

data/db/samples/adjustments.rb

@@ -1,22 +1,24 @@
-Spree::Sample.load_sample("orders")
+Spree::Sample.load_sample('orders')
 
-first_order = Spree::Order.find_by!(number: "R123456789")
-last_order = Spree::Order.find_by!(number: "R987654321")
+first_order = Spree::Order.find_by!(number: 'R123456789')
+last_order = Spree::Order.find_by!(number: 'R987654321')
 
 first_order.adjustments.where(
-  source: Spree::TaxRate.find_by!(name: "North America"),
+  source: Spree::TaxRate.find_by!(name: 'North America'),
   order: first_order,
-  label: "Tax",
-  state: "open",
-  mandatory: true).first_or_create! do |adj|
-    adj.amount = 0
-  end
+  label: 'Tax',
+  state: 'open',
+  mandatory: true
+).first_or_create! do |adj|
+  adj.amount = 0
+end
 
 last_order.adjustments.where(
-  source: Spree::TaxRate.find_by!(name: "North America"),
+  source: Spree::TaxRate.find_by!(name: 'North America'),
   order: last_order,
-  label: "Tax",
-  state: "open",
-  mandatory: true).first_or_create! do |adj|
-    adj.amount = 0
-  end
+  label: 'Tax',
+  state: 'open',
+  mandatory: true
+).first_or_create! do |adj|
+  adj.amount = 0
+end

data/db/samples/assets.rb

@@ -1,196 +1,209 @@
 unless ENV['SKIP_SAMPLE_IMAGES']
-  Spree::Sample.load_sample("products")
-  Spree::Sample.load_sample("variants")
-
+  Spree::Sample.load_sample('products')
+  Spree::Sample.load_sample('variants')
   products = {}
-  products[:ror_baseball_jersey] = Spree::Product.find_by!(name: "Ruby on Rails Baseball Jersey")
-  products[:ror_tote] = Spree::Product.find_by!(name: "Ruby on Rails Tote")
-  products[:ror_bag] = Spree::Product.find_by!(name: "Ruby on Rails Bag")
-  products[:ror_jr_spaghetti] = Spree::Product.find_by!(name: "Ruby on Rails Jr. Spaghetti")
-  products[:ror_mug] = Spree::Product.find_by!(name: "Ruby on Rails Mug")
-  products[:ror_ringer] = Spree::Product.find_by!(name: "Ruby on Rails Ringer T-Shirt")
-  products[:ror_stein] = Spree::Product.find_by!(name: "Ruby on Rails Stein")
-  products[:spree_baseball_jersey] = Spree::Product.find_by!(name: "Spree Baseball Jersey")
-  products[:spree_stein] = Spree::Product.find_by!(name: "Spree Stein")
-  products[:spree_jr_spaghetti] = Spree::Product.find_by!(name: "Spree Jr. Spaghetti")
-  products[:spree_mug] = Spree::Product.find_by!(name: "Spree Mug")
-  products[:spree_ringer] = Spree::Product.find_by!(name: "Spree Ringer T-Shirt")
-  products[:spree_tote] = Spree::Product.find_by!(name: "Spree Tote")
-  products[:spree_bag] = Spree::Product.find_by!(name: "Spree Bag")
-  products[:ruby_baseball_jersey] = Spree::Product.find_by!(name: "Ruby Baseball Jersey")
-  products[:apache_baseball_jersey] = Spree::Product.find_by!(name: "Apache Baseball Jersey")
+  products[:ror_baseball_jersey] = Spree::Product.find_by!(name: 'Ruby on Rails Baseball Jersey')
+  products[:ror_tote] = Spree::Product.find_by!(name: 'Ruby on Rails Tote')
+  products[:ror_bag] = Spree::Product.find_by!(name: 'Ruby on Rails Bag')
+  products[:ror_jr_spaghetti] = Spree::Product.find_by!(name: 'Ruby on Rails Jr. Spaghetti')
+  products[:ror_mug] = Spree::Product.find_by!(name: 'Ruby on Rails Mug')
+  products[:ror_ringer] = Spree::Product.find_by!(name: 'Ruby on Rails Ringer T-Shirt')
+  products[:ror_stein] = Spree::Product.find_by!(name: 'Ruby on Rails Stein')
+  products[:spree_baseball_jersey] = Spree::Product.find_by!(name: 'Spree Baseball Jersey')
+  products[:spree_stein] = Spree::Product.find_by!(name: 'Spree Stein')
+  products[:spree_jr_spaghetti] = Spree::Product.find_by!(name: 'Spree Jr. Spaghetti')
+  products[:spree_mug] = Spree::Product.find_by!(name: 'Spree Mug')
+  products[:spree_ringer] = Spree::Product.find_by!(name: 'Spree Ringer T-Shirt')
+  products[:spree_tote] = Spree::Product.find_by!(name: 'Spree Tote')
+  products[:spree_bag] = Spree::Product.find_by!(name: 'Spree Bag')
+  products[:ruby_baseball_jersey] = Spree::Product.find_by!(name: 'Ruby Baseball Jersey')
+  products[:apache_baseball_jersey] = Spree::Product.find_by!(name: 'Apache Baseball Jersey')
 
-  def image(name, type = "jpeg")
-    images_path = Pathname.new(File.dirname(__FILE__)) + "images"
+  def image(name, type = 'jpeg')
+    images_path = Pathname.new(File.dirname(__FILE__)) + 'images'
     path = images_path + file_name(name, type)
-    return false if !File.exist?(path)
+    return false unless File.exist?(path)
     File.open(path)
   end
 
-  def file_name(name, type = "jpeg")
+  def file_name(name, type = 'jpeg')
     "#{name}.#{type}"
   end
 
+  def attach_paperclip_image(variant, name, type)
+    if variant.images.where(attachment_file_name: file_name(name, type)).none?
+      image = image(name, type)
+      variant.images.create!(attachment: image)
+    end
+  end
+
+  def attach_active_storage_image(variant, name, type)
+    if variant.images.with_attached_attachment.where(active_storage_blobs: { filename: file_name(name, type) }).none?
+      image = image(name, type)
+      variant.images.create!(attachment: { io: image, filename: file_name(name, type) })
+    end
+  end
+
   images = {
     products[:ror_tote].master => [
       {
-        name: file_name("ror_tote"),
-        attachment: image("ror_tote")
+        name: file_name('ror_tote'),
+        attachment: image('ror_tote')
       },
       {
-        name: file_name("ror_tote_back"),
-        attachment: image("ror_tote_back")
+        name: file_name('ror_tote_back'),
+        attachment: image('ror_tote_back')
       }
     ],
     products[:ror_bag].master => [
       {
-        name: file_name("ror_bag"),
-        attachment: image("ror_bag")
+        name: file_name('ror_bag'),
+        attachment: image('ror_bag')
       }
     ],
     products[:ror_baseball_jersey].master => [
       {
-        name: file_name("ror_baseball"),
-        attachment: image("ror_baseball")
+        name: file_name('ror_baseball'),
+        attachment: image('ror_baseball')
       },
       {
-        name: file_name("ror_baseball_back"),
-        attachment: image("ror_baseball_back")
+        name: file_name('ror_baseball_back'),
+        attachment: image('ror_baseball_back')
       }
     ],
     products[:ror_jr_spaghetti].master => [
       {
-        name: file_name("ror_jr_spaghetti"),
-        attachment: image("ror_jr_spaghetti")
+        name: file_name('ror_jr_spaghetti'),
+        attachment: image('ror_jr_spaghetti')
       }
     ],
     products[:ror_mug].master => [
       {
-        name: file_name("ror_mug"),
-        attachment: image("ror_mug")
+        name: file_name('ror_mug'),
+        attachment: image('ror_mug')
       },
       {
-        name: file_name("ror_mug_back"),
-        attachment: image("ror_mug_back")
+        name: file_name('ror_mug_back'),
+        attachment: image('ror_mug_back')
       }
     ],
     products[:ror_ringer].master => [
       {
-        name: file_name("ror_ringer"),
-        attachment: image("ror_ringer")
+        name: file_name('ror_ringer'),
+        attachment: image('ror_ringer')
       },
       {
-        name: file_name("ror_ringer_back"),
-        attachment: image("ror_ringer_back")
+        name: file_name('ror_ringer_back'),
+        attachment: image('ror_ringer_back')
       }
     ],
     products[:ror_stein].master => [
       {
-        name: file_name("ror_stein"),
-        attachment: image("ror_stein")
+        name: file_name('ror_stein'),
+        attachment: image('ror_stein')
       },
       {
-        name: file_name("ror_stein_back"),
-        attachment: image("ror_stein_back")
+        name: file_name('ror_stein_back'),
+        attachment: image('ror_stein_back')
       }
     ],
     products[:apache_baseball_jersey].master => [
       {
-        name: file_name("apache_baseball", "png"),
-        attachment: image("apache_baseball", "png")
-      },
+        name: file_name('apache_baseball', 'png'),
+        attachment: image('apache_baseball', 'png')
+      }
     ],
     products[:ruby_baseball_jersey].master => [
       {
-        name: file_name("ruby_baseball", "png"),
-        attachment: image("ruby_baseball", "png")
-      },
+        name: file_name('ruby_baseball', 'png'),
+        attachment: image('ruby_baseball', 'png')
+      }
     ],
     products[:spree_bag].master => [
       {
-        name: file_name("spree_bag"),
-        attachment: image("spree_bag")
-      },
+        name: file_name('spree_bag'),
+        attachment: image('spree_bag')
+      }
     ],
     products[:spree_tote].master => [
       {
-        name: file_name("spree_tote_front"),
-        attachment: image("spree_tote_front")
+        name: file_name('spree_tote_front'),
+        attachment: image('spree_tote_front')
       },
       {
-        name: file_name("spree_tote_back"),
-        attachment: image("spree_tote_back")
+        name: file_name('spree_tote_back'),
+        attachment: image('spree_tote_back')
       }
     ],
     products[:spree_ringer].master => [
       {
-        name: file_name("spree_ringer_t"),
-        attachment: image("spree_ringer_t")
+        name: file_name('spree_ringer_t'),
+        attachment: image('spree_ringer_t')
       },
       {
-        name: file_name("spree_ringer_t_back"),
-        attachment: image("spree_ringer_t_back")
+        name: file_name('spree_ringer_t_back'),
+        attachment: image('spree_ringer_t_back')
       }
     ],
     products[:spree_jr_spaghetti].master => [
       {
-        name: file_name("spree_spaghetti"),
-        attachment: image("spree_spaghetti")
+        name: file_name('spree_spaghetti'),
+        attachment: image('spree_spaghetti')
       }
     ],
     products[:spree_baseball_jersey].master => [
       {
-        name: file_name("spree_jersey"),
-        attachment: image("spree_jersey")
+        name: file_name('spree_jersey'),
+        attachment: image('spree_jersey')
       },
       {
-        name: file_name("spree_jersey_back"),
-        attachment: image("spree_jersey_back")
+        name: file_name('spree_jersey_back'),
+        attachment: image('spree_jersey_back')
       }
     ],
     products[:spree_stein].master => [
       {
-        name: file_name("spree_stein"),
-        attachment: image("spree_stein")
+        name: file_name('spree_stein'),
+        attachment: image('spree_stein')
       },
       {
-        name: file_name("spree_stein_back"),
-        attachment: image("spree_stein_back")
+        name: file_name('spree_stein_back'),
+        attachment: image('spree_stein_back')
       }
     ],
     products[:spree_mug].master => [
       {
-        name: file_name("spree_mug"),
-        attachment: image("spree_mug")
+        name: file_name('spree_mug'),
+        attachment: image('spree_mug')
       },
       {
-        name: file_name("spree_mug_back"),
-        attachment: image("spree_mug_back")
+        name: file_name('spree_mug_back'),
+        attachment: image('spree_mug_back')
       }
-    ],
+    ]
   }
 
   products[:ror_baseball_jersey].variants.each do |variant|
-    color = variant.option_value("tshirt-color").downcase
-
-    if variant.images.where(attachment_file_name: file_name("ror_baseball_jersey_#{color}", "png")).none?
-      main_image = image("ror_baseball_jersey_#{color}", "png")
-      variant.images.create!(attachment: main_image)
-    end
+    color = variant.option_value('tshirt-color').downcase
 
-    if variant.images.where(attachment_file_name: file_name("ror_baseball_jersey_back_#{color}", "png")).none?
-      back_image = image("ror_baseball_jersey_back_#{color}", "png")
-      variant.images.create!(attachment: back_image)
+    if Rails.application.config.use_paperclip
+      attach_paperclip_image(variant, "ror_baseball_jersey_#{color}", 'png')
+      attach_paperclip_image(variant, "ror_baseball_jersey_back_#{color}", 'png')
+    else
+      attach_active_storage_image(variant, "ror_baseball_jersey_#{color}", 'png')
+      attach_active_storage_image(variant, "ror_baseball_jersey_back_#{color}", 'png')
     end
   end
 
   images.each do |variant, attachments|
     puts "Loading images for #{variant.product.name}"
     attachments.each do |attrs|
-      file_name = attrs.delete(:name)
-
-      if variant.images.where(attachment_file_name: file_name).none?
-        variant.images.create!(attrs)
+      if Rails.application.config.use_paperclip
+        file_name = attrs.delete(:name)
+        variant.images.create!(attrs) if variant.images.where(attachment_file_name: file_name).none?
+      else
+        name, type = attrs.delete(:name).split('.')
+        attach_active_storage_image(variant, name, type)
       end
     end
   end

data/db/samples/option_types.rb

@@ -1,12 +1,12 @@
 option_types_attributes = [
   {
-    name: "tshirt-size",
-    presentation: "Size",
+    name: 'tshirt-size',
+    presentation: 'Size',
     position: 1
   },
   {
-    name: "tshirt-color",
-    presentation: "Color",
+    name: 'tshirt-color',
+    presentation: 'Color',
     position: 2
   }
 ]

data/db/samples/option_values.rb

@@ -1,48 +1,48 @@
-Spree::Sample.load_sample("option_types")
+Spree::Sample.load_sample('option_types')
 
-size = Spree::OptionType.find_by!(presentation: "Size")
-color = Spree::OptionType.find_by!(presentation: "Color")
+size = Spree::OptionType.find_by!(presentation: 'Size')
+color = Spree::OptionType.find_by!(presentation: 'Color')
 
 option_values_attributes = [
   {
-    name: "Small",
-    presentation: "S",
+    name: 'Small',
+    presentation: 'S',
     position: 1,
     option_type: size
   },
   {
-    name: "Medium",
-    presentation: "M",
+    name: 'Medium',
+    presentation: 'M',
     position: 2,
     option_type: size
   },
   {
-    name: "Large",
-    presentation: "L",
+    name: 'Large',
+    presentation: 'L',
     position: 3,
     option_type: size
   },
   {
-    name: "Extra Large",
-    presentation: "XL",
+    name: 'Extra Large',
+    presentation: 'XL',
     position: 4,
     option_type: size
   },
   {
-    name: "Red",
-    presentation: "Red",
+    name: 'Red',
+    presentation: 'Red',
     position: 1,
-    option_type: color,
+    option_type: color
   },
   {
-    name: "Green",
-    presentation: "Green",
+    name: 'Green',
+    presentation: 'Green',
     position: 2,
-    option_type: color,
+    option_type: color
   },
   {
-    name: "Blue",
-    presentation: "Blue",
+    name: 'Blue',
+    presentation: 'Blue',
     position: 3,
     option_type: color
   }