kuhsaft 1.6.0 → 1.7.0

data/README.md

@@ -226,6 +226,29 @@ Simply override the default partial for the main navigation in your app with you
 * Implement the `fulltext` method on your brick, return anything you want to be searchable.
 * Customize the edit form behaviour of your brick by overriding methods like `to_style_class?`. See the `Brick` and `BrickList` files for more methods.
 
+## Integrating search
+
+Kuhsaft supports fulltext search when using PostgreSQL with a simple
+LIKE fallback for any other ActiveRecord DB.
+
+Add a call to the `search_page_form` helper in your views. This renders
+the default search form. The query will be executed by kuhsaft.
+
+    # e.g. _footer.html.haml
+    = search_page_form
+
+To customize the search and result views you can add your own partials
+to your rails app. The following partials are overridable.
+
+    app/views/kuhsaft/search
+    ├── _form.html.haml           # Search form
+    ├── _results.html.haml        # Results list (@pages)
+    └── _results_entry.html.haml  # Single result entry (@page)
+
+When using PostgreSQL, an additional attribute `excerpt` will be
+available on the page model. It includes a highlighted excerpt of the
+matching `fulltext` column.
+
 # LICENSE
 
 See the file LICENSE.

data/app/controllers/kuhsaft/pages_controller.rb

@@ -2,6 +2,13 @@ module Kuhsaft
   class PagesController < ::ApplicationController
     respond_to :html
 
+    def index
+      @search = params[:search]
+      if @search.present?
+        @pages = Kuhsaft::Page.unscoped.published.content_page.search(@search)
+      end
+    end
+
     def show
       url = locale.to_s
       url += "/#{params[:url]}" if params[:url].present?

data/app/helpers/kuhsaft/cms/admin_helper.rb

@@ -5,6 +5,18 @@ module Kuhsaft
       def render_language_switch?
         I18n.available_locales.size > 1
       end
+
+      def link_to_content_locale(locale)
+        action = params[:action]
+        if params[:action] == 'create'
+          action = 'new'
+        elsif params[:action] == 'update'
+          action = 'edit'
+        end
+
+        link_to locale.to_s.upcase, url_for(
+          :action => action, :content_locale => locale)
+      end
     end
   end
 end

data/app/helpers/pages_helper.rb

@@ -65,4 +65,14 @@ module PagesHelper
       @content << content_tag(:p, t('kuhsaft.text_bricks.text_brick.read_less'), :class => 'read-less-text')
     end
   end
+
+  def search_page_form
+    form_tag kuhsaft.pages_path, :method => :get, :class => 'form-inline' do
+      if block_given?
+        yield
+      else
+        render 'kuhsaft/search/form'
+      end
+    end
+  end
 end

data/app/models/kuhsaft/brick.rb

@@ -29,6 +29,13 @@ module Kuhsaft
       self.position ||= has_siblings? ? brick_list.bricks.maximum(:position).to_i + 1 : 1
     end
 
+    after_save do
+      # TODO: replace callback with fulltext row on each
+      # searchable model
+      brick_list.update_fulltext
+      brick_list.save!
+    end
+
     def to_edit_partial_path
       path = self.to_partial_path.split '/'
       path << 'edit'

data/app/models/kuhsaft/page.rb

@@ -1,26 +1,49 @@
 class Kuhsaft::Page < ActiveRecord::Base
+  include Kuhsaft::Engine.routes.url_helpers
   include Kuhsaft::Orderable
   include Kuhsaft::Translatable
   include Kuhsaft::BrickList
+  include Kuhsaft::Searchable
 
   has_ancestry
   acts_as_brick_list
 
-  translate :title, :slug, :keywords, :description, :body, :redirect_url, :url, :fulltext
-  attr_accessible :title, :slug, :redirect_url, :url, :page_type, :parent_id, :keywords, :description, :published
+  translate :title,
+    :slug,
+    :keywords,
+    :description,
+    :body,
+    :redirect_url,
+    :url
+
+  attr_accessible :title,
+    :slug,
+    :redirect_url,
+    :url,
+    :page_type,
+    :parent_id,
+    :keywords,
+    :description,
+    :published
 
   default_scope order('position ASC')
 
   scope :published, where(:published => Kuhsaft::PublishState::PUBLISHED)
