alchemy-solidus 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e237798bb907edb0bbd9c5d87e5182e7fa0a6718b7e6a2ac1fd586376c3e92
-  data.tar.gz: a296960bee111d7deee009f6e9308a0127e1f97d48d31a68aa58f99f199870d7
+  metadata.gz: de5c64f8172aa48e4baf9a5f2d98b575a15d67f1cbee342e696602ad5e622d2e
+  data.tar.gz: 90da86131495bac7078a39f3854dbc2cc37f290f2cb462e5bc58048ca364f7ea
 SHA512:
-  metadata.gz: 638f43f7eb3d9e296bb87be5cc51fa8a2c39b34158b55faaf5882fe3f5e608ea45f3b4bdadb52c04f9867a692921c2a25d35642a049d91653742d5e8ebe5d71e
-  data.tar.gz: '092e59c407377ba9f1ed9a18946fd4a5d5a5f48c6ac9b0f0edf4f31a20349a23ee68478c1d1393f457fd5cdca3352fa8c5f9b2a2b09303ae902d794d83c5d613'
+  metadata.gz: ebf23bca2c312fcb51bfa7ed97edd560bc1543c8b7b9f1a0df477daa418741453021f30df69b29b9b18048de697035925b07dfe8d7a7f601c94d3303bba4e8fc
+  data.tar.gz: ee0997b1e2b7d43f032f5f5f12c637a2df0b2ce07afd2ac1363fdca6407862659d97bac6289373278ead07ebc621b9746920cae396a0b7638843be955403da31

data/config/initializers/solidus.rb

@@ -0,0 +1,29 @@
+# In versions of Solidus prior to 2.8, we override this class to
+# add the match_path option to the initializer. (Version 2.8 has
+# this option already.) This option is used in the tabs partial
+# to configure the paths for which a given tab is active.
+#
+if Spree.solidus_gem_version < Gem::Version.new('2.8')
+  Spree::BackendConfiguration::MenuItem.class_eval do
+    attr_reader :match_path
+
+    def initialize(
+      sections,
+      icon,
+      condition: nil,
+      label: nil,
+      partial: nil,
+      url: nil,
+      match_path: nil
+    )
+
+      @condition = condition || -> { true }
+      @sections = sections
+      @icon = icon
+      @label = label || sections.first
+      @partial = partial
+      @url = url
+      @match_path = match_path
+    end
+  end
+end

data/lib/alchemy/solidus/engine.rb

@@ -44,6 +44,15 @@ module Alchemy
           end
         end
       end
+      
+      # In versions of Solidus prior to 2.8, we override the tabs partial
+      # to pass a match_path value to each tab. (Version 2.8 is already
+      # passing this option.) This option is used to configure the paths
+      # for which a given tab is active.
+      #
+      if Spree.solidus_gem_version < Gem::Version.new('2.8')
+        paths['app/views'] << 'lib/views'
+      end
     end
   end
 end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "2.3.1"
+    VERSION = "2.3.2"
   end
 end

data/lib/generators/alchemy/solidus/install/install_generator.rb

@@ -67,7 +67,8 @@ module Alchemy
             \    label: :cms,
             \    condition: -> { can?(:index, :alchemy_admin_dashboard) },
             \    partial: 'spree/admin/shared/alchemy_sub_menu',
-            \    url: '/admin/pages'
+            \    url: '/admin/pages',
+            \    match_path: '/pages'
             \  )
           ADMIN_TAB
         end

data/lib/views/spree/admin/shared/_tabs.html.erb

@@ -0,0 +1,15 @@
+<% Spree::Backend::Config.menu_items.each do |menu_item| %>
+  <% if instance_exec(&menu_item.condition) %>
+    <%=
+      tab(
+          *menu_item.sections,
+          icon: menu_item.icon,
+          label: menu_item.label,
+          url: menu_item.url.is_a?(Symbol) ? spree.public_send(menu_item.url) : menu_item.url,
+          match_path: menu_item.match_path
+      ) do
+    %>
+      <%- render partial: menu_item.partial if menu_item.partial %>
+    <%- end %>
+  <% end %>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -175,6 +175,7 @@ files:
 - app/views/alchemy/essences/_essence_spree_taxon_view.html.erb
 - app/views/spree/admin/shared/_alchemy_sub_menu.html.erb
 - config/initializers/alchemy.rb
+- config/initializers/solidus.rb
 - config/locales/alchemy_solidus_en.yml
 - config/locales/alchemy_solidus_it.yml
 - config/locales/en.yml
@@ -192,6 +193,7 @@ files:
 - lib/alchemy/solidus/version.rb
 - lib/generators/alchemy/solidus/install/install_generator.rb
 - lib/generators/alchemy/solidus/install/templates/alchemy.rb.tt
+- lib/views/spree/admin/shared/_tabs.html.erb
 homepage: https://github.com/AlchemyCMS/alchemy-solidus
 licenses:
 - BSD New