kuhsaft 2.2.6 → 2.3.0

data/app/models/kuhsaft/anchor_brick.rb

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

data/app/models/kuhsaft/asset.rb

@@ -1,26 +1,29 @@
-class Kuhsaft::Asset < ActiveRecord::Base
-  scope :by_date, -> { order('updated_at DESC') }
-  mount_uploader :file, Kuhsaft::AssetUploader
-  
-  def file_type
-    if file.path.present? && ext = File.extname(file.path).split('.').last
-      ext.to_sym unless ext.blank?
+module Kuhsaft
+  class Asset < ActiveRecord::Base
+    scope :by_date, -> { order('updated_at DESC') }
+    mount_uploader :file, Kuhsaft::AssetUploader
+
+    def file_type
+      return unless file.path.present?
+
+      ext = File.extname(file.path).split('.').last
+      ext.to_sym if ext.present?
+    end
+
+    def name
+      File.basename(file.path) if file.present? && file.path.present?
+    end
+
+    def path
+      file.url
+    end
+
+    def path=(val)
+      # do nothing
+    end
+
+    def filename
+      try(:file).try(:file).try(:filename)
     end
-  end
-  
-  def name
-    File.basename(file.path) if file.present? && file.path.present?
-  end
-  
-  def path
-    file.url
-  end
-  
-  def path=val
-    # do nothing
-  end
-  
-  def filename
-    try(:file).try(:file).try(:filename)
   end
 end

data/app/models/kuhsaft/asset_brick.rb

@@ -2,7 +2,8 @@ module Kuhsaft
   class AssetBrick < Brick
     mount_uploader :asset, Kuhsaft::AssetBrickAssetUploader
 
-    validates :caption, :asset, :presence => true
+    validates :caption,
+              :asset, presence: true
 
     def self.styles
       %w(pdf word excel button)

data/app/models/kuhsaft/brick.rb

@@ -2,10 +2,10 @@ module Kuhsaft
   class Brick < ActiveRecord::Base
     include Kuhsaft::BrickList
 
-    belongs_to :brick_list, :polymorphic => true, :touch => true
+    belongs_to :brick_list, polymorphic: true, touch: true
 
-    scope :localized, -> { where(:locale => I18n.locale) }
-    default_scope -> { order('position ASC').localized }
+    scope :localized, -> { where(locale: I18n.locale) }
+    default_scope { order('position ASC').localized }
 
     serialize :display_styles, Array
 
@@ -16,7 +16,17 @@ module Kuhsaft
               :type,
               :brick_list_id,
               :brick_list_type,
-              :presence => true
+              presence: true
+
+    validates :template_name,
+              :type,
+              :locale,
+              :caption,
+              :link_style,
+              :image_size,
+              :video,
+              :alt_text,
+              length: { maximum: 255 }
 
     after_initialize do
       self.position ||= has_siblings? ? brick_list.bricks.maximum(:position).to_i + 1 : 1
@@ -39,15 +49,13 @@ module Kuhsaft
     end
 
     def to_edit_partial_path
-      path = self.to_partial_path.split '/'
+      path = to_partial_path.split '/'
       path << 'edit'
       path.join '/'
     end
 
     def has_siblings?
-      if brick_list
-        brick_list.bricks.any?
-      end
+      brick_list.present? && brick_list.bricks.any?
     end
 
     #
@@ -56,7 +64,7 @@ module Kuhsaft
     # Returns the path to this partial.
     #
     def to_edit_childs_partial_path
-      path = self.to_partial_path.split '/'
+      path = to_partial_path.split '/'
       path << 'childs'
       path.join '/'
     end
@@ -74,12 +82,12 @@ module Kuhsaft
 
     def set_position
       self.position = if self.position.present?
-        self.position
-      elsif self.respond_to?(:brick_list) && self.brick_list.respond_to?(:bricks)
-        brick_list.bricks.maximum(:position).to_i + 1
-      else
-        1
-      end
+                        self.position
+                      elsif self.respond_to?(:brick_list) && brick_list.respond_to?(:bricks)
+                        brick_list.bricks.maximum(:position).to_i + 1
+                      else
+                        1
+                      end
     end
 
     def brick_list_type
@@ -88,7 +96,7 @@ module Kuhsaft
 
     # Returns a css classname suitable for use in the frontend
     def to_style_class
-      ([self.class.to_s.underscore.dasherize.gsub('/', '-')] + self.display_styles).join(' ')
+      ([self.class.to_s.underscore.dasherize.gsub('/', '-')] + display_styles).join(' ')
     end
 
     # Returns a unique DOM id suitable for use in the frontend
@@ -101,6 +109,12 @@ module Kuhsaft
       []
     end
 
+    def translated_available_display_styles
+      available_display_styles.map do |style|
+        [I18n.t("#{self.class.to_s.demodulize.underscore}.display_styles.#{style}"), style]
+      end
+    end
+
     def backend_label(options = {})
       label = self.class.model_name.human
       if options[:parenthesis] == true
@@ -109,5 +123,13 @@ module Kuhsaft
         label
       end
     end
+
+    def partial_digest(name)
+      ActionView::Digestor.digest(name, 'haml',  ApplicationController.new.lookup_context, partial: true)
+    end
+
+    def cache_key
+      super +  partial_digest(to_partial_path)
+    end
   end
 end

data/app/models/kuhsaft/brick_type.rb

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

data/app/models/kuhsaft/brick_type_filter.rb

@@ -1,7 +1,6 @@
 
 module Kuhsaft
   class BrickTypeFilter < SimpleDelegator
-
     def empty?
       !(respond_to?(:user_can_add_childs?) && user_can_add_childs? && !allowed.empty?)
     end
@@ -15,6 +14,5 @@ module Kuhsaft
         Kuhsaft::BrickType.enabled.constrained(allowed_brick_types)
       end
     end
-
   end
 end

data/app/models/kuhsaft/column_brick.rb

@@ -18,6 +18,5 @@ module Kuhsaft
     def renders_own_childs?
       false
     end
-
   end
 end

data/app/models/kuhsaft/image_brick.rb

@@ -2,8 +2,8 @@ module Kuhsaft
   class ImageBrick < Brick
     include Kuhsaft::ImageUploaderMounting
 
-    validates :image, :presence => true
-    validates :image_size, :presence => true
+    validates :image,
+              :image_size, presence: true
 
     def collect_fulltext
       [super, caption].join(' ')

data/app/models/kuhsaft/image_size.rb

@@ -47,6 +47,5 @@ module Kuhsaft
         end
       end
     end
-
   end
 end

data/app/models/kuhsaft/link_brick.rb

@@ -1,6 +1,6 @@
 module Kuhsaft
   class LinkBrick < Brick
-    validates :href, :caption, :presence => true
+    validates :href, :caption, presence: true
 
     def self.styles
       %w(pdf word excel button external)

data/app/models/kuhsaft/page.rb

@@ -1,142 +1,146 @@
-class Kuhsaft::Page < ActiveRecord::Base
-  include Kuhsaft::Engine.routes.url_helpers
-  include Kuhsaft::Orderable
-  include Kuhsaft::Translatable
-  include Kuhsaft::BrickList
-  include Kuhsaft::Searchable
+module Kuhsaft
+  class 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
+    has_ancestry
+    acts_as_brick_list
 
-  translate :title,
-    :page_title,
-    :slug,
-    :keywords,
-    :description,
-    :body,
-    :redirect_url,
-    :url
+    translate :title, :page_title, :slug, :keywords, :description,
+              :body, :redirect_url, :url
 
-  default_scope { order('position ASC') }
+    default_scope { order 'position ASC' }
 
-  scope :published, -> { where(:published => Kuhsaft::PublishState::PUBLISHED) }
-  scope :translated, -> { where("url_#{I18n.locale} is not null") }
+    scope :published, -> { where published: Kuhsaft::PublishState::PUBLISHED }
+    scope :translated, -> { where "url_#{I18n.locale} is not null" }
 
-  # 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 :content_page, -> { where page_type: Kuhsaft::PageType::CONTENT }
 
-  scope :navigation, ->(slug) {
-    where(locale_attr(:slug) => slug).where(
-      locale_attr(:page_type) => Kuhsaft::PageType::NAVIGATION) }
+    scope :navigation, lambda { |slug|
+      where(
+        locale_attr(:slug) => slug,
+        locale_attr(:page_type) => Kuhsaft::PageType::NAVIGATION)
+    }
 
-  before_validation :create_slug, :create_url
+    before_validation :create_slug, :create_url
 
