constructor-pages 0.5.6 → 0.5.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2baa47a4688a68e29dcf737f3b12bb3f1eb7b758
+  data.tar.gz: 0e041e904853abf666db195b27a49b97c80ab332
+SHA512:
+  metadata.gz: 18a6b01b23863c4b7f98db5613de1afab43cb9b71184bb3f789c8b9f5384da01deb50ad3dd6b07d06c87eb66e9c06856d9788ce5b34818eb336b43f4a54a9744
+  data.tar.gz: 550592c690084f29051ff33e4e2b07fe61f47b80dbd4feccb5db53c235805fafdfcebf3ae7e103537a6f608ab9ca4ce2d25e5bb605a715db61306d13829e8bc6

data/app/controllers/constructor_pages/pages_controller.rb

@@ -17,7 +17,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?
 

data/app/helpers/constructor_pages/code_name_uniq.rb

@@ -0,0 +1,9 @@
+module ConstructorPages
+  module CodeNameUniq
+    def code_name_uniqueness
+      unless Page.check_code_name(code_name) and check_code_name(code_name)
+        errors.add(:base, t(:code_name_already_in_use))
+      end
+    end
+  end
+end

data/app/models/constructor_pages/field.rb

@@ -2,12 +2,14 @@
 
 module ConstructorPages
   class Field < ActiveRecord::Base
+    include CodeNameUniq
+
     TYPES = %w{string integer float boolean text date html image}
 
     attr_accessible :name, :code_name, :type_value, :template_id, :template
     validates_presence_of :name
     validates_uniqueness_of :code_name, :scope => :template_id
-    validate :method_uniqueness
+    validate :code_name_uniqueness
 
     after_create :create_page_fields
     after_destroy :destroy_all_page_fields
@@ -57,15 +59,10 @@ module ConstructorPages
 
     private
 
-    def method_uniqueness
-      if Page.first.respond_to?(code_name) \
-      or Page.first.respond_to?(code_name.pluralize) \
-      or Page.first.respond_to?(code_name.singularize) \
-      or template.self_and_ancestors.map{|t| t.code_name unless t.code_name == code_name}.include?(code_name.pluralize) \
-      or template.self_and_ancestors.map{|t| t.code_name unless t.code_name == code_name}.include?(code_name.singularize) \
-      or template.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(code_name.pluralize) \
-      or template.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(code_name.singularize)
-        errors.add(:base, 'Такой метод уже используется')
+    def check_code_name(code_name)
+      [code_name.pluralize, code_name.singularize].each do |name|
+        template.self_and_ancestors.map{|t| t.code_name unless t.code_name == code_name}.include?(name)
+        template.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(name)
       end
     end
 

data/app/models/constructor_pages/page.rb

@@ -28,25 +28,80 @@ module ConstructorPages
     acts_as_nested_set
 
     # Used for find page by request. It return first page if no request given
+    # @param request for example <tt>'/conditioners/split-systems/zanussi'</tt>
     def self.find_by_request_or_first(request = nil)
-      request.nil? ? Page.first : Page.find_by_full_url('/' + request)
+      request.nil? ? Page.first : Page.find_by_full_url(request)
     end
 
-    # Generate full_url from parent page and url
+    # Generate full_url from parent id and url
+    # @param parent_id integer
+    # @param url should looks like <tt>'hello-world-page'</tt> without leading slash
     def self.full_url_generate(parent_id, url = '')
-      Page.find(parent_id).self_and_ancestors.map {|c| c.url}.append(url).join('/')
+      '/' + Page.find(parent_id).self_and_ancestors.map {|c| c.url}.append(url).join('/')
     end
 
+    # Check code_name for field and template.
+    # When missing method Page find field or page in branch with plural and singular code_name so
+    # field and template code_name should be uniqueness for page methods
+    def self.check_code_name(code_name)
+      [code_name, code_name.pluralize, code_name.singularize].each do |name|
+        if Page.first.respond_to?(name)
+          return false
+        end
+      end
+
+      true
+    end
+
+    # Get field by code_name
     def field(code_name)
       Field.find_by_code_name_and_template_id code_name, template_id
     end
 
+    # Get value of field by code_name
     def get_field_value(code_name)
       field = field(code_name)
       field.get_value_for(self) if field
     end
 
