constructor-pages 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea157c29fdb4cd4e44e3e48ac1afcdbd4c0192b
-  data.tar.gz: b6909560290f09d61a4e2067febc9a3fc1df1f32
+  metadata.gz: fe557ed858d29dafe8d2604a3041d4d72b362ab1
+  data.tar.gz: 417ab41ff118cafbabaac37ba4759de5d263a862
 SHA512:
-  metadata.gz: 0bfc2071eb754dae70406a6e5c572dae48fb640bcd6b7c3dadd3ca74ba13cc557551f820ffaeca8a11ed796d0e2cd3072830fc7583790116952e2b6c46176ba3
-  data.tar.gz: 353d275ce84ab7af904ba84d924b2c2ad6e62fc11a3078466a0d930b802526f54d005309fb296d84204bf4a8fea64c83407f94ee6de45342d525c490fe16b7ef
+  metadata.gz: c44421fa1db38795a17b89dda405d54bbea75366510b319940e1740178fbe7497d5d285876ae3575e718e5900cabaa6f973ed4bfe4920a810aae779cb56dbed4
+  data.tar.gz: 3b463ce126e2b123d6e41bad1bbad7b84dd95e68884bf05fbd06b4853c77112ebd9f43f13c0bd3748aa5543037e31888f4f27caf787e2bae719161d71921c8b8

data/app/controllers/constructor_pages/pages_controller.rb

@@ -6,6 +6,11 @@ module ConstructorPages
 
     before_filter {@roots = Page.roots}
 
+    def index
+      @template_exists = Template.count > 0
+      flash.notice = 'Create at least one template' unless @template_exists
+    end
+
     def new
       @page, @template_id, @multipart = Page.new, Template.first.id, false
 
@@ -15,7 +20,7 @@ module ConstructorPages
     end
 
     def show
-      @page = Page.find_by_request_or_first('/' + params[:all])
+      @page = Page.find_by_request_or_first("/#{params[:all]}")
 
       error_404 and return if @page.nil? or !@page.active?
 
@@ -102,12 +107,12 @@ module ConstructorPages
     def update
       @page = Page.find params[:id]
 
-      if @page.template.id != params[:page][:template_id].to_i
-        @page.remove_fields_values
-      end
+      _template_changed = @page.template.id != params[:page][:template_id].to_i
+
+      @page.remove_fields_values if _template_changed
 
       if @page.update page_params
-        @page.create_fields_values
+        @page.create_fields_values if _template_changed
         @page.update_fields_values params[:fields]
 
         redirect_to pages_url, notice: t(:page_success_updated, name: @page.name)
@@ -123,7 +128,7 @@ module ConstructorPages
       redirect_to pages_url, notice: t(:page_success_removed, name: _name)
     end
 
-    %w{up down}.each {|m| define_method "move_#{m}" do move_to :page, m.to_sym end}
+    %w{up down}.each {|m| define_method "move_#{m}" do move_to :page, params[:id], m.to_sym end}
 
     private
 

data/app/controllers/constructor_pages/templates_controller.rb

@@ -3,6 +3,7 @@
 module ConstructorPages
   class TemplatesController < ConstructorCore::ApplicationController
     include MoveHelper
+    include TreeviewHelper
 
     before_filter {@roots = Template.roots}
 
@@ -41,7 +42,7 @@ module ConstructorPages
       redirect_to templates_url, notice: t(:template_success_removed, name: name)
     end
 
-    %w{up down}.each {|m| define_method "move_#{m}" do move_to :template, m.to_sym end}
+    %w{up down}.each {|m| define_method "move_#{m}" do move_to :template, params[:id], m.to_sym end}
 
     private
 

data/app/helpers/constructor_pages/move_helper.rb

@@ -1,7 +1,7 @@
 module ConstructorPages
   module MoveHelper
-    def move_to(what, to)
-      from = ('constructor_pages/'+what.to_s).classify.constantize.find(params[:id])
+    def move_to(what, id, to)
+      from = ('constructor_pages/'+what.to_s).classify.constantize.find(id)
       to_sibling = to == :up ? from.left_sibling : from.right_sibling
 
       if not to_sibling.nil? and from.move_possible?(to_sibling)

data/app/helpers/constructor_pages/pages_helper.rb

@@ -1,5 +1,7 @@
 module ConstructorPages
   module PagesHelper
+    include TreeviewHelper
+
     def for_select(roots)
       result = []
       roots.each do |r|

data/app/helpers/constructor_pages/templates_helper.rb

@@ -1,5 +1,7 @@
 module ConstructorPages
   module TemplatesHelper
+    include TreeviewHelper
+
     def for_select(roots)
       result = []
       roots.each do |r|

data/app/helpers/constructor_pages/treeview_helper.rb

@@ -0,0 +1,33 @@
+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
+  end
+end

data/app/models/constructor_pages/page.rb

@@ -24,10 +24,10 @@ module ConstructorPages
 
     acts_as_nested_set
 
