kuhsaft 2.2.6 → 2.3.0

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "2.2.6"
+  VERSION = '2.3.0'
 end

data/lib/tasks/kuhsaft_tasks.rake

@@ -8,3 +8,15 @@ namespace :kuhsaft do
 end
 
 Rake::Task['db:seed'].enhance ['kuhsaft:db:seed']
+
+desc "Create nondigest versions of all ckeditor digest assets"
+task "assets:precompile" do
+  fingerprint = /\-[0-9a-f]{32}\./
+  for file in Dir["public/assets/kuhsaft/cms/ck-config*"]
+    next unless file =~ fingerprint
+    nondigest = file.sub fingerprint, '.'
+    if !File.exist?(nondigest) or File.mtime(file) > File.mtime(nondigest)
+      FileUtils.cp file, nondigest, verbose: true
+    end
+  end
+end

data/lib/templates/kuhsaft/assets/ck-config.js.coffee

@@ -1,5 +1,6 @@
 CKEDITOR.editorConfig = (config) ->
   config.language = "de"
+  config.extraAllowedContent = 'iframe[*]'
   config.removeButtons = "Anchor,Underline,Strike,Subscript,Superscript"
   config.format_tags = "p;h1;h2;h3;h4;pre"
   config.toolbar = [["Format"],
@@ -9,6 +10,12 @@ CKEDITOR.editorConfig = (config) ->
                     ["Source", "-", "ShowBlocks", "-", "About"],
                     ["Maximize"]]
 
+  config.linkShowAdvancedTab = false
+  config.linkShowTargetTab = false
+
+  config.removePlugins = 'link'
+  config.extraPlugins = 'adv_link'
+
   true
 
 # FULL OPTIONS:

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

@@ -1,14 +1,8 @@
-class Add<%= get_locale.classify %>Translation < ActiveRecord::Migration
+class Add<%= formatted_locale.classify %>Translation < ActiveRecord::Migration
 
   def change
-    add_column :kuhsaft_pages, :title_<%= get_locale %>, :string
-    add_column :kuhsaft_pages, :slug_<%= get_locale %>, :string
-    add_column :kuhsaft_pages, :keywords_<%= get_locale %>, :string
-    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
+    <%- translated_columns.each do |column_hash| %>
+      add_column :kuhsaft_pages, "<%= get_attribute(column_hash).to_s %>", :<%= get_type(column_hash).to_sym %>
+    <%- end %>
   end
-
 end

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

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Kuhsaft::Api::PagesController do
+  describe '#index' do
+    before do
+      @pages = []
+      @pages << @page1 = create(:page, published: true, title_de: 'foobar de',
+                                       url_de: 'de/foobar-de', title_en: 'foobar en', url_en: 'en/foobar-en')
+      @pages << @page2 = create(:page, published: true, title_de: 'barfoo de',
+                                       url_de: 'de/barfoo-de', title_en: 'barfoo en', url_en: 'en/barfoo-en')
+      @pages << @unpublished = create(:page, published: false, title_de: 'unpublished de',
+                                             url_de: 'de/unpublished-de', title_en: 'unpublished en',
+                                             url_en: 'en/unpublished-en')
+    end
+
+    it 'gets only published pages' do
+      I18n.with_locale :de do
+        get :index, use_route: :kuhsaft
+        expect(JSON.parse(response.body)).to eq([@page1, @page2].as_json)
+      end
+    end
+
+    it 'gets specific translated pages for each locale' do
+      I18n.with_locale :de do
+        @pages << @only_german = create(:page, published: true, title: 'foobar de', url: 'de/foobar-de')
+        get :index, use_route: :kuhsaft
+        expect(JSON.parse(response.body)).to eq([@page1, @page2, @only_german].as_json)
+      end
+
+      I18n.with_locale :en do
+        get :index, use_route: :kuhsaft
+        expect(JSON.parse(response.body)).to eq([@page1, @page2].as_json)
+      end
+    end
+  end
+
+  describe 'expected json format of a page' do
+    before do
+      @pages = []
+      @pages << @page1 = create(:page, published: true, title_de: 'foobar de',
+                                       url_de: 'de/foobar-de', title_en: 'foobar en', url_en: 'en/foobar-en')
+      @pages << @page2 = create(:page, published: true, title_de: 'barfoo de',
+                                       url_de: 'de/barfoo-de', title_en: 'barfoo en', url_en: 'en/barfoo-en')
+
+      I18n.with_locale :de do
+        get :index, use_route: :kuhsaft
+        @json = JSON.parse(response.body)
+        @page_hash = @json.first
+      end
+    end
+
+    it 'contains the title' do
+      I18n.with_locale :de do
+        expect(@page_hash['title']).to eq(@page1.title)
+      end
+    end
+
+    it 'contains the url with page ID' do
+      I18n.with_locale :de do
+        expect(@page_hash['url']).to eq('/pages/' + @page1.id.to_s)
+      end
+    end
+
+    it 'does not contain the slug' do
+      I18n.with_locale :de do
+        expect(@page_hash['slug']).to eq(nil)
+      end
+    end
+  end
+end

