kuhsaft 2.4.3 → 2.5.0

data/app/models/kuhsaft/page.rb

@@ -54,6 +54,11 @@ module Kuhsaft
       def by_identifier(identifier)
         where(identifier: identifier).first
       end
+
+      def all_urls
+        url_columns = column_names.select { |col| col.start_with? 'url_' }
+        pluck(url_columns).flatten.compact.sort.uniq.map { |r| "/#{r}" }
+      end
     end
 
     def without_self
@@ -69,7 +74,7 @@ module Kuhsaft
     end
 
     def redirect?
-      page_type == Kuhsaft::PageType::REDIRECT
+      page_type == Kuhsaft::PageType::REDIRECT || page_type == Kuhsaft::PageType::CUSTOM
     end
 
     def navigation?

data/app/models/kuhsaft/page_type.rb

@@ -3,9 +3,10 @@ module Kuhsaft
     REDIRECT = 'redirect'
     NAVIGATION = 'navigation'
     CONTENT = 'content'
+    CUSTOM = 'custom'
 
     def self.all
-      [CONTENT, REDIRECT, NAVIGATION]
+      [CONTENT, REDIRECT, NAVIGATION, CUSTOM]
     end
   end
 end

data/app/views/shoestrap/base/_form.html.haml

@@ -0,0 +1,9 @@
+= simple_form_for([:cms, resource], wrapper: :bootstrap) do |f|
+  = f.error_notification
+
+  .form-inputs
+    - resource.class.editable_attributes.each do |column_name|
+      = model_attribute_field(resource, column_name, f)
+
+  .form-actions
+    = f.button :submit

data/config/routes.rb

@@ -26,5 +26,5 @@ Kuhsaft::Engine.routes.draw do
   end
 
   get '/pages/:id' => 'pages#lookup_by_id'
-  get '/sitemap.format' => 'sitemaps#index', format: 'xml'
+  get '/sitemap' => 'sitemaps#index', format: 'xml'
 end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = '2.4.3'
+  VERSION = '2.5.0'
 end

data/spec/controllers/kuhsaft/api/pages_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::Api::PagesController do
+describe Kuhsaft::Api::PagesController, type: :controller do
   describe '#index' do
     before do
       @pages = []

data/spec/controllers/kuhsaft/pages_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::PagesController do
+describe Kuhsaft::PagesController, type: :controller do
   subject { described_class }
 
   describe '#index' do
@@ -16,7 +16,7 @@ describe Kuhsaft::PagesController do
         I18n.with_locale :de do
           get(:index,  use_route: :kuhsaft, search: 'foobar')
         end
-        assigns(:pages).should eq([@pages.first])
+        expect(assigns(:pages)).to eq([@pages.first])
       end
     end
   end
@@ -33,7 +33,7 @@ describe Kuhsaft::PagesController do
             I18n.with_locale(:de) do
               get(:show,   use_route: :kuhsaft)
             end
-            assigns(:page).should eq(@page)
+            expect(assigns(:page)).to eq(@page)
           end
         end
 
@@ -59,7 +59,7 @@ describe Kuhsaft::PagesController do
           page = FactoryGirl.create(:page, slug: 'dumdidum',
                                            url: 'de/dumdidum')
           get :show,   url: page.slug, use_route: :kuhsaft
-          assigns(:page).should eq(page)
+          expect(assigns(:page)).to eq(page)
         end
       end
 

data/spec/controllers/kuhsaft/sitemaps_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::SitemapsController do
+describe Kuhsaft::SitemapsController, type: :controller do
   describe '#index' do
     before do
       @page = FactoryGirl.create(:page)

data/spec/features/cms_pages_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Cms/Pages' do
+describe 'Cms/Pages', type: :feature do
 
   context '#new' do
     before do
@@ -19,7 +19,7 @@ describe 'Cms/Pages' do
         end
 
         it 'is not possible to change the value in url' do
-          page.find('#page_url')['disabled'].should be_true
+          expect(page.find('#page_url')['disabled']).to be_truthy
         end
       end
 
@@ -32,7 +32,7 @@ describe 'Cms/Pages' do
           within '.nav-pills' do
             click_on 'EN'
           end
-          page.should have_content(@page.title_en)
+          expect(page).to have_content(@page.title_en)
         end
       end
     end
@@ -52,7 +52,7 @@ describe 'Cms/Pages' do
 
         it 'is invalid when no value is in redirect_page' do
           click_on 'Update Page'