-  validates :title, :presence => true
-  validates :slug, :presence => true
-  validates :redirect_url, :presence => true, :if => :redirect?
+    validates :title, presence: true
+    validates :slug, presence: true
+    validates :redirect_url, presence: true, if: :redirect?
+    validates :title, :slug, :keywords, :page_type, length: { maximum: 255 }
 
-  class << self
-    def flat_tree(pages = nil)
-      arrange_as_array
-    end
+    class << self
+      def flat_tree(pages = nil)
+        arrange_as_array
+      end
+
+      def arrange_as_array(options = {}, hash = nil)
+        hash ||= arrange(options)
 
-    def arrange_as_array(options={}, hash=nil)
-      hash ||= arrange(options)
+        arr = []
+        hash.each do |node, children|
+          arr << node
+          arr += arrange_as_array(options, children) unless children.empty?
+        end
 
-      arr = []
-      hash.each do |node, children|
-        arr << node
-        arr += arrange_as_array(options, children) unless children.empty?
+        arr
       end
+    end
 
-      arr
+    def without_self
+      self.class.where 'id != ?', id
     end
-  end
 
-  def without_self
-    Kuhsaft::Page.where('id != ?', self.id)
-  end
+    def published?
+      published == Kuhsaft::PublishState::PUBLISHED
+    end
 
-  def published?
-    published == Kuhsaft::PublishState::PUBLISHED
-  end
+    def state_class
+      published? ? 'published' : 'unpublished'
+    end
 
-  def state_class
-    if published?
-      'published'
-    else
-      'unpublished'
+    def redirect?
+      page_type == Kuhsaft::PageType::REDIRECT
     end
-  end
 
-  def redirect?
-    page_type == Kuhsaft::PageType::REDIRECT
-  end
+    def navigation?
+      page_type == Kuhsaft::PageType::NAVIGATION
+    end
 
-  def navigation?
-    page_type == Kuhsaft::PageType::NAVIGATION
-  end
+    def parent_pages
+      ancestors
+    end
 
-  def parent_pages
-    ancestors
-  end
+    def translated?
+      url.present? && title.present? && slug.present?
+    end
 
-  def translated?
-    url.present? && title.present? && slug.present?
-  end
+    def link
+      if bricks.count == 0 && children.count > 0
+        children.first.link
+      else
+        url_with_locale
+      end
+    end
 
-  def link
-    if bricks.count == 0 && children.count > 0
-      children.first.link
-    else
-      url_with_locale
+    # 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
-  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_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 url_with_locale
-    opts = { :locale => I18n.locale }
-    url = url_without_locale
-    opts[:url] = url if url.present?
-    page_path(opts)
-  end
+    def create_url
+      self.url = url_with_locale[1..-1]
+    end
 
-  def create_url
-    self.url = url_with_locale[1..-1]
-  end
+    def create_slug
+      has_slug = title.present? && slug.blank?
+      self.slug = title.downcase.parameterize if has_slug
+    end
 
-  def create_slug
-    has_slug = title.present? && slug.blank?
-    self.slug = title.downcase.parameterize if has_slug
-  end
+    def nesting_name
+      num_dashes = parent_pages.size
+      num_dashes = 0 if num_dashes < 0
+      "#{'-' * num_dashes} #{title}".strip
+    end
 
-  def nesting_name
-    num_dashes = parent_pages.size
-    num_dashes = 0 if num_dashes < 0
-    "#{'-' * num_dashes} #{self.title}".strip
-  end
+    def brick_list_type
+      'Kuhsaft::Page'
+    end
 
-  def brick_list_type
-    'Kuhsaft::Page'
-  end
+    def to_style_class
+      'kuhsaft-page'
+    end
 
-  def to_style_class
-    'kuhsaft-page'
-  end
+    def allowed_brick_types
+      Kuhsaft::BrickType.enabled.pluck(:class_name) - ['Kuhsaft::AccordionItemBrick']
+    end
+
+    def cache_key
+      super + bricks.map(&:cache_key).join
+    end
 
-  def allowed_brick_types
-    Kuhsaft::BrickType.enabled.pluck(:class_name) - ['Kuhsaft::AccordionItemBrick']
+    def as_json(options = {})
+      Hash.new.tap do |json|
+        json['title'] = send("title_#{I18n.locale}")
+        json['pretty_url'] = '/' + send("url_#{I18n.locale}")
+        json['url'] = "/pages/#{id}"
+      end
+    end
   end
 end