solidus_product_assembly 1.0.0 → 1.1.0

data/app/views/spree/admin/orders/_stock_contents_2_3.html.erb

@@ -0,0 +1,69 @@
+<%= render 'stock_item', shipment: shipment %>
+
+<% unless shipment.shipped? %>
+  <tr class="edit-method hidden total">
+    <td colspan="5">
+      <div class="field alpha five columns">
+        <%= label_tag 'selected_shipping_rate_id', t('spree.shipping_method') %>
+        <%= select_tag :selected_shipping_rate_id,
+              options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+              {:class => 'select2 fullwidth', :data => {'shipment-number' => shipment.number } } %>
+      </div>
+    </td>
+    <td class="actions">
+      <% if can? :update, shipment %>
+        <%= link_to '', '#', :class => 'save-method fa fa-ok no-text with-tip',
+          :data => {'shipment-number' => shipment.number, :action => 'save'}, title: t('spree.actions.save') %>
+        <%= link_to '', '#', :class => 'cancel-method fa fa-cancel no-text with-tip',
+          :data => {:action => 'cancel'}, :title => t('spree.actions.cancel') %>
+      <% end %>
+    </td>
+  </tr>
+<% end %>
+
+<tr class="show-method total">
+  <% if shipment.shipping_method %>
+    <td colspan="4">
+      <strong><%= shipment.shipping_method.name %></strong>
+    </td>
+    <td class="total" align="center">
+      <span><%= shipment.display_cost %></span>
+    </td>
+  <% else %>
+    <td colspan='5'><%= t('spree.no_shipping_method_selected') %></td>
+  <% end %>
+
+  <td class="actions">
+    <% if can? :update, shipment %>
+      <%= link_to '', '#', :class => 'edit-method fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => t('spree.actions.edit') %>
+    <% end %>
+  </td>
+</tr>
+
+<tr class="edit-tracking hidden total">
+  <td colspan="5">
+    <label><%= t('spree.tracking_number') %>:</label>
+    <%= text_field_tag :tracking, shipment.tracking %>
+  </td>
+  <td class="actions">
+    <% if can? :update, shipment %>
+      <%= link_to '', '#', :class => 'save-tracking fa fa-ok no-text with-tip', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => t('spree.actions.save') %>
+      <%= link_to '', '#', :class => 'cancel-tracking fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => t('spree.actions.cancel') %>
+    <% end %>
+  </td>
+</tr>
+
+<tr class="show-tracking total">
+  <td colspan="5" class="tracking-value">
+    <% if shipment.tracking.present? %>
+      <%= shipment.tracking %>
+    <% else %>
+      <%= t('spree.no_tracking_present') %>
+    <% end %>
+  </td>
+  <td class="actions">
+    <% if can? :update, shipment %>
+      <%= link_to '', '#', :class => 'edit-tracking fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => t('spree.actions.edit') %>
+    <% end %>
+  </td>
+</tr>

data/app/views/spree/admin/orders/_stock_contents_2_4.html.erb

@@ -0,0 +1,70 @@
+<%= render 'stock_item', shipment: shipment %>
+
+<% unless shipment.shipped? %>
+  <tr class="edit-method hidden total">
+    <td colspan="5">
+      <div class="field alpha five columns">
+        <%= label_tag 'selected_shipping_rate_id', t('spree.shipping_method') %>
+        <%= select_tag :selected_shipping_rate_id,
+              options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+              {:class => 'select2 fullwidth', :data => {'shipment-number' => shipment.number } } %>
+      </div>
+    </td>
+    <td class="actions">
+      <% if can? :update, shipment %>
+        <%= button_tag '', :class => 'save-method fa fa-ok no-text with-tip',
+          :data => {'shipment-number' => shipment.number, :action => 'save'}, title: t('spree.actions.save') %>
+        <%= button_tag '', :class => 'cancel-method fa fa-cancel no-text with-tip',
+          :data => {:action => 'cancel'}, :title => t('spree.actions.cancel') %>
+      <% end %>
+    </td>
+  </tr>
+<% end %>
+
+<tr class="show-method total">
+  <% if shipment.shipping_method %>
+    <td colspan="4">
+      <strong><%= shipment.shipping_method.name %></strong>
+    </td>
+    <td class="total" align="center">
+      <span><%= shipment.display_cost %></span>
+    </td>
+  <% else %>
+    <td colspan='5'><%= t('spree.no_shipping_method_selected') %></td>
+  <% end %>
+
+  <td class="actions">
+    <% if can? :update, shipment %>
+      <%= button_tag '', :class => 'edit-method fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => t('spree.actions.edit') %>
+    <% end %>
+  </td>
+</tr>
+
+<tr class="edit-tracking hidden total">
+  <td colspan="5">
+    <label><%= t('spree.tracking_number') %>:</label>
+    <%= text_field_tag :tracking, shipment.tracking %>
+  </td>
+  <td class="actions">
+    <% if can? :update, shipment %>
+      <%= button_tag '', :class => 'save-tracking fa fa-ok no-text with-tip', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => t('spree.actions.save') %>
+      <%= button_tag '', :class => 'cancel-tracking fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => t('spree.actions.cancel') %>
+    <% end %>
+  </td>
+</tr>
+
+<tr class="show-tracking total">
+  <th><%= Spree::Shipment.human_attribute_name(:tracking) %></th>
+  <td colspan="4" class="tracking-value">
+    <% if shipment.tracking.present? %>
+      <%= shipment.tracking %>
+    <% else %>
+      <i><%= t('spree.no_tracking_present') %></i>
+    <% end %>
+  </td>
+  <td class="actions">
+    <% if can? :update, shipment %>
+      <%= button_tag '', class: 'edit-tracking fa fa-edit no-text with-tip', data: {action: 'edit'}, title: t('spree.actions.edit'), type: :button %>
+    <% end %>
+  </td>
+</tr>

