constructor-pages 1.0.0beta1 → 1.0.0beta2

data/db/migrate/8_create_text_types.rb

@@ -1,5 +1,5 @@
 class CreateTextTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Types::TextType.table_name do |t|
       t.text :value
       t.references :field
@@ -8,8 +8,4 @@ class CreateTextTypes < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table ConstructorPages::Types::TextType.table_name
-  end
 end

data/db/migrate/9_create_date_types.rb

@@ -1,15 +1,11 @@
 class CreateDateTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Types::DateType.table_name do |t|
-      t.date :value, :default => Time.now
+      t.date :value, default: Time.now
       t.references :field
       t.references :page
 
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table ConstructorPages::Types::DateType.table_name
-  end
 end

data/lib/constructor-pages.rb

@@ -1,5 +1,6 @@
 require 'awesome_nested_set'
 require 'slim'
+require 'activerecord-import'
 require 'constructor_pages/engine'
 require 'rack/cache'
 require 'acts_as_list'

data/spec/features/constructor_pages/fields_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 module ConstructorPages
@@ -19,6 +17,7 @@ module ConstructorPages
       end
 
       @template = Template.create name: 'Page', code_name: 'page'
+      @page = Page.create name: 'Page'
 
       login_as @user
     end
@@ -55,13 +54,13 @@ module ConstructorPages
       end
 
       context 'Access' do
-        it 'should be accessed by new_field_path if loggen in' do
+        it 'should be accessed by new_field_path if logged in' do
           visit pages.new_template_field_path(@template)
           current_path.should == pages.new_template_field_path(@template)
           status_code.should == 200
         end
 
-        it 'should not be accessed by new_field_path if not loggen in' do
+        it 'should not be accessed by new_field_path if not logged in' do
           logout
           visit pages.new_template_field_path(@template)
           current_path.should == '/'
@@ -156,13 +155,13 @@ module ConstructorPages
       end
 
       context 'Access' do
-        it 'should be accessed by edit_field_path if loggen in' do
+        it 'should be accessed by edit_field_path if logged in' do
           visit pages.edit_template_field_path(@template, @field_content)
           current_path.should == pages.edit_template_field_path(@template, @field_content)
           status_code.should == 200
         end
 
-        it 'should not be accessed by new_field_path if not loggen in' do
+        it 'should not be accessed by edit_field_path if not logged in' do
           logout
           visit pages.edit_template_field_path(@template, @field_content)
           current_path.should == '/'

data/spec/features/constructor_pages/pages_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 module ConstructorPages
@@ -19,6 +17,7 @@ module ConstructorPages
       end
 
       @template = Template.create name: 'Page', code_name: 'page'
+      @page = Page.create name: 'Page'
 
       login_as @user
     end
@@ -38,19 +37,6 @@ module ConstructorPages
         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
@@ -86,6 +72,8 @@ module ConstructorPages
       it 'should redirect if redirect specified' do
         _page = Page.create name: 'First page', template: @template
         _template = Template.create name: 'Home page', code_name: 'home_page'
+        _second_page = Page.create name: 'Second page', template: _template
+        _third_page = Page.create name: 'Third page', template: _template
 
         visit _page.full_url
         current_path.should == '/first-page'
@@ -120,6 +108,13 @@ module ConstructorPages
         end
       end
 
+      it 'should redirect if no template exist' do
+        Template.delete_all
+        visit pages.new_page_path
+        current_path.should == pages.pages_path
+        page.should have_text 'You need create at least one template'
+      end
+
       it 'should has published checkbox' do
         visit pages.new_page_path
         page.should have_checked_field 'Active'
@@ -135,6 +130,11 @@ module ConstructorPages
         page.should_not have_link 'Delete'
       end
 
+      it 'should has template select' do
+        visit pages.new_page_path
+        page.should have_select 'Template'
+      end
+
       it 'should has create button' do
         visit pages.new_page_path
         page.should have_button 'Create Page'