-    def find_page_in_branch_template(code_name)
+    # Set value of field by code_name and value
+    def set_field_value(code_name, value)
+      field = field(code_name)
+      field.set_value_for(self, value) if field
+    end
+
+    # Update all fields values with given params.
+    # @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)
+      fields.each do |field|
+        value = params[field.code_name.to_sym]
+
+        _type_object = field.find_or_create_type_object(self)
+        _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
+
+        if value
+          _type_object.value = field.type_value == 'date' ? parse_date(value).to_s : value
+        end
+
+        _type_object.save
+      end
+    end
+
+    # Remove all fields values
+    def remove_fields_values
+      fields.each {|f| f.remove_values_for self}
+    end
+
+    # Search page by template code_name in same branch of pages and templates.
+    # It allows to call page.category.brand.series.model etc.
+    #
+    # Return one page if founded in ancestors,
+    # and return array of pages if founded in descendants
+    #
+    # It determines if code_name is singular or nor
+    # @param code_name template code name
+    def find_page_in_branch(code_name)
       _template = Template.find_by_code_name code_name.singularize
 
       if _template
@@ -57,54 +112,40 @@ module ConstructorPages
       end
     end
 
-    alias_method :find_pages_in_branch_template, :find_page_in_branch_template
+    alias_method :find_pages_in_branch, :find_page_in_branch
 
-    def set_field_value(code_name, value)
-      field = field(code_name)
-      field.set_value_for(self, value) if field
-    end
+    def published?; active end
 
-    def active?; active end
+    alias_method :active?, :published?
 
+    # Returns page hash attributes with fields.
+    #
+    # Default attributes are name and title. Options param allows to add more.
+    # @param options default merge name and title page attributes
     def as_json(options = {})
       options = {name: self.name, title: self.title}.merge options
 
-      template.fields.each do |field|
-        options = {field.code_name.to_sym => field.get_value_for(self)}.merge options
+      fields.each do |field|
+        options.merge!({field.code_name.to_sym => field.get_value_for(self)})
       end
 
       options
     end
 
-    # remove all type fields
-    def remove_fields_values
-      fields.each {|f| f.remove_values_for self}
-    end
-
-    # update all type fields
-    def update_fields_values(params, reset_booleans = true)
-      fields.each do |field|
-        value = params[field.code_name.to_sym]
-
-        _type_object = field.find_or_create_type_object(self)
-        _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
-
-        if value
-          _type_object.value = field.type_value == 'date' ? parse_date(value).to_s : value
-        end
-
-        _type_object.save
-      end
-    end
+    # Check if link specified
+    def redirect?; url != link && !link.empty? end
 
+    # When method missing it get/set field value or get page in branch
+    #
+    # Examples:
+    #   page.content = 'Hello world'
+    #   puts page.price
+    #   page.brand.models.each do...
     def method_missing(name, *args, &block)
       name = name.to_s
-      name[-1] == '=' ? set_field_value(name[0..-2], args[0]) : get_field_value(name) || find_pages_in_branch_template(name)
+      name[-1] == '=' ? set_field_value(name[0..-2], args[0]) : get_field_value(name) || find_pages_in_branch(name)
     end
 
-    # check if link specified
-    def redirect?; url != link && !link.empty? end
-
     private
 
     # if url has been changed by manually or url is empty
@@ -112,34 +153,36 @@ module ConstructorPages
       self.url = ((auto_url || url.empty?) ? translit(name) : url).parameterize
     end
 
+    # TODO: move out
     def parse_date(value)
       Date.new(value['date(1i)'].to_i, value['date(2i)'].to_i, value['date(3i)'].to_i)
     end
 
     # TODO: add more languages
-    # translit to english
+    # Translit to english
     def translit(str)
       Russian.translit(str)
     end
 
-    # page is not valid if there is no template
+    # Page is not valid if there is no template
     def template_check
       errors.add_on_empty(:template_id) if Template.count == 0
     end
 
-    # if template_id is nil then get first template
+    # If template_id is nil then get first template
     def template_assign
       self.template_id = Template.first.id unless template_id
     end
 
+    # Update full_url
     def full_url_update