-          page.should have_css('.error', count: 1)
+          expect(page).to have_css('.error', count: 1)
         end
 
         it 'does not change the value in url' do
@@ -70,7 +70,7 @@ describe 'Cms/Pages' do
       invalid_brick.save(validate: false)
 
       visit kuhsaft.edit_cms_page_path(@page)
-      page.should have_css('.error', count: 1)
+      expect(page).to have_css('.error', count: 1)
     end
   end
 end

data/spec/features/search_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'pages#index' do
+describe 'pages#index', type: :feature do
   context 'with search parameter' do
     let! :page1 do
       p = create :page,
@@ -31,12 +31,12 @@ describe 'pages#index' do
 
       it 'highlights search term in preview' do
         within('ul.search-results.success') do
-          page.should have_content('Chromodorididae')
+          expect(page).to have_content('Chromodorididae')
         end
       end
 
       it 'truncates the text' do
-        find('.summary .excerpt').text.length.should == 110
+        expect(find('.summary .excerpt').text.length).to eq(110)
       end
     end
 
@@ -46,21 +46,21 @@ describe 'pages#index' do
       end
 
       it 'renders match count' do
-        page.should have_content('2 results')
+        expect(page).to have_content('2 results')
       end
 
       it 'renders the search results list' do
         within('ul.search-results.success') do
-          page.should have_content('Chromodorididae Ardeadoris')
-          page.should have_content('Chromodorididae Berlanguella')
-          page.should_not have_content('Gastropoda')
+          expect(page).to have_content('Chromodorididae Ardeadoris')
+          expect(page).to have_content('Chromodorididae Berlanguella')
+          expect(page).not_to have_content('Gastropoda')
         end
       end
 
       it 'renders links to the pages' do
         within('ul.search-results.success') do
-          page.should have_link('Chromodorididae Ardeadoris', href: page1.link)
-          page.should have_link('Chromodorididae Berlanguella', href: page2.link)
+          expect(page).to have_link('Chromodorididae Ardeadoris', href: page1.link)
+          expect(page).to have_link('Chromodorididae Berlanguella', href: page2.link)
         end
       end
     end
@@ -71,7 +71,7 @@ describe 'pages#index' do
       end
 
       it 'renders match count' do
-        page.should have_content('No results')
+        expect(page).to have_content('No results')
       end
     end
   end

data/spec/helpers/kuhsaft/cms/admin_helper_spec.rb

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
-describe Kuhsaft::Cms::AdminHelper do
+describe Kuhsaft::Cms::AdminHelper, type: :helper do
   describe '#render_language_switch?' do
     context 'when there is one language' do
       before do
-        I18n.stub(:available_locales).and_return([:de])
+        allow(I18n).to receive(:available_locales).and_return([:de])
       end
 
       it 'returns false' do
-        helper.render_language_switch?.should be_false
+        expect(helper.render_language_switch?).to be_falsey
       end
     end
 
     context 'when there are multiple languages' do
       before do
-        I18n.stub(:available_locales).and_return([:de, :en])
+        allow(I18n).to receive(:available_locales).and_return([:de, :en])
       end
 
       it 'returns true' do
-        helper.render_language_switch?.should be_true
+        expect(helper.render_language_switch?).to be_truthy
       end
     end
   end

data/spec/helpers/kuhsaft/cms/pages_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::Cms::PagesHelper do
+describe Kuhsaft::Cms::PagesHelper, type: :helper do
   describe '#content_tab_active' do
     it 'returns active when page has a title and no errors' do
       @page = create(:page, title: 'Page 1', slug: 'page1')
@@ -28,19 +28,19 @@ describe Kuhsaft::Cms::PagesHelper do
     it 'has a page without translations' do
       @page = create(:page, title: 'Page 1', slug: 'page1')
       I18n.with_locale :de do
-        expect(helper.hide_content_tab?(@page)).to be_true
+        expect(helper.hide_content_tab?(@page)).to be_truthy
       end
     end
 
     it 'has a redirect page' do
       @page = create(:page, title: 'Page 1', slug: 'page1',
                             page_type: Kuhsaft::PageType::REDIRECT, redirect_url: 'en/references')
-      expect(helper.hide_content_tab?(@page)).to be_true
+      expect(helper.hide_content_tab?(@page)).to be_truthy
     end
 
     it 'has a not saved page' do
       @page = Kuhsaft::Page.new