-  scope :search, lambda{ |term| published.where("`#{locale_attr(:fulltext)}` LIKE ?", "%#{term}%") }
-  scope :navigation, lambda{ |slug| where(locale_attr(:slug) => slug).where(locale_attr(:page_type) => Kuhsaft::PageType::NAVIGATION) }
 
-  before_validation :create_slug, :create_url, :collect_fulltext
+  # TODO: cleanup page_types (content pages => nil or PageType::CONTENT
+  scope :content_page, where(
+    ["page_type is NULL or page_type = ?",
+     Kuhsaft::PageType::CONTENT])
+
+  scope :navigation, lambda{ |slug|
+    where(locale_attr(:slug) => slug).where(
+      locale_attr(:page_type) => Kuhsaft::PageType::NAVIGATION) }
+
+  before_validation :create_slug, :create_url
 
   validates :title, :presence => true
   validates :slug, :presence => true
   validates :redirect_url, :presence => true, :if => :redirect?
-  #validates :url, :uniqueness => true, :unless => :navigation?
 
   class << self
     def flat_tree(pages = nil)
@@ -72,19 +95,30 @@ class Kuhsaft::Page < ActiveRecord::Base
     if bricks.count == 0 && children.count > 0
       children.first.link
     else
-      "/#{url}"
+      url_with_locale
     end
   end
 
+  # TODO: needs naming and routing refactoring (url/locale/path/slug)
+  def path_segments
+    paths = parent.present? ? parent.path_segments : []
+    paths << slug unless navigation?
+    paths
+  end
+
+  def url_without_locale
+    path_segments.join('/')
+  end
+
+  def url_with_locale
+    opts = { :locale => I18n.locale }
+    url = url_without_locale
+    opts[:url] = url if url.present?
+    page_path(opts)
+  end
+
   def create_url
-    complete_slug = ''
-    if parent.present?
-      complete_slug << parent.url.to_s
-    else
-      complete_slug = "#{I18n.locale}"
-    end
-    complete_slug << "/#{self.slug}" unless navigation?
-    self.url = complete_slug
+    self.url = url_with_locale[1..-1]
   end
 
   def create_slug
@@ -92,10 +126,6 @@ class Kuhsaft::Page < ActiveRecord::Base
     self.slug = title.downcase.parameterize if has_slug
   end
 
-  def collect_fulltext
-    self.fulltext =[super, title.to_s, keywords.to_s, description.to_s].join(' ')
-  end
-
   def nesting_name
     num_dashes = parent_pages.size
     num_dashes = 0 if num_dashes < 0

data/app/models/kuhsaft/page_type.rb

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

data/app/models/kuhsaft/text_brick.rb

@@ -1,5 +1,10 @@
+require 'htmlentities'
+
 module Kuhsaft
   class TextBrick < Brick
+    include ActionView::Helpers::SanitizeHelper
+    HTML_ENTITIES = HTMLEntities.new
+
     attr_accessible :text, :read_more_text
 
     def user_can_add_childs?
@@ -7,7 +12,12 @@ module Kuhsaft
     end
 
     def collect_fulltext
-      [super, text, read_more_text].join(' ')
+      HTML_ENTITIES.decode(
+        strip_tags([
+          text,
+          read_more_text
+        ].compact.join(' ')).squish
+      )
     end
   end
 end

data/app/views/kuhsaft/cms/admin/_content_language_switch.html.haml

@@ -3,5 +3,5 @@
     %ul.nav.nav-pills
       - I18n.available_locales.each do |locale|
         %li{ :class => (:active if I18n.locale.to_s == locale.to_s) }
-          = link_to locale.to_s.upcase, url_for(:content_locale => locale)
+          = link_to_content_locale(locale)
   .clear

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

