kuhsaft 1.5.0 → 1.6.0

data/app/assets/javascripts/kuhsaft/cms/application.js.coffee

@@ -17,7 +17,7 @@ loadTextEditor = ->
   CKEDITOR.replaceAll('editor')
 
 checkPageType = ->
-  redirect_url_input = $('#page_url')
+  redirect_url_input = $('#page_redirect_url')
   if ($('#page_page_type option:selected').val() == 'redirect')
     redirect_url_input.removeAttr('disabled')
   else

data/app/controllers/kuhsaft/pages_controller.rb

@@ -7,12 +7,14 @@ module Kuhsaft
       url += "/#{params[:url]}" if params[:url].present?
       @page = Kuhsaft::Page.find_by_url(url)
 
-      unless @page.present?
-        if respond_to?(:handle_404)
-          handle_404
-        else
-          raise ActionController::RoutingError.new('Not Found')
-        end
+      if @page.present? && @page.redirect? && @page.redirect_url.present?
+        redirect_to "/#{@page.redirect_url}"
+      elsif @page.present?
+        respond_with @page
+      elsif @page.blank? && respond_to?(:handle_404)
+        handle_404
+      else
+        raise ActionController::RoutingError.new('Not Found')
       end
     end
   end

data/app/models/kuhsaft/page.rb

@@ -6,8 +6,8 @@ class Kuhsaft::Page < ActiveRecord::Base
   has_ancestry
   acts_as_brick_list
 
-  translate :title, :slug, :keywords, :description, :body, :url, :fulltext
-  attr_accessible :title, :slug, :url, :page_type, :parent_id, :keywords, :description, :published
+  translate :title, :slug, :keywords, :description, :body, :redirect_url, :url, :fulltext
+  attr_accessible :title, :slug, :redirect_url, :url, :page_type, :parent_id, :keywords, :description, :published
 
   default_scope order('position ASC')
 
@@ -19,6 +19,7 @@ class Kuhsaft::Page < ActiveRecord::Base
 
   validates :title, :presence => true
   validates :slug, :presence => true
+  validates :redirect_url, :presence => true, :if => :redirect?
   #validates :url, :uniqueness => true, :unless => :navigation?
 
   class << self
@@ -71,17 +72,11 @@ class Kuhsaft::Page < ActiveRecord::Base
     if bricks.count == 0 && children.count > 0
       children.first.link
     else
-      if redirect?
-        url
-      else
-        "/#{url}"
-      end
+      "/#{url}"
     end
   end
 
   def create_url
-    return if redirect?
-
     complete_slug = ''
     if parent.present?
       complete_slug << parent.url.to_s

data/app/views/kuhsaft/cms/pages/_form.html.haml

@@ -12,7 +12,8 @@
       = form.input :slug, :required => false, :input_html => { :class => :span5 }
       = form.input :parent_id, :collection => Kuhsaft::Page.flat_tree, :label_method => :nesting_name, :selected => params[:parent_id].presence || @page.parent_id.presence, :prompt => 'None', :input_html => { :class => :span3 }
       = form.input :page_type, :collection => Kuhsaft::PageType.all, :prompt => false, :input_html => { :class => :span3 }
-      = form.input :url, :as => :string
+      = form.input :redirect_url, :as => :string
+      = form.input :url, :as => :string, :input_html => { :disabled => 'disabled' }
       = form.input :keywords, :input_html => { :class => :span5 }
       = form.input :description, :as => :text, :input_html => { :class => :span5, :rows => 4 }
       = form.input :published, :as => :boolean

data/config/locales/models/kuhsaft/page/de.yml

@@ -10,6 +10,7 @@ de:
         slug: 'URL Name'
         keywords: 'Stichwörter'
         description: 'Beschreibung'
+        redirect_url: 'Redirect URL'
         url: 'URL'
         published: 'Veröffentlicht'
         page_type: 'Seitentyp'

