kuhsaft 2.2.6 → 2.3.0

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

@@ -33,7 +33,8 @@ describe Kuhsaft::Cms::PagesHelper do
     end
 
     it 'has a redirect page' do
-      @page = create(:page, title: 'Page 1', slug: 'page1', page_type: Kuhsaft::PageType::REDIRECT, redirect_url: 'en/references')
+      @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
     end
 

data/spec/kuhsaft_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Kuhsaft do
-  it "should be valid" do
+  it 'should be valid' do
     Kuhsaft.should be_a(Module)
   end
 end

data/spec/lib/brick_list_spec.rb

@@ -13,7 +13,7 @@ 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.stub_chain(:bricks, :localized).and_return([mock_model(Kuhsaft::Brick, collect_fulltext: 'hallo')])
         brick.collect_fulltext.should == 'hallo'
       end
     end

data/spec/lib/page_tree_spec.rb

@@ -6,8 +6,12 @@ require_relative '../../app/models/kuhsaft/page'
 
 module Kuhsaft
   describe PageTree do
-    let(:page_tree) { {"0"=>{"id"=>"1", "children"=>{"0"=>{"id"=>"2"}}},
-                 "1"=>{"id"=>"3"}}}
+    let(:page_tree) do
+      {
+        '0' => { 'id' => '1', 'children' => { '0' => { 'id' => '2' } } },
+        '1' => { 'id' => '3' }
+       }
+    end
 
     before :each do
       @page1 = FactoryGirl.create(:page, id: 1, position: 10)
@@ -18,15 +22,15 @@ module Kuhsaft
     describe 'update' do
       it 'sets the correct position of the root nodes' do
         PageTree.update(page_tree)
-        @page1.reload.position.should == 0
-        @page2.reload.position.should == 0
-        @page3.reload.position.should == 1
+        expect(@page1.reload.position).to eq(0)
+        expect(@page2.reload.position).to eq(0)
+        expect(@page3.reload.position).to eq(1)
       end
 
       it 'sets the correct parent attribute for the nodes' do
         PageTree.update(page_tree)
         @page1.reload.parent_id.should be_nil
-        @page2.reload.parent_id.should == 1
+        expect(@page2.reload.parent_id).to eq(1)
         @page3.reload.parent_id.should be nil
       end
     end

data/spec/lib/searchable_spec.rb

@@ -4,11 +4,11 @@ describe Kuhsaft::Searchable do
 
   context 'with missing includes' do
     it 'raises exteption when class does not include Kuhsaft::Bricklist' do
-      expect {
+      expect do
         class Foo
           include Kuhsaft::Searchable
         end
-      }.to raise_error(/needs Kuhsaft::BrickList to be included/)
+      end.to raise_error(/needs Kuhsaft::BrickList to be included/)
     end
   end
 
@@ -19,12 +19,12 @@ describe Kuhsaft::Searchable do
 
     context 'without postgresql' do
       it 'initializes scope' do
-        ActiveRecord::Base.connection.instance_values.should_not == 'postgresql'
+        expect(ActiveRecord::Base.connection.instance_values).not_to eq('postgresql')
         SearchableDemo.should_receive :scope
         SearchableDemo.class_eval do
           include Kuhsaft::Searchable
         end
       end
     end
-  end 
+  end
 end

data/spec/lib/translatable_spec.rb

@@ -11,74 +11,144 @@ describe Kuhsaft::Translatable do
     Demo.new
   end
 
-  before do
-    I18n.available_locales = [:en, :de]
-    I18n.locale = :en
-  end
+  describe 'normal locale' do
+    before do
+      I18n.locale = :en
+    end
 
-  after do
-    I18n.available_locales = [:en]
-    I18n.locale = :en
-  end
+    describe '.translate' do
+      it 'defines a getter for each attribute' do
+        expect(model).to respond_to(:name)
+      end
 
-  describe '.translate' do
-    it 'defines a getter for each attribute' do
-      model.should respond_to(:name)
+      it 'defines a setter for each attributes' do
+        expect(model).to respond_to(:name=)
+      end
     end
 
-    it 'defines a setter for each attributes' do
-      model.should respond_to(:name=)
+    describe '.locale_attr' do
+      it 'returns a suffixed attribute name' do
+        expect(Demo.locale_attr('text')).to eq('text_en')
+      end
     end
-  end
 
-  describe '.locale_attr' do
-    it 'returns a suffixed attribute name' do
-      Demo.locale_attr('text').should == 'text_en'
+    describe '#locale_attr' do
+      it 'returns a suffixed attribute name' do
+        expect(model.locale_attr('text')).to eq('text_en')
+      end
     end
-  end
 