-      expect(helper.hide_content_tab?(@page)).to be_true
+      expect(helper.hide_content_tab?(@page)).to be_truthy
     end
   end
 end

data/spec/helpers/kuhsaft/pages_helper_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe PagesHelper do
+describe PagesHelper, type: :helper do
   describe '#search_page_form' do
 
     context 'without block' do
       it 'renders the default search form' do
         form = search_page_form
-        form.should have_css('form.form-inline')
-        form.should have_css('input[type=text]')
-        form.should have_css('input[type=submit]')
+        expect(form).to have_css('form.form-inline')
+        expect(form).to have_css('input[type=text]')
+        expect(form).to have_css('input[type=submit]')
       end
     end
 

data/spec/kuhsaft_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe Kuhsaft do
   it 'should be valid' do
-    Kuhsaft.should be_a(Module)
+    expect(Kuhsaft).to be_a(Module)
   end
 end

data/spec/lib/brick_list_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rspec/active_model/mocks'
 
 describe Kuhsaft::BrickList do
 
@@ -13,21 +14,22 @@ describe Kuhsaft::BrickList do
   describe '#collect_fulltext' do
     context 'with bricks' do
       it 'collects its childs fulltext' do
-        brick.stub_chain(:bricks, :localized).and_return([mock_model(Kuhsaft::Brick, collect_fulltext: 'hallo')])
-        brick.collect_fulltext.should == 'hallo'
+        result = [mock_model(Kuhsaft::Brick, collect_fulltext: 'hallo')]
+        allow(brick).to receive_message_chain(:bricks, :localized).and_return(result)
+        expect(brick.collect_fulltext).to eq('hallo')
       end
     end
 
     context 'with bricks without content' do
       it 'returns a string' do
-        brick.stub_chain(:bricks, :localized).and_return([])
-        brick.collect_fulltext.should == ''
+        allow(brick).to receive_message_chain(:bricks, :localized).and_return([])
+        expect(brick.collect_fulltext).to eq('')
       end
     end
 
     context 'without bricks' do
       it 'returns a string' do
-        brick.collect_fulltext.should == ''
+        expect(brick.collect_fulltext).to eq('')
       end
 
       it 'does not fail' do
@@ -38,13 +40,13 @@ describe Kuhsaft::BrickList do
 
   describe '#allowed_brick_types' do
     it 'returns an array of possible classes as strings' do
-      brick.allowed_brick_types.should be_a(Array)
+      expect(brick.allowed_brick_types).to be_a(Array)
     end
   end
 
   describe '#brick_types' do
     it 'returns a Kuhsaft::BrickTypeFilter' do
-      brick.brick_types.should be_a(Kuhsaft::BrickTypeFilter)
+      expect(brick.brick_types).to be_a(Kuhsaft::BrickTypeFilter)
     end
   end
 end

data/spec/lib/engine_spec.rb

@@ -6,14 +6,14 @@ describe Kuhsaft::Engine do
 
     describe '.image_sizes' do
       it 'delegates .clear to ImageSize' do
-        Kuhsaft::ImageSize.should_receive(:clear!)
+        expect(Kuhsaft::ImageSize).to receive(:clear!)
         Kuhsaft::Engine.configure do
           config.image_sizes.clear!
         end
       end
 
       it 'delegates .add to ImageSize' do
-        Kuhsaft::ImageSize.should_receive(:add).with(:something, 100, 200)
+        expect(Kuhsaft::ImageSize).to receive(:add).with(:something, 100, 200)
         Kuhsaft::Engine.configure do
           config.image_sizes.add(:something, 100, 200)
         end

data/spec/lib/gridded_spec.rb

@@ -13,12 +13,12 @@ describe Kuhsaft::Gridded do
 
     it 'returns false on gridded? if no col count is set' do
       expect_any_instance_of(GridClass).to receive(:col_count).at_least(:once).and_return(0)
-      expect(GridClass.new.gridded?).to be_false
+      expect(GridClass.new.gridded?).to be_falsey
     end
 
     it 'returns true on gridded? if a col count is set' do
       expect_any_instance_of(GridClass).to receive(:col_count).at_least(:once).and_return(10)
-      expect(GridClass.new.gridded?).to be_true
+      expect(GridClass.new.gridded?).to be_truthy
     end
   end
 end

data/spec/lib/image_uploader_mounting_spec.rb