data/app/views/spree/admin/orders/_stock_item.html.erb

@@ -1,10 +1,14 @@
 <% shipment.manifest.each do |item| %>
-  <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
-    <td class="item-image"><%= mini_image(item.variant) %></td>
+  <tr class="stock-item" data-item-quantity="<%= item.quantity %>" data-variant-id="<%= item.variant.id %>">
+    <td class="item-image"><%= render 'spree/shared/image',
+                      image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+                      size: :mini %></td>
     <td class="item-name">
-      <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+      <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
       <% if item.part && item.line_item %>
-        <i><%= Spree.t(:part_of_bundle, sku: item.product.sku) %></i>
+        <i><%= t('spree.part_of_bundle', sku: item.product.sku) %></i>
+      <% elsif item.variant.sku.present? %>
+        <strong><%= Spree::Variant.human_attribute_name(:sku) %>:</strong> <%= item.variant.sku %>
       <% end %>
     </td>
     <td class="item-price align-center">
@@ -32,13 +36,12 @@
       <% end %>
     </td>
     <td class="cart-item-delete actions" data-hook="cart_item_delete">
-      <% if !shipment.shipped? && !item.part %>
+      <% if !shipment.shipped? %>
         <% if can? :update, item %>
-          <%= link_to '', '#', :class => 'save-item fa fa-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
-          <%= link_to '', '#', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
-          <%= link_to '', '#', :class => 'edit-item fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
-          <%= link_to '', '#', :class => 'split-item fa fa-arrows-h no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
-          <%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('actions.delete') %>
+          <%= button_tag '', :class => 'save-item fa fa-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => t('spree.actions.save'), :style => 'display: none' %>
+          <%= link_to '', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => t('spree.actions.cancel'), :style => 'display: none' %>
+          <%= button_tag '', :class => 'split-item fa fa-arrows-h no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => t('spree.actions.split') %>
+          <%= button_tag '', :class => 'delete-item fa fa-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => t('spree.actions.delete') %>
         <% end %>
       <% end %>
     </td>

data/app/views/spree/admin/parts/_parts_table.html.erb

@@ -1,10 +1,11 @@
 <table class="index">
   <thead>
   	<tr>
-  	  <th><%= Spree.t(:sku) %></th>
-  		<th><%= Spree.t(:name) %></th>
-  		<th><%= Spree.t(:options) %></th>
-  		<th><%= Spree.t(:qty) %></th>
+  	  <th><%= t('spree.sku') %></th>
+      <th><%= t('spree.name') %></th>
+      <th><%= t('spree.available_on') %></th>
+  		<th><%= t('spree.options') %></th>
+  		<th><%= t('spree.qty') %></th>
   	</tr>
   </thead>
   <tbody>
@@ -12,21 +13,26 @@
       <tr id="<%= dom_id(part, :sel)%>">
         <td><%= part.sku %></td>
         <td><%= part.product.name %></td>
+        <td><%= part.product.available_on %></td>
         <td><%= variant_options part %></td>
         <td><%= text_field_tag :count, @product.count_of(part) %></td>
   	    <td class="actions">