@@ -0,0 +1,7 @@
+.search.has-section-space-bottom
+  .row-fluid
+    %h1=t 'kuhsaft.search.results.title'
+  .row-fluid
+    = render 'kuhsaft/search/results'
+  .row-fluid
+    = search_page_form

data/app/views/kuhsaft/search/_form.html.haml

@@ -0,0 +1,2 @@
+= text_field_tag 'search', params[:search], :placeholder => t('.placeholder')
+= submit_tag t('.search')

data/app/views/kuhsaft/search/_results.html.haml

@@ -0,0 +1,8 @@
+- if @pages.present?
+  %h2.success
+    = t('.number-of-results', :count => @pages.count)
+  %ul.search-results.success
+    - @pages.each do |page|
+      %li= render 'kuhsaft/search/results_entry', :page => page
+- else
+  %h2.no-results= t('.no-results')

data/app/views/kuhsaft/search/_results_entry.html.haml

@@ -0,0 +1,13 @@
+.link
+  = link_to page.link do
+    %h4= page.title
+  %h5= kuhsaft.page_url(:url => page.url_without_locale)
+.summary
+  -if page.excerpt.present?
+    .excerpt!= page.excerpt
+  -elsif page.fulltext.present?
+    .fulltext!= excerpt(highlight(page.fulltext, @search), @search)
+
+  -if page.keywords.present?
+    .keywords
+      = page.keywords

data/config/locales/views/kuhsaft/search/de.yml

@@ -0,0 +1,12 @@
+de:
+  kuhsaft:
+    search:
+      results:
+        title: 'Suchresultate'
+        number-of-results:
+          one: '1 Resultat'
+          other: '%{count} Resultate'
+        no-results: 'Keine Resultate'
+      form:
+        placeholder: 'Ihre Suche'
+        search: 'Suchen'

data/config/locales/views/kuhsaft/search/en.yml

@@ -0,0 +1,12 @@
+en:
+  kuhsaft:
+    search:
+      results:
+        title: Search results
+        number-of-results:
+          one: '1 result'
+          other: '%{count} results'
+        no-results: 'No results'
+      form:
+        placeholder: 'Search'
+        search: 'Search'

data/config/routes.rb

@@ -10,7 +10,9 @@ Kuhsaft::Engine.routes.draw do
   end
 
   scope ":locale", :locale => /#{I18n.available_locales.join('|')}/ do
-    resources :pages, :only => [:index]
-    match '*url' => 'pages#show'
+    resources :pages,
+      :only => [:index],
+      :defaults => { :locale => I18n.locale }
+    match '(*url)' => 'pages#show', :as => :page
   end
 end

data/db/migrate/12_regenerate_fulltext.rb

@@ -0,0 +1,12 @@
+class RegenerateFulltext < ActiveRecord::Migration
+  def up
+    Kuhsaft::Page.all.each do |p|
+      I18n.available_locales.each do |locale|
+        I18n.with_locale do
+          puts "Save #{p.locale_attr(:fulltext)} #{p.link}"
+          p.save!
+        end
+      end
+    end
+  end
+end

data/lib/kuhsaft.rb

@@ -2,6 +2,7 @@ module Kuhsaft
   require 'kuhsaft/engine'
   require 'kuhsaft/orderable'
   require 'kuhsaft/translatable'
+  require 'kuhsaft/searchable'
   require 'kuhsaft/brick_list'
   require 'kuhsaft/partial_extractor'
   require 'simple_form'

data/lib/kuhsaft/brick_list.rb

@@ -3,7 +3,10 @@ module Kuhsaft
 
     def self.included(base)
       def base.acts_as_brick_list
-        self.has_many :bricks, :class_name => 'Kuhsaft::Brick', :dependent => :destroy, :as => :brick_list
+        self.has_many :bricks,
+          :class_name => 'Kuhsaft::Brick',
+          :dependent => :destroy,
+          :as => :brick_list
       end
     end
 

data/lib/kuhsaft/searchable.rb