@@ -8,7 +8,7 @@ describe Kuhsaft::ImageUploaderMounting do
 
   describe '#uploader_mounting' do
     it 'has a uploader mounted' do
-      brick.class.ancestors.include?(CarrierWave::Mount::Extension).should be_true
+      expect(brick.class.ancestors.include?(CarrierWave::Mount::Extension)).to be_truthy
     end
   end
 end

data/spec/lib/page_tree_spec.rb

@@ -29,9 +29,9 @@ module Kuhsaft
 
       it 'sets the correct parent attribute for the nodes' do
         PageTree.update(page_tree)
-        @page1.reload.parent_id.should be_nil
+        expect(@page1.reload.parent_id).to be_nil
         expect(@page2.reload.parent_id).to eq(1)
-        @page3.reload.parent_id.should be nil
+        expect(@page3.reload.parent_id).to be nil
       end
     end
   end

data/spec/lib/searchable_spec.rb

@@ -20,7 +20,7 @@ describe Kuhsaft::Searchable do
     context 'without postgresql' do
       it 'initializes scope' do
         expect(ActiveRecord::Base.connection.instance_values).not_to eq('postgresql')
-        SearchableDemo.should_receive :scope
+        expect(SearchableDemo).to receive :scope
         SearchableDemo.class_eval do
           include Kuhsaft::Searchable
         end

data/spec/lib/translatable_spec.rb

@@ -40,23 +40,23 @@ describe Kuhsaft::Translatable do
 
     describe 'translated attributes' do
       it 'delegates the getter to the suffixed attribute' do
-        model.should_receive(:name_en).and_return('John')
-        model.name.should == 'John'
+        expect(model).to receive(:name_en).and_return('John')
+        expect(model.name).to eq('John')
       end
 
       it 'delegates the setter to the suffixed attribute' do
-        model.should_receive(:name_en=).with('Johnny')
+        expect(model).to receive(:name_en=).with('Johnny')
         model.name = 'Johnny'
       end
 
       context 'dynamic methods' do
         it 'delegates boolean accessors' do
-          model.should_receive(:name_en?)
+          expect(model).to receive(:name_en?)
           model.name?
         end
 
         it 'delegates simple dynamic finders' do
-          Demo.should_receive(:find_by_name_en).with('Max')
+          expect(Demo).to receive(:find_by_name_en).with('Max')
           Demo.find_by_name('Max')
         end
       end
@@ -67,12 +67,12 @@ describe Kuhsaft::Translatable do
         end
 
         it 'delegates the getter to current locale' do
-          model.should_receive(:name_de).and_return('Johannes')
-          model.name.should == 'Johannes'
+          expect(model).to receive(:name_de).and_return('Johannes')
+          expect(model.name).to eq('Johannes')
         end
 
         it 'delegates the getter to current locale' do
-          model.should_receive(:name_de=).with('Johannes')
+          expect(model).to receive(:name_de=).with('Johannes')
           model.name = 'Johannes'
         end
       end
@@ -114,23 +114,23 @@ describe Kuhsaft::Translatable do
 
     describe 'translated attributes' do
       it 'delegates the getter to the suffixed attribute' do
-        model.should_receive(:name_de_ch).and_return('John')
-        model.name.should == 'John'
+        expect(model).to receive(:name_de_ch).and_return('John')
+        expect(model.name).to eq('John')
       end
 
       it 'delegates the setter to the suffixed attribute' do
-        model.should_receive(:name_de_ch=).with('Johnny')
+        expect(model).to receive(:name_de_ch=).with('Johnny')
         model.name = 'Johnny'
       end
 
       context 'dynamic methods' do
         it 'delegates boolean accessors' do
-          model.should_receive(:name_de_ch?)
+          expect(model).to receive(:name_de_ch?)
           model.name?
         end
 
         it 'delegates simple dynamic finders' do
-          Demo.should_receive(:find_by_name_de_ch).with('Max')
+          expect(Demo).to receive(:find_by_name_de_ch).with('Max')
           Demo.find_by_name('Max')
         end
       end
@@ -141,12 +141,12 @@ describe Kuhsaft::Translatable do
         end
 
         it 'delegates the getter to current locale' do
-          model.should_receive(:name_de).and_return('Johannes')
-          model.name.should == 'Johannes'
+          expect(model).to receive(:name_de).and_return('Johannes')
+          expect(model.name).to eq('Johannes')
         end
 
         it 'delegates the getter to current locale' do