-          <%= link_to(icon('edit'),
-                      set_count_admin_product_part_url(@product, part),
-                      :class => "set_count_admin_product_part_link save-line-item fa fa-ok no-text") %>
+          <%= link_to_with_icon(
+            'edit',
+            t('spree.actions.edit'),
+            set_count_admin_product_part_url(@product, part),
+            :class => "set_count_admin_product_part_link save-line-item") %>
 
-          <%= link_to(icon('delete'),
-                      remove_admin_product_part_url(@product, part),
-                      :class => "remove_admin_product_part_link delete-line-item fa fa-trash no-text") %>
+          <%= link_to_with_icon(
+            'delete',
+            t('spree.actions.delete'),
+            remove_admin_product_part_url(@product, part),
+            class: "remove_admin_product_part_link delete-line-item") %>
   	    </td>
       </tr>
     <% end %>
     <% if parts.empty? %>
-     <tr><td colspan="5"><%= Spree.t(:none) %>.</td></tr>
+     <tr><td colspan="5"><%= t('spree.none') %>.</td></tr>
     <% end %>
   </tbody>
 </table>

data/app/views/spree/admin/parts/available.html.erb

@@ -6,13 +6,14 @@
   }
 </script>
 
-<h4><%= Spree.t(:available_parts) %></h4>
+<h4><%= t('spree.available_parts') %></h4>
 <table class="index">
 	<thead>
 		<tr>
-  		<th><%= Spree.t(:name) %></th>
-  		<th><%= Spree.t(:options) %></th>
-  		<th><%= Spree.t(:qty) %></th>
+      <th><%= t('spree.name') %></th>
+      <th><%= t('spree.available_on') %></th>
+  		<th><%= t('spree.options') %></th>
+  		<th><%= t('spree.qty') %></th>
   		<th></th>
 		</tr>
 	</thead>
@@ -21,25 +22,26 @@
       <tr id="<%= dom_id(product) %>">
 
         <td><%= product.name %></td>
+        <td><%= product.available_on %></td>
         <td>
           <% if product.has_variants? %>
             <%= select_tag "part[id]",
                 options_for_select(product.variants.map { |v| [variant_options(v), v.id] }) %>
           <% else %>
             <%= hidden_field_tag "part[id]", product.master.id %>
-            <%= Spree.t(:no_variants) %>
+            <%= t(:no_variants) %>
           <% end %>
         </td>
         <td><%= text_field_tag "part[count]", 1 %></td>
 		    <td class="actions">
-		      <%= link_to(icon('add') + ' ' + Spree.t(:select), 
+		      <%= link_to(t('spree.select'),
 		                  admin_product_parts_path(@product),
-		                  :class => "add_product_part_link") %>
+		                  :class => "add_product_part_link btn btn-primary") %>
 		    </td>
       </tr>
     <% end %>
     <% if @available_products.empty? %>
-     <tr><td colspan="3"><%= Spree.t(:no_match_found) %>.</td></tr>
+     <tr><td colspan="3"><%= t('spree.no_match_found') %>.</td></tr>
     <% end %>
   </tbody>
 </table>

data/app/views/spree/admin/parts/available.js.erb

@@ -5,13 +5,14 @@
     else row.style.display = '';
   }
 </script>
-<h4><%= Spree.t(:available_parts) %></h4>
+<h4><%= t('spree.available_parts') %></h4>
 <table class="index">
 	<thead>
 		<tr>
-  		<th><%= Spree.t(:name) %></th>
-  		<th><%= Spree.t(:options) %></th>
-  		<th><%= Spree.t(:qty) %></th>
+        <th><%= t('spree.name') %></th>
+        <th><%= t('spree.available_on') %></th>
+  		<th><%= t('spree.options') %></th>
+  		<th><%= t('spree.qty') %></th>
   		<th></th>
 		</tr>
 	</thead>
@@ -20,25 +21,26 @@
       <tr id="<%= dom_id(product) %>">
 
         <td><%= product.name %></td>
+        <td><%= product.available_on %></td>
         <td>
           <% if product.has_variants? %>
             <%= select_tag "part[id]",
                 options_for_select(product.variants.map { |v| [variant_options(v), v.id] }) %>
           <% else %>
             <%= hidden_field_tag "part[id]", product.master.id %>
