constructor-pages 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad8ecd535c634c2ca60ef07a528827309da354dc
-  data.tar.gz: a40b0e874c6deb4d0bfd4534429bd43a97484131
+  metadata.gz: 27f76c8e1756acf621e7a34dae4b7b798feb78f8
+  data.tar.gz: 046ce61e61f77fea4d4d79e845cc2532443db873
 SHA512:
-  metadata.gz: 4d3018fa5da4f6ea3c4dec6e68f9e8868fa6da55c572487fca2d934d6869dc577df6701dd6285695bc730847aeabee27d1d62e18134f00093214d6f202c2866b
-  data.tar.gz: d926d66001f42d933ddb6f016d1ac57b1edda1514fb9908e9050eaef3051659a440d59114def71bdaf6083a812bbd9e8589388db92c4a793756281953038d45e
+  metadata.gz: 35da98b6fb19281f2805672469f3d3ce5bda0cfaaa36177c8ba54ff777b6e266e6a051e63265fed720786e42dbaf119912ac4a8187c9d9d137e6726dfc39a747
+  data.tar.gz: cc53c47824bc38ca8b93dea6595116a9de302faf124be0abb50681e9b4b182b32d467d36732723780d23ae59b0b72159c2ff3e3f70f82212bc1453829e4a30e2

data/app/controllers/constructor_pages/pages_controller.rb

@@ -2,7 +2,7 @@
 
 module ConstructorPages
   class PagesController < ApplicationController
-    layout 'constructor_core/application_core', except: [:show, :search]
+    layout 'constructor_core/application_core', except: [:show]
 
     movable :page
 
@@ -10,7 +10,7 @@ module ConstructorPages
 
     def index
       @pages = Page.includes(:template).load
-      @pages_cache = Digest::MD5.hexdigest(@pages.map{|p| [p.name, p.full_url, p.in_url, p.lft, p.template_id]}.join)
+      @pages_cache = Digest::MD5.hexdigest(@pages.map{|p| [p.name, p.full_url, p.in_url, p.template.lft, p.lft, p.template_id]}.join)
       @template_exists = Template.count != 0
       flash[:notice] = 'Create at least one template' unless @template_exists
     end
@@ -19,22 +19,17 @@ module ConstructorPages
       @page = Page.new
     end
 
-    def new_child
-      @page, @parent_id = Page.new, params[:id]
-      @template_id = Page.find(@parent_id).try(:template).try(:child).try(:id)
-    end
-
     def show
       @page = Page.find_by_request_or_first("/#{params[:all]}")
       error_404 and return unless @page.try(:published?)
       redirect_to @page.link if @page.redirect?
       _code_name = @page.template.code_name
       instance_variable_set('@'+_code_name, @page)
-      _code_name = _code_name.pluralize
+
       respond_to do |format|
-        format.html { render "#{_code_name}/show" }
-        format.json { render "#{_code_name}/show.json", layout: false rescue render json: @page }
-        format.xml  { render "#{_code_name}/show.xml",  layout: false rescue render xml: @page }
+        format.html { render "#{_code_name.pluralize}/show" rescue render "templates/#{_code_name}"}
+        format.json { render "#{_code_name.pluralize}/show.json", layout: false rescue render json: @page }
+        format.xml  { render "#{_code_name.pluralize}/show.xml",  layout: false rescue render xml: @page }
       end
     end
 

data/app/controllers/constructor_pages/templates_controller.rb

@@ -6,10 +6,9 @@ module ConstructorPages
 
     movable :template
 
-    before_filter -> {@roots = Template.roots}, only: [:new, :edit]
+    before_filter -> {@templates = Template.all}, only: [:index, :new, :edit, :update, :create]
 
     def index
-      @templates = Template.all
       @templates_cache = Digest::MD5.hexdigest(@templates.map{|t| [t.name, t.lft]}.join)
     end
 

data/app/helpers/constructor_pages/treeview_helper.rb

@@ -17,7 +17,9 @@ module ConstructorPages
     def for_select(items, full_url = false)
       result = []
       items && items.each do |i|