@@ -0,0 +1,72 @@
+require 'active_support/concern'
+require 'pg_search'
+
+module Kuhsaft
+  module Searchable
+    extend ActiveSupport::Concern
+
+    DICTIONARIES = {
+      :en => 'english',
+      :de => 'german',
+    }
+
+    def update_fulltext
+      self.fulltext = collect_fulltext
+    end
+
+    included do
+      unless included_modules.include?(BrickList)
+        raise 'Kuhsaft::Searchable needs Kuhsaft::BrickList to be included'
+      end
+
+      if included_modules.include?(Translatable)
+        translate :fulltext
+      else
+        attr_accessible :fulltext
+      end
+
+      before_validation :update_fulltext
+
+      if ActiveRecord::Base.connection.instance_values['config'][:adapter] == 'postgresql'
+        include ::PgSearch
+        cb = lambda do |query|
+          {
+            :against => {
+              locale_attr(:title)       => 'A',
+              locale_attr(:keywords)    => 'B',
+              locale_attr(:description) => 'C',
+              locale_attr(:fulltext)    => 'C',
+            },
+            :query => query,
+            :using => { :tsearch => { :dictionary => DICTIONARIES[I18n.locale] || 'simple' }}
+          }
+        end
+        pg_search_scope :search_without_excerpt, cb
+        scope :search, lambda { |query|
+          ts_headline = sanitize_sql_array([
+            "ts_headline(%s, plainto_tsquery('%s')) AS excerpt",
+            locale_attr(:fulltext),
+            query
+          ])
+          search_without_excerpt(query).select(ts_headline)
+        }
+      else
+        # TODO: Tests run in this branch because dummy app uses mysql. Change it!
+        # define empty fallback excerpt attribute
+        attr_reader :excerpt
+        scope :search, lambda { |query|
+          if query.is_a? Hash
+            where("#{query.first[0]} LIKE ?", "%#{query.first[1]}%")
+          else
+            stmt = ""
+            stmt += "#{locale_attr(:keywords)} LIKE ? OR "
+            stmt += "#{locale_attr(:title)} LIKE ? OR "
+            stmt += "#{locale_attr(:description)} LIKE ? OR "
+            stmt += "#{locale_attr(:fulltext)} LIKE ?"
+            where(stmt, *(["%#{query}%"] * 4))
+          end
+        }
+      end
+    end
+  end
+end

data/lib/kuhsaft/version.rb

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

data/spec/controllers/kuhsaft/pages_controller_spec.rb

@@ -3,6 +3,24 @@ require 'spec_helper'
 describe Kuhsaft::PagesController do
   subject { described_class }
 
+  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')
+      ]
+    end
+
+    context 'with search parameter' do
+      it 'assigns the search results' do
+        I18n.with_locale :de do
+          get(:index, { :use_route => :kuhsaft, :search => 'foobar' })
+        end
+        assigns(:pages).should eq([@pages.first])
+      end
+    end
+  end
+
   describe '#show' do
     describe 'redirect' do
       around(:each) do |example|
@@ -14,7 +32,7 @@ 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, :locale => :de }
+          get :show,  { :url => page.slug, :use_route => :kuhsaft }
           assigns(:page).should eq(page)
         end
       end
@@ -22,7 +40,7 @@ describe Kuhsaft::PagesController do
       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 }
+          get :show,  { :url => page.slug, :use_route => :kuhsaft }
           expect(response).to redirect_to("/de/redirect_page")
         end
       end
@@ -52,5 +70,29 @@ describe Kuhsaft::PagesController do
         end
       end
     end
+
+    describe 'page type' 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
   end
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  helper Kuhsaft::Engine.helpers
 end

data/spec/features/cms_pages_spec.rb

@@ -13,12 +13,27 @@ describe 'Cms/Pages' do
     end
 
     describe '#create' do
-      it 'creates a new page' do
-        expect { click_on 'Create Seite' }.to change(Kuhsaft::Page, :count).by(1)
+      context 'when page is valid' 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
 