-            <%= Spree.t(:no_variants) %>
+            <%= t('spree.no_variants') %>
           <% end %>
         </td>
         <td><%= text_field_tag "part[count]", 1 %></td>
 		    <td class="actions">
-		      <%= link_to(icon('add') + ' ' + Spree.t(:select), 
+		      <%= link_to(icon('add') + ' ' + t('spree.select'),
 		                  admin_product_parts_path(@product),
 		                  :class => "add_product_part_link") %>
 		    </td>
       </tr>
     <% end %>
     <% if @available_products.empty? %>
-     <tr><td colspan="3"><%= Spree.t(:no_match_found) %>.</td></tr>
+     <tr><td colspan="3"><%= t('spree.no_match_found') %>.</td></tr>
     <% end %>
   </tbody>
 </table>

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

@@ -7,7 +7,7 @@
 </div>
 
 <%= form_tag('#') do %>
-  <label><%= Spree.t(:search) %>:</label>
+  <label><%= t('spree.search') %>:</label>
   <input id="searchtext" size="25">
   <button id="search_parts_button" class="fa fa-search button" name="button">Search</button>
 <% end %>

data/app/views/spree/admin/products/_product_assembly_fields.html.erb

@@ -1,12 +1,12 @@
 <div class="left six columns alpha">
   <div class="field">
-    <%= f.label :can_be_part, Spree.t(:can_be_part)%>
+    <%= f.label :can_be_part, t('spree.can_be_part')%>
     <%= f.check_box(:can_be_part) %>
   </div>
 </div>
 <div class="right six columns omega">
   <div class="field">
-    <%= f.label :individual_sale, Spree.t(:individual_sale)%>
+    <%= f.label :individual_sale, t('spree.individual_sale')%>
     <%= f.check_box(:individual_sale) %>
   </div>
 </div>

data/app/views/spree/admin/shared/_product_assembly_product_tabs.html.erb

@@ -1,3 +1,3 @@
 <li<%= ' class="active"' if current == "Parts" %>>
-  <%= link_to_with_icon 'sitemap', Spree.t(:parts), admin_product_parts_url(@product) %>
+  <%= link_to_with_icon 'sitemap', t('spree.parts'), admin_product_parts_url(@product) %>
 </li>

data/app/views/spree/api/line_items/show.v1.rabl

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+object @line_item
+cache [I18n.locale, root_object]
+attributes *line_item_attributes
+node(:single_display_amount) { |li| li.single_display_amount.to_s }
+node(:display_amount) { |li| li.display_amount.to_s }
+node(:total, &:total)
+glue variant: :parts do
+  glue :product do
+    child parts: :parts do
+      extends "spree/api/variants/small"
+      attributes :product_id
+
+      child(images: :images) { extends "spree/api/images/show" }
+    end
+  end
+end
+child :variant do
+  extends "spree/api/variants/small"
+  attributes :product_id
+  child(images: :images) { extends "spree/api/images/show" }
+end
+
+child adjustments: :adjustments do
+  extends "spree/api/adjustments/show"
+end

data/app/views/spree/checkout/_line_item_manifest.html.erb

@@ -1,6 +1,8 @@
 <% ship_form.object.line_item_manifest.each do |item| %>
   <tr class="stock-item">
-    <td class="item-image"><%= mini_image(item.variant) %></td>
+    <td class="item-image"><%= render 'spree/shared/image',
+                      image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+                      size: :mini %></td>
     <td class="item-name">
       <%= item.variant.name %>
       <%= render 'spree/orders/cart_description', variant: item.variant, line_item: item.line_item %>

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_product_assembly"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+$LOAD_PATH.unshift(*Dir["#{__dir__}/../app/*"])
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/rails

@@ -1,7 +1,15 @@
 #!/usr/bin/env ruby
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/solidus_product_assembly/engine', __FILE__)
+# frozen_string_literal: true
 
-require 'rails/all'
-require 'rails/engine/commands'
+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
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+bundle update
+bundle exec rake clobber

data/config/routes.rb

@@ -1,5 +1,6 @@
-Spree::Core::Engine.add_routes do
+# frozen_string_literal: true
 
+Spree::Core::Engine.routes.draw do
   namespace :admin do
     resources :products do
       resources :parts do
@@ -15,5 +16,4 @@ Spree::Core::Engine.add_routes do
       end
     end
   end
-
 end

data/db/migrate/20091028152124_add_many_to_many_relation_to_products.rb

@@ -1,9 +1,11 @@
-class AddManyToManyRelationToProducts < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddManyToManyRelationToProducts < SolidusSupport::Migration[4.2]
   def self.up
-    create_table :assemblies_parts, :id => false do |t|
-      t.integer "assembly_id", :null => false
-      t.integer "part_id", :null => false
-      t.integer "count", :null => false, :default => 1
+    create_table :assemblies_parts, id: false do |t|
+      t.integer "assembly_id", null: false
+      t.integer "part_id", null: false
+      t.integer "count", null: false, default: 1
     end
   end
 

data/db/migrate/20091029165620_add_parts_fields_to_products.rb

@@ -1,24 +1,26 @@
-class AddPartsFieldsToProducts < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddPartsFieldsToProducts < SolidusSupport::Migration[4.2]
   def self.up
-    table = if table_exists?(:products)
-      'products'
-    elsif table_exists?(:spree_products)
-      'spree_products'
-    end 
-    
+    table = if data_source_exists?(:products)
+              'products'
+            elsif data_source_exists?(:spree_products)
+              'spree_products'
+    end
+
     change_table(table) do |t|
-      t.column :can_be_part, :boolean, :default => false, :null => false
-      t.column :individual_sale, :boolean, :default => true, :null => false
-    end  
+      t.column :can_be_part, :boolean, default: false, null: false
+      t.column :individual_sale, :boolean, default: true, null: false
+    end
   end
 
   def self.down
-    table = if table_exists?(:products)
-      'products'
-    elsif table_exists?(:spree_products)
-      'spree_products'
-    end 
-    
+    table = if data_source_exists?(:products)
+              'products'
+            elsif data_source_exists?(:spree_products)
+              'spree_products'
+    end
+
     change_table(table) do |t|
       t.remove :can_be_part
       t.remove :individual_sale

data/db/migrate/20120316141830_namespace_product_assembly_for_spree_one.rb

@@ -1,4 +1,6 @@
-class NamespaceProductAssemblyForSpreeOne < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class NamespaceProductAssemblyForSpreeOne < SolidusSupport::Migration[4.2]
   def up
     rename_table :assemblies_parts, :spree_assemblies_parts
   end

data/db/migrate/20140620223938_add_id_to_spree_assemblies_parts.rb

@@ -1,9 +1,11 @@
-class AddIdToSpreeAssembliesParts < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class AddIdToSpreeAssembliesParts < SolidusSupport::Migration[4.2]
   def up
     add_column :spree_assemblies_parts, :id, :primary_key
   end
 
   def down
-    add_column :spree_assemblies_parts, :id
+    remove_column :spree_assemblies_parts, :id
   end
 end

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

@@ -1,23 +1,28 @@
+# frozen_string_literal: true
+
 module SolidusProductAssembly
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      class_option :auto_run_migrations, :type => :boolean, :default => false
+      class_option :auto_run_migrations, type: :boolean, default: false
 
       def add_migrations
-        run 'rake railties:install:migrations FROM=solidus_product_assembly'
+        run 'bundle exec rake railties:install:migrations FROM=solidus_product_assembly'
       end
 
       def add_javascripts
-        append_file "vendor/assets/javascripts/spree/backend/all.js", "//= require spree/backend/solidus_product_assembly\n"
+        append_file(
+          'vendor/assets/javascripts/spree/backend/all.js',
+          "//= require spree/backend/solidus_product_assembly\n"
+        )
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
         if run_migrations
-           run 'rake db:migrate'
-         else
-           puts "Skiping rake db:migrate, don't forget to run it!"
-         end
+          run 'bundle exec rake db:migrate'
+        else
+          puts 'Skipping rake db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+        end
       end
     end
   end

data/lib/solidus_product_assembly/engine.rb

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
+require 'spree/core'
+
 module SolidusProductAssembly
   class Engine < Rails::Engine
-    engine_name 'solidus_product_assembly'
+    include SolidusSupport::EngineExtensions
 
-    config.autoload_paths += %W(#{config.root}/lib)
+    isolate_namespace ::Spree
 
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator.rb")) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
-    end
+    engine_name 'solidus_product_assembly'
 
-    config.to_prepare &method(:activate).to_proc
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
   end
 end

data/lib/solidus_product_assembly/testing_support/factories.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+end

data/lib/solidus_product_assembly/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusProductAssembly
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/solidus_product_assembly.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
 require 'solidus_core'
-require 'solidus_product_assembly/engine'
+require 'solidus_support'
 require 'solidus_product_assembly/version'
+require 'solidus_product_assembly/engine'
+require 'deface'