constructor-pages 0.5.4 → 0.5.5

data/app/controllers/constructor_pages/fields_controller.rb

@@ -2,10 +2,6 @@
 
 module ConstructorPages
   class FieldsController < ConstructorCore::ApplicationController
-    before_filter :authenticate_user!
-
-    layout 'constructor_core/application_admin'
-
     def new
       @field = Field.new
       @field.template = Template.find(params[:template_id])
@@ -30,7 +26,7 @@ module ConstructorPages
       @field = Field.find params[:id]
 
         if @field.type_value != params[:field][:type_value]
-          "constructor_pages/types/#{@field.type_value}_type".classify.constantize.where(:field_id => @field.id).each do |field|
+          @field.type_model.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)
@@ -61,9 +57,7 @@ module ConstructorPages
       redirect_to edit_template_url(template), notice: t(:field_success_removed, name: name)
     end
 
-    def move_up; move_to :up end
-
-    def move_down; move_to :down end
+    %w{up down}.each {|m| define_method "move_#{m}" do move_to m.to_sym end}
 
     private
 

data/app/controllers/constructor_pages/pages_controller.rb

@@ -2,37 +2,24 @@
 
 module ConstructorPages
   class PagesController < ConstructorCore::ApplicationController
-    before_filter :authenticate_user!, :except => [:show, :search, :sitemap]
-
+    include MoveHelper
     caches_page :show
 
     before_filter {@roots = Page.roots}
-    layout 'constructor_core/application_admin', :except => [:show, :search, :sitemap]
-    before_filter :cache, :only => [:create, :update, :destroy, :move_up, :move_down]
+    before_filter :cache, only: [:create, :update, :destroy, :move_up, :move_down]
 
     def new
       @page, @template_id, @multipart = Page.new, Template.first.id, false
 
-      if params[:page]
-        _parent = @page.parent = Page.find(params[:page])
-
-        if _parent
-          if _parent.template.child_id.nil? and !_parent.template.leaf?
-            @template_id = _parent.template.children.first.id
-          else
-            @template_id = _parent.template.child_id
-          end
-        end
+      if params[:page] and (@page.parent = Page.find(params[:page]))
+        @template_id = @page.parent.template.child.id
       end
     end
 
     def show
-      @page = params[:all].nil? ? Page.first : Page.find_by_full_url('/' + params[:all])
+      @page = Page.find_by_request_or_first params[:all]
 
-      if @page.nil? or !@page.active
-        render action: 'error_404', layout: false
-        return
-      end
+      error_404 and return if @page.nil? or !@page.active?
 
       redirect_to @page.link if @page.redirect?
 
@@ -118,13 +105,13 @@ module ConstructorPages
       @page = Page.find params[:id]
 
       if @page.template.id != params[:page][:template_id].to_i
-        @page.fields.each {|f| f.remove_values_for @page}
+        @page.remove_fields_values
       end
 
       if @page.update_attributes params[:page]
-        @page.fields.each {|f| f.update_value(@page, params[:fields])}
+        @page.update_fields_values params[:fields]
 
-        redirect_to pages.pages_url, notice: t(:page_success_updated, name: @page.name)
+        redirect_to pages_url, notice: t(:page_success_updated, name: @page.name)
       else
         render action: :edit
       end
@@ -137,21 +124,12 @@ module ConstructorPages
       redirect_to pages_url, notice: t(:page_success_removed, name: _name)
     end
 
-    def move_up; move_to :up end
-
-    def move_down; move_to :down end
+    %w{up down}.each {|m| define_method "move_#{m}" do move_to :page, m.to_sym end}
 
     private
 
-    def move_to(to)
-      from = Page.find(params[:id])
-      to_sibling = to == :up ? from.left_sibling : from.right_sibling
-
-      if not to_sibling.nil? and from.move_possible?(to_sibling)
-        to == :up ? from.move_left : from.move_right
-      end
-
-      redirect_to :back
+    def error_404
+      render file: "#{Rails.root}/public/404", layout: false, status: 404
     end
 
     def cache

data/app/controllers/constructor_pages/templates_controller.rb

@@ -2,10 +2,9 @@
 
 module ConstructorPages
   class TemplatesController < ConstructorCore::ApplicationController
