constructor-pages 0.7.10 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c3ad880702d0787d409bd4990d73fc3016d12c7
-  data.tar.gz: d4a2b4044023da44df7bf14790eb6af7225bbea8
+  metadata.gz: d0457fa097a8f3640bda13ce1f9699d1de07fe13
+  data.tar.gz: 2dbd8ce3ee79fd7a4faa636823dc87ee6710b532
 SHA512:
-  metadata.gz: 548992f46464ebcaca5bd68d21e74efd877a4495b7c1670c3ecacb8008fc9407fdbe9eb5d6f613092765753cccc7c8fcae0734622b1a82d40bf79dfe8d642a00
-  data.tar.gz: cee707598161a23679cacc9faed3c04bfe67ca1b68674f4fe6e9b22326a4f5da473f11f1d81423aef64c70e28291d81a8eda0e3d0d35cae25e0482e43d7a4c3c
+  metadata.gz: 41e7f40d889a96c0210994feb7362c743912c700c373e49091a7d4b7ac51bb40a2896fa2899016d30bea7659420cbf88d54399aee5346051418c2c071f087732
+  data.tar.gz: 1384f5b705a64fda65ae8d1ef04c62c29071d487bdd038ee9322179b2c046b5aa3f68100e51ae4b9810c9b291dd7d073ae11a7c43699078702939fc1d75aee8a

data/app/controllers/constructor_pages/pages_controller.rb

@@ -6,9 +6,11 @@ module ConstructorPages
 
     movable :page
 
-    before_filter -> {@roots = Page.roots}, except: [:show, :create, :update, :destroy, :search]
+    before_filter -> {@pages = Page.all}, only: [:new, :edit]
 
     def index
+      @pages = Page.includes(:template).load
+      @pages_cache = Digest::MD5.hexdigest(@pages.map{|p| [p.name, p.lft, p.template_id]}.join)
       @template_exists = Template.count != 0
       flash[:notice] = 'Create at least one template' unless @template_exists
     end

data/app/controllers/constructor_pages/templates_controller.rb

@@ -6,7 +6,12 @@ module ConstructorPages
 
     movable :template
 
-    before_filter {@roots = Template.roots}
+    before_filter -> {@roots = Template.roots}, only: [:new, :edit]
+
+    def index
+      @templates = Template.all
+      @templates_cache = Digest::MD5.hexdigest(@templates.map{|t| [t.name, t.lft]}.join)
+    end
 
     def new
       @template = Template.new

data/app/helpers/constructor_pages/pages_helper.rb

@@ -2,14 +2,6 @@ module ConstructorPages
   module PagesHelper
     include TreeviewHelper
 
-    def for_select(roots)
-      result = []
-      roots.each do |r|
-        r.self_and_descendants.each {|i| result.push(["#{'--'*i.level} #{i.name}", i.id, {'data-full_url' => i.full_url}])}
-      end
-      result
-    end
-
     def templates
       Template.all.map{|t| ["#{'--'*t.level} #{t.name}", t.id]}
     end

data/app/helpers/constructor_pages/templates_helper.rb

@@ -1,13 +1,5 @@
 module ConstructorPages
   module TemplatesHelper
     include TreeviewHelper
-
-    def for_select(roots)
-      result = []
-      roots.each do |r|
-        r.self_and_descendants.each {|i| result.push(["#{'--'*i.level} #{i.name}", i.id])}
-      end
-      result
-    end
   end
 end

data/app/helpers/constructor_pages/treeview_helper.rb

@@ -1,35 +1,5 @@
 module ConstructorPages
   module TreeviewHelper
-    def render_tree(roots, &block)
-      output = '<ul>'
-
-      roots.each do |root|
-        level, last = root.level, nil
-
-        root.self_and_descendants.each do |item|
-          if item.level > level
-            output += '<ul>'
-          elsif item.level < level
-            output += '</li>'
-            output += '</ul></li>' * (level-item.level)
-          elsif !item.root?
-            output += '</li>'
-          end
-
-          output += '<li>'
-
-          output += capture(item, &block)
-
-          level, last = item.level, item
-        end
-
-        output += '</li>'
-        output += '</ul></li>' * last.level
-      end
-
-      output.html_safe
-    end
-
     def arrow_buttons_for(item)
       output = "<div class='btn-group'>"
 