data/db/migrate/10_add_redirect_url_to_kuhsaft_pages.rb

@@ -0,0 +1,7 @@
+class AddRedirectUrlToKuhsaftPages < ActiveRecord::Migration
+  def change
+    I18n.available_locales.each do |locale|
+      add_column :kuhsaft_pages, "redirect_url_#{locale}", :text
+    end
+  end
+end

data/db/migrate/11_update_url_and_redirect_url_value.rb

@@ -0,0 +1,45 @@
+class UpdateUrlAndRedirectUrlValue < ActiveRecord::Migration
+  def up
+    @redirect_pages = Kuhsaft::Page.where(:page_type => 'redirect')
+    I18n.available_locales.each do |locale|
+      move_url_to_redirect_url(locale)
+    end
+  end
+
+  def down
+    @redirect_pages = Kuhsaft::Page.where(:page_type => 'redirect')
+    I18n.available_locales.each do |locale|
+      move_redirect_url_to_url(locale)
+    end
+
+  end
+
+  def move_url_to_redirect_url(locale)
+    I18n.with_locale(locale) do
+      @redirect_pages.each do |redirect_page|
+        redirect_url = redirect_page.url
+        redirect_page.update_attributes(:url => update_url(redirect_page), :redirect_url => redirect_url) if redirect_page
+      end
+    end
+  end
+
+  def move_redirect_url_to_url(locale)
+    I18n.with_locale(locale) do
+      @redirect_pages.each do |redirect_page|
+        url = redirect_page.redirect_url
+        redirect_page.update_attributes(:url => url, :redirect_url => nil, :page_type => nil) if redirect_page
+      end
+    end
+  end
+
+  def update_url(page)
+    complete_slug = ''
+    if page.parent.present?
+      complete_slug << page.parent.url.to_s
+    else
+      complete_slug = "#{I18n.locale}"
+    end
+    complete_slug << "/#{page.slug}"
+    complete_slug
+  end
+end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/lib/templates/kuhsaft/translations/add_translation.html.erb

@@ -7,6 +7,7 @@ class Add<%= get_locale.classify %>Translation < ActiveRecord::Migration
     add_column :kuhsaft_pages, :description_<%= get_locale %>, :text
     add_column :kuhsaft_pages, :body_<%= get_locale %>, :text
     add_column :kuhsaft_pages, :url_<%= get_locale %>, :text
+    add_column :kuhsaft_pages, :redirect_url_<%= get_locale %>, :text
     add_column :kuhsaft_pages, :fulltext_<%= get_locale %>, :text
   end
 

data/spec/controllers/kuhsaft/pages_controller_spec.rb

@@ -4,24 +4,50 @@ describe Kuhsaft::PagesController do
   subject { described_class }
 
   describe '#show' do
-    context 'without url' do
-      before do
-        @page = FactoryGirl.create(:page, :url_de => 'de')
+    describe 'redirect' do
+      around(:each) do |example|
+        I18n.with_locale :de do
+          example.run
+        end
       end
 
-      context 'with matching locale' do
-        it 'sets the corresponding page' do
-          I18n.with_locale(:de) do
-            get(:show,  { :use_route => :kuhsaft })
-          end
-          assigns(:page).should eq(@page)
+      context 'when page is not a redirect page' do
+        it 'responds with page' do
+          page = FactoryGirl.create(:page, :slug => 'dumdidum', :url => 'de/dumdidum')
+          get :show,  { :url => page.slug, :use_route => :kuhsaft, :locale => :de }
+          assigns(:page).should eq(page)
+        end
+      end
+
+      context 'when page is a redirect page' do
+        it 'redirects to the redirected url' do
+          page = FactoryGirl.create(:page, :page_type => 'redirect', :slug => 'dumdidum', :url => 'de/dumdidum', :redirect_url => 'de/redirect_page')
+          get :show,  { :url => page.slug, :use_route => :kuhsaft, :locale => :de }
+          expect(response).to redirect_to("/de/redirect_page")
         end
       end