-    before_filter :authenticate_user!
+    include MoveHelper
 
     before_filter {@roots = Template.roots}
-    layout 'constructor_core/application_admin'
 
     def new
       @template = Template.new
@@ -24,9 +23,9 @@ module ConstructorPages
       @template = Template.new params[:template]
 
       if @template.save
-        redirect_to templates_url, :notice => "Шаблон «#{@template.name}» успешно добавлен."
+        redirect_to templates_url, notice: t(:template_success_added, name: @template.name)
       else
-        render :action => "new"
+        render action: :new
       end
     end
 
@@ -34,9 +33,9 @@ module ConstructorPages
       @template = Template.find params[:id]
 
       if @template.update_attributes params[:template]
-        redirect_to templates_url, :notice => "Шаблон «#{@template.name}» успешно обновлен."
+        redirect_to templates_url, notice: t(:template_success_updated, name: @template.name)
       else
-        render :action => "edit"
+        render action: :edit
       end
     end
 
@@ -44,24 +43,9 @@ module ConstructorPages
       @template = Template.find(params[:id])
       name = @template.name
       @template.destroy
-      redirect_to templates_url, :notice => "Шаблон «#{name}» успешно удален."
+      redirect_to templates_url, notice: t(:template_success_removed, name: name)
     end
 
-    def move_up; move_to :up end
-
-    def move_down; move_to :down end
-
-    private
-
-    def move_to(to)
-      from = Template.find(params[:id])
-      to_sibling = to == :up ? from.left_sibling : from.right_sibling
-
-      if not to_sibling.nil? and from.move_possible?(to_sibling)
-        to == :up ? from.move_left : from.move_right
-      end
-
-      redirect_to :back
-    end
+    %w{up down}.each {|m| define_method "move_#{m}" do move_to :template, m.to_sym end}
   end
 end

data/app/helpers/constructor_pages/move_helper.rb

@@ -0,0 +1,14 @@
+module ConstructorPages
+  module MoveHelper
+    def move_to(what, to)
+      from = ('constructor_pages/'+what.to_s).classify.constantize.find(params[:id])
+      to_sibling = to == :up ? from.left_sibling : from.right_sibling
+
+      if not to_sibling.nil? and from.move_possible?(to_sibling)
+        to == :up ? from.move_left : from.move_right
+      end
+
+      redirect_to :back
+    end
+  end
+end

data/app/models/constructor_pages/field.rb

@@ -32,25 +32,27 @@ module ConstructorPages
     def remove_values_for(page); type_model.destroy_all field_id: id, page_id: page.id end
 
     def update_value(page, params)
-      _type_value = type_model.where(field_id: id, page_id: page.id).first_or_create
+      _type_model = type_model.where(field_id: id, page_id: page.id).first_or_create
 
-      if params
-        _type_value.value = 0 if type_value == 'boolean'
+      update_type_model(_type_model, type_value, params) if params
+    end
 
-        if params[type_value]
-          if type_value == 'date'
-            value = params[type_value][id.to_s]
-            _type_value.value = Date.new(value['date(1i)'].to_i, value['date(2i)'].to_i, value['date(3i)'].to_i).to_s
-          else
-            _type_value.value = params[type_value][id.to_s]
-          end
-        end
+    private
+
+    def update_type_model(type_model, type_value, params)
+      type_model.value = 0 if type_value == 'boolean'
 
-        _type_value.save
+      if params[type_value]
+        if type_value == 'date'
+          value = params[type_value][id.to_s]
+          type_model.value = Date.new(value['date(1i)'].to_i, value['date(2i)'].to_i, value['date(3i)'].to_i).to_s
+        else
+          type_model.value = params[type_value][id.to_s]
+        end
       end
-    end
 
-    private
+      type_model.save
+    end
 
     def method_uniqueness
       if Page.first.respond_to?(code_name) \