@@ -143,12 +143,13 @@ module ConstructorPages
       it 'should save new page' do
         visit pages.new_page_path
         fill_in 'Name', with: 'Hello world'
-        Page.count.should == 0
         click_button 'Create Page'
-        Page.count.should == 1
-        _page = Page.first
+        Page.count.should == 2
+
+        _page = Page.last
         _page.name.should == 'Hello world'
         _page.url.should == 'hello-world'
+
         current_path.should == pages.pages_path
         page.should have_text 'added successfully'
       end
@@ -172,21 +173,14 @@ module ConstructorPages
         end
       end
 
-      it 'should edit with template view' do
+      it 'should has delete link' do
         visit pages.edit_page_path(@page)
-        page.should have_content 'This page show edit with template'
-      end
-
-      it 'should edit with page view if no view found' do
-        _template = Template.create name: 'Hello', code_name: 'hello'
-        _page = Page.create name: 'Hello', template: _template
-        visit pages.edit_page_path(_page)
-        page.should_not have_content 'This page show edit with template'
+        page.should have_link 'Delete'
       end
 
-      it 'should has delete link' do
+      it 'should not has template select' do
         visit pages.edit_page_path(@page)
-        page.should have_link 'Delete'
+        page.should_not have_select 'Template'
       end
 
       it 'should edit page' do
@@ -211,9 +205,9 @@ module ConstructorPages
       it 'should delete from page' do
         _page = Page.create name: 'Page'
         visit pages.edit_page_path(_page)
-        Page.count.should == 1
+        Page.count.should == 2
         click_link 'Delete'
-        Page.count.should == 0
+        Page.count.should == 1
         page.should have_text 'removed successfully'
       end
     end
@@ -228,7 +222,7 @@ module ConstructorPages
         click_button 'Create Page'
         page.should have_content 'added successfully'
 
-        _page = Page.first
+        _page = Page.last
         _page.short_description.should == ''
 
         visit pages.edit_page_path(_page)
@@ -240,37 +234,6 @@ module ConstructorPages
 
         _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/features/constructor_pages/templates_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 module ConstructorPages
@@ -18,6 +16,9 @@ module ConstructorPages
         "constructor_pages/types/#{t}_type".classify.constantize.delete_all
       end
 
+      @template = Template.create name: 'Page', code_name: 'page'
+      @page = Page.create name: 'Page'
+
       login_as @user
     end
 
@@ -42,16 +43,14 @@ module ConstructorPages
       end
 
       it 'should has list of templates' do
-        Template.create name: 'Page', code_name: 'page'
         visit pages.templates_path
         page.should have_selector 'ul li'
         page.should have_text 'Page'
       end
 
       it 'should has edit_template link' do
-        _template = Template.create name: 'Page', code_name: 'page'
         visit pages.templates_path
-        page.should have_link 'Page', pages.edit_template_path(_template)
+        page.should have_link 'Page', pages.edit_template_path(@template)
       end
     end
 
@@ -80,11 +79,6 @@ module ConstructorPages
         page.should have_field 'Code name'
       end
 
-      it 'should has parent select' do
-        visit pages.new_template_path
-        page.should have_select 'Parent'
-      end
-
       it 'should not has link new field' do
         visit pages.new_template_path
         page.should_not have_link 'New field'
@@ -104,11 +98,11 @@ module ConstructorPages
         visit pages.new_template_path
         fill_in 'Name', with: 'Brand'
         fill_in 'Code name', with: 'brand'
-        Template.count.should == 0
+        Template.count.should == 1
         click_button 'Create Template'
         current_path.should == pages.templates_path
-        Template.count.should == 1
-        _template = Template.first
+        Template.count.should == 2
+        _template = Template.last
         _template.name.should == 'Brand'
         _template.code_name.should == 'brand'
         page.should have_text 'added successfully'
@@ -128,18 +122,14 @@ module ConstructorPages
         visit pages.new_template_path
         fill_in 'Name', with: 'Brand'
         fill_in 'Code name', with: 'get_field_value'
-        Template.count.should == 0
+        Template.count.should == 1
         click_button 'Create Template'