-      self.full_url = '/' + (parent_id ? Page.full_url_generate(parent_id, url) : url)
+      self.full_url = (parent_id ? Page.full_url_generate(parent_id, url) : '/' + url)
     end
 
+    # Reload all descendants
     def descendants_update; descendants.map(&:save) end
 
-    def create_fields
-      fields.each {|field| field.type_class.create page_id: id, field_id: field.id}
-    end
+    # Create fields values
+    def create_fields; fields.each {|field| field.create_type_object(self) } end
   end
 end

data/app/models/constructor_pages/template.rb

@@ -2,12 +2,13 @@
 
 module ConstructorPages
   class Template < ActiveRecord::Base
+    include CodeNameUniq
+
     attr_accessible :name, :code_name, :child_id, :parent_id, :parent
 
     validates_presence_of :name, :code_name
     validates_uniqueness_of :code_name
-
-    validate :method_uniqueness
+    validate :code_name_uniqueness
 
     default_scope order(:lft)
 
@@ -27,15 +28,14 @@ module ConstructorPages
 
     private
 
-    def method_uniqueness
-      if Page.first.respond_to?(code_name) \
-      or Page.first.respond_to?(code_name.pluralize) \
-      or Page.first.respond_to?(code_name.singularize) \
-      or root.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(code_name.pluralize) \
-      or root.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(code_name.singularize) \
-
-        errors.add(:base, "Такой метод уже используется")
+    def check_code_name(code_name)
+      [code_name.pluralize, code_name.singularize].each do |name|
+        if root.descendants.map{|t| t.code_name unless t.code_name == code_name}.include?(name)
+          return false
+        end
       end
+
+      true
     end
   end
 end

data/config/locales/en.yml

@@ -11,6 +11,7 @@ en:
 
   new_field: 'New field'
 
+  code_name_already_in_use: 'This code name is already in use.'
   field_success_added: 'Field «%{name}» added successfully.'
   field_success_updated: 'Field «%{name}» updated successfully.'
   field_success_removed: 'Field «%{name}» removed successfully.'

data/config/locales/ru.yml

@@ -18,7 +18,7 @@ ru:
   delete_template: 'Удалить шаблон'
 
   new_field: 'Добавить поле'
-
+  code_name_already_in_use: 'Такое имя уже используется.'
   field_success_added: 'Поле «%{name}» успешно добавлено.'
   field_success_updated: 'Поле «%{name}» успешно обновлено.'
   field_success_removed: 'Поле «%{name}» успешно удалено.'

data/spec/models/constructor_pages/field_model_spec.rb

@@ -3,4 +3,26 @@
 require 'spec_helper'
 
 module ConstructorPages
+  describe Field do
+    before :each do
+      Template.delete_all
+      @template = Template.create name: 'Page', code_name: 'page'
+
+      Field.delete_all
+    end
+
+    describe '.create' do
+      it 'should be valid' do
+        _field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        _field.valid?.should be_true
+      end
+
+      it 'should validate uniqueness' do
+        Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+        _field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+
+        _field.valid?.should_not be_true
+      end
+    end
+  end
 end

data/spec/models/constructor_pages/page_model_spec.rb

@@ -6,277 +6,305 @@ module ConstructorPages
   describe Page do
     before :each do
       Template.delete_all
-      Template.create name: 'Page', code_name: 'page'
+      @template = Template.create name: 'Page', code_name: 'page'
 
       Page.delete_all
       Field.delete_all
       Types::TextType.delete_all
     end
 
-    it 'should be valid' do
-      Page.create.valid?.should be_true
-    end
+    context 'CLASS METHODS' do
+      describe '.create' do
+        it 'should be valid' do
+          Page.create.valid?.should be_true
+        end
 
-    describe '.find_by_request_or_first' do
-      before :each do
-        @page = Page.create name: 'New page', url: 'new-page'
-      end
+        it 'should create type_fields after' do
+          field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+          page = Page.create name: 'New page', template: @template
 
-      it 'should return page by given request path' do
-        Page.find_by_request_or_first('new-page').should == @page
+          field.get_value_for(page).should == ''
+        end
       end
 
