solidus_prototypes 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9131a484207f83936f00b9695771a141c1f04232368d5baf635ca0839db6846
-  data.tar.gz: bbad551751238ae411e3628f03dd6c1d207d740d3e7dafd101a43a07ded84b29
+  metadata.gz: 4d83dc71469d1dad717c3058dc548f9065d3c9c57238e5ecea5bda3cf3a0c1de
+  data.tar.gz: 36d898e6da0f7c5a5fb19b7bb0a6d0a738bd96cde95216caae9aa8aa2f83db6c
 SHA512:
-  metadata.gz: 517b5c66b9b531a0533b0e51a61fb54ef191cdf276f12cbcaecb202629a416a1e3ffe6792a7e8661739cfa66e31262c6fc9a809f4ae703e14a3b4ff5d643ddf4
-  data.tar.gz: 28f19fb7d5da1a7ba6e5a916327b88a8b8c5292db458f2675701a909ded51e2efea019cc6a67d2a852b84ecf222ea24d06897a50130b82a6adc529a28b8c7bae
+  metadata.gz: '082f9e4f51cab60a37d0c56307f0c947e8a0a13720889cf91cef0c48bc3cf1a438acc21acf07260c33085a4b27177da47be7134225f6755772a9b5483e2ff5d3'
+  data.tar.gz: 1dad4d8afe0306dc7ba8076c7792a3fd5c5e06cc876042fa6200d284369adee3b098db26805bcdb88194366f5c0c37216cc3614f7a422268d7b3a9f5ff0ecd28

data/.circleci/config.yml

@@ -10,17 +10,24 @@ orbs:
   solidusio_extensions: solidusio/extensions@volatile
 
 jobs:
+  run-specs-with-postgres-3-2:
+    executor:
+      name: solidusio_extensions/postgres
+      ruby_version: "3.2"
+    steps:
+      - browser-tools/install-chrome
+      - solidusio_extensions/run-tests
   run-specs-with-postgres:
     executor:
       name: solidusio_extensions/postgres
-      ruby_version: "3.0"
+      ruby_version: "3.1"
     steps:
       - browser-tools/install-chrome
       - solidusio_extensions/run-tests
   run-specs-with-mysql:
     executor:
       name: solidusio_extensions/mysql
-      ruby_version: "2.7"
+      ruby_version: "3.0"
     steps:
       - browser-tools/install-chrome
       - solidusio_extensions/run-tests
@@ -28,6 +35,7 @@ jobs:
 workflows:
   "Run specs on supported Solidus versions":
     jobs:
+      - run-specs-with-postgres-3-2
       - run-specs-with-postgres
       - run-specs-with-mysql
   "Weekly run specs against master":
@@ -39,5 +47,6 @@ workflows:
               only:
                 - master
     jobs:
+      - run-specs-with-postgres-3-2
       - run-specs-with-postgres
       - run-specs-with-mysql

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
 
-## [v1.2.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.2.0) (2022-11-22)
+## [v1.4.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.4.0) (2023-11-07)
 
