solidus_prototypes 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8c6d82912f52410929329f56729c4997dc2a7cae85ba14a2986dc7573f6c94
-  data.tar.gz: '08785e9e646c3ce47c9d8839172ee2483c7579c403d89c71884de2f720abb941'
+  metadata.gz: 90f94cb13627efd23d918c9faadc003c54cb283d004583ac0e43a6781d315313
+  data.tar.gz: a9a74751289418a0927c211e322ee7bb62fb4fe23148002c0cc9db9c18e39627
 SHA512:
-  metadata.gz: d5902be8307a71d7804eca04d7711b33ac2f47eec1272d8c9b32e1ab38001356d0ac6fef865885d52950303891ff00ed40f2206d1692ca4dd84254417e310e88
-  data.tar.gz: fa35be7f6baa5a275f5e94c9d0ebd605e521a3940d79eed493b0a4d5192d3b0381fadb01d0bef984077593c1fc9dcbac6ba7e0c09b0ca7a2a2d05ad8084b3830
+  metadata.gz: 9a7767d35181a881c1b8ee5dc141f6d3150d27788a206286adb1373bc68c4736266e78e965adb65b92563dc041f50f13be22f18edd7dd19a026a0a5a9850c4ec
+  data.tar.gz: 791398d09ee5122b45c07ed201d184ea5fcd419f3e70c953a3f2013bd7ce1fb9ebf77cbc9ff93f6601a501c9addb4ccfb3b8580159cdfc66fa3a3ba7860a2267

data/.gitignore

@@ -15,3 +15,4 @@ pkg
 spec/dummy
 spec/examples.txt
 .ruby-version
+sandbox

data/CHANGELOG.md

@@ -1,17 +1,23 @@
 # Changelog
 
-## [v1.3.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.3.0) (2023-03-27)
+## [v1.5.0](https://github.com/solidusio-contrib/solidus_prototypes/tree/v1.5.0) (2024-04-17)
 
-[Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.2.0...v1.3.0)
+[Full Changelog](https://github.com/solidusio-contrib/solidus_prototypes/compare/v1.4.0...v1.5.0)
 
 **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))