-      it 'is not possible to change the value in url' do
-        page.find('#page_url')['disabled'].should be_true
+      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')
+          visit kuhsaft.edit_cms_page_path(@page)
+          fill_in 'page_title', :with => ''
+          click_on 'Update Seite'
+          within '.nav-pills' do
+            click_on 'EN'
+          end
+          page.should have_content(@page.title_en)
+        end
       end
     end
 

data/spec/features/search_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+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}")
+      p.save!
+      p
+    end
+
+    let! :page2 do
+      create :page,
+        :page_type => Kuhsaft::PageType::CONTENT,
+        :published => true,
+        :title => 'Chromodorididae Berlanguella'
+    end
+
+    let! :page3 do
+      create :page,
+        :page_type => Kuhsaft::PageType::CONTENT,
+        :published => true,
+        :title => 'Gastropoda'
+    end
+
+    context 'with fulltext' do
+      before do
+        visit kuhsaft.pages_path(:locale => :en, :search => 'Chromodorididae')
+      end
+
+      it 'highlights search term in preview' do
+        within("ul.search-results strong.highlight") do
+          page.should have_content('Chromodorididae')
+        end
+      end
+
+      it 'truncates the text' do
+        find('.summary .fulltext').text.length.should < 200
+      end
+    end
+
+    context 'with multiple matches' do
+      before do
+        visit kuhsaft.pages_path(:locale => :en, :search => 'Chromodorididae')
+      end
+
+      it 'renders match count' do
+        page.should 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')
+        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)
+        end
+      end
+    end
+
+    context 'without matches' do
+      before do
+        visit kuhsaft.pages_path(:locale => :en, :search => 'foobar')
+      end
+
+      it 'renders match count' do
+        page.should have_content("No results")
+      end
+    end
+  end
+end

data/spec/helpers/kuhsaft/pages_helper_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe PagesHelper 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]')
+      end
+    end
+
+    context 'with block' do
+      it 'calls the given block' do
+        expect { |b| search_page_form(&b) }.to yield_with_no_args
+      end
+    end
+  end
+end

data/spec/lib/searchable_spec.rb

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

data/spec/models/brick_spec.rb

@@ -107,4 +107,28 @@ describe Kuhsaft::Brick do
       brick.uploader?.should be_false
     end
   end
+
+  describe '#after_save' do
+    describe 'update_fulltext' do
+      let! :brick do
+        Kuhsaft::Brick.new.tap do |b|
+          b.type = Kuhsaft::BrickType.new
+        end
+      end
+
+      let! :brick_list do
+        p = create(:page)
+        p.bricks << brick
+        p.save
+        p
+      end
+
+      it 'updates fulltext on bricklist after saving a single brick' do
+        brick.brick_list.should_receive(:update_fulltext)
+        brick.brick_list.should_receive(:save!)
+        brick.text = 'foobar'
+        brick.save
+      end
+    end
+  end
 end

data/spec/models/page_spec.rb

@@ -21,6 +21,10 @@ describe Kuhsaft::Page do
     it 'should only find published results' do
       Kuhsaft::Page.search('English Title').should be_all { |p| p.published? == true }
     end
+
+    it 'should find by using the old api' do
+      Kuhsaft::Page.search('English').should == Kuhsaft::Page.search('English')
+    end
   end
 
   describe '.position_of' do
@@ -72,6 +76,15 @@ describe Kuhsaft::Page do
     end
   end
 
+  describe '#content_page' do
+    it 'returns only content pages ("" or nil)' 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
 
     let(:page) { Kuhsaft::Page.new }
@@ -259,6 +272,13 @@ describe Kuhsaft::Page do
         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.link.should eq('/en')
+      end
+    end
   end
 
   describe '#navigation?' do
@@ -303,18 +323,6 @@ describe Kuhsaft::Page do
         page.save
       end
 
-      it 'contains the title' do
-        page.fulltext.should include('my title')
-      end
-
-      it 'contains the keywords' do
-        page.fulltext.should include('key words')
-      end
-
-      it 'contains the description' do
-        page.fulltext.should include('descrip tion')
-      end
-
       it 'contains the page part content' do
         page.fulltext.should include('oh la la')
       end