-        Template.count.should == 0
+        Template.count.should == 1
         page.should have_text 'Code name has already been taken'
       end
     end
 
     describe 'Edit template' do
-      before :each do
-        @template = Template.create name: 'Page', code_name: 'page'
-      end
-
       describe 'Access' do
         it 'should be accessed by edit_template_path if logged in' do
           visit pages.edit_template_path(@template)
@@ -182,22 +172,19 @@ module ConstructorPages
 
     describe 'Delete template' do
       it 'should delete from template' do
-        _template = Template.create name: 'Page', code_name: 'page'
-        visit pages.edit_template_path(_template)
+        visit pages.edit_template_path(@template)
+        Page.destroy_all
         Template.count.should == 1
         click_link 'Delete'
         Template.count.should == 0
         page.should have_text 'removed successfully'
       end
 
-      it 'should not delete if there are any pages' do
-        _template = Template.create name: 'Page', code_name: 'page'
-        Page.create name: 'Home page', template: _template
-        visit pages.edit_template_path(_template)
-        Template.count.should == 1
+      it 'should delete all pages with this template' do
+        page = Page.create name: 'Home page', template: @template
+        visit pages.edit_template_path(@template)
         click_link 'Delete'
-        Template.count.should == 1
-        page.should have_text 'Delete pages with this template before'
+        Page.where(id: page.id).any?.should be_false
       end
     end
   end

data/spec/models/constructor_pages/field_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 module ConstructorPages

data/spec/models/constructor_pages/page_spec.rb

@@ -26,20 +26,19 @@ module ConstructorPages
         end
       end
 
-      describe '.find_by_request_or_first' do
+      describe '.find_by_path' do
         before :each do
           @first_page = Page.create name: 'New page'
           @second_page = Page.create name: 'Second page'
         end
 
         it 'should return page by given request path' do
-          Page.find_by_request_or_first('/new-page').should == @first_page
-          Page.find_by_request_or_first('/second-page').should == @second_page
+          Page.find_by_path('/new-page').should == @first_page
+          Page.find_by_path('/second-page').should == @second_page
         end
 
-        it 'should return first page if no given request or request is home page' do
-          Page.find_by_request_or_first.should == @first_page
-          Page.find_by_request_or_first('/').should == @first_page
+        it 'should return first page if request is home page' do
+          Page.find_by_path('/').should == @first_page
         end
       end
 
@@ -204,17 +203,6 @@ module ConstructorPages
             @page.price.should == 1000
             @page.amount.should == 20
           end
-
-          it 'should reset boolean fields' do
-            Field.create name: 'Check', code_name: 'check', template: @template, type_value: 'boolean'
-
-            @page.check = true
-
-            @page.update_fields_values({price: 1000})
-
-            @page.price.should == 1000
-            @page.check.should be_false
-          end
         end
 
         describe '#remove_fields_values' do
@@ -291,19 +279,6 @@ module ConstructorPages
           page.redirect?.should be_true
         end
       end
-
-      describe '#touch_branch' do
-        it 'should touch all pages in same branch' do
-          page = Page.create name: 'Hello world'
-          second_page = Page.create name: 'Again', parent: page
-          page.reload
-
-          updated = second_page.updated_at
-          page.touch_branch
-          second_page.reload
-          second_page.updated_at.should_not == updated
-        end
-      end
     end
 
     context 'ATTRIBUTES' do
@@ -320,7 +295,7 @@ module ConstructorPages
             Template.delete_all
 
             page = Page.create
-            page.valid?.should_not be_true
+            page.valid?.should be_false
           end
         end
 
@@ -330,6 +305,15 @@ module ConstructorPages
             page.template.should == Template.first
           end
         end
+
+        context 'if template changed' do
+          it 'should not be valid' do
+            another_template = Template.create name: 'Another template', code_name: 'another_template'
+            page = Page.create template: @template
+            page.template = another_template
+            page.valid?.should be_false
+          end
+        end
       end
 
       describe '#url' do