-          model.should_receive(:name_de=).with('Johannes')
+          expect(model).to receive(:name_de=).with('Johannes')
           model.name = 'Johannes'
         end
       end

data/spec/models/accordion_brick_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::AccordionBrick do
+describe Kuhsaft::AccordionBrick, type: :model do
 
   let :accordion_brick do
     Kuhsaft::AccordionBrick.new
@@ -8,31 +8,31 @@ describe Kuhsaft::AccordionBrick do
 
   describe '#user_can_delete?' do
     it 'returns true' do
-      accordion_brick.user_can_delete?.should be_true
+      expect(accordion_brick.user_can_delete?).to be_truthy
     end
   end
 
   describe '#renders_own_childs?' do
     it 'returns false' do
-      accordion_brick.renders_own_childs?.should be_false
+      expect(accordion_brick.renders_own_childs?).to be_falsey
     end
   end
 
   describe '#bricks' do
     it 'can have childs' do
-      accordion_brick.should respond_to(:bricks)
+      expect(accordion_brick).to respond_to(:bricks)
     end
   end
 
   describe '#to_style_class' do
     it 'includes the bootstrap classname' do
-      accordion_brick.to_style_class.should == 'kuhsaft-accordion-brick accordion'
+      expect(accordion_brick.to_style_class).to eq('kuhsaft-accordion-brick accordion')
     end
   end
 
   describe '#allowed_brick_types' do
     it 'only allows AccordionItems' do
-      accordion_brick.allowed_brick_types.should == %w(Kuhsaft::AccordionItemBrick)
+      expect(accordion_brick.allowed_brick_types).to eq(%w(Kuhsaft::AccordionItemBrick))
     end
   end
 end

data/spec/models/accordion_item_brick_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::AccordionItemBrick do
+describe Kuhsaft::AccordionItemBrick, type: :model do
 
   let :accordion_item_brick do
     Kuhsaft::AccordionItemBrick.new
@@ -13,38 +13,38 @@ describe Kuhsaft::AccordionItemBrick do
 
     context 'without a #caption' do
       it 'has en error' do
-        accordion_item_brick.should have(1).error_on(:caption)
+        expect(accordion_item_brick.errors[:caption].count).to eq(1)
       end
     end
   end
 
   describe '#user_can_delete?' do
     it 'returns true' do
-      accordion_item_brick.user_can_delete?.should be_true
+      expect(accordion_item_brick.user_can_delete?).to be_truthy
     end
   end
 
   describe '#user_can_save' do
     it 'returns true' do
-      accordion_item_brick.user_can_save?.should == true
+      expect(accordion_item_brick.user_can_save?).to eq(true)
     end
   end
 
   describe '#renders_own_childs?' do
     it 'returns false' do
-      accordion_item_brick.renders_own_childs?.should be_false
+      expect(accordion_item_brick.renders_own_childs?).to be_falsey
     end
   end
 
   describe '#bricks' do
     it 'can have childs' do
-      accordion_item_brick.should respond_to(:bricks)
+      expect(accordion_item_brick).to respond_to(:bricks)
     end
   end
 
   describe '#to_style_class' do
     it 'includes the bootstrap classname' do
-      accordion_item_brick.to_style_class.should == 'kuhsaft-accordion-item-brick accordion-group'
+      expect(accordion_item_brick.to_style_class).to eq('kuhsaft-accordion-item-brick accordion-group')
     end
   end
 end

data/spec/models/anchor_brick_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::AnchorBrick do
+describe Kuhsaft::AnchorBrick, type: :model do
 
   let :anchor_brick do
     Kuhsaft::AnchorBrick.new(caption: 'test-anchor')
@@ -8,19 +8,19 @@ describe Kuhsaft::AnchorBrick do
 
   describe '#bricks' do
     it 'can not have childs' do
-      anchor_brick.should_not respond_to(:bricks)
+      expect(anchor_brick).not_to respond_to(:bricks)
     end
   end
 
   describe '#user_can_add_childs?' do
     it 'returns false' do
-      anchor_brick.user_can_add_childs?.should be_false
+      expect(anchor_brick.user_can_add_childs?).to be_falsey
     end
   end
 
   describe '#to_id' do
     it 'returns a parameterized id' do
-      anchor_brick.to_id.should == 'anchor-test-anchor'
+      expect(anchor_brick.to_id).to eq('anchor-test-anchor')
     end
   end
 end