kuhsaft 1.8.1 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6337d1cbb02a8c2d5cda0db4a44502a78b5e1959
-  data.tar.gz: 493728073fdcdcb4ddf2337c196543ed1e6c819b
+  metadata.gz: 73cd2ecb946a2cd746ed66e59a7a42229061598b
+  data.tar.gz: 35a05d25261d5763f73b706b099ab7749f780d5b
 SHA512:
-  metadata.gz: 1a364e11a91e83222e8a2468a633b3266985f1965885f793b0110e5bcee755d1eb6d07f28a6f502e6f6b7a0128e762a16ae332f4bb2770f507990e4ed1869524
-  data.tar.gz: cc0629807905eb96c04b6c6156c2e0156664fa65d3aed4671949ba830eef92454652e58109c860bec01734ae00547f9a16ce3c2393b96a169b941a825886f2ad
+  metadata.gz: 63f92e9766401476bcc8935e6a1392bf4b3cb50452ee056eb21d818804be056c507f51b74a5e11b23182588a05d9dcf18156a6e21cb00558e20723f16dbf987b
+  data.tar.gz: 6ce336e392eb2ab5af483087f1b8ba7b7365856b93927d36ae458ce00abba4acedc211aaebe9d73df6eed747fd3cb48241380083134a55835069921f843e8863

data/README.md

@@ -223,6 +223,13 @@ Building a navigation is simple, access to the page tree is available through th
       end
     end
 
+## Use the `page_title` attribute in your app
+
+Kuhsaft::Pages will provide a `%title` tag containing its `page_title` (or the required `title`if no title is present). Simply yield for `:head` in your `application.html` to use it.
+
+    %head
+      = yield(:head)
+
 ## Modifying the backend navigation
 
 Simply override the default partial for the main navigation in your app with your own file at `kuhsaft/cms/admin/_main_navigation.html.haml`

data/Rakefile

@@ -22,6 +22,9 @@ rescue LoadError
   RDoc::Task = Rake::RDocTask
 end
 
+desc "Run specs"
+RSpec::Core::RakeTask.new(:spec => :setup)
+
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Kuhsaft'
@@ -30,4 +33,14 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+task :setup do
+  Dir.chdir('spec/dummy') do
+    `bundle exec rake kuhsaft:install:migrations`
+    `bundle exec rails generate kuhsaft:install:assets`
+    `bundle exec rake db:create`
+    `bundle exec rake db:migrate`
+    `bundle exec rake db:test:prepare`
+  end
+end
+
 Bundler::GemHelper.install_tasks

data/app/controllers/kuhsaft/cms/admin_controller.rb

@@ -5,10 +5,6 @@ module Kuhsaft
       layout 'kuhsaft/cms/application'
       before_filter :set_content_locale
 
-      def url_options
-        { content_locale: I18n.locale }.merge(super)
-      end
-
       def set_content_locale
         if params[:content_locale].present?
           I18n.locale = params[:content_locale]

data/app/controllers/kuhsaft/pages_controller.rb

@@ -15,7 +15,8 @@ module Kuhsaft
       @page = Kuhsaft::Page.find_by_url(url)
 
       if @page.present? && @page.redirect? && @page.redirect_url.present?
-        redirect_to "/#{@page.redirect_url}"
+        redirect_url = @page.redirect_url.sub(/\A\/+/,'') # remove all preceding slashes
+        redirect_to "/#{redirect_url}"
       elsif @page.present?
         respond_with @page
       elsif @page.blank? && respond_to?(:handle_404)

data/app/models/kuhsaft/page.rb

@@ -9,6 +9,7 @@ class Kuhsaft::Page < ActiveRecord::Base
   acts_as_brick_list
 
   translate :title,
+    :page_title,
     :slug,
     :keywords,
     :description,
@@ -17,6 +18,7 @@ class Kuhsaft::Page < ActiveRecord::Base
     :url
 
   attr_accessible :title,
+    :page_title,
     :slug,
     :redirect_url,
     :url,

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

@@ -10,6 +10,7 @@
     = simple_form_for @page, :url => url, :html => { :class => 'form-horizontal' } do |form|
       = form.input :title, :required => false, :input_html => { :class => :span5 }
       = form.input :slug, :required => false, :input_html => { :class => :span5 }
+      = form.input :page_title, :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 :redirect_url, :as => :string

data/app/views/kuhsaft/pages/show.html.haml

