constructor-pages 1.0.0beta1 → 1.0.0beta2

data/app/models/constructor_pages/template.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ConstructorPages
   # Template model. Template allows assing different design for pages.
   #
@@ -7,8 +5,6 @@ module ConstructorPages
   # For example:
   #   template "Product" should has fields like "price", "description", "size" etc.
   class Template < ActiveRecord::Base
-    # Adding code_name_uniqueness method
-    include CodeNameUniq
     include TheSortableTree::Scopes
 
     validates_presence_of :name, :code_name
@@ -34,6 +30,11 @@ module ConstructorPages
 
     private
 
+    # Check if code_name is not available
+    def code_name_uniqueness
+      errors.add(:base, :code_name_already_in_use) unless Page.check_code_name(code_name) and check_code_name(code_name)
+    end
+
     # Check if there is code_name in same branch
     def check_code_name(cname)
       [cname.pluralize, cname.singularize].each {|name|

data/app/models/constructor_pages/types/boolean_type.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ConstructorPages
   module Types
     # Boolean type. Render as checkbox.

data/app/models/constructor_pages/types/date_type.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ConstructorPages
   module Types
     # Date time. Render as three select lists (day, month, year).

data/app/models/constructor_pages/types/float_type.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ConstructorPages
   module Types
     # Float type. Render small text field.

data/app/models/constructor_pages/types/html_type.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ConstructorPages
   module Types
     # HTML type. Render ckeditor wysiwyg.

data/app/models/constructor_pages/types/image_type.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ConstructorPages
   module Types
     # Image type. Render select file field.

data/app/models/constructor_pages/types/integer_type.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ConstructorPages
   module Types
     # Integer type. Render small text field.

data/app/models/constructor_pages/types/string_type.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ConstructorPages
   module Types
     # String type. Render large text field.

data/app/models/constructor_pages/types/text_type.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ConstructorPages
   module Types
     # Text type. Render textarea.

data/app/views/constructor_pages/fields/_form.html.slim

@@ -1,4 +1,4 @@
-= form_for [@template, @field] do |f|
+= form_for [@field.template, @field] do |f|
   - if @field.errors.any?
     .b-error
       = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
@@ -12,7 +12,7 @@
   .b-form__row
     = f.label :code_name, class: 'b-form__label'
     = f.text_field :code_name, class: 'b-form__field'
-    = f.hidden_field :template_id, value: @template.id
+    = f.hidden_field :template_id, value: @field.template.id
 
   - unless @field.type_value == 'image'
     .b-form__row
@@ -21,5 +21,5 @@
 
   .b-form__actions
     = f.submit class: 'b-button'
-    = link_to t(:cancel), edit_template_path(@template), class: 'b-button b-button_color_light'
-    = link_to t(:delete_field), [@template, @field], method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @field.new_record?
+    = link_to t(:cancel), edit_template_path(@field.template), class: 'b-button b-button_color_light'
+    = link_to t(:delete_field), [@field.template, @field], method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'b-button b-button_color_light g-float_right' unless @field.new_record?

data/app/views/constructor_pages/fields/types/_boolean.html.slim

@@ -1 +1,2 @@
+= hidden_field_tag "fields[#{field.code_name}]", 0
 = check_box_tag "fields[#{field.code_name}]", nil, page.get_field_value(field.code_name)

data/app/views/constructor_pages/fields/types/_html.html.slim

@@ -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: 'b-form__field ckeditor'

data/app/views/constructor_pages/fields/types/_string.html.slim

@@ -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: 'b-form__field'

data/app/views/constructor_pages/fields/types/_text.html.slim

@@ -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: 'b-form__field'

data/app/views/constructor_pages/pages/_form.html.slim

@@ -22,20 +22,17 @@
     .b-inline.b-full-url
       span.b-full-url__path
         = @page.parent.full_url if @page.parent
-        | /
+      | /
       span.b-full-url__url= @page.url
       = f.text_field :url, class: 'b-form__field'
       i.fa.fa-pencil.b-full-url__icon
 
   = render partial: 'field', collection: @page.fields
 
-  .b-form__row
-    = f.label :parent_id, class: 'b-form__label'
-    = f.select :parent_id, options_for_select(for_select(@pages, true), selected: @parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: '--'
-
-  .b-form__row
-    = f.label :template_id, class: 'b-form__label'
-    = f.select :template_id,  options_for_select(templates, selected: @template_id)
+  - if @page.new_record?
+    .b-form__row
+      = f.label :template_id, class: 'b-form__label'
+      = f.select :template_id,  options_for_select(templates_tree(@templates), selected: @page.template_id)
 
   .b-form__row
     = f.label :redirect, class: 'b-form__label'

data/app/views/constructor_pages/pages/index.html.slim

@@ -1,7 +1,6 @@
 .l-pages
-  - if @template_exists
-    = link_to new_page_path, class: 'b-button' do
-      =t :new_page
+  = link_to new_page_path, class: 'b-button' do
+    =t :new_page
 
 
   ol.b-block.b-tree.g-out data-rebuild_url="#{rebuild_pages_path}" data-expand-node-url="#{expand_node_pages_path}" data-cookie-store='true'

data/app/views/constructor_pages/templates/_form.html.slim

@@ -12,10 +12,6 @@
     = f.label :code_name, class: 'b-form__label'
     = f.text_field :code_name, class: 'b-form__field'
 
-  .b-form__row
-    = f.label :parent_id, class: 'b-form__label'
-    = f.select :parent_id, options_for_select(for_select(@templates), selected: @template.parent_id), disabled: @template.self_and_descendants.map(&:id), include_blank: '--'
-
   - unless @template.new_record?
     .b-form__row
       .b-form__label

data/config/locales/en.yml

@@ -11,7 +11,9 @@ en:
   delete: Delete
   url: URL
 
+  create_template_first: You need create at least one template
   code_name_already_in_use: This code name is already in use.
+  can_not_change_template: Template of page can not be changed
   field_success_added: Field «%{name}» added successfully.
   field_success_updated: Field «%{name}» updated successfully.
   field_success_removed: Field «%{name}» removed successfully.

data/config/locales/fr.yml

@@ -10,7 +10,9 @@ fr:
   edit: Èditer
   delete: Supprimer
 
+  create_template_first: Pour créer une page, vous devez créer au moins un modèle
   code_name_already_in_use: Ce nom de code est déjà utilisé
+  can_not_change_template: Modèle de page ne peut pas être modifié
   field_success_added: Champ %{name} a ajouté avec succès
   field_success_updated: Champ %{name} mis à jour
   field_success_removed: Champ %{name} supprimé avec succès

data/config/locales/ru.yml

@@ -17,7 +17,9 @@ ru:
   edit_template: Редактирование шаблона
   delete_template: Удалить шаблон
 
+  create_template_first: Для создания страницы необходимо создать хотя бы один шаблон
   code_name_already_in_use: Такое имя уже используется.
+  can_not_change_template: Шаблон страницы не может быть изменен
   field_success_added: Поле «%{name}» успешно добавлено.
   field_success_updated: Поле «%{name}» успешно обновлено.
   field_success_removed: Поле «%{name}» успешно удалено.

data/config/routes.rb

@@ -23,5 +23,5 @@ ConstructorPages::Engine.routes.draw do
 
   root to: 'pages#show'
 
-  get '*all(.:format)' => 'pages#show', format: /(html|json|xml)/
+  get '*path' => 'pages#show'
 end

data/constructor-pages.gemspec

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require File.expand_path('../../core/lib/constructor_core/version', __FILE__)
 
 Gem::Specification.new do |s|
@@ -20,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'dragonfly', '1.0.3'
   s.add_dependency 'rack-cache'
+  s.add_dependency 'activerecord-import'
   s.add_dependency 'awesome_nested_set', '3.0.0.rc2'
   s.add_dependency 'acts_as_list'
 

data/db/migrate/10_create_html_types.rb

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

data/db/migrate/11_create_image_types.rb

@@ -1,5 +1,5 @@
 class CreateImageTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Types::ImageType.table_name do |t|
       t.string :value_uid
       t.string  :value_name
@@ -9,8 +9,4 @@ class CreateImageTypes < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table ConstructorPages::Types::ImageType.table_name
-  end
 end

data/db/migrate/12_add_default_template.rb

@@ -1,9 +1,9 @@
 class AddDefaultTemplate < ActiveRecord::Migration
   def self.up
     ConstructorPages::Template.create!(
-      :name => "Page",
-      :code_name => "page",
-      :child_id => 1
+      name: 'Page',
+      code_name: 'page',
+      child_id: 1
     )
   end
 

data/db/migrate/14_remove_child_id_from_templates.rb

@@ -1,9 +1,5 @@
 class RemoveChildIdFromTemplates < ActiveRecord::Migration
-  def self.up
-    remove_column 'constructor_pages_templates', :child_id
-  end
-
-  def self.down
-    add_column 'constructor_pages_templates', :child_id, :boolean, default: true
+  def change
+    remove_column 'constructor_pages_templates', :child_id, :boolean, default: true
   end
 end

data/db/migrate/15_rename_link_to_redirect.rb

@@ -1,9 +1,5 @@
 class RenameLinkToRedirect < ActiveRecord::Migration
-  def self.up
+  def change
     rename_column 'constructor_pages_pages', :link, :redirect
   end
-
-  def self.down
-    rename_column 'constructor_pages_pages', :redirect, :link
-  end
 end

data/db/migrate/16_add_indexes.rb

@@ -0,0 +1,13 @@
+class AddIndexes < ActiveRecord::Migration
+  def change
+    add_index ConstructorPages::Page.table_name, :parent_id
+    add_index ConstructorPages::Page.table_name, :lft
+    add_index ConstructorPages::Page.table_name, :rgt
+
+    add_index ConstructorPages::Template.table_name, :parent_id
+    add_index ConstructorPages::Template.table_name, :lft
+    add_index ConstructorPages::Template.table_name, :rgt
+
+    add_index ConstructorPages::Field.table_name, :type_value
+  end
+end

data/db/migrate/1_create_pages.rb

@@ -1,18 +1,18 @@
 class CreatePages < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Page.table_name do |t|
-      t.boolean :active, :default => true
-      t.string  :name,  :default => ""
-      t.boolean :auto_url, :default => true
-      t.string  :full_url, :default => ""
-      t.string  :url,    :default => ""
-      t.string  :link,   :default => ""
-      t.string  :title, :default => ""
-      t.string  :keywords, :default => ""
+      t.boolean :active,    default: true
+      t.string  :name,      default: ''
+      t.boolean :auto_url,  default: true
+      t.string  :full_url,  default: ''
+      t.string  :url,       default: ''
+      t.string  :link,      default: ''
+      t.string  :title,     default: ''
+      t.string  :keywords,  default: ''
       t.text    :description
-      t.boolean :in_menu, :default => true
-      t.boolean :in_nav,  :default => true
-      t.boolean :in_map,  :default => true
+      t.boolean :in_menu, default: true
+      t.boolean :in_nav,  default: true
+      t.boolean :in_map,  default: true
       t.integer :parent_id
       t.integer :lft
       t.integer :rgt
@@ -20,8 +20,4 @@ class CreatePages < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table ConstructorPages::Page.table_name
-  end
 end

data/db/migrate/2_create_templates.rb

@@ -1,5 +1,5 @@
 class CreateTemplates < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Template.table_name do |t|
       t.string :name
       t.string :code_name
@@ -11,8 +11,4 @@ class CreateTemplates < ActiveRecord::Migration
       t.timestamps
     end
   end
-  
-  def self.down
-    drop_table ConstructorPages::Template.table_name
-  end
 end

data/db/migrate/3_create_fields.rb

@@ -1,5 +1,5 @@
 class CreateFields < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Field.table_name do |t|
       t.string :name
       t.string :code_name
@@ -10,8 +10,4 @@ class CreateFields < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table ConstructorPages::Field.table_name
-  end
 end

data/db/migrate/4_create_string_types.rb

@@ -1,15 +1,11 @@
 class CreateStringTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Types::StringType.table_name do |t|
-      t.string :value, :default => ""
+      t.string :value, default: ''
       t.references :field
       t.references :page
 
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table ConstructorPages::Types::StringType.table_name
-  end
 end

data/db/migrate/5_create_float_types.rb

@@ -1,15 +1,11 @@
 class CreateFloatTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Types::FloatType.table_name do |t|
-      t.float :value, :default => 0.0
+      t.float :value, default: 0.0
       t.references :field
       t.references :page
 
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table ConstructorPages::Types::FloatType.table_name
-  end
 end

data/db/migrate/6_create_boolean_types.rb

@@ -1,15 +1,11 @@
 class CreateBooleanTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Types::BooleanType.table_name do |t|
-      t.boolean :value, :default => false
+      t.boolean :value, default: false
       t.references :field
       t.references :page
 
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table ConstructorPages::Types::BooleanType.table_name
-  end
 end

data/db/migrate/7_create_integer_types.rb

@@ -1,15 +1,11 @@
 class CreateIntegerTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table ConstructorPages::Types::IntegerType.table_name do |t|
-      t.integer :value, :default => 0
+      t.integer :value, default: 0
       t.references :field
       t.references :page
 
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table ConstructorPages::Types::IntegerType.table_name
-  end
 end