constructor-pages 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52fee714d69f06402fc65d1d9ad8f30dea28ff63
-  data.tar.gz: 9dc647b30c35888a0b31b823508f70e9f4268f6e
+  metadata.gz: ad8ecd535c634c2ca60ef07a528827309da354dc
+  data.tar.gz: a40b0e874c6deb4d0bfd4534429bd43a97484131
 SHA512:
-  metadata.gz: 5b5d24e9e7b32277bc20196147fa0dbf784c0046b5238c5aa25acdc4dfdd5a868073c7273904a6238837eee7e7a00f97624a62c1f4e07438148406bbe98a4d4a
-  data.tar.gz: c3728f3b11e85bd6314d740e727f781b8405d1216a32076b0fc10e06d17548fbd93d64d337bc94ccf9b5a5ee26dcd9a34f909e3cd9e03ce915d83dd2889fb4bf
+  metadata.gz: 4d3018fa5da4f6ea3c4dec6e68f9e8868fa6da55c572487fca2d934d6869dc577df6701dd6285695bc730847aeabee27d1d62e18134f00093214d6f202c2866b
+  data.tar.gz: d926d66001f42d933ddb6f016d1ac57b1edda1514fb9908e9050eaef3051659a440d59114def71bdaf6083a812bbd9e8589388db92c4a793756281953038d45e

data/app/controllers/constructor_pages/pages_controller.rb

@@ -10,7 +10,7 @@ module ConstructorPages
 
     def index
       @pages = Page.includes(:template).load
-      @pages_cache = Digest::MD5.hexdigest(@pages.map{|p| [p.name, p.url, p.lft, p.template_id]}.join)
+      @pages_cache = Digest::MD5.hexdigest(@pages.map{|p| [p.name, p.full_url, p.in_url, p.lft, p.template_id]}.join)
       @template_exists = Template.count != 0
       flash[:notice] = 'Create at least one template' unless @template_exists
     end
@@ -21,7 +21,7 @@ module ConstructorPages
 
     def new_child
       @page, @parent_id = Page.new, params[:id]
-      @template_id = Page.find(@parent_id).try(:template).child.id
+      @template_id = Page.find(@parent_id).try(:template).try(:child).try(:id)
     end
 
     def show
@@ -30,17 +30,19 @@ module ConstructorPages
       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 "templates/#{_code_name}" }
-        format.json { render "templates/#{_code_name}.json", layout: false }
-        format.xml  { render "templates/#{_code_name}.xml",  layout: false }
+        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 }
       end
     end
 
     def edit
       @page = Page.find(params[:id])
       @parent_id, @template_id = @page.parent.try(:id), @page.template.id
+      _code_name = @page.template.code_name.pluralize
+      render "#{_code_name}/edit" rescue render :edit
     end
 
     def create
@@ -50,7 +52,13 @@ module ConstructorPages
         @page.touch_branch
         redirect_to pages_path, notice: t(:page_success_added, name: @page.name)
       else
-        render :new
+        if @page.template_id
+          _template = Template.find(@page.template_id)
+          _code_name = _template.code_name.pluralize if _template
+          render "#{_code_name}/new" rescue render :new
+        else
+          render :new
+        end
       end
     end
 
@@ -68,7 +76,7 @@ module ConstructorPages
 
         redirect_to pages_path, notice: t(:page_success_updated, name: @page.name)
       else
-        render :edit
+        render "#{@page.template.code_name.pluralize}/new" rescue render :edit
       end
     end
 
@@ -95,6 +103,7 @@ module ConstructorPages
           :in_nav,
           :in_map,
           :in_menu,
+          :in_url,
           :link
       )
     end

data/app/models/constructor_pages/page.rb

@@ -34,7 +34,7 @@ module ConstructorPages
       # @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('/')
+        '/' + Page.find(parent_id).self_and_ancestors.map{|p| p.url if p.in_url}.append(url).compact.join('/')
       end
 
       # Check code_name for field and template.
@@ -157,6 +157,8 @@ module ConstructorPages
 
     alias_method :find_pages_in_branch, :find_page_in_branch
 
+    def in_breadcrumbs; in_nav end
+
     def published?; active? end
 
     # Return true if there is a file upload field in page
@@ -199,7 +201,7 @@ module ConstructorPages
 
     # if url has been changed by manually or url is empty
     def friendly_url
-      self.url = ((auto_url || url.empty?) ? transliterate(name, '') : url).parameterize
+      self.url = ((auto_url || url.empty?) ? parameterize(transliterate(name, '')) : url)
     end
 
     # Page is not valid if there is no template
@@ -215,7 +217,7 @@ module ConstructorPages
 
     # Reload all descendants
     def descendants_update
-      descendants.map(&:save) if self.full_url_changed?
+      descendants.map(&:save) if self.full_url_changed? or self.in_url_changed?
     end
   end
 end

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 ? self.class.find(child_id) : children.first if !leaf?
+      child_id ? Template.find(child_id) : children.first if !leaf?
     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)
 
 - if image
-  = image_tag image.value.thumb('200x200').url
+  = image_tag image.thumb('200x200').url
 
 %br/
 = file_field_tag "fields[#{field.code_name}]", class: 'span6'

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

@@ -66,6 +66,10 @@
                   = f.check_box :in_nav
                   =t :breadcrumbs
 
+                %label.checkbox.inline.span2{for: 'in_url'}
+                  = f.check_box :in_url
+                  =t :url
+
     .accordion
       .accordion-group
         .accordion-heading.text-center

data/db/migrate/13_add_in_url_to_pages.rb