@@ -333,4 +341,56 @@ describe Kuhsaft::Page do
       page.url.should be_present
     end
   end
+
+  describe '#url_without_locale' do
+    let :page do
+      create(:page, :slug => 'page')
+    end
+
+    context 'without parent' do
+      it 'returns url without leading /' do
+        page.url_without_locale.should_not start_with '/'
+      end
+
+      it 'returns a single slug' do
+        page.url_without_locale.should == 'page'
+      end
+    end
+
+    context 'when parent is navigation' do
+      let :parent do
+        create(:page, :page_type => Kuhsaft::PageType::NAVIGATION)
+      end
+
+      let :child do
+        create(:page, :slug => 'child', :parent => parent)
+      end
+
+      it 'returns url without leading /' do
+        child.url_without_locale.should_not start_with '/'
+      end
+
+      it 'does not concatenate the parent slug' do
+        child.url_without_locale.should == 'child'
+      end
+    end
+
+    context 'when parent is normal page' do
+      let :parent do
+        create(:page, :slug => 'parent')
+      end
+
+      let :child do
+        create(:page, :slug => 'child', :parent => parent)
+      end
+
+      it 'returns url without leading /' do
+        child.url_without_locale.should_not start_with '/'
+      end
+
+      it 'does not concatenate the parent slug' do
+        child.url_without_locale.should == 'parent/child'
+      end
+    end
+  end
 end

data/spec/models/text_brick_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Kuhsaft::TextBrick do
-
   let :text_brick do
     Kuhsaft::TextBrick.new
   end
@@ -17,4 +16,15 @@ describe Kuhsaft::TextBrick do
       text_brick.user_can_add_childs?.should be_false
     end
   end
+
+  describe '#collect_fulltext' do
+    before do
+      text_brick.text = '<div><b>foo</b> <b>bar</b></div>'
+      text_brick.read_more_text = '<div><span>foo</span><span>bar</span></div>'
+    end
+
+    it 'sanitizes text and read_more_text' do
+      text_brick.collect_fulltext.should == 'foo bar foobar'
+    end
+  end
 end

data/spec/support/default_url_options.rb