@@ -67,7 +69,7 @@ module ConstructorPages
     %w{create destroy_all}.each do |m|
       class_eval %{
           def #{m}_page_fields
-            pages.each {|page| type_model.#{m} page_id: page.id, field_id: id}
+            template.pages.each {|page| type_model.#{m} page_id: page.id, field_id: id}
           end
       }
     end

data/app/models/constructor_pages/page.rb

@@ -27,11 +27,17 @@ module ConstructorPages
 
     acts_as_nested_set
 
+    def self.find_by_request_or_first(request)
+      request.nil? ? Page.first : Page.find_by_full_url('/' + request)
+    end
+
     # generate full_url from parent page and url
     def self.full_url_generate(parent_id, url = '')
       Page.find(parent_id).self_and_ancestors.map {|c| c.url}.append(url).join('/')
     end
 
+    def active?; active end
+
     def field(code_name, meth = 'value')
       field = Field.find_by_code_name_and_template_id code_name, template_id
 
@@ -56,6 +62,16 @@ module ConstructorPages
       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)
+      fields.each {|f| f.update_value(self, params)}
+    end
+
     def method_missing(name, *args, &block)
       name = name.to_s
 

data/app/models/constructor_pages/template.rb

@@ -16,6 +16,15 @@ module ConstructorPages
 
     acts_as_nested_set
 
+    # return child corresponding child_id or children first
+    def child
+      if child_id.nil? and !leaf?
+        children.first
+      else
+        Template.find child_id
+      end
+    end
+
     private
 
     def method_uniqueness

data/config/locales/en.yml

@@ -43,4 +43,8 @@ en:
   template: 'Template'
   new_template: 'New template'
   edit_template: 'Edit template'
-  delete_template: 'Delete 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.'

data/config/locales/ru.yml

@@ -45,6 +45,10 @@ ru:
   page_success_updated: 'Страница «%{name}» успешно обновлена.'
   page_success_removed: 'Страница «%{name}» успешно удалена.'
 
+  template_success_added: 'Шаблон «%{name}» успешно добавлен.'
+  template_success_updated: 'Шаблон «%{name}» успешно обновлен.'
+  template_success_removed: 'Шаблон «%{name}» успешно удален.'
+
   activerecord:
     attributes:
       constructor_pages/field:

data/spec/features/constructor_pages/pages_controller_spec.rb

@@ -6,7 +6,8 @@ require 'capybara/rspec'
 module ConstructorPages
   describe 'Page Controller', type: :feature do
     it 'should be valid' do
-      visit '/'
+      Page.create name: 'Hello'
+      visit '/hello'
     end
   end
 end

data/spec/models/constructor_pages/page_model_spec.rb

@@ -169,7 +169,10 @@ module ConstructorPages
     end
 
     describe 'create_fields' do
-      it 'should create type_fields after update page'
+      it 'should create type_fields after update page' do
+        page = Page.create name: 'Hello fields'
+
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constructor-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,7 @@ files:
 - app/controllers/constructor_pages/pages_controller.rb
 - app/controllers/constructor_pages/templates_controller.rb
 - app/helpers/constructor_pages/fields_helper.rb
+- app/helpers/constructor_pages/move_helper.rb
 - app/helpers/constructor_pages/pages_helper.rb
 - app/helpers/constructor_pages/templates_helper.rb
 - app/models/constructor_pages/field.rb
@@ -185,7 +186,6 @@ files:
 - app/views/constructor_pages/pages/_menu.haml
 - app/views/constructor_pages/pages/_submenu.haml
 - app/views/constructor_pages/pages/edit.haml
-- app/views/constructor_pages/pages/error_404.haml
 - app/views/constructor_pages/pages/index.haml
 - app/views/constructor_pages/pages/new.haml
 - app/views/constructor_pages/pages/show.haml

data/app/views/constructor_pages/pages/error_404.haml

@@ -1,24 +0,0 @@
-!!!
-%html{'class' => 'no-js', 'lang' => 'en'}
-  %head
-    %meta{'charset' => 'utf-8'}/
-    %meta{'http-equiv' => 'X-UA-Compatible', 'content' => 'IE=edge,chrome=1'}/
-    %title=t :page_not_found
-    
-    = stylesheet_link_tag 'styles'
-    = csrf_meta_tag
-    = favicon_link_tag
-
-    %style
-      body { font-family: 'Arial', sans-serif; }
-
-  %body
-    .b-error-404
-      %h1.b-error-404__h1
-        =t :error
-        404
-      %p
-        = link_to t(:homepage), '/', :class => "b-error-404__link-home"
-        %br/
-        = link_to t(:sitemap), "/sitemap"
-