constructor-pages 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c09866c9e4bcf1acc6b6507998a7cb406f374eda
-  data.tar.gz: ea5777196397b8e286e6f692b9c7a9cdd25a13b0
+  metadata.gz: d026926c52a6cb3a5ae3d475466be5ea3e7b117b
+  data.tar.gz: 607421994b5261c7375f5af42f3912d6f9521f83
 SHA512:
-  metadata.gz: 8312e4a5faf16128dad527508472dea2b4bb1938cf69ae1a0a177e3b3fabd844a14a3425edae259209467ae50f5e18ec3816bbdfcee4225f455b1274554e1697
-  data.tar.gz: 38778dbfc8f196fd125d7e296005ff9b8d0471aac3ef56b4b839007534a37688a726e9e702cf26ce3eb5126b0700829cf0c49af69e02945960307dd86e4b5880
+  metadata.gz: 4ed6b39d54645df86219b201f3f9451a96812dca3f809d6fabeb9068bd0703cb3fe6129ca912d32fd4573b42705d4557006a65877d3639ff650e0043169237b6
+  data.tar.gz: 1a531f685ae260efe0db140f77e65a6ac5950469a17d0e88bcc093bc3f89643b57fd658bb0edb1b148d02760f4dabaa77caba6c721337791032bb105b4c52be2

data/app/controllers/constructor_pages/pages_controller.rb

@@ -23,7 +23,7 @@ module ConstructorPages
       _request = "/#{params[:all]}"
       @page = Page.find_by_request_or_first(_request)
       error_404 and return if @page.nil? or (!@page.published? and _request != '/')
-      redirect_to @page.link if @page.redirect?
+      redirect_to(@page.redirect) && return if @page.redirect?
       _code_name = @page.template.code_name
       instance_variable_set('@'+_code_name, @page)
 

data/app/models/constructor_pages/page.rb

@@ -181,7 +181,7 @@ module ConstructorPages
     end
 
     # Check if link specified
-    def redirect?; url != link && !link.empty? end
+    def redirect?; url != redirect && !redirect.empty? end
 
     # Touch all pages in same branch
     def touch_branch

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

@@ -41,16 +41,16 @@
             .control-group
               = f.label :parent_id, class: 'control-label'
               .controls
-                = f.select :parent_id, options_for_select(for_select(@pages, true), selected: @parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: t(:no)
+                = f.select :parent_id, options_for_select(for_select(@pages, true), selected: @parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: '--'
 
             .control-group
               = f.label :template_id, :class => 'control-label'
               .controls
                 = f.select :template_id,  options_for_select(templates, selected: @template_id)
             .control-group
-              = f.label :link, class: 'control-label'
+              = f.label :redirect, class: 'control-label'
               .controls
-                = f.text_field :link, class: 'span9'
+                = f.text_field :redirect, class: 'span9'
             .control-group
               %label.control-label=t :display_in
               .controls

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

@@ -18,7 +18,7 @@
     .control-group
       = f.label :parent_id, class: 'control-label'
       .controls
-        = 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)
+        = f.select :parent_id, options_for_select(for_select(@templates), selected: @template.parent_id), disabled: @template.self_and_descendants.map(&:id), include_blank: '--'
 
     - unless @template.new_record?
       .control-group

data/config/locales/ru.yml

@@ -62,14 +62,14 @@ ru:
       constructor_pages/template:
         name: "Название"
         code_name: "Кодовое имя"
-        parent: "Родительский"
+        parent_id: "Родительский"
         child: "Дочерний"
 
       constructor_pages/page:
         active: "Вкл./Выкл."
         image: "Изображение"
         name: "Название"
-        template: "Шаблон"
+        template_id: "Шаблон"
         auto_url: "Авто-ссылка"
         url: "Адрес"
         in_menu: "Меню"
@@ -78,7 +78,7 @@ ru:
         in_url: "Адрес"
         parent: "Родитель"
         parent_id: "Родительская страница"
-        link: "Ссылка"
+        redirect: "Редирект"
         title: "Заголовок"
         keywords: "Ключевые слова"
         description: "Описание"

data/constructor-pages.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'dragonfly'
   s.add_dependency 'rack-cache'
-  s.add_dependency 'awesome_nested_set'
+  s.add_dependency 'awesome_nested_set', '3.0.0.rc1'
   s.add_dependency 'haml-rails'
   s.add_dependency 'acts_as_list'
 

data/db/migrate/15_rename_link_to_redirect.rb

@@ -0,0 +1,9 @@
+class RenameLinkToRedirect < ActiveRecord::Migration
+  def self.up
+    rename_column 'constructor_pages_pages', :link, :redirect
+  end
+
+  def self.down
+    rename_column 'constructor_pages_pages', :redirect, :link
+  end
+end

data/spec/features/constructor_pages/pages_spec.rb

@@ -88,6 +88,21 @@ module ConstructorPages
         visit _second_page.full_url
         page.should have_content 'Home page'
       end
+
+      it 'should redirect if redirect specified' do
+        _page = Page.create name: 'First page', template: @template
+        _template = Template.create name: 'Home page', code_name: 'home_page'
+        Page.create name: 'Second page', template: _template
+
+        visit _page.full_url
+        current_path.should == '/first-page'
+
+        _page.redirect = '/second-page'
+        _page.save
+
+        visit _page.full_url
+        current_path.should == '/second-page'
+      end
     end
 
     describe 'Moving' do

data/spec/models/constructor_pages/page_spec.rb

@@ -280,12 +280,12 @@ module ConstructorPages
           page = Page.create name: 'Test redirection'
           page.redirect?.should be_false
 
-          page.link = ''
+          page.redirect = ''
           page.save
 
           page.redirect?.should be_false
 
-          page.link = '/hello-redirect'
+          page.redirect = '/hello-redirect'
           page.save
 
           page.redirect?.should be_true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
 platform: ruby
 authors:
 - Ivan Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-06 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.12
+        version: 0.8.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.12
+        version: 0.8.13
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - 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/15_rename_link_to_redirect.rb
 - db/migrate/1_create_pages.rb
 - db/migrate/2_create_templates.rb
 - db/migrate/3_create_fields.rb