-        result.push(["#{'--'*i.level} #{i.name}", i.id, ({'data-full_url' => i.full_url} if full_url) ])
+        arr = ["#{'--'*i.level} #{i.name}", i.id]
+        arr << {'data-full_url' => i.full_url} if full_url
+        result.push(arr)
       end
       result
     end

data/app/models/constructor_pages/field.rb

@@ -33,6 +33,9 @@ module ConstructorPages
     # Create object of type_value by page
     def create_type_object(page); type_class.create(field_id: id, page_id: page.id) end
 
+    # Find or create type object by page
+    def find_or_create_type_object(page); find_type_object(page) || create_type_object(page) end
+
     # Remove all type_fields values for specified page
     def remove_type_object(page); find_type_object(page).destroy end
 

data/app/models/constructor_pages/page.rb

@@ -129,7 +129,7 @@ module ConstructorPages
     def update_fields_values(params, reset_booleans = true)
       params || return
 
-      fields.each {|f| f.find_type_object(self).tap {|t| t || break
+      fields.each {|f| f.find_or_create_type_object(self).tap {|t| t || next
         t.value = 0 if f.type_value == 'boolean' && reset_booleans
         params[f.code_name.to_sym].tap {|v| v && t.value = v}
         t.save }}

data/app/models/constructor_pages/template.rb

@@ -23,7 +23,7 @@ module ConstructorPages
 
     # Return child corresponding child_id or children first
     def child
-      child_id ? Template.find(child_id) : children.first if !leaf?
+      Template.find(child_id) if child_id
     end
 
     # Convert name to accusative

data/app/views/constructor_pages/fields/types/_image.haml

@@ -1,7 +1,7 @@
-- image = page.get_field_value(field.code_name)
+- image = field.get_value_for(page)
 
 - if image
   = image_tag image.thumb('200x200').url
+  %br/
 
-%br/
 = file_field_tag "fields[#{field.code_name}]", class: 'span6'

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

@@ -26,12 +26,6 @@
               =t :edit
               = page.template.to_accusative
 
-            - if page.template.child
-              = link_to new_child_page_path(page), class: 'btn btn-success btn-mini' do
-                %i.icon-chevron-down
-                =t :add
-                = page.template.child.to_accusative
-
             = link_to page, method: :delete, class: 'btn btn-danger btn-mini pull-right', data: {confirm: t(:are_you_sure?)} do
               %i.icon-remove
               =t :delete

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

@@ -18,12 +18,7 @@
     .control-group
       = f.label :parent_id, class: 'control-label'
       .controls
-        = f.select :parent_id, options_for_select(for_select(@roots), selected: @template.parent_id), disabled: @template.self_and_descendants.map(&:id), include_blank: t(:no)
-
-    .control-group
-      = f.label :child_id, class: 'control-label'
-      .controls
-        = f.select :child_id, options_for_select(for_select(@roots), selected: @template.child_id), include_blank: t(:no)
+        = f.select :parent_id, options_for_select(for_select(@templates), selected: @template.parent_id), disabled: @template.self_and_descendants.map(&:id), include_blank: t(:no)
 
     - unless @template.new_record?
       .control-group

data/config/locales/en.yml

@@ -9,6 +9,7 @@ en:
   help: Help
   edit: Edit
   delete: Delete
+  url: URL
 
   code_name_already_in_use: This code name is already in use.
   field_success_added: Field «%{name}» added successfully.

data/config/locales/ru.yml

@@ -8,6 +8,7 @@ ru:
   are_you_sure?: Вы уверены?
   display_in: Отображать в
   delete: Удалить
+  url: "Адрес"
 
   menu: Меню
   breadcrumbs: Хлебные крошки
@@ -74,6 +75,7 @@ ru:
         in_menu: "Меню"
         in_nav: "Хлебные крошки"
         in_map: "Карта сайта"
+        in_url: "Адрес"
         parent: "Родитель"
         parent_id: "Родительская страница"
         link: "Ссылка"

data/config/routes.rb

@@ -1,9 +1,6 @@
 ConstructorPages::Engine.routes.draw do
   scope '/admin' do
-    resources :pages, except: [:show] do
-      get :new_child, on: :member
-    end
-
+    resources :pages, except: [:show]
     resources :templates, except: [:show] do
       resources :fields, except: [:show, :index]
     end  
@@ -17,6 +14,5 @@ ConstructorPages::Engine.routes.draw do
 
   root :to => 'pages#show'
 
-  get '*all.:format' => 'pages#show'
-  get '*all' => 'pages#show'
+  get '*all(.:format)' => 'pages#show', format: /(html|json|xml)/
 end

data/db/migrate/14_remove_child_id_from_templates.rb

@@ -0,0 +1,9 @@
+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
+  end
+end

data/spec/features/constructor_pages/pages_spec.rb

@@ -74,19 +74,6 @@ module ConstructorPages
         visit pages.pages_path
         page.should have_link 'Delete', pages.page_path(_page)
       end
-
-      it 'should has Add child if child exists' do
-        _template = Template.create name: 'Child', code_name: 'child_page', parent: @template
-        _page = Page.create name: 'Zanussi', template: @template
-        visit pages.pages_path
-        page.should have_link 'Add child', pages.new_page_path(_page)
-      end
-
-      it 'should not has if child not exists' do
-        _page = Page.create name: 'Zanussi', template: @template
-        visit pages.pages_path
-        page.should have_no_link 'Add'
-      end
     end
 
     describe 'Show' do
@@ -164,22 +151,6 @@ module ConstructorPages
         end
       end
 
-      it 'should has child template of parent page' do
-        _template = Template.create name: 'Child', code_name: 'child_page', parent: @template
-        _page = Page.create name: 'Zanussi', template: @template
-        visit pages.pages_path
-        click_link 'Add child'
-        current_path.should == pages.new_child_page_path(_page)
-        page.should have_select 'Template', selected: '-- Child'
-      end
-
-      it 'should edit with page view if no view found' do
-        _template = Template.create name: 'Hello', code_name: 'hello'
-        _page = Page.create name: 'Hello', template: _template
-        visit pages.new_child_page_path(_page)
-        page.should_not have_content 'This page show new with template'
-      end
-
       it 'should has published checkbox' do
         visit pages.new_page_path
         page.should have_checked_field 'Active'
@@ -266,7 +237,7 @@ module ConstructorPages
         page.should have_text 'updated successfully'
       end
 
-      describe 'renegerate descendants' do
+      describe 'regenerate descendants' do
         before :each do
           _template = Template.create name: 'Another page', code_name: 'another_page'
           _page_first = Page.create name: 'First', template: _template
@@ -282,7 +253,7 @@ module ConstructorPages
         end
 
         it 'should regenerate full_url of descendants without url if full_url or in_url changed' do
-          check 'Url', false
+          uncheck 'URL'
           click_button 'Update Page'
 
           page.should have_link('First', '/first')
@@ -291,7 +262,7 @@ module ConstructorPages
         end
 
         it 'should regenerate full_url of descendants with url if full_url or in_url changed' do
-          check 'Url', true
+          uncheck 'URL'
           click_button 'Update Page'
 
           page.should have_link('First', '/first')

data/spec/features/constructor_pages/templates_spec.rb

@@ -133,10 +133,9 @@ module ConstructorPages
         page.should have_field 'Code name'
       end
 
-      it 'should has parent and child selects' do
+      it 'should has parent select' do
         visit pages.new_template_path
         page.should have_select 'Parent'
-        page.should have_select 'Child'
       end
 
       it 'should not has link new field' do

data/spec/features/constructor_pages/types/image_type_spec.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module ConstructorPages
+  describe 'Image type field' do
+    before :all do
+      ConstructorCore::User.delete_all
+      @user = ConstructorCore::User.create email: 'ivanzotov@gmail.com', password: '123qweASD'
+    end
+
+    before :each do
+      Page.delete_all
+      Field.delete_all
+      Template.delete_all
+
+      Field::TYPES.each do |t|
+        "constructor_pages/types/#{t}_type".classify.constantize.delete_all
+      end
+
+      @template = Template.create name: 'Brand', code_name: 'brand'
+
+      login_as @user
+    end
+
+    it 'should upload image' do
+      field = Field.create name: 'Logo', code_name: 'logo', type_value: 'image', template: @template
+      _page = Page.create name: 'Zanussi'
+
+      visit pages.edit_page_path(_page)
+      page.should have_content('Logo')
+      attach_file('Logo', Rails.root.to_s+'/app/assets/images/upload_image.png')
+      click_button 'Update Page'
+      _page.reload
+      _page.logo.should_not be_nil
+      visit pages.edit_page_path(_page)
+      save_and_open_page
+      page.should have_selector('img[alt="Upload image"]')
+    end
+  end
+end

data/spec/models/constructor_pages/field_spec.rb

@@ -72,6 +72,19 @@ module ConstructorPages
       end
     end
 
+    describe '#find_or_create_type_object' do
+      it 'should find or create object of type_value by page' do
+        field = Field.create name: 'Logo', code_name: 'logo', template: @template, type_value: 'image'
+        page = Page.create name: 'Page', template: @template
+        image_type = field.find_type_object(page)
+        image_type.should be_nil
+        image_type = field.find_or_create_type_object(page)
+        image_type.should be_an_instance_of(Types::ImageType)
+        image_type.page_id.should == page.id
+        image_type.field_id.should == field.id
+      end
+    end
+
     describe '#remove_type_object' do
       it 'should remote object of type_value by page' do
         field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'

data/spec/models/constructor_pages/template_spec.rb

@@ -17,18 +17,5 @@ module ConstructorPages
       _template = Template.create name: 'Page', code_name: 'get_field_value'
       _template.valid?.should be_false
     end
-
-    describe '#child' do
-      it 'should return child corresponding child_id or children first' do
-        _brand = Template.create name: 'Brand', code_name: 'brand'
-        _series = Template.create name: 'Series', code_name: 'series', parent: _brand
-        _brand.reload
-
-        _brand.child.should == _series
-        _brand.child_id = _brand.id
-
-        _brand.child.should == _brand
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constructor-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,6 @@ files:
 - app/views/constructor_pages/pages/edit.haml
 - app/views/constructor_pages/pages/index.haml
 - app/views/constructor_pages/pages/new.haml
-- app/views/constructor_pages/pages/new_child.haml
 - app/views/constructor_pages/templates/_form.haml
 - app/views/constructor_pages/templates/edit.haml
 - app/views/constructor_pages/templates/index.haml
@@ -188,6 +187,7 @@ files:
 - db/migrate/11_create_image_types.rb
 - db/migrate/12_add_default_template.rb
 - db/migrate/13_add_in_url_to_pages.rb
+- db/migrate/14_remove_child_id_from_templates.rb
 - db/migrate/1_create_pages.rb
 - db/migrate/2_create_templates.rb
 - db/migrate/3_create_fields.rb
@@ -203,6 +203,7 @@ files:
 - spec/features/constructor_pages/fields_spec.rb
 - spec/features/constructor_pages/pages_spec.rb
 - spec/features/constructor_pages/templates_spec.rb
+- spec/features/constructor_pages/types/image_type_spec.rb
 - spec/helpers/constructor_pages/.keep
 - spec/models/constructor_pages/field_spec.rb
 - spec/models/constructor_pages/page_spec.rb
@@ -243,6 +244,7 @@ test_files:
 - spec/features/constructor_pages/fields_spec.rb
 - spec/features/constructor_pages/pages_spec.rb
 - spec/features/constructor_pages/templates_spec.rb
+- spec/features/constructor_pages/types/image_type_spec.rb
 - spec/helpers/constructor_pages/.keep
 - spec/models/constructor_pages/field_spec.rb
 - spec/models/constructor_pages/page_spec.rb

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

@@ -1,5 +0,0 @@
-- content_for :page_title do
-  =t :new_page
-
-%section.span12
-  = render 'form'