constructor-cms 0.6.4 → 0.7.0

data/core/lib/constructor_core/version.rb

@@ -1,3 +1,3 @@
 module ConstructorCore
-  VERSION = '0.6.4'
+  VERSION = '0.7.0'
 end

data/pages/app/controllers/constructor_pages/fields_controller.rb

@@ -3,13 +3,11 @@
 module ConstructorPages
   class FieldsController < ApplicationController
     def new
-      @field = Field.new
-      @field.template = Template.find(params[:template_id])
+      @field = Field.new.tap {|f| f.template = Template.find(params[:template_id])}
     end
 
     def edit
-      @field = Field.find(params[:id])
-      @field.template = Template.find(params[:template_id])
+      @field = Field.find(params[:id]).tap {|f| f.template = Template.find(params[:template_id])}
     end
 
     def create
@@ -18,7 +16,7 @@ module ConstructorPages
       if @field.save
         redirect_to edit_template_path(@field.template_id), notice: t(:field_success_added, name: @field.name)
       else
-        render :action => 'new', :template_id => @field.template_id
+        render action: :new, template_id: @field.template_id
       end
     end
 
@@ -26,10 +24,9 @@ module ConstructorPages
       @field = Field.find params[:id]
 
         if @field.type_value != params[:field][:type_value]
-          @field.type_class.where(:field_id => @field.id).each do |field|
+          @field.type_class.where(field_id: @field.id).each do |field|
             new_field = "constructor_pages/types/#{params[:field][:type_value]}_type".classify.constantize.new(
-                :field_id => @field.id,
-                :page_id => field.page_id)
+                field_id: @field.id, page_id: field.page_id)
 
             if @field.type_value != 'image' \
             and params[:field][:type_value] != 'image' \
@@ -45,14 +42,13 @@ module ConstructorPages
       if @field.update field_params
         redirect_to edit_template_url(@field.template.id), notice: t(:field_success_updated, name: @field.name)
       else
-        render :action => "edit"
+        render action: :edit
       end
     end
 
     def destroy
       @field = Field.find(params[:id])
-      name = @field.name
-      template = @field.template.id
+      name, template = @field.name, @field.template.id
       @field.destroy
       redirect_to edit_template_url(template), notice: t(:field_success_removed, name: name)
     end

data/pages/app/models/constructor_pages/page.rb

@@ -5,9 +5,7 @@ module ConstructorPages
   class Page < ActiveRecord::Base
     # Adding has_many for all field types
     Field::TYPES.each do |t|
