kuhsaft 2.2.6 → 2.3.0

data/config/locales/views/kuhsaft/cms/pages/de.yml

@@ -26,3 +26,6 @@ de:
             Beschreibung des Inhaltes dieser Seite. Diese Beschreibung ist einmalig und nur auf dieser Seite
             vorhanden. Auf den anderen Seiten hat es andere Beschreibungen.
             </em>
+          expand_all: Alle aufklappen
+          collapse_all: Alle zuklappen
+          none: Keine

data/config/locales/views/kuhsaft/cms/video_bricks/de.yml

@@ -3,5 +3,5 @@ de:
     video_bricks:
       video_brick:
         edit:
-          any_source_error: 'Bitte geben Sie mindestens eine Video Quelle an.'
+          any_source_error: 'Bitte geben Sie mindestens eine Videoquelle an.'
           embed_src_optional: 'Alternativ kann ein HTML Code zum einbetten eines Videos eingefügt werden.'

data/config/routes.rb

@@ -1,20 +1,29 @@
 Kuhsaft::Engine.routes.draw do
+
   namespace :cms do
-    resources :pages, :except => :show do
-      post :sort, :on => :collection
+    resources :pages, except: :show do
+      post :sort, on: :collection
     end
-    resources :bricks, :except => [:new, :edit, :index] do
-      post :sort, :on => :collection
+
+    resources :bricks, except: [:edit, :index] do
+      post :sort, on: :collection
     end
 
     resources :assets
-    root :to => 'pages#index'
+    root to: 'pages#index'
   end
 
-  scope ":locale", :locale => /#{I18n.available_locales.join('|')}/ do
+  scope ':locale', locale: /#{I18n.available_locales.join('|')}/ do
+    namespace :api, defaults: { format: :json } do
+      resources :pages, only: :index
+    end
+
     resources :pages,
-      :only => [:index],
-      :defaults => { :locale => I18n.locale }
-    get '(*url)' => 'pages#show', :as => :page
+              only: [:index],
+              defaults: { locale: I18n.locale }
+    get '(*url)' => 'pages#show', as: :page
   end
+
+  get '/pages/:id' => 'pages#lookup_by_id'
+  get '/sitemap.format' => 'sitemaps#index', format: 'xml'
 end

data/db/migrate/10_add_redirect_url_to_kuhsaft_pages.rb

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

data/db/migrate/11_update_url_and_redirect_url_value.rb

@@ -2,14 +2,14 @@ class UpdateUrlAndRedirectUrlValue < ActiveRecord::Migration
   def up
     @redirect_pages = Kuhsaft::Page.where(:page_type => 'redirect')
     I18n.available_locales.each do |locale|
-      move_url_to_redirect_url(locale)
+      move_url_to_redirect_url(locale.to_s.underscore)
     end
   end
 
   def down
     @redirect_pages = Kuhsaft::Page.where(:page_type => 'redirect')
     I18n.available_locales.each do |locale|
-      move_redirect_url_to_url(locale)
+      move_redirect_url_to_url(locale.to_s.underscore)
     end
 
   end
@@ -37,9 +37,9 @@ class UpdateUrlAndRedirectUrlValue < ActiveRecord::Migration
     if page.parent.present?
       complete_slug << page.parent.url.to_s
     else
-      complete_slug = "#{I18n.locale}"
+      complete_slug = I18n.locale.to_s.underscore
     end
     complete_slug << "/#{page.slug}"
     complete_slug
   end
-end
+end

data/db/migrate/13_add_page_title_to_pages.rb

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

data/db/migrate/15_add_alt_text_to_bricks.rb

@@ -0,0 +1,5 @@
+class AddAltTextToBricks < ActiveRecord::Migration
+  def change
+    add_column :kuhsaft_bricks, :alt_text, :string
+  end
+end

data/db/migrate/16_update_default_value_for_page_type.rb

@@ -0,0 +1,9 @@
+class UpdateDefaultValueForPageType < ActiveRecord::Migration
+  def up
+    change_column :kuhsaft_pages, :page_type, :string, :default => Kuhsaft::PageType::CONTENT
+  end
+
+  def down
+    change_column_default(:kuhsaft_pages, :page_type, nil)
+  end
+end

data/db/migrate/17_set_page_type_to_content_for_empty_fields.rb

@@ -0,0 +1,7 @@
+class SetPageTypeToContentForEmptyFields < ActiveRecord::Migration
+  def change
+    Kuhsaft::Page.where( "page_type is NULL or page_type = ''" ).each do |page|
+      page.update_attribute(:page_type, Kuhsaft::PageType::CONTENT)
+    end
+  end
+end

data/lib/generators/kuhsaft/assets/install_generator.rb

@@ -16,11 +16,10 @@ module Kuhsaft
         copy_file 'customizations.js.coffee', "#{custom_js_folder}/customizations.js.coffee"
         copy_file 'ck-config.js.coffee', "#{custom_js_folder}/ck-config.js.coffee"
 
