constructor-pages 0.5.2 → 0.5.3

data/app/controllers/constructor_pages/fields_controller.rb

@@ -61,15 +61,15 @@ module ConstructorPages
       redirect_to edit_template_url(template), notice: t(:field_success_removed, name: name)
     end
 
-    def move_up
-      @field = Field.find(params[:id])
-      @field.move_higher
-      redirect_to :back, notice: t(:field_success_moved, name: @field.name)
-    end
+    def move_up; move_to :up end
+
+    def move_down; move_to :down end
+
+    private
 
-    def move_down
+    def move_to(to)
       @field = Field.find(params[:id])
-      @field.move_lower
+      to == :up ? @field.move_higher : @field.move_lower
       redirect_to :back, notice: t(:field_success_moved, name: @field.name)
     end
   end

data/app/controllers/constructor_pages/pages_controller.rb

@@ -11,52 +11,47 @@ module ConstructorPages
     before_filter :cache, :only => [:create, :update, :destroy, :move_up, :move_down]
 
     def new
-      @page = Page.new
-      @template = Template.first.id
-      @multipart = false
+      @page, @template_id, @multipart = Page.new, Template.first.id, false
 
       if params[:page]
-        @parent = Page.find(params[:page])
-        @page.parent_id = @parent.id
+        _parent = @page.parent = Page.find(params[:page])
 
-        if @parent.template.child_id.nil? and !@parent.template.leaf?
-          @template = @parent.template.descendants.first.id
-        else
-          @template = @parent.template.child_id
+        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
       end
     end
 
     def show
-      if params[:all].nil?
-        @page = Page.first
-      else
-        @request = '/' + params[:all]
-        @page = Page.where(:full_url => @request).first
-      end
+      @page = params[:all].nil? ? Page.first : Page.find_by_full_url('/' + params[:all])
 
       if @page.nil? or !@page.active
-        render :action => "error_404", :layout => false
+        render action: 'error_404', layout: false
         return
       end
 
-      if @page.url != @page.link and !@page.link.empty?
-        redirect_to @page.link
-      end
+      redirect_to @page.link if @page.redirect?
 
-      instance_variable_set('@'+@page.template.code_name.to_s, @page)
+      _code_name = @page.template.code_name.to_s
+
+      instance_variable_set('@'+_code_name, @page)
 
       respond_to do |format|
-        format.html { render :template => "html_templates/#{@page.template.code_name}" }
+        format.html { render template: "html_templates/#{_code_name}" }
         format.json {
-          _template = render_to_string :partial => "json_templates/#{@page.template.code_name}.json.erb", :layout => false, :locals => {@page.template.code_name.to_sym => @page, :page => @page}
-          _js = render_to_string :partial => "js_partials/#{@page.template.code_name}.js"
+          _template = render_to_string partial: "json_templates/#{_code_name}.json.erb", layout: false, locals: {_code_name.to_sym => @page, page: @page}
+          _js = render_to_string partial: "js_partials/#{_code_name}.js"
 
-          render :json => @page, :self_and_ancestors => @page.self_and_ancestors.map{|a| a.id}, :template => _template.gsub(/\n/, '\\\\n'), :js => _js
+          render json: @page, self_and_ancestors: @page.self_and_ancestors.map(&:id), template: _template.gsub(/\n/, '\\\\n'), js: _js
         }
       end
     end
 
+=begin
     def search
       if params[:all].nil?
         @page = Page.first
@@ -99,22 +94,23 @@ module ConstructorPages
 
       render :template => "templates/#{template.code_name}_search"
     end
+=end
 
     def edit
       @page = Page.find(params[:id])
       @page.template ||= Template.first
-      @template = @page.template.id
+      @template_id = @page.template.id
 
-      @multipart = @page.template.fields.map{|f| f.type_value == "image"}.include?(true) ? true : false
+      @multipart = @page.fields.map{|f| f.type_value == 'image'}.include?(true) ? true : false
     end
 
     def create
       @page = Page.new params[:page]
 
       if @page.save
-        redirect_to pages_url, notice: t(:page_success_added, name: @page.name)
+        redirect_to pages.pages_url, notice: t(:page_success_added, name: @page.name)
       else
-        render :action => "new"
+        render action: :new
       end
     end
 
@@ -122,71 +118,42 @@ module ConstructorPages
       @page = Page.find params[:id]
 
       if @page.template.id != params[:page][:template_id].to_i
-        @page.template.fields.each do |field|
-          "constructor_pages/types/#{field.type_value}_type".classify.constantize.destroy_all(
-              :field_id => field.id,
-              :page_id => @page.id)
-        end
+        @page.fields.each {|f| f.remove_values_for @page}
       end
 
       if @page.update_attributes params[:page]
+        @page.fields.each {|f| f.update_value(@page, params[:fields])}
 