-  describe '#locale_attr' do
-    it 'returns a suffixed attribute name' do
-      model.locale_attr('text').should == 'text_en'
+    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'
+      end
+
+      it 'delegates the setter to the suffixed attribute' do
+        model.should_receive(:name_en=).with('Johnny')
+        model.name = 'Johnny'
+      end
+
+      context 'dynamic methods' do
+        it 'delegates boolean accessors' do
+          model.should_receive(:name_en?)
+          model.name?
+        end
+
+        it 'delegates simple dynamic finders' do
+          Demo.should_receive(:find_by_name_en).with('Max')
+          Demo.find_by_name('Max')
+        end
+      end
+
+      context 'when changing the locale' do
+        before do
+          I18n.locale = :de
+        end
+
+        it 'delegates the getter to current locale' do
+          model.should_receive(:name_de).and_return('Johannes')
+          model.name.should == 'Johannes'
+        end
+
+        it 'delegates the getter to current locale' do
+          model.should_receive(:name_de=).with('Johannes')
+          model.name = 'Johannes'
+        end
+      end
     end
   end
 
-  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'
+  describe 'country specific locale' do
+    before do
+      I18n.available_locales = [:de, 'de-CH']
+      I18n.locale = 'de-CH'
     end
 
-    it 'delegates the setter to the suffixed attribute' do
-      model.should_receive(:name_en=).with('Johnny')
-      model.name = 'Johnny'
+    after do
+      I18n.available_locales = [:en]
+      I18n.locale = :en
     end
 
-    context 'dynamic methods' do
-      it 'delegates boolean accessors' do
-        model.should_receive(:name_en?)
-        model.name?
+    describe '.translate' do
+      it 'defines a getter for each attribute' do
+        expect(model).to respond_to(:name)
       end
 
-      it 'delegates simple dynamic finders' do
-        Demo.should_receive(:find_by_name_en).with('Max')
-        Demo.find_by_name('Max')
+      it 'defines a setter for each attributes' do
+        expect(model).to respond_to(:name=)
       end
     end
 
-    context 'when changing the locale' do
-      before do
-        I18n.locale = :de
+    describe '.locale_attr' do
+      it 'returns a suffixed attribute name' do
+        expect(Demo.locale_attr('text')).to eq('text_de_ch')
       end
+    end
+
+    describe '#locale_attr' do
+      it 'returns a suffixed attribute name' do
+        expect(Demo.locale_attr('text')).to eq('text_de_ch')
+      end
+    end
 
-      it 'delegates the getter to current locale' do
-        model.should_receive(:name_de).and_return('Johannes')
-        model.name.should == 'Johannes'
+    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'
       end
 
-      it 'delegates the getter to current locale' do
-        model.should_receive(:name_de=).with('Johannes')
-        model.name = 'Johannes'
+      it 'delegates the setter to the suffixed attribute' do
+        model.should_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?)
+          model.name?
+        end
+
+        it 'delegates simple dynamic finders' do
+          Demo.should_receive(:find_by_name_de_ch).with('Max')
+          Demo.find_by_name('Max')
+        end
+      end
+
+      context 'when changing the locale' do
+        before do
+          I18n.locale = :de
+        end
+
+        it 'delegates the getter to current locale' do
+          model.should_receive(:name_de).and_return('Johannes')
+          model.name.should == 'Johannes'
+        end
+
+        it 'delegates the getter to current locale' do
+          model.should_receive(:name_de=).with('Johannes')
+          model.name = 'Johannes'
+        end
       end
     end
   end

data/spec/models/anchor_brick_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Kuhsaft::AnchorBrick do
 
   let :anchor_brick do
-    Kuhsaft::AnchorBrick.new(:caption => 'test-anchor')
+    Kuhsaft::AnchorBrick.new(caption: 'test-anchor')
   end
 
   describe '#bricks' do

data/spec/models/asset_spec.rb

@@ -24,7 +24,7 @@ describe Kuhsaft::Asset do
     uploader.should respond_to(:thumb)
   end
 
-  it "makes the image readable only to the owner and not executable" do
+  it 'makes the image readable only to the owner and not executable' do
     pending 'how and where do we ensure permissions?'
     uploader.should have_permissions(0600)
   end

data/spec/models/brick_spec.rb

@@ -98,7 +98,7 @@ describe Kuhsaft::Brick do
 
     context 'with the parenthesis option given' do
       brick = Kuhsaft::TextBrick.new
-      brick.backend_label(:parenthesis => true).should == '(Text)'
+      brick.backend_label(parenthesis: true).should == '(Text)'
     end
   end
 

data/spec/models/page_spec.rb

@@ -5,9 +5,7 @@ describe Kuhsaft::Page do
 
   describe '.search' do
     before do
-      create :page
-      create :page
-      create :page
+      3.times { create :page }
     end
 
     it 'should find any containing the search term' do
@@ -70,33 +68,32 @@ describe Kuhsaft::Page do
 
   describe '#published' do
     it 'returns only published pages' do