-      it 'should return first page if no given request' do
-        Page.find_by_request_or_first.should == @page
+      describe '.find_by_request_or_first' do
+        before :each do
+          @page = Page.create name: 'New page', url: 'new-page'
+        end
+
+        it 'should return page by given request path' do
+          Page.find_by_request_or_first('/new-page').should == @page
+        end
+
+        it 'should return first page if no given request' do
+          Page.find_by_request_or_first.should == @page
+        end
       end
-    end
 
-    describe '.full_url_generate' do
-      it 'should generate full_url from parent_id and url' do
+      describe '.full_url_generate' do
+        it 'should generate full_url from parent_id and url' do
+          first_page = Page.create name: 'First page', url: 'first-page'
+          second_page = Page.create name: 'Second page', url: 'second-page', parent: first_page
+          Page.full_url_generate(second_page.id, 'third-page').should == '/first-page/second-page/third-page'
+        end
       end
     end
 
-    describe '#set_field' do
-      it 'should set value for type_field' do
-        template = Template.create name: 'Page template', code_name: 'page_template'
-        page = Page.create name: 'Home page', template: template
-        field = Field.create name: 'Content', code_name: 'desc', template: template, type_value: 'text'
+    context 'INSTANCE METHODS' do
+      context 'Getting and setting field value' do
+        before :each do
+          @template = Template.create name: 'Page template', code_name: 'page_template'
+          @page = Page.create name: 'Home page', template: @template
+          @field = Field.create name: 'Desc', code_name: 'desc', template: @template, type_value: 'text'
+        end
 
-        page.set_field_value('desc', 'my world')
+        describe '#get_field' do
+          it 'should get value from type_field' do
+            @field.set_value_for(@page, 'Hello world')
+            @page.get_field_value('desc').should == 'Hello world'
+          end
+        end
 
-        field.get_value_for(page).should == 'my world'
+        describe '#set_field' do
+          it 'should set value for type_field' do
+            @page.set_field_value('desc', 'my world')
+            @field.get_value_for(@page).should == 'my world'
+          end
+        end
       end
-    end
 
-    describe '#get_field' do
-      it 'should get value from type_field' do
-        template = Template.create name: 'Page template', code_name: 'page_template'
-        page = Page.create name: 'Home page', template: template
-        Field.create name: 'Content', code_name: 'desc', template: template, type_value: 'text'
+      context 'Updating and removing fields values' do
+        before :each do
+          @template = Template.create name: 'New template', code_name: 'brand'
+          @field = Field.create name: 'Price', code_name: 'price', template: @template, type_value: 'float'
+          @page = Page.create name: 'New page', template: @template
+          @page.price = 500
+        end
 
-        page.set_field_value('desc', 'Hello world')
-        page.get_field_value('desc').should == 'Hello world'
-      end
-    end
+        describe '#update_fields_values' do
+          it 'should update fields values with params' do
+            Field.create name: 'Count', code_name: 'count', template: @template, type_value: 'integer'
+            @page.reload
 
-    describe '#find_page_in_branch_template' do
-      it 'should find page in one branch template by code_name' do
-        brand_template = Template.create name: 'Brand', code_name: 'brand'
-        series_template = Template.create name: 'Series', code_name: 'series', parent: brand_template
+            @page.count = 10
 
-        brand_page = Page.create name: 'Zanussi', template: brand_template
-        series_page = Page.create name: 'Fresco', template: series_template, parent: brand_page
+            @page.update_fields_values({price: 1000, count: 20})
 
-        series_page.find_page_in_branch_template('brand').should == brand_page
-      end
-    end
+            @page.price.should == 1000
+            @page.count.should == 20
+          end
 
-    describe '#as_json' do
-      it 'should return page as json format with fields' do
-        template = Template.create name: 'JSON', code_name: 'json_template'
-        page = Page.create name: 'Hi json', template: template
-        Field.create name: 'Content', code_name: 'content', template: template, type_value: 'text'
-        page.content = 'Hello world'
-        page.as_json.should == {content: 'Hello world', name: page.name, title: page.title}
-      end
-    end
+          it 'should reset boolean fields' do
+            Field.create name: 'Check', code_name: 'check', template: @template, type_value: 'boolean'
 
-    describe '#redirect?' do
-      it 'should check if link specified or not' do
-        page = Page.create name: 'Test redirection'
-        page.redirect?.should be_false
+            @page.check = true
 
