constructor-cms 0.6.1 → 0.6.2

data/pages/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/pages/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/pages/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/pages/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/pages/config/locales/en.yml

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

data/pages/config/locales/ru.yml

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

data/pages/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/pages/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