data/spec/controllers/kuhsaft/pages_controller_spec.rb

@@ -6,15 +6,15 @@ describe Kuhsaft::PagesController do
   describe '#index' do
     before do
       @pages = [
-        create(:page, :page_type => Kuhsaft::PageType::CONTENT, :published => true, :fulltext_de => 'foobar'),
-        create(:page, :page_type => Kuhsaft::PageType::CONTENT, :published => true, :fulltext_de => 'barfoo')
+        create(:page, published: true, fulltext_de: 'foobar'),
+        create(:page, published: true, fulltext_de: 'barfoo')
       ]
     end
 
     context 'with search parameter' do
       it 'assigns the search results' do
         I18n.with_locale :de do
-          get(:index, { :use_route => :kuhsaft, :search => 'foobar' })
+          get(:index,  use_route: :kuhsaft, search: 'foobar')
         end
         assigns(:pages).should eq([@pages.first])
       end
@@ -25,13 +25,13 @@ describe Kuhsaft::PagesController do
     describe 'routing' do
       context 'without url' do
         before do
-          @page = FactoryGirl.create(:page, :url_de => 'de')
+          @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 })
+              get(:show,   use_route: :kuhsaft)
             end
             assigns(:page).should eq(@page)
           end
@@ -40,7 +40,7 @@ describe Kuhsaft::PagesController do
         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)
+              expect { get(:show,   use_route: :kuhsaft) }.to raise_error(ActionController::RoutingError)
             end
           end
         end
@@ -56,28 +56,32 @@ describe Kuhsaft::PagesController do
 
       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 }
+          page = FactoryGirl.create(:page, slug: 'dumdidum',
+                                           url: 'de/dumdidum')
+          get :show,   url: page.slug, use_route: :kuhsaft
           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 }
+          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
           expect(response).to redirect_to('/de/redirect_page')
         end
 
         it 'redirects to invalid redirect urls with too many preceding slashes' 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 }
+          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
           expect(response).to redirect_to('/de/redirect_page')
         end
 
         it 'redirects to root' do
-          page = FactoryGirl.create(:page, :page_type => 'redirect', :slug => 'dumdidum', :url => 'de/dumdidum', :redirect_url => '/')
-          get :show,  { :url => page.slug, :use_route => :kuhsaft }
+          page = FactoryGirl.create(:page, page_type: 'redirect', slug: 'dumdidum',
+                                           url: 'de/dumdidum', redirect_url: '/')
+          get :show,   url: page.slug, use_route: :kuhsaft
           expect(response).to redirect_to('/')
         end
       end

data/spec/controllers/kuhsaft/sitemaps_controller_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Kuhsaft::SitemapsController do
+  describe '#index' do
+    before do
+      @page = FactoryGirl.create(:page)
+    end
+
+    it 'should be able to send a xml file' do
+      get(:index,  use_route: :kuhsaft, format: 'xml')
+    end
+  end
+end

data/spec/dummy/app/assets/javascripts/kuhsaft/cms/ck-config.js.coffee

@@ -1,5 +1,6 @@
 CKEDITOR.editorConfig = (config) ->
   config.language = "de"
+  config.extraAllowedContent = 'iframe[*]'
   config.removeButtons = "Anchor,Underline,Strike,Subscript,Superscript"
   config.format_tags = "p;h1;h2;h3;h4;pre"
   config.toolbar = [["Format"],
@@ -9,6 +10,12 @@ CKEDITOR.editorConfig = (config) ->
                     ["Source", "-", "ShowBlocks", "-", "About"],
                     ["Maximize"]]
 
+  config.linkShowAdvancedTab = false
+  config.linkShowTargetTab = false
+
+  config.removePlugins = 'link'
+  config.extraPlugins = 'adv_link'
+
   true
 
 # FULL OPTIONS:

data/spec/dummy/config/application.rb

@@ -20,6 +20,7 @@ module Dummy
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    config.i18n.available_locales = [:de, :en]
+    #config.i18n.default_locale = :de
   end
 end

data/spec/dummy/config/database.yml

@@ -10,7 +10,7 @@ development:
 
 test:
   adapter: postgresql
-  database: kuhsaft_development
+  database: kuhsaft_test
   username: screenconcept
   password:
   host: localhost

data/spec/factories.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   sequence(:title) { |n| n }
 
-  factory :page, :class => 'Kuhsaft::Page' do |p|
+  factory :page, class: 'Kuhsaft::Page' do |p|
     p.parent nil
     p.position 1
     p.title { "English Title #{FactoryGirl.generate(:title)}" }
@@ -10,12 +10,12 @@ FactoryGirl.define do
     p.url ''
   end
 
-  factory :text_brick, :class => 'Kuhsaft::TextBrick' do |tb|
+  factory :text_brick, class: 'Kuhsaft::TextBrick' do |tb|
     tb.type 'Kuhsaft::TextBrick'
     tb.text 'DummyText'
   end
 