-        page.link = ''
-        page.save
+            @page.update_fields_values({price: 1000})
 
-        page.redirect?.should be_false
+            @page.price.should == 1000
+            @page.check.should be_false
+          end
+        end
 
-        page.link = '/hello-redirect'
-        page.save
+        describe '#remove_fields_values' do
+          it 'should destroy all type_values fields' do
+            @field.find_type_object(@page).value.should == 500
 
-        page.redirect?.should be_true
+            @page.remove_fields_values
+            @field.find_type_object(@page).should be_nil
+          end
+        end
       end
-    end
 
-    describe '#auto_url' do
-      it 'should be true by default' do
-        page = Page.create
-        page.auto_url.should be_true
-      end
-    end
+      describe '#find_page_in_branch' do
+        it 'should find page(s) in same branch pages and templates by template_code_name' do
+          brand_template = Template.create name: 'Brand', code_name: 'brand'
+          series_template = Template.create name: 'Series', code_name: 'series', parent: brand_template
 
-    describe '#template' do
-      context 'if there is no template' do
-        it 'should not be valid' do
-          Template.delete_all
-          page = Page.create
-          page.valid?.should_not be_true
-          Template.create name: 'Page', code_name: 'page'
-        end
-      end
+          brand_page = Page.create name: 'Zanussi', template: brand_template
+          series_page = Page.create name: 'Fresco', template: series_template, parent: brand_page
+          brand_page.reload
 
-      context 'if template_id is nil' do
-        it 'should be first template' do
-          page = Page.create
-          page.template.should == Template.first
+          series_page.find_page_in_branch('brand').should == brand_page
+          brand_page.find_pages_in_branch('series').should == [series_page]
         end
       end
-    end
 
-    describe '#url' do
-      context 'if url is empty or if auto_url is true' do
-        it 'should be generated from name' do
-          page = Page.create name: 'Hello world'
-          page.url.should == 'hello-world'
-        end
-      end
+      describe '#as_json' do
+        context 'should return page hash attributes with fields' do
+          before :each do
+            @template = Template.create name: 'Json', code_name: 'json_template'
+            @page = Page.create name: 'Test json', template: @template
+          end
 
-      context 'else' do
-        it 'should get url field value' do
-          page = Page.create name: 'Hello', auto_url: true
-          page.url.should == 'hello'
+          it 'should return defaults name and title attrs' do
+            @page.as_json.should == {name: @page.name, title: @page.title}
+          end
 
-          page.auto_url = false
-          page.url = 'world'
-          page.save
-          page.url.should == 'world'
+          it 'should add fields to hash' do
+            Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
+            @page.content = 'Hello world'
+            @page.reload
 
-          page.auto_url = true
-          page.name = 'Another world'
-          page.url = 'world-two'
-          page.save
-          page.url.should == 'another-world'
+            @page.as_json.should == {name: @page.name, title: @page.title, content: 'Hello world'}
+          end
         end
       end
-    end
 
-    describe '#update_fields_values' do
-      it 'should update fields values with params' do
-        template = Template.create name: 'New template', code_name: 'brand'
-        Field.create name: 'Price', code_name: 'price', template: template, type_value: 'float'
-        Field.create name: 'Check', code_name: 'check', template: template, type_value: 'boolean'
+      describe '#redirect?' do
+        it 'should check if link specified or not' do
+          page = Page.create name: 'Test redirection'
+          page.redirect?.should be_false
 
-        page = Page.create name: 'New page', template: template
+          page.link = ''
+          page.save
 
-        page.check = true
-        page.check.should be_true
+          page.redirect?.should be_false
 
-        page.update_fields_values({price: 1000})
+          page.link = '/hello-redirect'
+          page.save
 
-        page.price.should == 1000
-        page.check.should be_false
+          page.redirect?.should be_true
+        end
       end
     end
 
-    describe '#remove_fields_values' do
-      it 'should destroy all type_values fields' do
-        template = Template.create name: 'New template', code_name: 'template'
-        field = Field.create name: 'Price', code_name: 'price', template: template, type_value: 'float'
-        page = Page.create name: 'New page', template: template
-
-        page.price = 500
-        field.find_type_object(page).value.should == 500
-
-        page.remove_fields_values
-        field.find_type_object(page).should be_nil
+    context 'ATTRIBUTES' do
+      describe '#auto_url' do
+        it 'should be true by default' do
+          page = Page.create
+          page.auto_url.should be_true
+        end
       end