-    # Used for find page by request. It return first page if no request given
+    # Used for find page by request. It return first page if no request given or request is home page
     # @param request for example <tt>'/conditioners/split-systems/zanussi'</tt>
     def self.find_by_request_or_first(request = nil)
-      request.nil? ? Page.first : Page.where(full_url: request).first
+      request.nil? || request == '/' ? Page.first : Page.where(full_url: request).first
     end
 
     # Generate full_url from parent id and url
@@ -72,6 +72,8 @@ module ConstructorPages
     # @param params should looks like <tt>{price: 500, content: 'Hello'}</tt>
     # @param reset_booleans reset all boolean fields to false before assign params
     def update_fields_values(params, reset_booleans = true)
+      return if params.nil?
+
       fields.each do |field|
         value = params[field.code_name.to_sym]
 

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

@@ -1,28 +1,28 @@
 = form_for @field do |f|
   - if @field.errors.any?
     .alert.alert-error.fade.in.span12
-      = link_to "×", "#", :class => "close", 'data-dismiss' => 'alert'
+      = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
       - @field.errors.full_messages.each do |m|
         = m
 
   .form-horizontal
     .control-group
-      = f.label :name, :class => 'control-label'
-      .controls= f.text_field :name, :class => "span4"
+      = f.label :name, class: 'control-label'
+      .controls= f.text_field :name, class: 'span4'
 
     .control-group
-      = f.label :code_name, :class => 'control-label'
-      .controls= f.text_field :code_name, :class => "span4"
-      = f.hidden_field :template_id, :value => @field.template.id, :class => "span4"
+      = f.label :code_name, class: 'control-label'
+      .controls= f.text_field :code_name, class: 'span4'
+      = f.hidden_field :template_id, value: @field.template.id, class: 'span4'
 
     - unless @field.type_value == 'image'
       .control-group
-        = f.label :type_value, :class => 'control-label'
+        = f.label :type_value, class: 'control-label'
         .controls
-          = f.select :type_value, options_for_select(types_value, :selected => @field.type_value), :class => "span4"
+          = f.select :type_value, options_for_select(types_value, selected: @field.type_value), class: 'span4'
 
     .row-fluid
       .span12
         .form-actions
-          = f.submit :class => "btn btn-primary"
-          = link_to t(:cancel), edit_template_url(@field.template), :class => "btn"
+          = f.submit class: 'btn btn-primary'
+          = link_to t(:cancel), edit_template_url(@field.template), class: 'btn'

data/app/views/constructor_pages/fields/types/_html.haml

@@ -1 +1 @@
-= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :rows => 10, :class => 'span9 ckeditor'
+= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), rows: 10, class: 'span9 ckeditor'

data/app/views/constructor_pages/fields/types/_image.haml

@@ -4,4 +4,4 @@
   = image_tag image.value.thumb('200x200').url
 
 %br/
-= file_field_tag "fields[#{field.code_name}]", :class => 'span6'
+= file_field_tag "fields[#{field.code_name}]", class: 'span6'

data/app/views/constructor_pages/fields/types/_integer.haml

@@ -1 +1 @@
-= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :class => 'span2'
+= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'span2'

data/app/views/constructor_pages/fields/types/_string.haml

@@ -1 +1 @@
-= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :class => 'span6'
+= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'span6'

data/app/views/constructor_pages/fields/types/_text.haml

@@ -1 +1 @@
-= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :rows => 10, :class => 'span6'
+= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), rows: 10, class: 'span6'

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

@@ -3,5 +3,5 @@
     - page.ancestors.each do |i|
       - if i.in_nav
         %li
-          = link_to i.name, i.full_url, :title => i.name, :class => 'b-page-json'
-          %span{:class => "divider"} /
+          = link_to i.name, i.full_url, title: i.name, class: 'b-page-json'
+          %span{class: 'divider'} /

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

@@ -1,97 +1,97 @@
-= form_for @page, :html => {:multipart => @multipart} do |f|
+= form_for @page, html: {multipart: @multipart} do |f|
   - if @page.errors.any?
     .alert.alert-error.fade.in.span12
-      = link_to "×", "#", :class => "close", 'data-dismiss' => 'alert'
+      = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
       - @page.errors.full_messages.each do |m|
         = m
           
   .form-horizontal
     .control-group
-      = f.label :active, :class => 'control-label'
-      .controls= f.check_box :active, :class => "span6"
+      = f.label :active, class: 'control-label'
+      .controls= f.check_box :active, class: 'span6'
 
     .control-group
-      = f.label :name, :class => 'control-label'
-      .controls= f.text_field :name, :class => "span4"
+      = f.label :name, class: 'control-label'
+      .controls= f.text_field :name, class: 'span4'
 
     .control-group.auto_url
-      = f.label :auto_url, :class => 'control-label'
+      = f.label :auto_url, class: 'control-label'
       .controls