@@ -43,5 +13,13 @@ module ConstructorPages
       output += "</div>"
       output.html_safe
     end
+
+    def for_select(items, full_url = false)
+      result = []
+      items && items.each do |i|
+        result.push(["#{'--'*i.level} #{i.name}", i.id, ({'data-full_url' => i.full_url} if full_url) ])
+      end
+      result
+    end
   end
 end

data/app/models/constructor_pages/page.rb

@@ -164,6 +164,8 @@ module ConstructorPages
     end
 
     # Reload all descendants
-    def descendants_update; descendants.map(&:save) end
+    def descendants_update
+      descendants.map(&:save) if self.url_changed?
+    end
   end
 end

data/app/views/constructor_pages/pages/_form.haml

@@ -41,7 +41,7 @@
             .control-group
               = f.label :parent_id, class: 'control-label'
               .controls
-                = f.select :parent_id, options_for_select(for_select(@roots), selected: @parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: t(:no)
+                = f.select :parent_id, options_for_select(for_select(@pages, true), selected: @parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: t(:no)
 
             .control-group
               = f.label :template_id, :class => 'control-label'

data/app/views/constructor_pages/pages/index.haml

@@ -10,26 +10,28 @@
 
 %section.b-tree.span12
   %ul
-    = render_tree @roots do |page|
-      - if page.published?
-        = link_to page.name, page.full_url, class: 'btn btn-link'
-      - else
-        %button.btn.disabled= page.name
+    - cache @pages_cache do
+      - @pages.each do |page|
+        %li{class: "level#{page.level}"}
+          - if page.published?
+            = link_to page.name, page.full_url, class: 'btn btn-link'
+          - else
+            %button.btn.disabled= page.name
 
-      .b-tree__buttons
-        = arrow_buttons_for(page)
+          .b-tree__buttons
+            = arrow_buttons_for(page)
 
-        = link_to edit_page_path(page), class: 'btn btn-primary btn-mini' do
-          %i.icon-pencil
-          =t :edit
-          = page.template.to_accusative
+            = link_to edit_page_path(page), class: 'btn btn-primary btn-mini' do
+              %i.icon-pencil
+              =t :edit
+              = page.template.to_accusative
 
-        - if page.template.child
-          = link_to new_child_page_path(page), class: 'btn btn-success btn-mini' do
-            %i.icon-chevron-down
-            =t :add
-            = page.template.child.to_accusative
+            - if page.template.child
+              = link_to new_child_page_path(page), class: 'btn btn-success btn-mini' do
+                %i.icon-chevron-down
+                =t :add
+                = page.template.child.to_accusative
 
-        = link_to page, method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)} do
-          %i.icon-remove
-          =t :delete
+            = link_to page, method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)} do
+              %i.icon-remove
+              =t :delete

data/app/views/constructor_pages/templates/index.haml

@@ -8,17 +8,20 @@
       =t :new_template
 
 %section.b-tree.span12
-  = render_tree(@roots) do |template|
-    %button.btn.btn-link.disabled= template.name
+  %ul
+    - cache @templates_cache do
+      - @templates.each do |template|
+        %li{class: "level#{template.level}"}
+          %button.btn.btn-link.disabled= template.name
 
-    .b-tree__buttons
-      = arrow_buttons_for(template)
+          .b-tree__buttons
+            = arrow_buttons_for(template)
 
-      = link_to edit_template_path(template), class: 'btn btn-primary btn-mini' do
-        %i.icon-pencil
-        =t :edit
-        = t(:template).mb_chars.downcase
+            = link_to edit_template_path(template), class: 'btn btn-primary btn-mini' do
+              %i.icon-pencil
+              =t :edit
+              = t(:template).mb_chars.downcase
 
-      = link_to template, method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)} do
-        %i.icon-remove
-        =t :delete
+            = link_to template, method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)} do
+              %i.icon-remove
+              =t :delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.8.0
 platform: ruby
 authors:
 - Ivan Zotov
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.10
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.10
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement