kuhsaft 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eecde1b2e276afa2b521baaf04bd0312a4ec74d9
-  data.tar.gz: 257ed6496e7b45df88df4f8d556875164eef0013
+  metadata.gz: dece1070f1406b31773243d2f070e48387f15a27
+  data.tar.gz: 22cb559490bc2b7e86eb92a475eb1ef9f7939d06
 SHA512:
-  metadata.gz: 8ed475ede79f506ecfb728f9eefa525e9116f2cb956949cbf661ff13dd3953fa957e4285e38e44868a7acec6934ce2bec7c64f046f5613eaac217c3ca52ace7c
-  data.tar.gz: 131744bc047b4d30e1626f4c69b90d4f3c221f1f9ce6488ba59db4ad0371873676edf54c6d734ee18c3f4c5fc8b26ccc650754636d581fbad4f2b4bbd6a867b9
+  metadata.gz: b0ba82b69049bbaa1ca7a62fa0d2c156f86908b4114a891e35db58320c7455b774e46c706bcb5df9a8244aef26b9ab97d25a14a002948f6a97a4b5489e5c0f6a
+  data.tar.gz: a6c5464e5cbeea1fc505bc53582fab6bfde81cba649d7bd4cfcee16f3c8c052243d56b934452eb40a9ddea2f14162fa65de87a590bef53dcaad5e91ce0d99f7e

data/README.md

@@ -225,6 +225,15 @@ 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/app/controllers/kuhsaft/cms/admin_controller.rb

@@ -10,6 +10,10 @@ module Kuhsaft
           I18n.locale = params[:content_locale]
         end
       end
+
+      def url_options
+        { content_locale: I18n.locale }.merge(super)
+      end
     end
   end
 end

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

@@ -5,14 +5,14 @@ module Kuhsaft
       respond_to :html, :js
 
       def create
-        @brick = params[:brick][:type].constantize.new(params[:brick])
+        @brick = params[:brick][:type].constantize.new(brick_params)
         @brick.image_size = ImageSize.all.first.name.to_s
         @brick.save(:validate => false)
       end
 
       def update
         @brick = Kuhsaft::Brick.find(params[:id])
-        @brick.update_attributes(params[:brick])
+        @brick.update_attributes(brick_params)
 
         #
         # rails will fall back to html if ajax can't be used
@@ -40,6 +40,11 @@ module Kuhsaft
         render :nothing => true
       end
 
+      private
+
+      def brick_params
+        params.require(:brick).permit!
+      end
     end
   end
 end

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

@@ -20,7 +20,7 @@ module Kuhsaft
       end
 
       def create
-        @page = Kuhsaft::Page.create params[:page]
+        @page = Kuhsaft::Page.create(page_params)
 
         if @page.valid?
           flash[:success] = t('layouts.kuhsaft.cms.flash.success', :subject => Kuhsaft::Page.model_name.human)
@@ -38,7 +38,7 @@ module Kuhsaft
 
       def update
         @page = Kuhsaft::Page.find(params[:id])
-        if @page.update_attributes(params[:page])
+        if @page.update_attributes(page_params)
           flash[:success] = t('layouts.kuhsaft.cms.flash.success', :subject => Kuhsaft::Page.model_name.human)
           respond_with @page, :location => kuhsaft.edit_cms_page_path(@page)
         else
@@ -55,6 +55,23 @@ module Kuhsaft
       def sort
         Kuhsaft::PageTree.update(params[:page_tree])
       end
+
+      private
+
+      def page_params
+        safe_params = [:title,
+                       :page_title,
+                       :slug,
+                       :redirect_url,
+                       :url,
+                       :page_type,
+                       :parent_id,
+                       :keywords,
+                       :description,
+                       :published,
+                       :position]
+        params.require(:page).permit(*safe_params)
+      end
     end
   end
 end

data/app/models/kuhsaft/accordion_brick.rb

@@ -1,9 +1,5 @@
 module Kuhsaft
   class AccordionBrick < ColumnBrick
-    attr_accessible :caption
-
-    # TODO: validate only accept AccordionItem as child
-
     def user_can_delete?
       true
     end

data/app/models/kuhsaft/accordion_item_brick.rb

@@ -1,6 +1,5 @@
 module Kuhsaft
   class AccordionItemBrick < ColumnBrick
-    attr_accessible :caption
     validates :caption, :presence => true
 
     def user_can_delete?

data/app/models/kuhsaft/anchor_brick.rb

@@ -1,7 +1,5 @@
 module Kuhsaft
   class AnchorBrick < Brick
-    attr_accessible :caption
-
     validates :caption, :presence => true
 
     def user_can_add_childs?

data/app/models/kuhsaft/asset_brick.rb

@@ -1,7 +1,5 @@
 module Kuhsaft
   class AssetBrick < Brick
-    attr_accessible :caption, :link_style, :asset
-
     mount_uploader :asset, Kuhsaft::AssetBrickAssetUploader
 
     validates :caption, :asset, :presence => true

data/app/models/kuhsaft/brick.rb

@@ -9,13 +9,6 @@ module Kuhsaft
 
     serialize :display_styles, Array
 
-    attr_accessible :locale,
-                    :position,
-                    :type,
-                    :brick_list_id,
-                    :brick_list_type,
-                    :display_styles
-
     before_validation :set_position
 
     validates :locale,

data/app/models/kuhsaft/brick_type.rb

@@ -1,6 +1,5 @@
 module Kuhsaft
   class BrickType < ActiveRecord::Base
-    attr_accessible :disabled, :class_name, :group
     scope :grouped, -> { order('`group`, `id` asc') }
     scope :enabled, -> { where(:enabled => true) }
     scope :constrained, ->(list) { where(:class_name => list) }

data/app/models/kuhsaft/image_brick.rb

@@ -1,6 +1,5 @@
 module Kuhsaft
   class ImageBrick < Brick
-    attr_accessible :image, :caption, :href, :image_size
     mount_uploader :image, Kuhsaft::ImageBrickImageUploader
 
     validates :image, :presence => true

data/app/models/kuhsaft/link_brick.rb

@@ -1,7 +1,5 @@
 module Kuhsaft
   class LinkBrick < Brick
-    attr_accessible :href, :caption, :link_style, :open_in_new_window
-
     validates :href, :caption, :presence => true
 
     def self.styles

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,
@@ -16,17 +17,6 @@ class Kuhsaft::Page < ActiveRecord::Base
     :redirect_url,
     :url
 
-  attr_accessible :title,
-    :slug,
-    :redirect_url,
-    :url,
-    :page_type,
-    :parent_id,
-    :keywords,
-    :description,
-    :published,
-    :position
-
   default_scope { order('position ASC') }
 
   scope :published, -> { where(:published => Kuhsaft::PublishState::PUBLISHED) }

data/app/models/kuhsaft/placeholder_brick.rb

@@ -1,7 +1,5 @@
 module Kuhsaft
   class PlaceholderBrick < Brick
-
-    attr_accessible :template_name
     PARTIAL_PATH = '/app/views/kuhsaft/placeholder_bricks/partials/_*.haml'
 
     def self.available_partials

data/app/models/kuhsaft/text_brick.rb

@@ -5,8 +5,6 @@ module Kuhsaft
     include ActionView::Helpers::SanitizeHelper
     HTML_ENTITIES = HTMLEntities.new
 
-    attr_accessible :text, :read_more_text
-
     def user_can_add_childs?
       false
     end

data/app/models/kuhsaft/two_column_brick.rb

@@ -3,8 +3,6 @@ module Kuhsaft
 
     before_create :add_columns
 
-    attr_accessible :partitioning
-
     #
     # Childs should only contain ColumnBricks, therefore we
     # don't want the user to mess with it

data/app/models/kuhsaft/video_brick.rb

@@ -5,7 +5,6 @@ module Kuhsaft
     VIMEO = 'vimeo'
     EXTERNAL = 'external'
 
-    attr_accessible :video, :embed_src, :href
     validates :any_source, :presence => true
 
     # a video id, an embed code or a link to a video is required

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,12 +1,17 @@
+= 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
-      - @page.bricks.localized.each do |brick|
+      -# TODO: refactor into scopes or simplify otherwise:
+      - @page.bricks.localized.select(&:valid?).each do |brick|
         = render brick
 
 - else
   - cache [@page, I18n.locale] do
     - unless @page.blank?
       .page-content
-        - @page.bricks.localized.each do |brick|
+        -# TODO: refactor into scopes or simplify otherwise:
+        - @page.bricks.localized.select(&:valid?).each do |brick|
           = render brick

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.rb

@@ -15,5 +15,4 @@ module Kuhsaft
   require 'bootstrap-sass'
   require 'haml'
   require 'ckeditor'
-  require 'protected_attributes'
 end

data/lib/kuhsaft/searchable.rb

@@ -21,8 +21,6 @@ module Kuhsaft
 
       if included_modules.include?(Translatable)
         translate :fulltext
-      else
-        attr_accessible :fulltext
       end
 
       before_validation :update_fulltext
@@ -33,6 +31,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 +60,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 = "2.0.2"
+  VERSION = "2.0.3"
 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 %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-07-23 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
@@ -280,20 +280,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.0.rc
-- !ruby/object:Gem::Dependency
-  name: protected_attributes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -463,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