effective_pages 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d30bf85dfe32cfaa5d4cbfeb4af24cd5078d44
-  data.tar.gz: b580911a306abd7383e6aa2fb0c1bbe0510476ca
+  metadata.gz: e1a00ef1dd50024c7491f7112e97b858fd65a7a9
+  data.tar.gz: a1cb70948388278617d07d3e401bb0a43f425f1d
 SHA512:
-  metadata.gz: e2410edff072d954a3606cefd966581be37953a78f6169dd635cd648b9a7160620b811d5db3a95af8fb7e89b02adc0c568e01f24548a549e120bc0a75130359b
-  data.tar.gz: f7e227c8759d2738684192e93c5b4cad3acc41093dcc70ac6583b9ed5f1eee03e66090c1b2331187454b37cb59919c13c7baafd2d86ac80ab42f9b8df79daaeb
+  metadata.gz: abadfdb4293769589bb16bba5f0818377056b6fcc2842c7678dfc8e7ea756315cb3b5f1f71ba8128534f8674faa1b0547a87bd8cbb4039bc45455bf8e6b2be0a
+  data.tar.gz: 598eea46d0fdbc1a2543dfba51f87ca048fe603032da65f8d52acdd0f5e28a9fbf3801606ab8efb05cb8637a43107bd2074bcc3252f44bdbb51d015f2f276a0e

data/app/models/effective/menu.rb

@@ -12,25 +12,35 @@ module Effective
 
     accepts_nested_attributes_for :menu_items, :allow_destroy => true
 
-    before_create do
+    before_save do
       if self.menu_items.find { |menu_item| menu_item.lft == 1 }.blank?
-        menu_items.build(:title => 'Home', :url => '#', :lft => 1, :rgt => 2)
+        menu_items.build(:title => 'Home', :url => '/', :lft => 1, :rgt => 2)
       end
     end
 
     def self.update_from_effective_regions!(params)
-      (params || {}).each do |menu_id, attributes|
-        menu = Effective::Menu.includes(:menu_items).find(menu_id)
+      Effective::Menu.transaction do
+        (params || {}).each do |menu_id, attributes|
+          menu = Effective::Menu.includes(:menu_items).find(menu_id)
+          menu.menu_items.delete_all
 
-        attributes[:menu_items_attributes].each { |_, atts| atts[:menuable_type] = 'Effective::Page' if atts[:menuable_type].blank? }
-        menu.attributes = attributes
+          attributes[:menu_items_attributes].each do |_, atts|
+            atts[:menuable_type] = 'Effective::Page' if atts[:menuable_type].blank?
+            atts.delete(:id)
+          end
 
-        # So when we render the menu, we don't include the Root/Home item.
-        # It has a left of 1 and a right of max(items.right)
-        right = attributes[:menu_items_attributes].map { |_, atts| atts[:rgt].to_i }.max
-        menu.menu_items.find { |menu_item| menu_item.lft == 1 }.rgt = right + 1
+          menu.attributes = attributes
 
-        menu.save!
+          # So when we render the menu, we don't include the Root/Home item.
+          # It has a left of 1 and a right of max(items.right)
+          right = attributes[:menu_items_attributes].map { |_, atts| atts[:rgt].to_i }.max
+
+          root_node = menu.menu_items.find { |menu_item| menu_item.lft == 1 }
+          root_node ||= menu.menu_items.build(:title => 'Home', :url => '/', :lft => 1, :rgt => 2)
+          root_node.rgt = right + 1
+
+          menu.save!
+        end
       end
     end
 
@@ -42,7 +52,7 @@ module Effective
     def build(&block)
       raise 'build must be called with a block' if !block_given?
 
-      root = menu_items.build(:title => 'Home', :url => '#', :lft => 1, :rgt => 2)
+      root = menu_items.build(:title => 'Home', :url => '/', :lft => 1, :rgt => 2)
       root.parent = true
       instance_exec(&block) # A call to dropdown or item
       root.rgt = menu_items.map(&:rgt).max

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '0.9.7'.freeze
+  VERSION = '0.9.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Code and Effect