@@ -0,0 +1,17 @@
+class AddInUrlToPages < ActiveRecord::Migration
+  def self.up
+    add_column 'constructor_pages_pages', :in_url, :boolean, default: true
+
+    ConstructorPages::Page.reset_column_information
+
+    ConstructorPages::Page.all.each do |p|
+      p.in_url = true
+      p.save
+    end
+
+  end
+
+  def self.down
+    remove_column 'constructor_pages_pages', :in_url
+  end
+end

data/spec/factories.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :pages, :class => ConstructorPages::Page do
+    sequence(:name, "a") {|n| "Test title #{n}" }
+  end
+end

data/spec/features/constructor_pages/pages_spec.rb

@@ -173,6 +173,13 @@ module ConstructorPages
         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'
@@ -225,6 +232,18 @@ module ConstructorPages
         end
       end
 
+      it 'should edit with template view' do
+        visit pages.edit_page_path(@page)
+        page.should have_content 'This page show edit with template'
+      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.edit_page_path(_page)
+        page.should_not have_content 'This page show edit with template'
+      end
+
       it 'should has delete link' do
         visit pages.edit_page_path(@page)
         page.should have_link 'Delete'
@@ -246,6 +265,40 @@ module ConstructorPages
         @page.description.should == 'Zanussi conditioners Voronezh'
         page.should have_text 'updated successfully'
       end
+
+      describe 'renegerate descendants' do
+        before :each do
+          _template = Template.create name: 'Another page', code_name: 'another_page'
+          _page_first = Page.create name: 'First', template: _template
+          _page_second = Page.create name: 'Second', parent_id: _page_first.id, template: _template
+          _page_third = Page.create name: 'Third', parent_id: _page_second.id, template: _template
+
+          visit pages.pages_path
+          page.should have_link('First', '/first')
+          page.should have_link('Second', '/first/second')
+          page.should have_link('Third', '/first/second/third')
+
+          visit pages.edit_page_path(_page_first)
+        end
+
+        it 'should regenerate full_url of descendants without url if full_url or in_url changed' do
+          check 'Url', false
+          click_button 'Update Page'
+
+          page.should have_link('First', '/first')
+          page.should have_link('Second', '/second')
+          page.should have_link('Third', '/second/third')
+        end
+
+        it 'should regenerate full_url of descendants with url if full_url or in_url changed' do
+          check 'Url', true
+          click_button 'Update Page'
+
+          page.should have_link('First', '/first')
+          page.should have_link('Second', '/first/second')
+          page.should have_link('Third', '/first/second/third')
+        end
+      end
     end
 
     describe 'Delete page' do

data/spec/models/constructor_pages/page_spec.rb

@@ -21,8 +21,7 @@ module ConstructorPages
 
         it 'should create type_fields after' do
           field = Field.create name: 'Content', code_name: 'content', template: @template, type_value: 'text'
-          page = Page.create name: 'New page', template: @template
-
+          page = Page.create(name: 'New page', template: @template)
           field.get_value_for(page).should == ''
         end
       end
@@ -160,7 +159,6 @@ module ConstructorPages
       end
     end
 
-
     context 'INSTANCE METHODS' do
       context 'Getting and setting field value' do
         before :each do
@@ -368,6 +366,39 @@ module ConstructorPages
             page.save
             page.url.should == 'another-world'
           end
+
+          it 'should doesn\'t parameterize' do
+            page = Page.create name: 'Hello', url: 'hello_world_How_Are/You', auto_url: false
+            page.url.should == 'hello_world_How_Are/You'
+          end
+        end
+      end
+
+      describe '#in_menu' do
+        it 'should be true by default' do
+          page = Page.create name: 'Hello'
+          page.in_menu.should be_true
+        end
+      end
+
+      describe '#in_nav' do
+        it 'should be true by default' do
+          page = Page.create name: 'Hello'
+          page.in_nav.should be_true
+        end
+      end
+
+      describe '#in_map' do
+        it 'should be true by default' do
+          page = Page.create name: 'Hello'
+          page.in_map.should be_true
+        end
+      end
+
+      describe '#in_url' do
+        it 'should be true by default' do
+          page = Page.create name: 'Hello'
+          page.in_url.should be_true
         end
       end
 
@@ -414,6 +445,17 @@ module ConstructorPages
             page.full_url.should == '/page'
           end
         end
+
+        context 'if page in_url false' do
+          it 'should generate without url' do
+            page = Page.create name: 'Hello world'
+            second_page = Page.create name: 'Sub page', url: 'my-world', auto_url: false, parent_id: page.id, in_url: false
+            third_page = Page.create name: 'Third page', url: 'third', auto_url: false, parent_id: second_page.id
+            page.full_url.should == '/hello-world'
+            second_page.full_url.should == '/hello-world/my-world'
+            third_page.full_url.should == '/hello-world/third'
+          end
+        end
       end
 
       describe 'method_missing' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-07 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.4
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,7 @@ files:
 - db/migrate/10_create_html_types.rb
 - 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/1_create_pages.rb
 - db/migrate/2_create_templates.rb
 - db/migrate/3_create_fields.rb
@@ -198,6 +199,7 @@ files:
 - db/migrate/9_create_date_types.rb
 - lib/constructor-pages.rb
 - lib/constructor_pages/engine.rb
+- spec/factories.rb
 - spec/features/constructor_pages/fields_spec.rb
 - spec/features/constructor_pages/pages_spec.rb
 - spec/features/constructor_pages/templates_spec.rb
@@ -237,6 +239,7 @@ signing_key:
 specification_version: 4
 summary: Pages for Constructor CMS
 test_files:
+- spec/factories.rb
 - spec/features/constructor_pages/fields_spec.rb
 - spec/features/constructor_pages/pages_spec.rb
 - spec/features/constructor_pages/templates_spec.rb