+    end
+
+    describe 'routing' do
+      context 'without url' do
+        before do
+          @page = FactoryGirl.create(:page, :url_de => 'de')
+        end
+
+        context 'with matching locale' do
+          it 'sets the corresponding page' do
+            I18n.with_locale(:de) do
+              get(:show,  { :use_route => :kuhsaft })
+            end
+            assigns(:page).should eq(@page)
+          end
+        end
 
-      context 'without matching locale' do
-        it 'raises a routing error' do
-          I18n.with_locale(:en) do
-            expect { get(:show,  { :use_route => :kuhsaft }) }.to raise_error(ActionController::RoutingError)
+        context 'without matching locale' do
+          it 'raises a routing error' do
+            I18n.with_locale(:en) do
+              expect { get(:show,  { :use_route => :kuhsaft }) }.to raise_error(ActionController::RoutingError)
+            end
           end
         end
       end

data/spec/features/cms_pages_spec.rb

@@ -16,7 +16,35 @@ describe 'Cms/Pages' do
       it 'creates a new page' do
         expect { click_on 'Create Seite' }.to change(Kuhsaft::Page, :count).by(1)
       end
+
+      it 'is not possible to change the value in url' do
+        page.find('#page_url')['disabled'].should be_true
+      end
     end
 
+    describe '#update' do
+      context 'when creating a redirect page' do
+        before do
+          @page = FactoryGirl.create(:page, :url => 'de/dumdidum')
+          visit kuhsaft.edit_cms_page_path(@page)
+          select 'redirect', :from => 'Seitentyp'
+        end
+
+        it 'has a value in redirect_page' do
+          fill_in 'Redirect URL', :with => 'target_page'
+          expect { click_on 'Update Seite' }.to change{ @page.reload.redirect_url }.to('target_page')
+        end
+
+        it 'is invalid when no value is in redirect_page' do
+          click_on 'Update Seite'
+          page.should have_css('.error', :count => 1)
+        end
+
+        it 'does not change the value in url' do
+          fill_in 'Redirect URL', :with => 'target_page'
+          expect { click_on 'Update Seite' }.to_not change{ @page.reload.url }
+        end
+      end
+    end
   end
 end

data/spec/models/page_spec.rb

@@ -254,8 +254,8 @@ describe Kuhsaft::Page do
     end
 
     context 'when it is a redirect? page' do
-      it 'returns the plain url' do
-        page = create(:page, :page_type => Kuhsaft::PageType::REDIRECT, :url => '/en/news')
+      it 'returns the absolute url' do
+        page = create(:page, :page_type => Kuhsaft::PageType::REDIRECT, :redirect_url => 'en/references', :slug => 'news')
         page.link.should eq('/en/news')
       end
     end
@@ -324,4 +324,13 @@ describe Kuhsaft::Page do
       end
     end
   end
+
+  describe '#before_validation' do
+    it 'generates url automatically' do
+      page = Kuhsaft::Page.new :slug => 'slug'
+      page.url.should be_nil
+      page.valid?
+      page.url.should be_present
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -450,6 +450,8 @@ files:
 - db/migrate/07_add_default_value_to_brick_type_enabled.rb
 - db/migrate/08_add_display_styles_to_bricks.rb
 - db/migrate/09_add_additional_fields_to_kuhsaft_bricks.rb
+- db/migrate/10_add_redirect_url_to_kuhsaft_pages.rb
+- db/migrate/11_update_url_and_redirect_url_value.rb
 - db/seeds.rb
 - lib/generators/kuhsaft/assets/install_generator.rb
 - lib/generators/kuhsaft/translations/add_generator.rb
@@ -542,7 +544,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1500188424572130827
+      hash: 1502563843709159469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -551,7 +553,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1500188424572130827
+      hash: 1502563843709159469
 requirements: []
 rubyforge_project: kuhsaft
 rubygems_version: 1.8.24