@@ -1,3 +1,6 @@
+= content_for :head do
+  %title= @page.page_title.present? ? @page.page_title : @page.title
+
 - if @page.bricks.map(&:type).include? "Kuhsaft::PlaceholderBrick"
   - unless @page.blank?
     .page-content

data/config/locales/kuhsaft.de.yml

@@ -5,6 +5,9 @@ de:
       admin:
         pages_nav: 'Seiten'
         assets_nav: 'Assets'
+      cms:
+        flash:
+          success: 'Seite wurde erfolgreich aktualisiert'
   kuhsaft:
     page_part:
       markdown: 'Formatierter Text'
@@ -44,4 +47,4 @@ de:
       title: 'Seiten Titel'
       slug: 'URL Segment'
       page_part_type: 'Element hinzufügen'
-      _destroy: 'Diese Element löschen'
+      _destroy: 'Diese Element löschen'

data/config/locales/kuhsaft.en.yml

@@ -5,6 +5,9 @@ en:
       admin:
         pages_nav: 'Pages'
         assets_nav: 'Assets'
+      cms:
+        flash:
+          success: 'Page was updated successfully'
   kuhsaft:
     page_part:
       markdown: 'Formatted Text'

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

@@ -8,6 +8,7 @@ de:
       kuhsaft/page:
         title: 'Titel'
         slug: 'URL Name'
+        page_title: 'Seitentitel (im Browser)'
         keywords: 'Stichwörter'
         description: 'Beschreibung'
         redirect_url: 'Redirect URL'

data/db/migrate/13_add_page_title_to_pages.rb

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

data/lib/kuhsaft/searchable.rb

@@ -33,6 +33,7 @@ module Kuhsaft
           {
             :against => {
               locale_attr(:title)       => 'A',
+              locale_attr(:page_title)  => 'A',
               locale_attr(:keywords)    => 'B',
               locale_attr(:description) => 'C',
               locale_attr(:fulltext)    => 'C',
@@ -61,9 +62,10 @@ module Kuhsaft
             stmt = ""
             stmt += "#{locale_attr(:keywords)} LIKE ? OR "
             stmt += "#{locale_attr(:title)} LIKE ? OR "
+            stmt += "#{locale_attr(:page_title)} LIKE ? OR "
             stmt += "#{locale_attr(:description)} LIKE ? OR "
             stmt += "#{locale_attr(:fulltext)} LIKE ?"
-            where(stmt, *(["%#{query}%"] * 4))
+            where(stmt, *(["%#{query}%"] * 5))
           end
         }
       end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.8.1"
+  VERSION = "1.8.4"
 end

data/spec/controllers/kuhsaft/pages_controller_spec.rb

@@ -22,30 +22,6 @@ describe Kuhsaft::PagesController do
   end
 
   describe '#show' do
-    describe 'redirect' do
-      around(:each) do |example|
-        I18n.with_locale :de do
-          example.run
-        end
-      end
-
-      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 }
-          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 }
-          expect(response).to redirect_to("/de/redirect_page")
-        end
-      end
-    end
-
     describe 'routing' do
       context 'without url' do
         before do
@@ -90,7 +66,19 @@ describe Kuhsaft::PagesController 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 }
-          expect(response).to redirect_to("/de/redirect_page")
+          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 }
+          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 }
+          expect(response).to redirect_to('/')
         end
       end
     end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Dummy</title>
+  <%= yield(:head) %>
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>

data/spec/spec_helper.rb

@@ -36,16 +36,8 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
 
   config.before :suite do
-
-    load File.expand_path("../dummy/Rakefile", __FILE__)
-    Rake::Task['kuhsaft:install:migrations'].invoke
-    Rails::Generators.invoke('kuhsaft:install:assets')
-
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
-    # Drop all records and run any available migration
-    ActiveRecord::Base.connection.tables.each { |table| ActiveRecord::Base.connection.drop_table(table) }
-    ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
   end
 
   config.after :suite do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.4
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -32,16 +32,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -449,6 +449,7 @@ files:
 - db/migrate/10_add_redirect_url_to_kuhsaft_pages.rb
 - db/migrate/11_update_url_and_redirect_url_value.rb
 - db/migrate/12_regenerate_fulltext.rb
+- db/migrate/13_add_page_title_to_pages.rb
 - db/seeds.rb
 - lib/generators/kuhsaft/assets/install_generator.rb
 - lib/generators/kuhsaft/translations/add_generator.rb
@@ -556,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kuhsaft
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: A tool that helps you to manage your content within your app.