releaf-core 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b630a015d5b90273ddac8d6833a1e3e4593d5692
-  data.tar.gz: 3a5a40a7016c526ee7661c39f44f6e34263729f5
+  metadata.gz: 774aa55ef930837a7e646278f436c3fe676ecb97
+  data.tar.gz: 5fb2eaaa8ac74dc233a5cbe37ce9da17eeb84c2d
 SHA512:
-  metadata.gz: 1758b1b03be6700dbbeb322bd826f02cb5333301969b9bfb26cfe4d585331c5e1567fbe4533b3e745f39db7f6955590a6788a5bb630e9db5bc4b557ab9b83631
-  data.tar.gz: 15df83b1989316d55197c1c70387fec7ab8dc712916ae85b12ca845a9fee48731466fce662cf214cfaa86beeaa22c953a9be32b3110ccce4b22d9039655edaab
+  metadata.gz: 05b5fe1d0263450f196132267005e31814af72959b6bd9c497d6f5dd1a356f0a066eb4448476f2a83cad9455e4cba85574e95acc1f172cc0f6dd03978929280e
+  data.tar.gz: 444fa055b95f9801ef4ba5ee5ace5347bcdfb9bf53084d3eb16342457074607d2ae7e1609483ddb3530289ca0f7f239c9ed86e9e569be2ee9f781a3c5c1c97a3

data/app/builders/releaf/builders/page/menu_builder.rb

@@ -10,7 +10,7 @@ module Releaf::Builders::Page
 
     def active?(item)
       instance_cache("active_#{item.class.name}_#{item.name}") do
-        if controller_group?(item)
+        if item.group?
           item.controllers.find{|subitem| active?(subitem) }.present?
         else
           item.controller_name == controller.short_name
@@ -25,7 +25,7 @@ module Releaf::Builders::Page
 
     def menu_item(item)
       tag(:li, item_attributes(item)) do
-        if controller_group?(item)
+        if item.group?
           menu_item_group(item)
         else
           menu_item_single(item)
@@ -33,10 +33,6 @@ module Releaf::Builders::Page
       end
     end
 
-    def controller_group?(item)
-      item.respond_to? :controllers
-    end
-
     def menu_item_single(item)
       tag(:a, class: "trigger", href: item.path) do
         item_name_content(item)
@@ -50,7 +46,7 @@ module Releaf::Builders::Page
     end
 
     def collapsed_item?(item)
-      controller_group?(item) && !active?(item) && layout_settings("releaf.menu.collapsed.#{item.name}") == true
+      item.group? && !active?(item) && layout_settings("releaf.menu.collapsed.#{item.name}") == true
     end
 
     def item_attributes(item)

data/app/lib/releaf/controller_definition.rb

@@ -13,6 +13,10 @@ class Releaf::ControllerDefinition
     self.helper = "#{options[:helper]}_path" if options[:helper]
   end
 
+  def group?
+    false
+  end
+
   def localized_name
     I18n.t(name, scope: "admin.controllers")
   end

data/app/lib/releaf/controller_group_definition.rb

@@ -9,4 +9,8 @@ class Releaf::ControllerGroupDefinition
   def localized_name
     I18n.t(name, scope: "admin.controllers")
   end
+
+  def group?
+    true
+  end
 end

data/spec/lib/releaf/controller_definition_spec.rb

@@ -69,4 +69,10 @@ describe Releaf::ControllerDefinition do
       end
     end
   end
+
+  describe "#group?" do
+    it "returns false" do
+      expect(subject.group?).to be false
+    end
+  end
 end

data/spec/lib/releaf/controller_group_definition_spec.rb

@@ -24,4 +24,10 @@ describe Releaf::ControllerGroupDefinition do
       expect(subject.localized_name).to eq("poiugasd")
     end
   end
+
+  describe "#group?" do
+    it "returns true" do
+      expect(subject.group?).to be true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-core
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - CubeSystems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails