decidim-decidim_awesome 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be39606cbd0f92bc8232bbd4a1c8b04a27aed18e9a0732668af6f37126d66f4
-  data.tar.gz: 5034f9d65042871ec4be47c313e90c46390e40751003666ea8a93166df087d31
+  metadata.gz: 5f080eae1f34847934c143b7bdc9c091632701cb339f269754640d5f2a78f879
+  data.tar.gz: 64f8f793914cf99e2f5ac37801039000936911799c518da44528698f6c3fba92
 SHA512:
-  metadata.gz: b2219e00f0a35206d772032e1f259e5283e2085a39bf5f45e47af09a784ece3776c0824ed7dc6d191cdcbf036b34a647fb5c9c172e13f86ef21394f54275fc9a
-  data.tar.gz: e2abb579c41c61b11377c986f692cba8b944671e1876616bf771309b8e62900a05b57582f72f1f458ef17309b55d8030c15727993ad99092c40ac4c4e31fd94a
+  metadata.gz: 507f43c02cfe83261c5e0caa656387aba8dc7ffa15a80c70305e71736e1aeebec90a6678f663ca4de854740f17ef2960a29f9d58caf980e1c0dbd534b1d0c46b
+  data.tar.gz: 7398b5cacb4eed3ff628a7026c2934c089dcbe8b1cf9ff9cd22275228816fa1ddc9ba50909dbf4bccf4e0e671349517c8bea4485e8c3dd709868f17000ef55a2

data/README.md

@@ -135,7 +135,7 @@ Some things in the road-map:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "decidim-decidim_awesome", "~> 0.6.5"
+gem "decidim-decidim_awesome", "~> 0.6.6"
 ```
 
 And then execute:

data/app/awesome_overrides/presenters/decidim/menu_presenter_override.rb

@@ -2,16 +2,24 @@
 
 Decidim::MenuPresenter.class_eval do
   def evaluated_menu
-    @evaluated_menu ||= if Decidim::DecidimAwesome.config.send(@name) == :disabled
+    @evaluated_menu ||= if awesome_override?
+                          Decidim::DecidimAwesome::MenuHacker.new(@name, @view)
+                        else
                           begin
                             menu = Decidim::Menu.new(@name)
                             menu.build_for(@view)
                             menu
                           end
-                        else
-                          Decidim::DecidimAwesome::MenuHacker.new(@name, @view)
                         end
   end
+
+  private
+
+  def awesome_override?
+    return false unless Decidim::DecidimAwesome.config.has_key?(@name)
+
+    Decidim::DecidimAwesome.config.send(@name) != :disabled
+  end
 end
 
 Decidim::MenuItemPresenter.class_eval do

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -22,9 +22,10 @@ module Decidim
             item.send("overrided?=", true)
             @items.reject! { |i| i.url.gsub(/\?.*/, "") == item.url }
           end
-          @items << item if include_invisible || visible?(item)
+          @items << item
         end
 
+        @items.select!(&:visible?) unless include_invisible
         @items.sort_by!(&:position)
       end
 
@@ -33,19 +34,6 @@ module Decidim
       attr_accessor :organization, :user
       attr_reader :name, :view
 
-      def visible?(item)
-        case item.visibility
-        when "hidden"
-          false
-        when "logged"
-          user.present?
-        when "non_logged"
-          user.blank?
-        else
-          true
-        end
-      end
-
       def default_items
         @default_items ||= build_menu.instance_variable_get(:@items).map do |item|
           item.instance_variable_set(:@active, method(:activate?)) unless item.active == :exact
@@ -69,6 +57,7 @@ module Decidim
             # see options in https://github.com/comfy/active_link_to
             active: method(:activate?),
             visibility: item["visibility"],
+            visible?: visible?(item),
             target: item["target"],
             overrided?: false
           )
@@ -80,6 +69,19 @@ module Decidim
         url == urls.find { |u| view.request.original_fullpath.start_with?(u) }
       end
 
+      def visible?(item)
+        case item["visibility"]
+        when "hidden"
+          false
+        when "logged"
+          user.present?
+        when "non_logged"
+          user.blank?
+        else
+          true
+        end
+      end
+
       def current_config
         @current_config ||= (AwesomeConfig.find_by(var: name, organization: organization)&.value || []).filter { |i| i.is_a? Hash }
       end

data/lib/decidim/decidim_awesome/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.6.5"
+    VERSION = "0.6.6"
     COMPAT_DECIDIM_VERSION = [">= 0.22.0", "< 0.24"].freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Ivan Vergés