-    end
 
-    describe '#full_url' do
-      it 'should be generated from url and ancestors' do
-        page = Page.create name: 'Hello'
-        page.full_url.should == '/hello'
+      describe '#template' do
+        context 'if there is no template' do
+          it 'should not be valid' do
+            Template.delete_all
 
-        page_two = Page.create name: 'World', parent: page
-        page_two.full_url.should == '/hello/world'
-      end
-
-      context 'if parent or url has been changed' do
-        it 'should update full_url' do
-          page = Page.create name: 'Change url', url: 'change-url', auto_url: false
-          page.full_url.should == '/change-url'
+            page = Page.create
+            page.valid?.should_not be_true
+          end
+        end
 
-          page.url = 'another-change-url'
-          page.save
-          page.full_url.should == '/another-change-url'
+        context 'if template_id is nil' do
+          it 'should be first template' do
+            page = Page.create
+            page.template.should == Template.first
+          end
         end
       end
 
-      context 'if parent is root or nil' do
-        it 'should be as /self.url' do
-          page = Page.create name: 'Page', url: 'page', auto_url: false, parent_id: nil
-          page.full_url.should == '/page'
+      describe '#url' do
+        context 'if url is empty or if auto_url is true' do
+          it 'should be generated from name' do
+            page = Page.create name: 'Hello world'
+            page.url.should == 'hello-world'
+          end
 
-          parent = Page.create name: 'Parent'
-          page.parent = parent
-          page.save
+          it 'should translit utf-8' do
+            page = Page.create name: 'Проверка'
+            page.full_url.should == '/proverka'
 
-          page.full_url.should == '/parent/page'
+            page_two = Page.create name: 'Тест', parent: page
+            page_two.full_url.should == '/proverka/test'
+          end
+        end
 
-          page.parent = nil
-          page.save
-          page.full_url.should == '/page'
+        context 'else' do
+          it 'should get url field value' do
+            page = Page.create name: 'Hello', auto_url: true
+            page.url.should == 'hello'
+
+            page.auto_url = false
+            page.url = 'world'
+            page.save
+            page.url.should == 'world'
+
+            page.auto_url = true
+            page.name = 'Another world'
+            page.url = 'world-two'
+            page.save
+            page.url.should == 'another-world'
+          end
         end
       end
-    end
 
-    describe 'translit' do
-      it 'should translit utf-8' do
-        page = Page.create name: 'Проверка'
-        page.full_url.should == '/proverka'
+      describe '#full_url' do
+        it 'should be generated from url and ancestors' do
+          page = Page.create name: 'Hello'
+          page.full_url.should == '/hello'
 
-        page_two = Page.create name: 'Тест', parent: page
-        page_two.full_url.should == '/proverka/test'
-      end
-    end
+          page_two = Page.create name: 'World', parent: page
+          page_two.full_url.should == '/hello/world'
+        end
 
-    describe 'descendants_update' do
-      it 'should update descendants full_url' do
-        page = Page.create name: 'Update descendants', url: 'update-descendants', auto_url: false
-        page_two = Page.create name: 'Child', url: 'child', parent: page
-        page_two.full_url.should == '/update-descendants/child'
+        context 'if parent or url has been changed' do
+          it 'should update full_url' do
+            page = Page.create name: 'Change url', url: 'change-url', auto_url: false
+            child_page = Page.create name: 'Child page', url: 'child', auto_url: false, parent: page
+            page.reload
 
-        page = Page.find(page.id)
-        page.url = 'another-update-descendants'
-        page.save
+            page.full_url.should == '/change-url'
+            child_page.full_url.should == '/change-url/child'
 
-        page_two = Page.find(page_two.id)
-        page_two.full_url.should == '/another-update-descendants/child'
-      end
-    end
+            page.url = 'another-change-url'
+            page.save
+            page.full_url.should == '/another-change-url'
 
