From ce379b34dfe1ce591f9c3675d90e60a0603f7149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Boivin?= Date: Tue, 11 Jul 2017 17:25:58 -0700 Subject: [PATCH 1/2] Move OrdersHelper from Core to Frontend This commit moves the OrdersHelper module from core/ to frontend/. The included methods (`order_just_completed` and `truncated_product_description`) are fairly simple and used only in the frontend. This also allows us to remove a core dependency on `truncate_html`. --- {core => frontend}/app/helpers/spree/orders_helper.rb | 0 {core => frontend}/spec/helpers/order_helper_spec.rb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {core => frontend}/app/helpers/spree/orders_helper.rb (100%) rename {core => frontend}/spec/helpers/order_helper_spec.rb (100%) diff --git a/core/app/helpers/spree/orders_helper.rb b/frontend/app/helpers/spree/orders_helper.rb similarity index 100% rename from core/app/helpers/spree/orders_helper.rb rename to frontend/app/helpers/spree/orders_helper.rb diff --git a/core/spec/helpers/order_helper_spec.rb b/frontend/spec/helpers/order_helper_spec.rb similarity index 100% rename from core/spec/helpers/order_helper_spec.rb rename to frontend/spec/helpers/order_helper_spec.rb From e854c3e2795fe4e45a5a8ca365bf24bb442b9208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Boivin?= Date: Tue, 11 Jul 2017 17:28:14 -0700 Subject: [PATCH 2/2] Move `truncate_html` dependency to Frontend This library is only used on the OrdersHelper module that was moved to frontend/ in the previous commmit. --- core/solidus_core.gemspec | 1 - frontend/solidus_frontend.gemspec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec index 6124a201034..01aa6ce5b95 100644 --- a/core/solidus_core.gemspec +++ b/core/solidus_core.gemspec @@ -37,7 +37,6 @@ Gem::Specification.new do |s| s.add_dependency 'responders' s.add_dependency 'state_machines-activerecord', '~> 0.4' s.add_dependency 'stringex', '~> 1.5.1' - s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2' s.add_dependency 'twitter_cldr', '>= 3.0', '< 5' s.add_development_dependency 'email_spec', '~> 1.6' diff --git a/frontend/solidus_frontend.gemspec b/frontend/solidus_frontend.gemspec index 1d8edfe6215..130faf297d6 100644 --- a/frontend/solidus_frontend.gemspec +++ b/frontend/solidus_frontend.gemspec @@ -29,6 +29,7 @@ Gem::Specification.new do |s| s.add_dependency 'sass-rails' s.add_dependency 'coffee-rails' s.add_dependency 'font-awesome-rails', '~> 4.0' + s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2' s.add_development_dependency 'capybara-accessible' end