-      class_eval %{
-        has_many :#{t}_types,  dependent: :destroy, class_name: 'Types::#{t.titleize}Type'
-      }
+      class_eval %{ has_many :#{t}_types,  dependent: :destroy, class_name: 'Types::#{t.titleize}Type'}
     end
 
     has_many :fields, through: :template
@@ -24,45 +22,83 @@ module ConstructorPages
 
     acts_as_nested_set
 
-    # 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? || request == '/' ? Page.first : Page.where(full_url: request).first
-    end
+    class << self
+      # 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 find_by_request_or_first(request = nil)
+        request == nil || '/' ? Page.first : Page.find_by(full_url: request)
+      end
 
-    # 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('/')
-    end
+      # 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 full_url_generate(parent_id, url = '')
+        '/' + Page.find(parent_id).self_and_ancestors.map(&: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|
-        return false if Page.instance_methods.include?(name.to_sym)
+      # 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 check_code_name(code_name)
+        [code_name, code_name.pluralize, code_name.singularize].each do |name|
+          return false if Page.instance_methods.include?(name.to_sym)
+        end
+
+        true
       end
 
-      true
+      def search(what_search = nil)
+        if @where_search
+          if @where_search.is_a?(String)
+            _page = Page.find_by full_url: @where_search
+          elsif @where_search.is_a?(Page)
+            _page = @where_search
+          end
+
+          @result = _page ? _page.descendants : []
+        else
+          @result = Page.all
+        end
+
+        if what_search
+          _template = Template.find_by code_name: what_search.to_s.singularize.downcase
+          @result = _template ? @result.where(template: _template) : []
+        end
+
+        if @params_search
+          @params_search.each_pair do |k, v|
+            @result = @result.select { |p| p.send(k) == v }
+          end
+        end
+
+        @where_search = @params_search = nil
+
+        @result
+      end
+
+      def in(where_search  = nil); tap {@where_search  = where_search}  end
+      def by(params_search = nil); tap {@params_search = params_search} end
+
+      def search_in(where_search  = nil); self.in(where_search).search  end
+      def search_by(params_search = nil); self.by(params_search).search end
     end
 
+    def search(what_search = nil); Page.in(self).search(what_search) end
+    def search_by(params_search = nil); Page.by(params_search).in(self).search end
+
     # Get field by code_name
     def field(code_name)
-      Field.where(code_name: code_name, template_id: template_id).first
+      Field.find_by code_name: code_name, template_id: 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
+      field(code_name).tap {|f| return f.get_value_for(self) if f}
     end
 
     # 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
+      field(code_name).tap {|f| f.set_value_for(self, value) if f}
     end
 
     # Update all fields values with given params.
@@ -78,18 +114,14 @@ module ConstructorPages
 
         if _type_object
           _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
-
-          if value
-            _type_object.value = value
-          end
-
+          _type_object.value = value if value
           _type_object.save
         end
       end
     end
 
     # Create fields values
-    def create_fields_values; fields.each {|field| field.create_type_object(self) } end
+    def create_fields_values; fields.each {|f| f.create_type_object(self) } end
 
     # Remove all fields values
     def remove_fields_values
@@ -105,12 +137,12 @@ module ConstructorPages
     # It determines if code_name is singular or nor
     # @param code_name template code name
     def find_page_in_branch(code_name)
-      _template = Template.where(code_name: code_name.singularize).first
+      _template = Template.find_by code_name: code_name.singularize
 
       if _template
         result = []
         result = descendants.where(template_id: _template.id) if code_name == code_name.pluralize
-        result = ancestors.where(template_id: _template.id).first if result.empty?
+        result = ancestors.find_by(template_id: _template.id) if result.empty?
         result
       end
     end
@@ -126,13 +158,11 @@ module ConstructorPages
     # 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
-
-      fields.each do |field|
-        options.merge!({field.code_name.to_sym => field.get_value_for(self)})
+      {name: self.name, title: self.title}.merge(options).tap do |options|
+        fields.each do |f|
+          options.merge!({f.code_name.to_sym => f.get_value_for(self)})
+        end
       end
-
-      options
     end
 
     # Check if link specified

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

@@ -25,4 +25,5 @@
       .span12
         .form-actions
           = f.submit class: 'btn btn-primary'
-          = link_to t(:cancel), edit_template_url(@field.template), class: 'btn'
+          = link_to t(:cancel), edit_template_url(@field.template), class: 'btn'
+          = link_to t(:delete_field), @field, method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @field.new_record?

data/pages/config/locales/en.yml

@@ -1,57 +1,56 @@
 en:
-  structure: 'Structure'
-  templates: 'Templates'
-  settings: 'Settings'
-  new_field: 'New field'
-  edit_field: 'Edit field'
-  seo: 'SEO'
-  display_in: 'Display in'
-  help: 'Help'
-  edit: 'Edit'
-  delete: 'Delete'
-
-  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.'
-  field_success_moved: 'Field «%{name} moved successfully.'
-
-  string: 'String'
-  integer: 'Integer'
-  float: 'Float'
-  boolean: 'Boolean'
-  date: 'Date'
-  text: 'Text'
-  html: 'HTML'
-  image: 'Image'
-
-  menu: 'Menu'
-  breadcrumbs: 'Breadcrumbs'
-
-  are_you_sure?: 'Are you sure?'
-
-  page_not_found: 'Page not found'
-
-  new_page: 'New page'
-  edit_page: 'Edit page'
-  delete_page: 'Delete page'
-
-  page_success_added: 'Page «%{name}» added successfully.'
-  page_success_updated: 'Page «%{name}» updated successfully.'
-  page_success_removed: 'Page «%{name}» removed successfully.'
-
-  template: 'Template'
-  new_template: 'New template'
-  edit_template: 'Edit template'
-  delete_template: 'Delete template'
-
-  template_success_added: 'Template «%{name}» added successfully.'
-  template_success_updated: 'Template «%{name}» updated successfully.'
-  template_success_removed: 'Template «%{name}» removed successfully.'
-
-  template_error_delete_pages: 'Delete pages with this template before'
+  structure: Structure
+  templates: Templates
+  settings: Settings
+  new_field: New field
+  edit_field: Edit field
+  seo: SEO
+  display_in: Display in
+  help: Help
+  edit: Edit
+  delete: Delete
+
+  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.
+  field_success_moved: Field «%{name} moved successfully.
+  delete_field: Delete field
+
+  string: String
+  integer: Integer
+  float: Float
+  boolean: Boolean
+  date: Date
+  text: Text
+  html: HTML
+  image: Image
+
+  menu: Menu
+  breadcrumbs: Breadcrumbs
+
+  are_you_sure?: Are you sure?
+
+  page_not_found: Page not found
+
+  new_page: New page
+  edit_page: Edit page
+  delete_page: Delete page
+
+  page_success_added: Page «%{name}» added successfully.
+  page_success_updated: Page «%{name}» updated successfully.
+  page_success_removed: Page «%{name}» removed successfully.
+
+  template: Template
+  new_template: New template
+  edit_template: Edit template
+  delete_template: Delete template
+
+  template_success_added: Template «%{name}» added successfully.
+  template_success_updated: Template «%{name}» updated successfully.
+  template_success_removed: Template «%{name}» removed successfully.
+
+  template_error_delete_pages: Delete pages with this template before
 
   activerecord:
     errors:
@@ -59,4 +58,8 @@ en:
         constructor_pages/template:
           attributes:
             base:
-              code_name_already_in_use: 'Code name has already been taken'
+              code_name_already_in_use: Code name has already been taken
+        constructor_pages/field:
+          attributes:
+            base:
+              code_name_already_in_use: Code name has already been taken

data/pages/config/locales/fr.yml

@@ -0,0 +1,65 @@
+fr:
+  structure: Structure
+  templates: Modèles
+  settings: Réglages
+  new_field: Nouveau champ
+  edit_field: Champ dédition
+  seo: SEO
+  display_in: Montrer
+  help: Aider
+  edit: Èditer
+  delete: Supprimer
+
+  code_name_already_in_use: Ce nom de code est déjà utilisé
+  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
+  field_success_moved: Champ %{name} passé avec succès
+  delete_field: Supprimer le champ
+
+  string: String
+  integer: Entier
+  float: Flotter
+  boolean: Booléen
+  date: Date
+  text: Texte
+  html: HTML
+  image: Image
+
+  menu: Menu
+  breadcrumbs: Chapelure
+
+  are_you_sure?: Etes-vous sûr?
+
+  page_not_found: Page introuvable
+
+  new_page: Nouvelle page
+  edit_page: Modifier cette page
+  delete_page: Supprimer page
+
+  page_success_added: Page %{name} a ajouté avec succès
+  page_success_updated: Page %{name} mis à jour avec succès
+  page_success_removed: Page %{name} supprimé avec succès
+
+  template: Modèle
+  new_template: Nouveau modèle
+  edit_template: Modifier le modèle
+  delete_template: Supprimer le modèle
+
+  template_success_added: Modèle %{name} a ajouté avec succès
+  template_success_updated: Modèle %{name} mis à jour
+  template_success_removed: Modèle %{name} supprimé avec succès.
+
+  template_error_delete_pages: Supprimer les pages avec ce modèle avant
+
+  activerecord:
+    errors:
+      models:
+        constructor_pages/template:
+          attributes:
+            base:
+              code_name_already_in_use: Nom de code a déjà été prise
+        constructor_pages/field:
+          attributes:
+            base:
+              code_name_already_in_use: Nom de code a déjà été prise

data/pages/config/locales/ru.yml

@@ -1,55 +1,55 @@
 ru:
-  structure: 'Структура'
-  templates: 'Шаблоны'
-  settings: 'Настройки'
-  new_field: 'Новое поле'
-  edit_field: 'Редактирование поля'
-  seo: 'Поисковая оптимизация'
-  are_you_sure?: 'Вы уверены?'
-  display_in: 'Отображать в'
-  delete: 'Удалить'
+  structure: Структура
+  templates: Шаблоны
+  settings: Настройки
+  new_field: Новое поле
+  edit_field: Редактирование поля
+  seo: Поисковая оптимизация
+  are_you_sure?: Вы уверены?
+  display_in: Отображать в
+  delete: Удалить
 
-  menu: 'Меню'
-  breadcrumbs: 'Хлебные крошки'
-  code_name_already_in_use: 'Такое кодовое имя уже используется'
-  template: 'Шаблон'
-  new_template: 'Создать шаблон'
-  edit_template: 'Редактирование шаблона'
-  delete_template: 'Удалить шаблон'
+  menu: Меню
+  breadcrumbs: Хлебные крошки
+  code_name_already_in_use: Такое кодовое имя уже используется
+  template: Шаблон
+  new_template: Создать шаблон
+  edit_template: Редактирование шаблона
+  delete_template: Удалить шаблон
 
-  new_field: 'Добавить поле'
-  code_name_already_in_use: 'Такое имя уже используется.'
-  field_success_added: 'Поле «%{name}» успешно добавлено.'
-  field_success_updated: 'Поле «%{name}» успешно обновлено.'
-  field_success_removed: 'Поле «%{name}» успешно удалено.'
-  field_success_moved: 'Поле «%{name}» успешно перемещено.'
+  code_name_already_in_use: Такое имя уже используется.
+  field_success_added: Поле «%{name}» успешно добавлено.
+  field_success_updated: Поле «%{name}» успешно обновлено.
+  field_success_removed: Поле «%{name}» успешно удалено.
+  field_success_moved: Поле «%{name}» успешно перемещено.
+  delete_field: Удалить поле
 
-  string: 'Строка'
-  integer: 'Целое число'
-  float: 'Дробное число'
-  boolean: 'Булево'
-  date: 'Дата'
-  text: 'Текст'
-  html: 'HTML'
-  image: 'Изображение'
-  help: 'Помощь'
-  edit: 'Редактировать'
+  string: Строка
+  integer: Целое число
+  float: Дробное число
+  boolean: Булево
+  date: Дата
+  text: Текст
+  html: HTML
+  image: Изображение
+  help: Помощь
+  edit: Редактировать
 
-  page_not_found: 'Страница не найдена'
+  page_not_found: Страница не найдена
 
-  new_page: 'Создать страницу'
-  edit_page: 'Редактирование страницы'
-  delete_page: 'Удалить страницу'
+  new_page: Создать страницу
+  edit_page: Редактирование страницы
+  delete_page: Удалить страницу
 
-  page_success_added: 'Страница «%{name}» успешно добавлена.'
-  page_success_updated: 'Страница «%{name}» успешно обновлена.'
-  page_success_removed: 'Страница «%{name}» успешно удалена.'
+  page_success_added: Страница «%{name}» успешно добавлена.
+  page_success_updated: Страница «%{name}» успешно обновлена.
+  page_success_removed: Страница «%{name}» успешно удалена.
 
-  template_success_added: 'Шаблон «%{name}» успешно добавлен.'
-  template_success_updated: 'Шаблон «%{name}» успешно обновлен.'
-  template_success_removed: 'Шаблон «%{name}» успешно удален.'
+  template_success_added: Шаблон «%{name}» успешно добавлен.
+  template_success_updated: Шаблон «%{name}» успешно обновлен.
+  template_success_removed: Шаблон «%{name}» успешно удален.
 
-  template_error_delete_pages: 'Удалите страницы с данным шаблоном'
+  template_error_delete_pages: Удалите страницы с данным шаблоном
 
   activerecord:
     attributes:
@@ -93,4 +93,8 @@ ru:
         constructor_pages/template:
           attributes:
             base:
-              code_name_already_in_use: 'Такое кодовое имя уже используется'
+              code_name_already_in_use: Такое кодовое имя уже используется
+        constructor_pages/field:
+          attributes:
+            base:
+              code_name_already_in_use: Такое кодовое имя уже используется