+- Fix option\_values\_hash form field name name [\#65](https://github.com/solidusio-contrib/solidus_prototypes/pull/65) ([tvdeyen](https://github.com/tvdeyen))
+- Replace Deface Override with Deface DSL [\#64](https://github.com/solidusio-contrib/solidus_prototypes/pull/64) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- 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))
+- Admin UI fixes [\#62](https://github.com/solidusio-contrib/solidus_prototypes/pull/62) ([tvdeyen](https://github.com/tvdeyen))
 
-## [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)
+
+## [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:**
 
@@ -19,9 +25,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'
@@ -34,3 +29,5 @@ gemspec
 # Use a local Gemfile to include development dependencies that might not be
 # relevant for the project or for other contributors, e.g.: `gem 'pry-debug'`.
 send :eval_gemfile, 'Gemfile-local' if File.exist? 'Gemfile-local'
+
+gem 'debug'

data/README.md

@@ -1,7 +1,7 @@
 SolidusPrototypes
 ================
 
-[![CircleCI](https://circleci.com/gh/solidusio-contrib/solidus_prototypes.svg?style=svg)](https://circleci.com/gh/solidusio-contrib/solidus_prototypes)
+[![CircleCI](https://dl.circleci.com/status-badge/img/gh/solidusio-contrib/solidus_prototypes/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/solidusio-contrib/solidus_prototypes/tree/main)
 
 Prototype extension for Solidus.
 

data/app/overrides/spree/admin/product_properties/index/prototype_product_properties_form.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_after '[data-hook="add_product_properties"]' enabled -->
+<div id='prototypes' data-hook></div>

data/app/overrides/spree/admin/product_properties/index/prototypes_product_properties_toolbar.html.erb.deface

@@ -0,0 +1,6 @@
+<!-- insert_bottom 'ul.tollbar' enabled -->
+<li>
+  <span id="new_ptype_link">
+    <%= link_to I18n.t('spree.select_from_prototype'), available_admin_prototypes_url, :remote => true, :class => 'button fa fa-copy' %>
+  </span>
+</li>

data/app/overrides/spree/admin/products/_form/prototypes_admin_products_form.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_before '[data-hook="admin_product_form_taxons"]' enabled -->
+<% if f.object.new_record? %>
+  <%= f.field_container :prototype do %>
+    <%= f.label :prototype_id, Spree::Prototype.model_name.human %><br />
+    <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'custom-select fullwidth'} %>
+  <% end %>
+  <div id="product-from-prototype"></div>
+<% end %>

data/app/overrides/spree/admin/products/new/prototypes_admin_products_new.html.erb.deface

@@ -0,0 +1,7 @@
+<!-- insert_before '[data-hook="new_product_price"]' enabled -->
+<div data-hook="new_product_prototype" class="col-3">
+  <%= f.field_container :prototype do %>
+    <%= f.label :prototype_id, Spree::Prototype.model_name.human %><br />
+    <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'custom-select fullwidth'} %>
+  <% end %>
+</div>

data/app/overrides/spree/admin/products/new/prototypes_admin_products_new_clearfix.html.erb.deface

@@ -0,0 +1,4 @@
+<!-- insert_after '[data-hook="new_product_tax_category"]' enabled -->
+<div class="clearfix" data-hook="product-from-prototype" id="product-from-prototype">
+  <%= render :file => 'spree/admin/prototypes/show' if @prototype %>
+</div>

data/app/overrides/spree/admin/shared/_product_sub_menu/prototypes_admin_tab.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_bottom '[data-hook="admin_product_sub_tabs"]' -->
+<%= tab :prototypes if can?(:admin, Spree::Prototype) %>

data/app/views/spree/admin/prototypes/index.html.erb

@@ -5,14 +5,11 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Prototype) %>
     <li id="new_prototype_link">
-      <%= link_to I18n.t('spree.new_prototype'), new_admin_prototype_url, {:remote => true, :id => 'new_prototype_link'} %>
+      <%= link_to I18n.t('spree.new_prototype'), spree.new_admin_prototype_url, { class: "btn btn-primary" } %>
     </li>
   <% end %>
 <% end %>
 
-<%# Placeholder for new prototype form %>
-<div id="new_prototype_container"></div>
-
 <% if @prototypes.any? %>
 <table class="index" id='listing_prototypes' data-hook>
   <colgroup>

data/app/views/spree/admin/prototypes/show.html.erb

@@ -11,7 +11,7 @@
         <ul class="option-type-values">
         <% ot.option_values.each do |ov| %>
           <li>
-            <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), :id => "option_value_#{ov.id}", :class => "option-value" %>
+            <%= check_box_tag "product[option_values_hash][#{ot.id}][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), :id => "option_value_#{ov.id}", :class => "option-value" %>
             <%= label_tag "option_value_#{ov.id}", ov.presentation %>
           </li>
         <% end %>

data/bin/rails

@@ -1,15 +1,7 @@
 #!/usr/bin/env ruby
 
-# frozen_string_literal: true
-
-app_root = 'spec/dummy'
-
-unless File.exist? "#{app_root}/bin/rails"
-  system "bin/rake", app_root or begin # rubocop:disable Style/AndOr
-    warn "Automatic creation of the dummy app failed"
-    exit 1
-  end
+if %w[g generate].include? ARGV.first
+  exec "#{__dir__}/rails-engine", *ARGV
+else
+  exec "#{__dir__}/rails-sandbox", *ARGV
 end
-
-Dir.chdir app_root
-exec 'bin/rails', *ARGV

data/bin/rails-engine

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/solidus_prototypes/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/bin/rails-sandbox

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+app_root = 'sandbox'
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the sandbox app...'
+  Dir.chdir "#{__dir__}/.." do
+    system "#{__dir__}/sandbox" or begin
+      warn 'Automatic creation of the sandbox app failed'
+      exit 1
+    end
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/rake

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/setup

@@ -5,4 +5,4 @@ set -vx
 
 gem install bundler --conservative
 bundle update
-bundle exec rake clobber
+bin/rake clobber

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.3.0'
+  VERSION = '1.5.0'
 end

data/solidus_prototypes.gemspec

@@ -30,9 +30,9 @@ 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"
-  s.add_development_dependency "selenium-webdriver", "< 4.8.2"
 end

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

@@ -1 +1 @@
-unxkvMNolyR3ugfMbRJkKwhWoqqojgYigAeBvzvVkAS/eyNTaBJ5e34Lf6GutNPPmKWxvAevsVR0OeKx65QRaKzmZzPxQ7wbYg099wcBFr0IaJMIT4fEF9pIn8AflnMe1GHcvW42754rz55JXEN2uVXlpdhCS8FZ99GfINYuwtHINbcYkw7ICcyVExTzA9Yq16fd7Z/AqzhKTrwoQWVz8TNCpQgTq1QICU1C915gMbaGFnjXXyCImYTIBEEoeGH6AJwojl77QoI+cCNcro0MyGckU9SeTFGjAfM8o+ybrWKnJz3IPMCn61pQPr3IBVSFr82RmhvjVzqXpMh2DKXlO24quPrUs7aV0RP3Mh2IBU9pvc3D1ZIhGwk3VbNIBYWoOGC9wi/z3vkVMwByt6YDavESZE3krWkSf0nj--0C9zvikRLuW7Ao2p--XKpR3yOfJmMPHChljvJ14g==
+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.4.0.dev'
+Spree.load_defaults '3.4.7.dev'
 
 Spree.config do |config|
   # Core:

data/spec/dummy/config/master.key

@@ -1 +1 @@
-2b1f0c421acb212bd2110ecc7c337159
+60ed55ba583a5212fd329cd54e4bb964

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: 2023_03_26_093457) 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: 2023_03_26_093457) 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