-    describe 'create_fields' do
-      it 'should create type_fields after update page'
-    end
+            child_page.reload
+            child_page.full_url.should == '/another-change-url/child'
+          end
+        end
 
-    describe 'method_missing' do
-      it 'should return value of type_value for missing method' do
-        template = Template.create name: 'Page', code_name: 'page_template'
-        page = Page.create name: 'No method', template: template
-        field = Field.create name: 'Content', code_name: 'desc', template: template, type_value: 'text'
-        field.set_value_for(page, 'my world')
+        context 'if parent is root or nil' do
+          it 'should be as /self.url' do
+            page = Page.create name: 'Page', url: 'page', auto_url: false, parent_id: nil
+            page.full_url.should == '/page'
 
-        page.desc.should == 'my world'
-      end
+            parent = Page.create name: 'Parent'
+            page.parent = parent
+            page.save
 
-      it 'should set value for type_value for missing method' do
-        template = Template.create name: 'Page', code_name: 'page_templ'
-        page = Page.create name: 'No method', template: template
-        field = Field.create name: 'Content', code_name: 'desc', template: template, type_value: 'text'
+            page.full_url.should == '/parent/page'
 
-        page.desc = 'my world 2'
-        field.get_value_for(page).should == 'my world 2'
+            page.parent = nil
+            page.save
+            page.full_url.should == '/page'
+          end
+        end
       end
 
-      it 'should find page in branch template if no field found' do
-        Template.delete_all
-        brand_template = Template.create name: 'Brand', code_name: 'brand'
-        series_template = Template.create name: 'Series', code_name: 'series', parent: brand_template
+      describe 'method_missing' do
+        context 'Getting and setting field value' do
+          before :each do
+            @template = Template.create name: 'Page', code_name: 'page_template'
+            @page = Page.create name: 'No method', template: @template
+            @field = Field.create name: 'Content', code_name: 'desc', template: @template, type_value: 'text'
+          end
+
+          it 'should return value of type_value for missing method' do
+            @field.set_value_for(@page, 'my world')
+            @page.desc.should == 'my world'
+          end
+
+          it 'should set value for type_value for missing method' do
+            @page.desc = 'my world 2'
+            @field.get_value_for(@page).should == 'my world 2'
+          end
+        end
+
+        it 'should find page in branch template if no field found' do
+          brand_template = Template.create name: 'Brand', code_name: 'brand'
+          series_template = Template.create name: 'Series', code_name: 'series', parent: brand_template
 
-        brand_page = Page.create name: 'Zanussi', template: brand_template
-        series_page = Page.create name: 'Fresco', template: series_template, parent: brand_page
+          brand_page = Page.create name: 'Zanussi', template: brand_template
+          series_page = Page.create name: 'Fresco', template: series_template, parent: brand_page
+          brand_page.reload
 
-        series_page.brand.should == brand_page
+          series_page.brand.should == brand_page
+          brand_page.series.should == [series_page]
+        end
       end
     end
   end

data/spec/models/constructor_pages/template_model_spec.rb

@@ -8,15 +8,5 @@ module ConstructorPages
       template = Template.create name: 'Page template', code_name: 'page_template'
       template.valid?.should be_true
     end
-
-    describe '#name' do
-      it 'should convert russian suffix'
-    end
-
-    describe '#code_name' do
-      context 'validation' do
-        it 'should be uniqueness'
-      end
-    end
   end
 end

data/spec/requests/constructor_pages/pages_controller_spec.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.6
-  prerelease: 
+  version: 0.5.7
 platform: ruby
 authors:
 - Ivan Zotov
@@ -14,55 +13,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: constructor-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,65 +69,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Pages for Constructor CMS
@@ -155,6 +138,7 @@ files:
 - app/controllers/constructor_pages/fields_controller.rb
 - app/controllers/constructor_pages/pages_controller.rb
 - app/controllers/constructor_pages/templates_controller.rb
+- app/helpers/constructor_pages/code_name_uniq.rb
 - app/helpers/constructor_pages/fields_helper.rb
 - app/helpers/constructor_pages/move_helper.rb
 - app/helpers/constructor_pages/pages_helper.rb
@@ -217,33 +201,33 @@ files:
 - 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: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+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
-has_rdoc: 
+- spec/requests/constructor_pages/pages_controller_spec.rb