-      p1, p2, p3 = 3.times.map { create(:page) }
+      _p1, p2, _p3 = 3.times.map { create(:page) }
       p2.update_attribute :published, Kuhsaft::PublishState::UNPUBLISHED
       Kuhsaft::Page.published.should be_all { |p| p.published?.should be_true }
     end
   end
 
   describe '#content_page' do
-    it 'returns only content pages ("" or nil)' do
+    it 'returns only content pages' do
       p1, p2, p3 = 3.times.map { create(:page) }
       p2.update_attribute :page_type, Kuhsaft::PageType::REDIRECT
-      p3.update_attribute :page_type, nil
       Kuhsaft::Page.content_page.should == [p1, p3]
     end
   end
 
-  describe "#state_class" do
+  describe '#state_class' do
 
     let(:page) { Kuhsaft::Page.new }
 
     it 'returns publsihed as string when page is published' do
-      page.published == Kuhsaft::PublishState::PUBLISHED
-      page.state_class == 'published'
+      page.published = Kuhsaft::PublishState::PUBLISHED
+      expect(page.state_class).to eq 'published'
     end
 
     it 'returns unpublsihed as string when page is unpublished' do
-      page.published == Kuhsaft::PublishState::UNPUBLISHED
-      page.state_class == 'unpublished'
+      page.published = Kuhsaft::PublishState::UNPUBLISHED
+      expect(page.state_class).to eq 'unpublished'
     end
   end
 
@@ -114,11 +111,11 @@ describe Kuhsaft::Page do
     end
 
     let :child_page do
-      create(:page, :parent => page)
+      create(:page, parent: page)
     end
 
     let :child_child_page do
-      create(:page, :parent => child_page)
+      create(:page, parent: child_page)
     end
 
     context 'on the topmost level' do
@@ -146,7 +143,7 @@ describe Kuhsaft::Page do
     end
 
     let :child_page do
-      create(:page, :parent => page)
+      create(:page, parent: page)
     end
 
     it 'has a list of parent pages' do
@@ -162,7 +159,7 @@ describe Kuhsaft::Page do
     context 'when it has no content' do
       it 'should return the link of it\'s first child' do
         page = create(:page)
-        child = create(:page, :parent => page)
+        child = create(:page, parent: page)
         page.body = nil
         page.save
         page.link.should == child.link
@@ -190,7 +187,7 @@ describe Kuhsaft::Page do
 
   describe '#preceding_sibling' do
     it 'finds the predecing sibling' do
-      page1 = create :page
+      _page1 = create :page
       page2 = create :page
       page3 = create :page
       page3.preceding_sibling.id.should == page2.id
@@ -199,7 +196,7 @@ describe Kuhsaft::Page do
 
   describe '#succeeding_sibling' do
     it 'finds the succeeding sibling' do
-      page1 = create :page
+      _page1 = create :page
       page2 = create :page
       page3 = create :page
       page2.succeeding_sibling.id.should == page3.id
@@ -209,14 +206,14 @@ describe Kuhsaft::Page do
   describe '#reposition' do
     it 'repositions before a page, specified by id' do
       page1 = create :page
-      page2 = create :page
+      _page2 = create :page
       page3 = create :page
       page3.reposition page1.id
       page3.preceding_sibling.id.should == page1.id
     end
 
     it 'repositions before all siblings, specified by nil' do
-      page1 = create :page
+      _page1 = create :page
       page2 = create :page
       page2.reposition nil
       page2.position.should == 1
@@ -252,30 +249,30 @@ describe Kuhsaft::Page do
   describe '#url' do
     context 'when it is a normal page' do
       it 'returns the concatenated slug of the whole child/parent tree' do
-        page = create(:page, :slug => 'parent-slug', :page_type => '')
-        child = create(:page, :slug => 'child-slug', :page_type => '', :parent => page)
+        page = create(:page, slug: 'parent-slug')
+        child = create(:page, slug: 'child-slug', parent: page)
         child.url.should == 'en/parent-slug/child-slug'
       end
     end
 
     context 'when it is a navigation? page' do
       it 'returns without the parent page slug' do
-        page = create(:page, :slug => 'parent-slug', :page_type => Kuhsaft::PageType::NAVIGATION)
-        child = create(:page, :slug => 'child-slug', :page_type => '', :parent => page)
+        page = create(:page, slug: 'parent-slug', page_type: Kuhsaft::PageType::NAVIGATION)
+        child = create(:page, slug: 'child-slug', parent: page)
         child.url.should == 'en/child-slug'
       end
     end
 
     context 'when it is a redirect? page' do
       it 'returns the absolute url' do