-        = f.check_box :auto_url, :class => "span9"
+        = f.check_box :auto_url, class: 'span9'
 
     .control-group.url
-      = f.label :url, :class => 'control-label'
+      = f.label :url, class: 'control-label'
       .controls
         .full_url
           %span.path>= @page.parent.full_url unless @page.parent.nil?
           \/
           %span.address>= @page.url
-        = f.text_field :url, :class => "span3"
+        = f.text_field :url, class: 'span3'
         %i.address_icon.icon-pencil
 
     - unless @page.new_record?
       - @page.template.fields.each do |field|
         .control-group
-          = label_tag "", field.name, :class => 'control-label'
+          = label_tag "fields[#{field.code_name}]", field.name, class: 'control-label'
           .controls
-            = render :partial => "constructor_pages/fields/types/#{field.type_value}", :locals => {:field => field, :page => @page}
+            = render :partial => "constructor_pages/fields/types/#{field.type_value}", locals: {field: field, page: @page}
 
     .accordion
       .accordion-group
         .accordion-heading.text-center
-          = link_to t(:settings), '#collapse', :class => 'accordion-toggle', 'data-toggle' => 'collapse'
+          = link_to t(:settings), '#collapse', class: 'accordion-toggle', 'data-toggle' => 'collapse'
         .accordion-body.in.collapse#collapse
           .accordion-inner
             .control-group
-              = f.label :parent, :class => 'control-label'
+              = f.label :parent_id, class: 'control-label'
               .controls