-  factory :asset, :class => Kuhsaft::Asset do |a|
+  factory :asset, class: Kuhsaft::Asset do |a|
     a.file File.open("#{Kuhsaft::Engine.root}/spec/dummy/app/assets/images/spec-image.png")
   end
 end

data/spec/features/cms_pages_spec.rb

@@ -7,9 +7,9 @@ describe 'Cms/Pages' do
   context '#new' do
     before do
       visit kuhsaft.new_cms_page_path
-      fill_in 'Titel', :with => 'The Title of the page'
-      fill_in 'Stichwörter', :with => 'My keywords'
-      fill_in 'Beschreibung', :with => 'My Description'
+      fill_in 'Titel', with: 'The Title of the page'
+      fill_in 'Stichwörter', with: 'My keywords'
+      fill_in 'Beschreibung', with: 'My Description'
     end
 
     describe '#create' do
@@ -25,9 +25,9 @@ describe 'Cms/Pages' do
 
       context 'when page is invalid' do
         it 'does not create a routing error by switching the locale' do
-          @page = FactoryGirl.create(:page, :title => 'DummyPage', :title_en => 'DummyEN', :slug => 'dummy_page')
+          @page = FactoryGirl.create(:page, title: 'DummyPage', title_en: 'DummyEN', slug: 'dummy_page')
           visit kuhsaft.edit_cms_page_path(@page)
-          fill_in 'page_title', :with => ''
+          fill_in 'page_title', with: ''
           click_on 'Update Seite'
           within '.nav-pills' do
             click_on 'EN'
@@ -40,24 +40,24 @@ describe 'Cms/Pages' do
     describe '#update' do
       context 'when creating a redirect page' do
         before do
-          @page = FactoryGirl.create(:page, :url => 'de/dumdidum')
+          @page = FactoryGirl.create(:page, url: 'de/dumdidum')
           visit kuhsaft.edit_cms_page_path(@page)
-          select 'redirect', :from => 'Seitentyp'
+          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')
+          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)
+          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 }
+          fill_in 'Redirect URL', with: 'target_page'
+          expect { click_on 'Update Seite' }.to_not change { @page.reload.url }
         end
       end
     end
@@ -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)
+      page.should have_css('.error', count: 1)
     end
   end
 end

data/spec/features/search_spec.rb

@@ -4,35 +4,33 @@ describe 'pages#index' do
   context 'with search parameter' do
     let! :page1 do
       p = create :page,
-        :page_type => Kuhsaft::PageType::CONTENT,
-        :published => true,
-        :title => 'Chromodorididae Ardeadoris'
-      p.bricks << Kuhsaft::TextBrick.new(:locale => I18n.locale, :text => "#{'foo bar' * 300} Chromodorididae #{'foo bar' * 300}")
+                 published: true,
+                 title: 'Chromodorididae Ardeadoris'
+      p.bricks << Kuhsaft::TextBrick.new(locale: I18n.locale,
+                                         text: "#{'foo bar' * 300} Chromodorididae #{'foo bar' * 300}")
       p.save!
       p
     end
 
     let! :page2 do
       create :page,
-        :page_type => Kuhsaft::PageType::CONTENT,
-        :published => true,
-        :title => 'Chromodorididae Berlanguella'
+             published: true,
+             title: 'Chromodorididae Berlanguella'
     end
 
     let! :page3 do
       create :page,
-        :page_type => Kuhsaft::PageType::CONTENT,
-        :published => true,
-        :title => 'Gastropoda'
+             published: true,
+             title: 'Gastropoda'
     end
 
     context 'with fulltext' do
       before do
-        visit kuhsaft.pages_path(:locale => :en, :search => 'Chromodorididae')
+        visit kuhsaft.pages_path(locale: :en, search: 'Chromodorididae')
       end
 
       it 'highlights search term in preview' do
-        within("ul.search-results.success") do
+        within('ul.search-results.success') do
           page.should have_content('Chromodorididae')
         end
       end
@@ -44,15 +42,15 @@ describe 'pages#index' do
 
     context 'with multiple matches' do
       before do
-        visit kuhsaft.pages_path(:locale => :en, :search => 'Chromodorididae')
+        visit kuhsaft.pages_path(locale: :en, search: 'Chromodorididae')
       end
 
       it 'renders match count' do
-        page.should have_content("2 results")
+        page.should have_content('2 results')
       end
 
       it 'renders the search results list' do
-        within("ul.search-results.success") 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')
@@ -60,7 +58,7 @@ describe 'pages#index' do
       end
 
       it 'renders links to the pages' do
-        within("ul.search-results.success") 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)
         end
@@ -69,11 +67,11 @@ describe 'pages#index' do
 
     context 'without matches' do
       before do
-        visit kuhsaft.pages_path(:locale => :en, :search => 'foobar')
+        visit kuhsaft.pages_path(locale: :en, search: 'foobar')
       end
 
       it 'renders match count' do
-        page.should have_content("No results")
+        page.should have_content('No results')
       end
     end
   end