-        page = create(:page, :page_type => Kuhsaft::PageType::REDIRECT, :redirect_url => 'en/references', :slug => 'news')
+        page = create(:page, page_type: Kuhsaft::PageType::REDIRECT, redirect_url: 'en/references', slug: 'news')
         page.link.should eq('/en/news')
       end
     end
 
     context 'when url part is empty' do
       it 'strips the trailing slash' do
-        page = create(:page, :page_type => Kuhsaft::PageType::NAVIGATION)
+        page = create(:page, page_type: Kuhsaft::PageType::NAVIGATION)
         page.link.should eq('/en')
       end
     end
@@ -284,13 +281,13 @@ describe Kuhsaft::Page do
   describe '#navigation?' do
     context 'when the page_type is navigation' do
       it 'returns true if the page_type is PageType::NAVIGATION' do
-        Kuhsaft::Page.new(:page_type => Kuhsaft::PageType::NAVIGATION).navigation?.should be_true
+        Kuhsaft::Page.new(page_type: Kuhsaft::PageType::NAVIGATION).navigation?.should be_true
       end
     end
 
     context 'when the page_type is anything else' do
       it 'returns false' do
-        Kuhsaft::Page.new(:page_type => Kuhsaft::PageType::REDIRECT).navigation?.should be_false
+        Kuhsaft::Page.new(page_type: Kuhsaft::PageType::REDIRECT).navigation?.should be_false
       end
     end
   end
@@ -298,17 +295,31 @@ describe Kuhsaft::Page do
   describe '#redirect?' do
     context 'when the page_type is a redirect' do
       it 'returns true' do
-        Kuhsaft::Page.new(:page_type => Kuhsaft::PageType::REDIRECT).redirect?.should be_true
+        Kuhsaft::Page.new(page_type: Kuhsaft::PageType::REDIRECT).redirect?.should be_true
       end
     end
 
     context 'when the page type is anything else' do
       it 'returns false' do
-        Kuhsaft::Page.new(:page_type => Kuhsaft::PageType::NAVIGATION).redirect?.should be_false
+        Kuhsaft::Page.new(page_type: Kuhsaft::PageType::NAVIGATION).redirect?.should be_false
       end
     end
   end
 
+  describe 'page types' do
+    it 'returns content by default' do
+      expect(Kuhsaft::Page.new.page_type).to eq('content')
+    end
+
+    it 'returns navigation if set' do
+      expect(Kuhsaft::Page.new(page_type: Kuhsaft::PageType::NAVIGATION).page_type).to eq('navigation')
+    end
+
+    it 'returns redirect if set' do
+      expect(Kuhsaft::Page.new(page_type: Kuhsaft::PageType::REDIRECT).page_type).to eq('redirect')
+    end
+  end
+
   describe '#translated?' do
     it 'returns true when page is translated' do
       @page = create(:page, title: 'Page 1', slug: 'page1')
@@ -325,8 +336,8 @@ describe Kuhsaft::Page do
 
   describe '#fulltext' do
     let :page do
-      p = create(:page, :keywords => 'key words', :description => 'descrip tion', :title => 'my title')
-      p.bricks << Kuhsaft::TextBrick.new(:locale => I18n.locale, :text => 'oh la la')
+      p = create(:page, keywords: 'key words', description: 'descrip tion', title: 'my title')
+      p.bricks << Kuhsaft::TextBrick.new(locale: I18n.locale, text: 'oh la la')
       p.save
       p
     end
@@ -349,7 +360,7 @@ describe Kuhsaft::Page do
 
   describe '#before_validation' do
     it 'generates url automatically' do
-      page = Kuhsaft::Page.new :slug => 'slug'
+      page = Kuhsaft::Page.new slug: 'slug'
       page.url.should be_nil
       page.valid?
       page.url.should be_present
@@ -358,7 +369,7 @@ describe Kuhsaft::Page do
 
   describe '#url_without_locale' do
     let :page do
-      create(:page, :slug => 'page')
+      create(:page, slug: 'page')
     end
 
     context 'without parent' do
@@ -373,11 +384,11 @@ describe Kuhsaft::Page do
 
     context 'when parent is navigation' do
       let :parent do
-        create(:page, :page_type => Kuhsaft::PageType::NAVIGATION)
+        create(:page, page_type: Kuhsaft::PageType::NAVIGATION)
       end
 
       let :child do
-        create(:page, :slug => 'child', :parent => parent)
+        create(:page, slug: 'child', parent: parent)
       end
 
       it 'returns url without leading /' do
@@ -391,11 +402,11 @@ describe Kuhsaft::Page do
 
     context 'when parent is normal page' do
       let :parent do
-        create(:page, :slug => 'parent')
+        create(:page, slug: 'parent')
       end
 
       let :child do
-        create(:page, :slug => 'child', :parent => parent)
+        create(:page, slug: 'child', parent: parent)
       end
 
       it 'returns url without leading /' do