-                = f.select :parent_id, options_for_select(for_select(@roots), :selected => @page.parent_id, :disabled => @page.self_and_descendants.map{|p| p.id}), :include_blank => t(:no)
+                = f.select :parent_id, options_for_select(for_select(@roots), selected: @page.parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: t(:no)
 
             .control-group
-              = f.label :template, :class => 'control-label'
+              = f.label :template_id, :class => 'control-label'
               .controls
-                = f.select :template_id, options_for_select(templates, :selected => @template_id)
+                = f.select :template_id,  options_for_select(templates, selected: @template_id)
             .control-group
-              = f.label :link, :class => 'control-label'
+              = f.label :link, class: 'control-label'
               .controls
-                = f.text_field :link, :class => "span9"          
+                = f.text_field :link, class: 'span9'
             .control-group
               %label.control-label=t :display_in
               .controls
-                %label.checkbox.inline.span2{:for => 'in_menu'}
+                %label.checkbox.inline.span2{for: 'in_menu'}
                   = f.check_box :in_menu
                   =t :menu
 
-                %label.checkbox.inline.span2{:for => 'in_map'}
+                %label.checkbox.inline.span2{for: 'in_map'}
                   = f.check_box :in_map
                   =t :sitemap
 
-                %label.checkbox.inline.span2{:for => 'in_nav'}
+                %label.checkbox.inline.span2{for: 'in_nav'}
                   = f.check_box :in_nav
                   =t :breadcrumbs
 
     .accordion
       .accordion-group
         .accordion-heading.text-center
-          = link_to t(:seo), '#collapse-three', :class => 'accordion-toggle', 'data-toggle' => 'collapse'
+          = link_to t(:seo), '#collapse-three', class: 'accordion-toggle', 'data-toggle' => 'collapse'
         .accordion-body.in.collapse#collapse-three
           .accordion-inner
             .control-group
-              = f.label :title, :class => 'control-label'
+              = f.label :title, class: 'control-label'
               .controls
-                = f.text_field :title, :class => "span9"
+                = f.text_field :title, class: 'span9'
             .control-group
-              = f.label :keywords, :class => 'control-label'
+              = f.label :keywords, class: 'control-label'
               .controls
-                = f.text_field :keywords, :class => "span9"
+                = f.text_field :keywords, class: 'span9'
             .control-group
-              = f.label :description, :class => 'control-label'
+              = f.label :description, class: 'control-label'
               .controls
-                = f.text_area :description, :class => "span9", :rows => 8
+                = f.text_area :description, class: 'span9', rows: 8
 
     .row-fluid        
       .span12
         .form-actions
-          = f.submit :class => "btn btn-primary"
+          = f.submit class: 'btn btn-primary'
           = link_to t(:cancel), pages_url, class: 'btn'
           = link_to t(:delete_page), @page, method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @page.new_record?

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

@@ -2,51 +2,41 @@
   =t :structure
 
 - content_for :actions do
-  .span4.clearfix.text-right
-    = link_to "<i class='icon-plus icon-white'></i> #{t :new_page}".html_safe, pages.new_page_path, :class => "btn btn-large btn-link"
+  - if @template_exists
+    .span4.clearfix.text-right
+      = link_to pages.new_page_path, class: 'btn btn-large btn-link' do
+        %i.icon-plus
+        =t :new_page
 
 %section.b-tree.span12
   %ul
-    - @roots.each do |root|
-      - level = root.level
-      - last_page = nil
-
-      - root.self_and_descendants.each do |page|
-        - if page.level > level
-          <ul>
-        - elsif page.level < level
-          </li>
-          = raw "</ul></li>" * (level-page.level)
-        - elsif !page.root?
-          </li>
-
-        <li>
-        - if page.published?
-          = link_to page.name, page.full_url, class: 'btn btn-link'
-        - else
-          %button.btn.disabled= page.name
-
-        .b-tree__buttons
-          .btn-group
-            - if not page.right_sibling.nil? and page.move_possible?(page.right_sibling)
-              = link_to "<i class='icon-arrow-down'></i>".html_safe, page_move_down_path(page), :method => :post, :class => "btn btn-mini"
-            - if not page.left_sibling.nil? and page.move_possible?(page.left_sibling)
-              = link_to "<i class='icon-arrow-up'></i>".html_safe, page_move_up_path(page), :method => :post, :class => "btn btn-mini"
-
-          = link_to "<i class='icon-pencil'></i> #{t :edit} #{page.template.name.downcase}".html_safe, edit_page_path(page), :class => "btn btn-primary btn-mini"
-
-          - unless page.template.nil?
-            - if page.template.child_id.nil?
-              - if !page.template.leaf?
-                = link_to "<i class='icon-chevron-down'></i> #{t :add} #{page.template.descendants.first.name.downcase}".html_safe, new_child_page_path(page), :class => "btn btn-success btn-mini"
-            - else
-              = link_to "<i class='icon-chevron-down'></i> #{t :add} #{ConstructorPages::Template.find(page.template.child_id).name.downcase}".html_safe, new_child_page_path(page), :class => "btn btn-success btn-mini"
-
-          = link_to "<i class='icon-remove'></i> #{t :delete}".html_safe, page_path(page), method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)}
-
-
-
-        - level = page.level
-        - last_page = page
-      </li>
-      = raw "</ul></li>" * last_page.level
+    = 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
+
+      .b-tree__buttons
+        = render partial: 'constructor_pages/partials/arrow_buttons', locals: {item: page}
+
+        = link_to edit_page_path(page), class: 'btn btn-primary btn-mini' do
+          %i.icon-pencil
+          =t :edit
+          = page.template.name.downcase
+
+        - unless page.template.nil?
+          - if page.template.child_id.nil?
+            - if !page.template.leaf?
+              = link_to new_child_page_path(page), class: 'btn btn-success btn-mini' do
+                %i.icon-chevron-down
+                =t :add
+                = page.template.descendants.first.name.downcase
+          - else
+            = link_to new_child_page_path(page), class: 'btn btn-success btn-mini' do
+              %i.icon-chevron-down
+              =t :add
+              = ConstructorPages::Template.find(page.template.child_id).name.downcase
+
+        = link_to page_path(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/partials/_arrow_buttons.haml

@@ -0,0 +1,6 @@
+.btn-group
+  - {down: :right, up: :left}.each_pair do |a, b|
+    - sibling = item.send(b.to_s+'_sibling')
+    - if sibling and item.move_possible?(sibling)
+      = link_to "/admin/#{item.class.to_s.demodulize.downcase.pluralize}/move/#{a}/#{item.id}", class: 'btn btn-mini' do
+        %i{class: "icon-arrow-#{a}"}

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

@@ -1,47 +1,52 @@
 = form_for @template do |f|
   - if @template.errors.any?
     .alert.alert-error.fade.in.span12
-      = link_to "×", "#", :class => "close", 'data-dismiss' => 'alert'
+      = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
       - @template.errors.full_messages.each do |m|
         = m
 
   .form-horizontal
     .control-group
-      = f.label :name, :class => 'control-label'
-      .controls= f.text_field :name, :class => "span4"
+      = f.label :name, class: 'control-label'
+      .controls= f.text_field :name, class: 'span4'
 
     .control-group
-      = f.label :code_name, :class => 'control-label'
-      .controls= f.text_field :code_name, :class => "span4"
+      = f.label :code_name, class: 'control-label'
+      .controls= f.text_field :code_name, class: 'span4'
 
     .control-group
-      = f.label :parent, :class => 'control-label'
+      = f.label :parent, class: 'control-label'
       .controls
-        = f.select :parent_id, options_for_select(for_select(@roots), :selected => @template.parent_id), :include_blank => t(:no)
+        = f.select :parent_id, options_for_select(for_select(@roots), selected: @template.parent_id), disabled: @template.self_and_descendants.map(&:id), include_blank: t(:no)
 
     .control-group
-      = f.label :child, :class => 'control-label'
+      = f.label :child, class: 'control-label'
       .controls
-        = f.select :child_id, options_for_select(for_select(@roots), :selected => @template.child_id), :include_blank => t(:no)
+        = f.select :child_id, options_for_select(for_select(@roots), selected: @template.child_id), include_blank: t(:no)
 
     - unless @template.new_record?
       .control-group
         .controls
-          = link_to "<i class='icon-plus icon-white'></i> #{t :new_field}".html_safe, new_field_path(@template.id), :class => "btn btn-mini btn-link"
+          = link_to new_field_path(@template.id), class: 'btn btn-mini btn-link' do
+            %i.icon-plus
+            =t :new_field
 
     - @template.fields.each do |field|
       .control-group
-        = label_tag "", field.name, :class => 'control-label'
+        = label_tag '', field.name, class: 'control-label'
         .controls
-          = link_to "<i class='icon-arrow-down'></i>".html_safe, field_move_down_path(field), :class => "btn btn-mini #{"disabled" if field.last?}"
-          = link_to "<i class='icon-arrow-up'></i>".html_safe, field_move_up_path(field), :class => "btn btn-mini #{"disabled" if field.first?}"
-
-          = link_to "<i class='icon-pencil icon-white'></i>".html_safe, edit_field_path(field, field.template), :class => "btn btn-mini btn-primary"
-          = link_to "<i class='icon-remove icon-white'></i>".html_safe, field_path(field), method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-mini btn-danger'
+          = link_to field_move_down_path(field), class: "btn btn-mini #{'disabled' if field.last?}" do
+            %i.icon-arrow-down
+          = link_to field_move_up_path(field), class: "btn btn-mini #{'disabled' if field.first?}" do
+            %i.icon-arrow-up
+          = link_to edit_field_path(field, field.template), class: 'btn btn-mini btn-primary' do
+            %i.icon-pencil
+          = link_to field_path(field), method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-mini btn-danger' do
+            %i.icon-remove
 
     .row-fluid
       .span12
         .form-actions
-          = f.submit :class => "btn btn-primary"
-          = link_to t(:cancel), templates_url, :class => "btn"
+          = f.submit class: 'btn btn-primary'
+          = link_to t(:cancel), templates_url, class: 'btn'
           = link_to t(:delete_template), @template, method: :delete, data: {confirm: t(:are_you_sure?)},  class: 'btn btn-danger pull-right' unless @template.new_record?

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

@@ -3,37 +3,18 @@
 
 - content_for :actions do
   .span4.clearfix.text-right
-    = link_to "<i class='icon-plus icon-white'></i> #{t :new_template}".html_safe, new_template_path, :class => "btn btn-link btn-large"
+    = link_to new_template_path, class: 'btn btn-link btn-large' do
+      %i.icon-plus
+      =t :new_template
 
 %section.b-tree.span12
-  %ul
-    - @roots.each do |root|
-      - level = root.level
-      - last_template = nil
+  = render_tree(@roots) do |template|
+    %button.btn.btn-link.disabled= template.name
 
-      - root.self_and_descendants.each do |template|
-        - if template.level > level
-          <ul>
-        - elsif template.level < level
-          </li>
-          = raw "</ul></li>" * (level-template.level)
-        - elsif !template.root?
-          </li>
+    .b-tree__buttons
+      = render partial: 'constructor_pages/partials/arrow_buttons', locals: {item: template}
 
-        <li>
-        %button.btn.btn-link.disabled= template.name
-
-        .b-tree__buttons
-          .btn-group
-            - if not template.right_sibling.nil? and template.move_possible?(template.right_sibling)
-              = link_to "<i class='icon-arrow-down'></i>".html_safe, template_move_down_path(template), :method => :post, :class => "btn btn-mini"
-            - if not template.left_sibling.nil? and template.move_possible?(template.left_sibling)
-              = link_to "<i class='icon-arrow-up'></i>".html_safe, template_move_up_path(template), :method => :post, :class => "btn btn-mini"
-
-          = link_to "<i class='icon-pencil'></i> #{t :edit} #{ t(:template).downcase}".html_safe, edit_template_path(template), :class => "btn btn-primary btn-mini"
-
-
-        - level = template.level
-        - last_template = template
-      </li>
-      = raw "</ul></li>" * last_template.level
+      = link_to edit_template_path(template), class: 'btn btn-primary btn-mini' do
+        %i.icon-pencil
+        =t :edit
+        = t(:template).downcase

data/config/locales/en.yml

@@ -8,6 +8,7 @@ en:
   display_in: 'Display in'
   help: 'Help'
   edit: 'Edit'
+  delete: 'Delete'
 
   new_field: 'New field'
 

data/config/locales/ru.yml

@@ -7,6 +7,7 @@ ru:
   seo: 'Поисковая оптимизация'
   are_you_sure?: 'Вы уверены?'
   display_in: 'Отображать в'
+  delete: 'Удалить'
 
   menu: 'Меню'
   breadcrumbs: 'Хлебные крошки'

data/config/routes.rb

@@ -1,32 +1,27 @@
 ConstructorPages::Engine.routes.draw do
   scope '/admin' do
-    resources :pages, :except => [:show]
-    resources :templates, :except => [:show]
-    resources :fields, :except => [:show, :new, :edit]
+    resources :pages, except: [:show]
+    resources :templates, except: [:show]
+    resources :fields, except: [:show, :new, :edit]
 
-    scope '/fields' do
-      get ':template_id/new/' => 'fields#new', :as => :new_field
-      get ':id/:template_id/edit/' => 'fields#edit', :as => :edit_field
-
-      get 'move/up/:id' => "fields#move_up", :as => :field_move_up
-      get 'move/down/:id' => "fields#move_down", :as => :field_move_down
+    %w{page template field}.each do |c|
+      %w{up down}.each do |d|
+        get "#{c.pluralize}/move/#{d}/:id" => "#{c.pluralize}#move_#{d}", as: "#{c}_move_#{d}"
+      end
     end
 
-    scope '/pages' do
-      post 'move/up/:id' => "pages#move_up", :as => :page_move_up
-      post 'move/down/:id' => "pages#move_down", :as => :page_move_down
-      
-      get ':page/new' => "pages#new", :as => :new_child_page
+    scope '/fields' do
+      get ':template_id/new/' => 'fields#new', as: :new_field
+      get ':id/:template_id/edit/' => 'fields#edit', as: :edit_field
     end
 
-    scope '/templates' do
-      post 'move/up/:id' => "templates#move_up", :as => :template_move_up
-      post 'move/down/:id' => "templates#move_down", :as => :template_move_down
+    scope '/pages' do
+      get ':page/new' => 'pages#new', as: :new_child_page
     end
   end
 
-  root :to => "pages#show"
-  get '*all/search/:what_search' => "pages#search", :format => false
-  get '*all.:format' => "pages#show"
-  get '*all' => "pages#show"
+  root :to => 'pages#show'
+  get '*all/search/:what_search' => 'pages#search', format: false
+  get '*all.:format' => 'pages#show'
+  get '*all' => 'pages#show'
 end

data/spec/features/constructor_pages/pages_controller_spec.rb

@@ -0,0 +1,280 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module ConstructorPages
+  describe 'Pages Controller' do
+    before :all do
+      @user = ConstructorCore::User.create email: 'ivanzotov@gmail.com', password: '123qweASD'
+      @template = Template.create name: 'Page', code_name: 'page'
+    end
+
+    before :each do
+      Page.delete_all
+      Field.delete_all
+
+      Field::TYPES.each do |t|
+        "constructor_pages/types/#{t}_type".classify.constantize.delete_all
+      end
+
+      login_as @user
+    end
+
+    describe 'Index' do
+      context 'Access' do
+        it 'should be accessed by pages_path if loggen in' do
+          visit pages.pages_path
+          current_path.should == pages.pages_path
+          status_code.should == 200
+        end
+
+        it 'should not be accessed by pages_path if not loggen in' do
+          logout
+          visit pages.pages_path
+          current_path.should == '/'
+        end
+      end
+
+      it 'should notice if no template exists' do
+        Template.delete_all
+        visit pages.pages_path
+        page.should_not have_link 'New page'
+        page.should have_content 'Create at least one template'
+      end
+
+      it 'should not notice if template exists' do
+        visit pages.pages_path
+        page.should have_link 'New page'
+        page.should_not have_text 'Create at least one template'
+      end
+
+      it 'should has pages list' do
+        Page.create name: 'Zanussi'
+        visit pages.pages_path
+        page.should have_selector 'ul li'
+        page.should have_link 'Zanussi'
+      end
+
+      it 'should has new page link' do
+        visit pages.pages_path
+        page.should have_link 'New page', pages.new_page_path
+      end
+
+      it 'should has edit_page link' do
+        _page = Page.create name: 'Zanussi'
+        visit pages.pages_path
+        page.should have_link 'Edit page', pages.edit_page_path(_page)
+      end
+
+      it 'should has delete_page link' do
+        _page = Page.create name: 'Zanussi'
+        visit pages.pages_path
+        page.should have_link 'Delete', pages.page_path(_page)
+      end
+
+      it 'should has Add child' do
+        _template = Template.create name: 'Child', code_name: 'child_page', parent: @template
+        _page = Page.create name: 'Zanussi', template: @template
+        visit pages.pages_path
+        page.should have_link 'Add child', pages.new_child_page_path(_page)
+      end
+    end
+
+    describe 'Moving' do
+      it 'should move up' do
+        _page_first = Page.create name: 'First'
+        _page_second = Page.create name: 'Second'
+        _page_third = Page.create name: 'Third'
+
+        # test
+        _page_first.lft.should == 1
+        _page_first.rgt.should == 2
+
+        _page_second.lft.should == 3
+        _page_second.rgt.should == 4
+
+        _page_third.lft.should == 5
+        _page_third.rgt.should == 6
+
+
+        # test
+
+        _page_first.left_sibling.should be_nil
+        _page_first.right_sibling.should == _page_second
+
+        _page_second.left_sibling.should == _page_first
+        _page_second.right_sibling.should == _page_third
+
+        _page_third.left_sibling.should == _page_second
+        _page_third.right_sibling.should be_nil
+      end
+    end
+
+    describe 'New page' do
+      it 'should be accessed by new_page_path if logged in' do
+        visit pages.new_page_path
+        current_path.should == pages.new_page_path
+        status_code.should == 200
+      end
+
+      it 'should not be accessed by new_page_path if not logged in' do
+        logout
+        visit pages.new_page_path
+        current_path.should == '/'
+      end
+
+      it 'should has child template of parent page' do
+        _template = Template.create name: 'Child', code_name: 'child_page', parent: @template
+        _page = Page.create name: 'Zanussi', template: @template
+        visit pages.pages_path
+        click_link 'Add child'
+        current_path.should == pages.new_child_page_path(_page)
+        page.should have_select 'Template', selected: '-- Child'
+      end
+
+      it 'should has published checkbox' do
+        visit pages.new_page_path
+        page.should have_checked_field 'Active'
+      end
+
+      it 'should has name field' do
+        visit pages.new_page_path
+        page.should have_field 'Name'
+      end
+
+      it 'should has not delete link' do
+        visit pages.new_page_path
+        page.should_not have_link 'Delete'
+      end
+
+      it 'should has create button' do
+        visit pages.new_page_path
+        page.should have_button 'Create Page'
+      end
+
+      it 'should save new page' do
+        visit pages.new_page_path
+        fill_in 'Name', with: 'Hello world'
+        Page.count.should == 0
+        page.click_button 'Create Page'
+        Page.count.should == 1
+        _page = Page.first
+        _page.name.should == 'Hello world'
+        _page.url.should == 'hello-world'
+        current_path.should == pages.pages_path
+      end
+    end
+
+    describe 'Edit page' do
+      before :each do
+        @page = Page.create name: 'Hello world'
+      end
+
+      it 'should be accessed by edit_page_path if logged in' do
+        visit pages.edit_page_path(@page)
+        status_code.should == 200
+      end
+
+      it 'should not be accessed by edit_page_path if not logged in' do
+        logout
+        visit pages.edit_page_path(@page)
+        current_path.should == '/'
+      end
+
+      it 'should has delete link' do
+        visit pages.edit_page_path(@page)
+        page.should have_link 'Delete'
+      end
+
+      it 'should edit page' do
+        visit pages.edit_page_path(@page)
+        fill_in 'Name', with: 'Zanussi'
+        fill_in 'Title', with: 'Zanussi conditioners'
+        fill_in 'Keywords', with: 'Zanussi, conditioners, Voronezh'
+        fill_in 'Description', with: 'Zanussi conditioners Voronezh'
+        @page.name.should == 'Hello world'
+        click_button 'Update Page'
+        @page.reload
+        @page.name.should == 'Zanussi'
+        @page.url.should == 'zanussi'
+        @page.title.should == 'Zanussi conditioners'
+        @page.keywords.should == 'Zanussi, conditioners, Voronezh'
+        @page.description.should == 'Zanussi conditioners Voronezh'
+      end
+    end
+
+    describe 'Delete page' do
+      it 'should delete from pages index' do
+        Page.create name: 'Page'
+        visit pages.pages_path
+        Page.count.should == 1
+        click_link 'Delete'
+        Page.count.should == 0
+      end
+
+      it 'should delete from page' do
+        _page = Page.create name: 'Page'
+        visit pages.edit_page_path(_page)
+        Page.count.should == 1
+        click_link 'Delete'
+        Page.count.should == 0
+      end
+    end
+
+    describe 'Fields' do
+      it 'should create fields after create page' do
+        Field.create name: 'Short description', code_name: 'short_description', template: @template, type_value: 'text'
+        Field.create name: 'Long description', code_name: 'long_description', template: @template, type_value: 'html'
+
+        visit pages.new_page_path
+        fill_in 'Name', with: 'Page'
+        click_button 'Create Page'
+        page.should have_content 'added successfully'
+
+        _page = Page.first
+        _page.short_description.should == ''
+
+        visit pages.edit_page_path(_page)
+
+        fill_in 'Short description', with: 'This is short description'
+        fill_in 'Long description', with: 'This is long description'
+
+        click_button 'Update Page'
+
+        _page.reload
+        _page.short_description.should == 'This is short description'
+      end
+
+      it 'should change fields if template change' do
+        Field.create name: 'Price', code_name: 'price', template: @template, type_value: 'float'
+        _template = Template.create name: 'Brand', code_name: 'brand'
+        Field.create name: 'Amount', code_name: 'amount', template: _template, type_value: 'integer'
+
+        visit pages.new_page_path
+        fill_in 'Name', with: 'Simple page'
+        click_button 'Create Page'
+        _page = Page.first
+        visit pages.edit_page_path(_page)
+        page.should have_selector('#fields_price')
+        fill_in 'Price', with: '250.20'
+        click_button 'Update Page'
+        _page.reload
+        _page.price.should == 250.2
+        visit pages.edit_page_path(_page)
+        select 'Brand', from: 'Template'
+        click_button 'Update Page'
+        _page.reload
+        _page.template.should == _template
+        _page.price.should be_nil
+        _page.amount.should == 0
+        visit pages.edit_page_path(_page)
+        page.should_not have_selector('#fields_price')
+        page.should have_selector('#fields_amount')
+        fill_in 'Amount', with: 200
+        click_button 'Update Page'
+        _page.reload
+        _page.amount.should == 200
+      end
+    end
+  end
+end

data/spec/models/constructor_pages/field_model_spec.rb

@@ -8,27 +8,23 @@ module ConstructorPages
       Template.delete_all
       @template = Template.create name: 'Page', code_name: 'page'
 
-      #Field.delete_all
-      #Field::TYPES.each do |t|
-      #  "constructor_pages/types/#{t}_type".classify.constantize.delete_all
-      #end
+      Field.delete_all
+      Field::TYPES.each do |t|
+        "constructor_pages/types/#{t}_type".classify.constantize.delete_all
+      end
     end
 
     describe '.create' do
-      #it 'should be valid' do
-       # _field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
-       # _field.should be_valid
-      #end
+      it 'should be valid' do
+        _field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        _field.should be_valid
+      end
 
       it 'should create page fields' do
-        #_field = Field.create name: 'Price', code_name: 'price', template: @template, type_value: 'text'
-
-        @template.should_not be_nil
-        Page.new name: 'hello world'#, template: @template
-        #_page.save.should be_true
-        #_page = Page.create name: 'Page'#, template_id: @template.id
-        #_page.template_id.should_not be_nil
-        #_page.price.should == ''
+        _field = Field.create name: 'Price', code_name: 'price', template: @template, type_value: 'text'
+
+        _page = Page.create name: 'Page', template_id: @template.id
+        _page.price.should == ''
       end
     end
 

data/spec/models/constructor_pages/page_model_spec.rb

@@ -36,8 +36,9 @@ module ConstructorPages
           Page.find_by_request_or_first('/new-page').should == @page
         end
 
-        it 'should return first page if no given request' do
+        it 'should return first page if no given request or request is home page' do
           Page.find_by_request_or_first.should == @page
+          Page.find_by_request_or_first('/').should == @page
         end
       end
 

data/spec/models/constructor_pages/template_model_spec.rb

@@ -20,7 +20,7 @@ module ConstructorPages
         _brand.reload
 
         _brand.child.should == _series
-        _brand.child_id = 1
+        _brand.child_id = _brand.id
 
         _brand.child.should == _brand
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constructor-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ files:
 - app/helpers/constructor_pages/move_helper.rb
 - app/helpers/constructor_pages/pages_helper.rb
 - app/helpers/constructor_pages/templates_helper.rb
+- app/helpers/constructor_pages/treeview_helper.rb
 - app/models/constructor_pages/field.rb
 - app/models/constructor_pages/page.rb
 - app/models/constructor_pages/template.rb
@@ -187,6 +188,7 @@ files:
 - app/views/constructor_pages/pages/index.haml
 - app/views/constructor_pages/pages/new.haml
 - app/views/constructor_pages/pages/show.haml
+- app/views/constructor_pages/partials/_arrow_buttons.haml
 - app/views/constructor_pages/templates/_form.haml
 - app/views/constructor_pages/templates/edit.haml
 - app/views/constructor_pages/templates/index.haml
@@ -211,10 +213,10 @@ files:
 - lib/constructor-pages.rb
 - lib/constructor_pages/engine.rb
 - public/hello.txt
+- spec/features/constructor_pages/pages_controller_spec.rb
 - spec/models/constructor_pages/field_model_spec.rb
 - spec/models/constructor_pages/page_model_spec.rb
 - spec/models/constructor_pages/template_model_spec.rb
-- spec/requests/constructor_pages/pages_controller_spec.rb
 homepage: http://ivanzotov.github.com/constructor
 licenses: []
 metadata: {}
@@ -239,8 +241,8 @@ signing_key:
 specification_version: 4
 summary: Pages for Constructor CMS
 test_files:
+- spec/features/constructor_pages/pages_controller_spec.rb
 - spec/models/constructor_pages/field_model_spec.rb
 - spec/models/constructor_pages/page_model_spec.rb
 - spec/models/constructor_pages/template_model_spec.rb
-- spec/requests/constructor_pages/pages_controller_spec.rb
 has_rdoc: 

data/spec/requests/constructor_pages/pages_controller_spec.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-module ConstructorPages
-  describe 'Page Controller', type: :feature do
-#    it 'should be valid' do
-#      Page.create name: 'Hello'
-#      visit '/hello'
-#    end
-  end
-end