-        @page.template.fields.each do |field|
-          f = "constructor_pages/types/#{field.type_value}_type".classify.constantize.where(
-              :field_id => field.id,
-              :page_id => @page.id).first_or_create
-
-          if params[:fields]
-            f.value = 0 if field.type_value == 'boolean'
-
-            if params[:fields][field.type_value]
-              if field.type_value == "date"
-                value = params[:fields][field.type_value][field.id.to_s]
-                f.value = Date.new(value["date(1i)"].to_i, value["date(2i)"].to_i, value["date(3i)"].to_i).to_s
-              else
-                f.value = params[:fields][field.type_value][field.id.to_s]
-              end
-            end
-
-            f.save
-          end
-        end
-
-        redirect_to pages_url, notice: t(:page_success_updated, name: @page.name)
+        redirect_to pages.pages_url, notice: t(:page_success_updated, name: @page.name)
       else
-        render :action => "edit"
+        render action: :edit
       end
     end
 
     def destroy
       @page = Page.find(params[:id])
-      title = @page.name
+      _name = @page.name
       @page.destroy
-      redirect_to pages_url, notice: t(:page_success_removed, name: @page.name)
+      redirect_to pages_url, notice: t(:page_success_removed, name: _name)
     end
 
-    def move_up
-      from = Page.find(params[:id])
-      ls = from.left_sibling
-      if not ls.nil? and from.move_possible?(ls)
-        from.move_left
-      end
+    def move_up; move_to :up end
 
-      redirect_to :back
-    end
+    def move_down; move_to :down end
+
+    private
 
-    def move_down
+    def move_to(to)
       from = Page.find(params[:id])
-      rs = from.right_sibling
-      if not rs.nil? and from.move_possible?(rs)
-        from.move_right
+      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
 
-    private
-
     def cache
       expire_page :action => :show
       cache_dir = ActionController::Base.page_cache_directory

data/app/controllers/constructor_pages/templates_controller.rb

@@ -47,21 +47,18 @@ module ConstructorPages
       redirect_to templates_url, :notice => "Шаблон «#{name}» успешно удален."
     end
 
-    def move_up
-      from = Template.find(params[:id])
-      ls = from.left_sibling
-      if not ls.nil? and from.move_possible?(ls)
-        from.move_left
-      end
+    def move_up; move_to :up end
 
-      redirect_to :back
-    end
+    def move_down; move_to :down end
+
+    private
 
-    def move_down
+    def move_to(to)
       from = Template.find(params[:id])
-      rs = from.right_sibling
-      if not rs.nil? and from.move_possible?(rs)
-        from.move_right
+      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

data/app/models/constructor_pages/field.rb

@@ -24,6 +24,31 @@ module ConstructorPages
     acts_as_list  scope: :template_id
     default_scope order: :position
 
+    # return constant of model by type_value
+    def type_model; "constructor_pages/types/#{type_value}_type".classify.constantize end
+
+    # remove all type_fields values for specified page
+    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
+
+      if params
+        _type_value.value = 0 if type_value == 'boolean'
+
+        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
+
+        _type_value.save
+      end
+    end
+
     private
 
     def method_uniqueness

data/app/models/constructor_pages/page.rb

@@ -16,6 +16,8 @@ module ConstructorPages
     has_many :html_types,     dependent: :destroy, class_name: 'Types::HtmlType'
     has_many :image_types,    dependent: :destroy, class_name: 'Types::ImageType'
 
+    has_many :fields, through: :template
+
     belongs_to :template
 
     default_scope order :lft
@@ -75,6 +77,9 @@ module ConstructorPages
       end
     end
 
+    # check if link specified
+    def redirect?; url != link && !link.empty? end
+
     private
 
     # if url has been changed by manually or url is empty

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

@@ -50,7 +50,7 @@
             .control-group
               = f.label :template, :class => 'control-label'
               .controls
-                = f.select :template_id, options_for_select(templates, :selected => @template)
+                = f.select :template_id, options_for_select(templates, :selected => @template_id)
             .control-group
               = f.label :link, :class => 'control-label'
               .controls

data/constructor-pages.gemspec

@@ -25,5 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'haml-rails'
   s.add_dependency 'acts_as_list'
 
+
   s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'capybara'
 end

data/spec/features/constructor_pages/pages_controller_spec.rb

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

data/spec/models/constructor_pages/page_model_spec.rb

@@ -36,6 +36,23 @@ module ConstructorPages
       it 'should return page as json format with fields'
     end
 
+    describe '#redirect?' do
+      it 'should check if link specified or not' do
+        page = Page.create name: 'Test redirection'
+        page.redirect?.should be_false
+
+        page.link = ''
+        page.save
+
+        page.redirect?.should be_false
+
+        page.link = '/hello-redirect'
+        page.save
+
+        page.redirect?.should be_true
+      end
+    end
+
     describe '#auto_url' do
       it 'should be true by default' do
         page = Page.create

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !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
 email: ivanzotov@gmail.com
 executables: []
@@ -197,6 +213,7 @@ files:
 - lib/constructor-pages.rb
 - lib/constructor_pages/engine.rb
 - public/hello.txt
+- 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
@@ -225,6 +242,7 @@ signing_key:
 specification_version: 3
 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