@@ -0,0 +1,36 @@
+class ActionView::TestCase::TestController
+  def default_url_options(options={})
+    { :locale => I18n.locale }.merge options
+  end
+end
+
+# The following snippet breaks url_for
+# as described by franca
+# https://github.com/screenconcept/shoestrap/issues/23
+# <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+#class ActionDispatch::Routing::RouteSet
+  #def default_url_options(options={})
+    #{ :locale => I18n.locale }
+  #end
+#end
+# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+# Fixes the missing default locale problem in controller specs
+# See http://www.ruby-forum.com/topic/3448797#1041659
+class ActionController::TestCase
+  module Behavior
+    def process_with_default_locale(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
+      parameters = { :locale => I18n.locale }.merge( parameters || {} )
+      process_without_default_locale(action, parameters, session, flash, http_method)
+    end
+    alias_method_chain :process, :default_locale
+  end
+end
+
+module ActionDispatch::Assertions::RoutingAssertions
+  def assert_recognizes_with_default_locale(expected_options, path, extras = {}, message=nil)
+    expected_options = { :locale => I18n.locale.to_s }.merge(expected_options || {} )
+    assert_recognizes_without_default_locale(expected_options, path, extras, message)
+  end
+  alias_method_chain :assert_recognizes, :default_locale
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -319,6 +319,38 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.0.2
+- !ruby/object:Gem::Dependency
+  name: pg_search
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Kuhsaft is a Rails engine that offers a simple CMS.
 email: developers@screenconcept.ch
 executables: []
@@ -402,9 +434,13 @@ files:
 - app/views/kuhsaft/image_bricks/image_brick/_edit.html.haml
 - app/views/kuhsaft/link_bricks/_link_brick.html.haml
 - app/views/kuhsaft/link_bricks/link_brick/_edit.html.haml
+- app/views/kuhsaft/pages/index.html.haml
 - app/views/kuhsaft/pages/show.html.haml
 - app/views/kuhsaft/placeholder_bricks/_placeholder_brick.html.haml
 - app/views/kuhsaft/placeholder_bricks/placeholder_brick/_edit.html.haml
+- app/views/kuhsaft/search/_form.html.haml
+- app/views/kuhsaft/search/_results.html.haml
+- app/views/kuhsaft/search/_results_entry.html.haml
 - app/views/kuhsaft/slider_bricks/_slider_brick.html.haml
 - app/views/kuhsaft/slider_bricks/slider_brick/_edit.html.haml
 - app/views/kuhsaft/text_bricks/_text_brick.html.haml
@@ -438,6 +474,8 @@ files:
 - config/locales/views/kuhsaft/cms/bricks/de.yml
 - config/locales/views/kuhsaft/cms/pages/de.yml
 - config/locales/views/kuhsaft/cms/video_bricks/de.yml
+- config/locales/views/kuhsaft/search/de.yml
+- config/locales/views/kuhsaft/search/en.yml
 - config/locales/views/kuhsaft/text_brick/de.yml
 - config/locales/views/layouts/de.yml
 - config/routes.rb
@@ -452,6 +490,7 @@ files:
 - 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/migrate/12_regenerate_fulltext.rb
 - db/seeds.rb
 - lib/generators/kuhsaft/assets/install_generator.rb
 - lib/generators/kuhsaft/translations/add_generator.rb
@@ -459,6 +498,7 @@ files:
 - lib/kuhsaft/engine.rb
 - lib/kuhsaft/orderable.rb
 - lib/kuhsaft/partial_extractor.rb
+- lib/kuhsaft/searchable.rb
 - lib/kuhsaft/translatable.rb
 - lib/kuhsaft/version.rb
 - lib/kuhsaft.rb
@@ -505,10 +545,13 @@ files:
 - spec/dummy/script/rails
 - spec/factories.rb
 - spec/features/cms_pages_spec.rb
+- spec/features/search_spec.rb
 - spec/helpers/kuhsaft/cms/admin_helper_spec.rb
+- spec/helpers/kuhsaft/pages_helper_spec.rb
 - spec/kuhsaft_spec.rb
 - spec/lib/brick_list_spec.rb
 - spec/lib/engine_spec.rb
+- spec/lib/searchable_spec.rb
 - spec/lib/translatable_spec.rb
 - spec/models/accordion_brick_spec.rb
 - spec/models/accordion_item_brick_spec.rb
@@ -529,6 +572,7 @@ files:
 - spec/models/two_column_brick_spec.rb
 - spec/models/video_brick_spec.rb
 - spec/spec_helper.rb
+- spec/support/default_url_options.rb
 - spec/support/kuhsaft_spec_helper.rb
 homepage: http://github.com/screenconcept/kuhsaft
 licenses: []
@@ -544,7 +588,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1502563843709159469
+      hash: 2803199904668343026
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -553,7 +597,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1502563843709159469
+      hash: 2803199904668343026
 requirements: []
 rubyforge_project: kuhsaft
 rubygems_version: 1.8.24
@@ -597,10 +641,13 @@ test_files:
 - spec/dummy/script/rails
 - spec/factories.rb
 - spec/features/cms_pages_spec.rb
+- spec/features/search_spec.rb
 - spec/helpers/kuhsaft/cms/admin_helper_spec.rb
+- spec/helpers/kuhsaft/pages_helper_spec.rb
 - spec/kuhsaft_spec.rb
 - spec/lib/brick_list_spec.rb
 - spec/lib/engine_spec.rb
+- spec/lib/searchable_spec.rb
 - spec/lib/translatable_spec.rb
 - spec/models/accordion_brick_spec.rb
 - spec/models/accordion_item_brick_spec.rb
@@ -621,4 +668,5 @@ test_files:
 - spec/models/two_column_brick_spec.rb
 - spec/models/video_brick_spec.rb
 - spec/spec_helper.rb
+- spec/support/default_url_options.rb
 - spec/support/kuhsaft_spec_helper.rb