alchemy-solidus 2.5.0 → 2.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/alchemy/solidus/alchemy_in_solidus.rb +15 -11
  3. data/lib/alchemy/solidus/use_solidus_layout.rb +17 -15
  4. data/lib/alchemy/solidus/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 78297e4bf371b6cfc4d26faa46417dbcbf165650a64d484f60dac52feae1ebde
4
- data.tar.gz: 9d985945b0d70a693cef42837edf97791ac4c7b3b38b5df5e5e5c79e21382642
3
+ metadata.gz: 902f1162c27c48166435b147674f8b9da9fd5c0fa9d3d95b60acb4cc62cf900c
4
+ data.tar.gz: acd5cabe30ca1080ef6790ad7f3e47b553b02b7eb3ff8fe68c82ca7bb6c8c178
5
5
  SHA512:
6
- metadata.gz: 0c1f70ee1697b9dc3aa3fdca9ab58e532a5adbf81c0ed5ddc7f3c1e07033c77717b43815920ca47f9d1a0731792fe69e7185402289a9cb5a4aa99bb4a6ae5d53
7
- data.tar.gz: 7e5923735790b534b8e780f71a51b3cb4e07c34692a7977bf0accf9abb949406eee23cd4166c839b6d40df62c374832367e2dedef16f11ac4163e84041ec6c50
6
+ metadata.gz: a8b2ce4bcf0f1ef9a8e1e1461c6843f404c7ff7397a7cef4f71dc8d3efbe8cd5a31979b83d29cb2a42279afd7f0f10261064c52e9ee31ef04e8826f4c60718f6
7
+ data.tar.gz: 2b479960fe66bbe12d2168ca95eedf62c798a00e790647d80fa6dc1ac7c6aadc453a6d6b2e7ec28405aec2e534b1ad5a675884df4481f3bc0adea83b9e8faf08
data/lib/alchemy/solidus/alchemy_in_solidus.rb CHANGED
@@ -1,14 +1,18 @@
1
- ##
2
- # If there is the Devise Constant loaded, we can assume that we use it as the authentication method
3
- # then we set the ParentController of device as the Spree::BaseController
4
- # https://github.com/AlchemyCMS/alchemy-solidus/issues/10
5
- if Object.const_defined?("Devise")
6
- Devise.setup do |config|
7
- config.parent_controller = "Spree::BaseController"
1
+ # Make sure we have everything loaded before patching classes
2
+ Rails.application.config.to_prepare do
3
+ # Allows to render Alchemy content within Solidus' controller views
4
+ Spree::BaseController.include Alchemy::ControllerActions
5
+ Spree::BaseController.include Alchemy::ConfigurationMethods
6
+
7
+ # Hook into SolidusAuthDevise controllers if present
8
+ if defined? Spree::Auth::Engine
9
+ Spree::UserPasswordsController.include Alchemy::ControllerActions
10
+ Spree::UserConfirmationsController.include Alchemy::ControllerActions
11
+ Spree::UserRegistrationsController.include Alchemy::ControllerActions
12
+ Spree::UserSessionsController.include Alchemy::ControllerActions
8
13
  end
9
14
  end
10
15
 
11
- # Allow Alchemy content within Solidus views
12
- Spree::BaseController.send :include, Alchemy::ControllerActions
13
- Spree::UserSessionsController.send :include, Alchemy::ControllerActions if defined? Spree::UserSessionsController
14
- Spree::BaseController.send :include, Alchemy::ConfigurationMethods
16
+ # Do not prefix element view partials with `spree` namespace.
17
+ # See https://github.com/AlchemyCMS/alchemy_cms/issues/1626
18
+ ActionView::Base.prefix_partial_path_with_controller_namespace = false
data/lib/alchemy/solidus/use_solidus_layout.rb CHANGED
@@ -1,16 +1,18 @@
1
- # Include this to make Alchemy render within the Solidus layout
1
+ # Make sure we have everything loaded before patching classes
2
+ Rails.application.config.to_prepare do
3
+ # Allows to use Solidus helpers within Alchemys controller views
4
+ Alchemy::BaseHelper.include Spree::BaseHelper
5
+ Alchemy::BaseHelper.include Spree::CheckoutHelper
6
+ Alchemy::BaseHelper.include Spree::ProductsHelper
7
+ Alchemy::BaseHelper.include Spree::StoreHelper
8
+ Alchemy::BaseHelper.include Spree::TaxonsHelper
2
9
 
3
- Alchemy::BaseHelper.send :include, Spree::BaseHelper
4
- Alchemy::BaseHelper.send :include, Spree::CheckoutHelper
5
- Alchemy::BaseHelper.send :include, Spree::ProductsHelper
6
- Alchemy::BaseHelper.send :include, Spree::StoreHelper
7
- Alchemy::BaseHelper.send :include, Spree::TaxonsHelper
8
-
9
- Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::Auth
10
- Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::Common
11
- Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::Order
12
- Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::PaymentParameters
13
- Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::Pricing
14
- Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::Search
15
- Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::Store
16
- Alchemy::BaseController.send :include, Spree::Core::ControllerHelpers::StrongParameters
10
+ Alchemy::BaseController.include Spree::Core::ControllerHelpers::Auth
11
+ Alchemy::BaseController.include Spree::Core::ControllerHelpers::Common
12
+ Alchemy::BaseController.include Spree::Core::ControllerHelpers::Order
13
+ Alchemy::BaseController.include Spree::Core::ControllerHelpers::PaymentParameters
14
+ Alchemy::BaseController.include Spree::Core::ControllerHelpers::Pricing
15
+ Alchemy::BaseController.include Spree::Core::ControllerHelpers::Search
16
+ Alchemy::BaseController.include Spree::Core::ControllerHelpers::Store
17
+ Alchemy::BaseController.include Spree::Core::ControllerHelpers::StrongParameters
18
+ end
data/lib/alchemy/solidus/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Alchemy
2
2
  module Solidus
3
- VERSION = "2.5.0"
3
+ VERSION = "2.5.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy-solidus
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0
4
+ version: 2.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-11-12 00:00:00.000000000 Z
11
+ date: 2019-12-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: alchemy_cms