-        inject_into_file 'config/environments/production.rb', :after => /config\.assets\.precompile.*$/ do
+        inject_into_file 'config/environments/production.rb', after: /config\.assets\.precompile.*$/ do
           "\n  config.assets.precompile += %w( kuhsaft/cms/customizations.css kuhsaft/cms/customizations.js kuhsaft/cms/ck-config.js )"
         end
       end
     end
   end
 end
-

data/lib/generators/kuhsaft/translations/add_generator.rb

@@ -8,19 +8,34 @@ module Kuhsaft
       include Rails::Generators::Migration
 
       source_root(File.join(Kuhsaft::Engine.root, '/lib/templates/kuhsaft/translations'))
-      argument :locale, :type => :string
+      argument :locale, type: :string
 
       def self.next_migration_number(dirname)
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
 
-      def get_locale
-        locale.downcase.underscore
+      def translated_columns
+        Kuhsaft::Page.column_names.select { |attr| attr.include?("_#{I18n.default_locale}") }
       end
+
+      def formatted_locale
+        locale.underscore
+      end
+
       def create_locale_migration_file
-        migration_template('add_translation.html.erb', Rails.root.join('db', 'migrate', "add_#{get_locale}_translation.rb"))
+        migration_template('add_translation.html.erb',
+                           Rails.root.join('db', 'migrate', "add_#{formatted_locale}_translation.rb"))
       end
 
+      private
+
+      def get_attribute(attribute_name = '')
+        attribute_name.gsub("_#{I18n.default_locale}", "_#{formatted_locale}")
+      end
+
+      def get_type(key = '')
+        Kuhsaft::Page.columns_hash[key].type
+      end
     end
   end
 end

data/lib/kuhsaft.rb

@@ -12,6 +12,7 @@ module Kuhsaft
   require 'bourbon'
   require 'jquery-rails'
   require 'jquery-ui-rails'
+  require 'remotipart'
   require 'ancestry'
   require 'bootstrap-sass'
   require 'haml'

data/lib/kuhsaft/brick_list.rb

@@ -1,12 +1,11 @@
 module Kuhsaft
   module BrickList
-
     def self.included(base)
       def base.acts_as_brick_list
-        self.has_many :bricks,
-          :class_name => 'Kuhsaft::Brick',
-          :dependent => :destroy,
-          :as => :brick_list
+        has_many :bricks,
+                 class_name: 'Kuhsaft::Brick',
+                 dependent: :destroy,
+                 as: :brick_list
       end
     end
 
@@ -56,12 +55,12 @@ module Kuhsaft
 
     #
     # Return relevant fulltext information for this brick (e.g: it's name, description etc ).
-    # It will be stored in the related Page.
+    # It will be stored in the related Page.
     # Implement how you see fit.
     #
     def collect_fulltext
       if respond_to?(:bricks)
-        bricks.localized.inject('') do |text, brick|
+        bricks.localized.reduce('') do |text, brick|
           text << brick.collect_fulltext
           text
         end
@@ -88,6 +87,5 @@ module Kuhsaft
     def uploader?
       self.class.ancestors.include? CarrierWave::Mount::Extension
     end
-
   end
 end

data/lib/kuhsaft/engine.rb

@@ -1,5 +1,4 @@
 module Kuhsaft
-
   class ImageSizeDelegator
     def method_missing(method, *args, &block)
       Kuhsaft::ImageSize.send(method, *args, &block)
@@ -19,5 +18,10 @@ module Kuhsaft
 
     # delegate image size config to ImageSize class
     config.image_sizes = ImageSizeDelegator.new
+
+    initializer 'kuhsaft.initialize_haml_dependency_tracker' do |app|
+      require 'action_view/dependency_tracker'
+      ActionView::DependencyTracker.register_tracker :haml, ActionView::DependencyTracker::ERBTracker
+    end
   end
 end

data/lib/kuhsaft/orderable.rb

@@ -1,50 +1,53 @@
 module Kuhsaft
   # If you use this mixin, your class must implement the following methods
   # siblings(), returns the siblings of the same type of object
-  
+
   module Orderable
-    def self.included base
+    def self.included(base)
       base.extend(ClassMethods)
       base.send :include, InstanceMethods
       base.after_create :set_position
     end
-    
+
     module InstanceMethods
       def increment_position
         update_attribute :position, position + 1
       end
-  
+
       def decrement_position
         update_attribute :position, position - 1
       end
-  
+
       def preceding_sibling
         siblings.where('position = ?', position - 1).first
       end
-  
+
       def succeeding_sibling
         siblings.where('position = ?', position + 1).first
       end
-  
+
       def preceding_siblings
         siblings.where('position <= ?', position).where('id != ?', id)
       end
-  
+
       def succeeding_siblings
         siblings.where('position >= ?', position).where('id != ?', id)
       end
-  
+
       def position_to_top
         update_attribute :position, 1
         recount_siblings_position_from 1
       end
-  
-      def recount_siblings_position_from position
+
+      def recount_siblings_position_from(position)
         counter = position
-        succeeding_siblings.each { |s| counter += 1; s.update_attribute(:position, counter) }
+        succeeding_siblings.each do |s|
+          counter += 1
+          s.update_attribute(:position, counter)
+        end
       end
-  
-      def reposition before_id
+
+      def reposition(before_id)
         if before_id.blank?
           position_to_top
         else
@@ -52,17 +55,17 @@ module Kuhsaft
           recount_siblings_position_from position
         end
       end
-  
+
       def set_position
         initial_position = siblings.blank? ? 1 : siblings.count + 1
         update_attribute(:position, initial_position)
       end
     end
-    
+
     module ClassMethods
-      def position_of id
-        self.find(id).position rescue 1
+      def position_of(id)
+        find(id).position rescue 1
       end
     end
   end
-end
+end

data/lib/kuhsaft/partial_extractor.rb

@@ -7,7 +7,7 @@ module Kuhsaft
         filename.slice!(0)
         partials << filename
       end
-      partials.collect {|d| [I18n.t(d), d]}
+      partials.map { |d| [I18n.t(d), d] }
     end
 
     def collect_partials(path)

data/lib/kuhsaft/searchable.rb

@@ -6,8 +6,8 @@ module Kuhsaft
     extend ActiveSupport::Concern
 
     DICTIONARIES = {
-      :en => 'english',
-      :de => 'german',
+      en: 'english',
+      de: 'german'
     }
 
     def update_fulltext
@@ -19,25 +19,22 @@ module Kuhsaft
         raise 'Kuhsaft::Searchable needs Kuhsaft::BrickList to be included'
       end
 
-      if included_modules.include?(Translatable)
-        translate :fulltext
-      end
-
+      translate :fulltext if included_modules.include?(Translatable)
       before_validation :update_fulltext
 
       if ActiveRecord::Base.connection.instance_values['config'][:adapter] == 'postgresql'
         include ::PgSearch
         cb = lambda do |query|
           {
-            :against => {
+            against: {
               locale_attr(:title)       => 'A',
               locale_attr(:page_title)  => 'A',
               locale_attr(:keywords)    => 'B',
               locale_attr(:description) => 'C',
-              locale_attr(:fulltext)    => 'C',
+              locale_attr(:fulltext)    => 'C'
             },
-            :query => query,
-            :using => { :tsearch => { :dictionary => DICTIONARIES[I18n.locale] || 'simple' }}
+            query: query,
+            using: { tsearch: { dictionary: DICTIONARIES[I18n.locale] || 'simple' } }
           }
         end
         pg_search_scope :search_without_excerpt, cb
@@ -57,7 +54,7 @@ module Kuhsaft
           if query.is_a? Hash
             where("#{query.first[0]} LIKE ?", "%#{query.first[1]}%")
           else
-            stmt = ""
+            stmt = ''
             stmt += "#{locale_attr(:keywords)} LIKE ? OR "
             stmt += "#{locale_attr(:title)} LIKE ? OR "
             stmt += "#{locale_attr(:page_title)} LIKE ? OR "

data/lib/kuhsaft/translatable.rb

@@ -1,38 +1,54 @@
 module Kuhsaft
   module Translatable
-
     def self.included(base)
       base.extend ClassMethods
     end
 
+    extend self
+
     module ClassMethods
-      def translate *args
+      def translate(*args)
         args.each do |attr_name|
-          define_method attr_name do
-            send "#{attr_name}_#{I18n.locale}"
-          end
+          define_localized_attr_getter attr_name
+          define_localized_attr_setter attr_name
+          define_localized_attr_finder attr_name
+          define_localized_attr_predicate_method attr_name
+        end
+      end
+
+      def define_localized_attr_getter(attr_name)
+        define_method attr_name do
+          send "#{attr_name}_#{locale_for_attr_name}"
+        end
+      end
 
-          define_method "#{attr_name}?" do
-            send "#{attr_name}_#{I18n.locale}?"
-          end
+      def define_localized_attr_predicate_method(attr_name)
+        define_method "#{attr_name}?" do
+          send "#{attr_name}_#{locale_for_attr_name}?"
+        end
+      end
 
-          define_method "#{attr_name}=" do |val|
-            send "#{attr_name}_#{I18n.locale}=", val
-          end
+      def define_localized_attr_setter(attr_name)
+        define_method "#{attr_name}=" do |val|
+          send "#{attr_name}_#{locale_for_attr_name}=", val
+        end
+      end
 
-          define_singleton_method "find_by_#{attr_name}" do |val|
-            send "find_by_#{attr_name}_#{I18n.locale}", val
-          end
+      def define_localized_attr_finder(attr_name)
+        define_singleton_method "find_by_#{attr_name}" do |val|
+          send "find_by_#{attr_name}_#{locale_for_attr_name}", val
         end
       end
 
-      def locale_attr attr_name
-        "#{attr_name}_#{I18n.locale}"
+      def locale_for_attr_name
+        I18n.locale.to_s.underscore
       end
-    end
 
-    def locale_attr attr_name
-      "#{attr_name}_#{I18n.locale}"
+      def locale_attr(attr_name)
+        "#{attr_name}_#{I18n.locale.to_s.underscore}"
+      end
     end
+
+    include ClassMethods
   end
 end