-[Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.1.1...v1.2.0)
+[Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.3.0...v1.4.0)
+
+**Merged pull requests:**
+
+- Add Solidus 4.0, 4.1, 4.2 and 4.3 support [\#63](https://github.com/solidusio-contrib/solidus_prototypes/pull/63) ([tvdeyen](https://github.com/tvdeyen))
+
+## [v1.3.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.3.0) (2023-03-27)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.2.0...v1.3.0)
 
 **Fixed bugs:**
 
@@ -10,9 +18,15 @@
 
 **Merged pull requests:**
 
+- Allow Ruby 3.2 [\#61](https://github.com/solidusio-contrib/solidus_prototypes/pull/61) ([tvdeyen](https://github.com/tvdeyen))
+- Allow Ruby 3.1 [\#60](https://github.com/solidusio-contrib/solidus_prototypes/pull/60) ([tvdeyen](https://github.com/tvdeyen))
 - Keep "Products" submenu open [\#58](https://github.com/solidusio-contrib/solidus_prototypes/pull/58) ([benjaminwil](https://github.com/benjaminwil))
 - Allow Ruby 3.0 [\#55](https://github.com/solidusio-contrib/solidus_prototypes/pull/55) ([tvdeyen](https://github.com/tvdeyen))
 
+## [v1.2.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.2.0) (2022-11-22)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.1.1...v1.2.0)
+
 ## [v1.1.1](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.1.1) (2022-10-14)
 
 [Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.1.0...v1.1.1)

data/Gemfile

@@ -3,14 +3,8 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
-                                      %w[solidusio/solidus solidusio/solidus_frontend]
-                                    else
-                                      %w[solidusio/solidus] * 2
-                                    end
-gem 'solidus', github: solidus_git, branch: branch
-gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
+solidus_branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
+gem 'solidus', github: "solidusio/solidus", branch: solidus_branch
 
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
@@ -19,6 +13,7 @@ gem 'rails', '>0.a'
 
 # Provides basic authentication functionality for testing parts of your engine
 gem 'solidus_auth_devise'
+gem 'solidus_dev_support', github: "solidusio/solidus_dev_support", branch: "main"
 
 case ENV['DB']
 when 'mysql'

data/app/overrides/decorate_admin_product_tabs.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-Spree::Backend::Config.configure do |config|
-  config.menu_items.detect { |menu_item|
-    menu_item.label == :products
-  }.sections << :prototypes
-end
-
 Deface::Override.new(
   virtual_path: "spree/admin/shared/_product_sub_menu",
   name: "prototypes_admin_tab",

data/config/initializers/spree.rb

@@ -1,3 +1,18 @@
 Rails.application.config.to_prepare do
   Spree::PermittedAttributes.product_attributes << :prototype_id
+  Spree::Backend::Config.configure do |config|
+    product_tab = config.menu_items.detect { |menu_item|
+      menu_item.label == :products
+    }
+    if product_tab.respond_to?(:children)
+      product_tab.children << Spree::BackendConfiguration::MenuItem.new(
+        condition: -> { can?(:admin, Spree::Prototype) },
+        url: :admin_prototypes_path,
+        label: :prototypes,
+        match_path: '/prototypes'
+      )
+    else
+      product_tab.sections << :prototypes
+    end
+  end
 end

data/lib/generators/solidus_prototypes/install/install_generator.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
+require 'solidus_support'
+
 module SolidusPrototypes
   module Generators
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, type: :boolean, default: false
 
       def add_javascripts
-        append_file(
-          'vendor/assets/javascripts/spree/frontend/all.js',
-          "//= require spree/frontend/solidus_prototypes\n"
-        )
         append_file(
           'vendor/assets/javascripts/spree/backend/all.js',
           "//= require spree/backend/solidus_prototypes\n"
@@ -17,12 +15,6 @@ module SolidusPrototypes
       end
 
       def add_stylesheets
-        inject_into_file(
-          'vendor/assets/stylesheets/spree/frontend/all.css',
-          " *= require spree/frontend/solidus_prototypes\n",
-          before: %r{\*/},
-          verbose: true
-        )
         inject_into_file(
           'vendor/assets/stylesheets/spree/backend/all.css',
           " *= require spree/backend/solidus_prototypes\n",

data/lib/solidus_prototypes/testing_support/factories.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories/property_factory'
-
 FactoryBot.define do
   factory :prototype, class: 'Spree::Prototype' do
     name { 'Baseball Cap' }

data/lib/solidus_prototypes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusPrototypes
-  VERSION = '1.2.0'
+  VERSION = '1.4.0'
 end

data/solidus_prototypes.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = "Breaking out prototypes from solidus"
   s.license = "BSD-3-Clause"
 
-  s.required_ruby_version = [">= 2.4", "< 3.1"]
+  s.required_ruby_version = [">= 2.4", "< 3.3"]
 
   s.author = "Graeme Nathan"
   s.email = "graeme@stembolt.com"
@@ -30,7 +30,8 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency "deface"
-  s.add_dependency "solidus_core", [">= 2.1.0", "< 4"]
+  s.add_dependency "solidus_backend", [">= 3.2.0", "< 5"]
+  s.add_dependency "solidus_core", [">= 3.2.0", "< 5"]
   s.add_dependency "solidus_support", "~> 0.4"
 
   s.add_development_dependency "solidus_dev_support"

data/spec/dummy/config/credentials.yml.enc

@@ -1 +1 @@
-YZLb10oF2GcRzQ/GPm24J92nNrxiDc1oUqql9GCYhn+hN67NgW/78Qvbfjhf/veova+sL/4CAZedQb0vfFekHMSlUjuPCcoffNICNYObqcSv7UFaMyv2OyQCfaxzEoelCN7qLdDCO+fLfV4dUPqBdoxpS6huhB03nhCmfhSKDCTdZBIzI0rs6DFAwGIimQ1IfeKJ8mlYFd8oUF0jXS9T0hQ/rwclJxczi7S5Bvhc8tUzNphNKDGqi7Xj0kwBq7oYt8vgex/db5F58lCkUDiepxZNaYjprVFhg1dIk0RXlTP64exu+ELh5fkrN26iJLNTMcg9gcwcx3B8UChqWZbM34xX5MRF/xi1XYgFng/7VwtlOk8N2wuL4Et5um/K5YvZEYiHeM2ZfmiI5PiWslvO1FgZcTCoiL8x3W17--UHRlt94gYr21FSh0--T/khJxNBEA3pvj/1KxVRjQ==
+Sf8llLc5oyJds5lZWwlyYc6GcSpoE0r+JQ1ZXgRb3hThvUIl7NB9ghzEUxYxhNdLz24SVyURhhxJFbqTVl8KdoWoxbfpOaPKa5UJwtdpT06Z3XFaKVZc7ec40oTAji/y4BI7gRQfeRj9agR3sVd7A/0pRnh7UMj0VXNqC20p3Zv7Cq7e++PLWrJibcxKKLmxUQD8Li6mhyvkYiFRA+MCVmzkSBMCWPjkZrd+hwngkC2v8z0LS1qT4ezDtJdKwFYS0ZrAVBsABaEZ/wl/p1XzZKwUrF1tswSAud02VU0k2uAm3KA5kv3nYFQwWLOGUxl8ozHwDItyFVuh0W6jvnOASZ1Vae3altjvMOeYMPQ9ZWiz3l78f3FIcDdOqoFFMhuzlXdAjbCncjtBpZ7embqfGHyI1+NV9FKzx5Nb--BtYSXyUt21jNUuPv--xAEJXqMz+R+URtsNeD4zMA==

data/spec/dummy/config/initializers/spree.rb

@@ -2,7 +2,7 @@
 # See http://docs.solidus.io/Spree/AppConfiguration.html for details
 
 # Solidus version defaults for preferences that are not overridden
-Spree.load_defaults '3.3.0.alpha'
+Spree.load_defaults '3.4.7.dev'
 
 Spree.config do |config|
   # Core:

data/spec/dummy/config/master.key

@@ -1 +1 @@
-8e1349e73e98fc46645dd1199b98f7d7
+60ed55ba583a5212fd329cd54e4bb964

data/spec/dummy/db/migrate/20231107091985_add_shipping_category_to_spree_variants.spree.rb

@@ -0,0 +1,6 @@
+# This migration comes from spree (originally 20221123152807)
+class AddShippingCategoryToSpreeVariants < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :spree_variants, :shipping_category, index: true
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2022_11_22_203182) do
+ActiveRecord::Schema[7.0].define(version: 2023_11_07_091999) do
   create_table "action_mailbox_inbound_emails", force: :cascade do |t|
     t.integer "status", default: 0, null: false
     t.string "message_id", null: false
@@ -1161,7 +1161,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_11_22_203182) do
     t.integer "product_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.boolean "apply_to_all", default: true, null: false
+    t.boolean "apply_to_all", default: true
     t.index ["product_id"], name: "index_spree_variant_property_rules_on_product_id"
   end
 
@@ -1181,8 +1181,10 @@ ActiveRecord::Schema[7.0].define(version: 2022_11_22_203182) do
     t.integer "tax_category_id"
     t.datetime "updated_at"
     t.datetime "created_at"
+    t.integer "shipping_category_id"
     t.index ["position"], name: "index_spree_variants_on_position"
     t.index ["product_id"], name: "index_spree_variants_on_product_id"
+    t.index ["shipping_category_id"], name: "index_spree_variants_on_shipping_category_id"
     t.index ["sku"], name: "index_spree_variants_on_sku"
     t.index ["tax_category_id"], name: "index_spree_variants_on_tax_category_id"
     t.index ["track_inventory"], name: "index_spree_variants_on_track_inventory"