ecm_cms2 1.1.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7924e282fbaa1e5c4c7b8eb88c2d40d55818913
-  data.tar.gz: daf1bc4752377390608d2c2e6d789cc97d048f61
+  metadata.gz: e1707440044dae2f74e476338ba1cb70beba1f0b
+  data.tar.gz: 5c38d25ea7c5bc14af5ed74010b0add39288b009
 SHA512:
-  metadata.gz: 7e48db3b8611184f726889f3446652695d84d57a2562184a2df8d260d56a50142c07866ee37a6b83991c07350d328b9eae201c895661497dce10d6a024847458
-  data.tar.gz: f1183f4235f01e5f50d595776a9616a84a0d9404449daf3dcf2d2bf2f8129facea3bb1ee3cd7d1fe940a37bb537f9fbafa4b94d1d3df206c3280f893cd5e5a3a
+  metadata.gz: 2bf055d316ccafcf21289db136779fcbe23483017ef1dd73edfa50f620b5dd102e138a0c923a6b2c85feabd11982f3b857a1a68a8cffd5e6376dff67b17f631d
+  data.tar.gz: f7c48ee4aef4c8b2ea6769b4ebf3d269f66c4486f524388416cdf4db1a10e34bad71f988238c4205706be5b9d9abbc76d12c83c9e78da5b704804eaee39db5ef

data/README.rdoc

@@ -1,12 +1,23 @@
-= ECM Module Template
+= ECM CMS 2
 
 = End-User documentation
 
 Please look at the[link:doc] Folder.
 
+= Migrating from 1.x.x to 2.0.0
+
+Add active_admin-awesome_nested_set to your gemfile, if you are using activeadmin:
+
+    # Gemfile
+    gem 'active_admin-awesome_nested_set'
 
 = Prerequisites
 
+if you are using activeadmin as backend, ecm_cms2 comes with admin files to provide a backend. In that case, you'll need active_admin-awesome_nested_set. Add it to your gemfile:
+
+    # Gemfile
+    gem 'active_admin-awesome_nested_set'
+
 = Installation
 
 Add it to your bundle:
@@ -61,6 +72,13 @@ Warning: *RUNNING THIS WILL DELETE ALL OF YOUR CMS DATA AND REPLACE IT WITH EXAM
       ...
     end
 
+= Running specs
+
+    gem install bundler
+    bundle
+    cd spec/dummy && rake db:migrate RAILS_ENV=test && cd ../..
+    guard
+
 = License
 
 This project rocks and uses MIT-LICENSE.

data/{lib/ecm/cms/active_admin → app/admin}/ecm_cms_content_box.rb

@@ -1,19 +1,19 @@
 ActiveAdmin.register Ecm::Cms::ContentBox do
   permit_params(:name) if Rails.version >= '4.0.0'
 
-  menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call
+  menu parent: proc { I18n.t('ecm.cms.active_admin.menu') }.call
 
   index do
     selectable_column
     column :name
     column :created_at
-    column :updated_at    
+    column :updated_at
     ActiveAdmin::VERSION[0] < '1' ? default_actions : actions
   end
 
   show do
     panel Ecm::Cms::ContentBox.human_attribute_name(:ecm_cms_page_content_blocks) do
-      table_for ecm_cms_content_box.ecm_cms_page_content_blocks, :i18n => Ecm::Cms::Page::ContentBlock do |content_block|
+      table_for ecm_cms_content_box.ecm_cms_page_content_blocks, i18n: Ecm::Cms::Page::ContentBlock do |_content_block|
         column :ecm_cms_page
         column :body
         column :created_at
@@ -22,7 +22,7 @@ ActiveAdmin.register Ecm::Cms::ContentBox do
     end
   end
 
-  sidebar Ecm::Cms::ContentBox.human_attribute_name(:details), :only => :show do
+  sidebar Ecm::Cms::ContentBox.human_attribute_name(:details), only: :show do
     attributes_table_for ecm_cms_content_box do
       row :name
       row :created_at
@@ -30,4 +30,4 @@ ActiveAdmin.register Ecm::Cms::ContentBox do
       row :ecm_cms_page_content_blocks_count
     end
   end # sidebar
-end
+end if Gem::Specification.find_all_by_name('activeadmin').any?

data/{lib/ecm/cms/active_admin → app/admin}/ecm_cms_navigation_items.rb

@@ -11,16 +11,16 @@ ActiveAdmin.register Ecm::Cms::NavigationItem do
                 :url,
                 *Ecm::Cms::Configuration.navigation_item_properties,
                 :highlights_on
-  )
+               )
 
   sortable_tree_member_actions
 
   # Menu
-  menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call
+  menu parent: proc { I18n.t('ecm.cms.active_admin.menu') }.call
 
   form do |f|
     f.inputs do
-      f.input :ecm_cms_navigation, :collection => Ecm::Cms::Navigation.all.collect { |navigation| [navigation.to_s, navigation.id] }
+      f.input :ecm_cms_navigation, collection: Ecm::Cms::Navigation.all.collect { |navigation| [navigation.to_s, navigation.id] }
       f.input :parent
       f.input :name
     end
@@ -48,7 +48,7 @@ ActiveAdmin.register Ecm::Cms::NavigationItem do
     f.actions
   end
 
-  index :as => :nested_set do
+  index as: :nested_set do
     selectable_column
     sortable_tree_columns
     column(:ecm_cms_navigation) { |ni| link_to(ni.ecm_cms_navigation.to_s, [:admin, ni.ecm_cms_navigation]) }
@@ -56,7 +56,7 @@ ActiveAdmin.register Ecm::Cms::NavigationItem do
     column :url
     column :ecm_cms_page do |ni|
       if ni.ecm_cms_page.blank?
-        link_to(I18n.t('active_admin.new_model', :model => Ecm::Cms::Page.model_name.human), new_admin_ecm_cms_page_path({:ecm_cms_page => ni.params_for_new_page}))
+        link_to(I18n.t('active_admin.new_model', model: Ecm::Cms::Page.model_name.human), new_admin_ecm_cms_page_path(ecm_cms_page: ni.params_for_new_page))
       else
         link_to(ni.ecm_cms_page.title, [:admin, ni.ecm_cms_page])
       end
@@ -65,4 +65,4 @@ ActiveAdmin.register Ecm::Cms::NavigationItem do
     column :updated_at
     ActiveAdmin::VERSION[0] < '1' ? default_actions : actions
   end
-end
+end if Gem::Specification.find_all_by_name('activeadmin').any?

data/{lib/ecm/cms/active_admin → app/admin}/ecm_cms_navigations.rb

@@ -1,20 +1,20 @@
-include ActiveAdmin::AwesomeNestedSet::Helper
+include ActiveAdmin::AwesomeNestedSet::Helper if Gem::Specification.find_all_by_name('activeadmin').any?
 
 ActiveAdmin.register Ecm::Cms::Navigation do
   permit_params(:locale,
                 :name,
                 :slug) if Rails.version >= '4.0.0'
-                  
+
   # Filters
-  filter :locale, :as => :select, :collection => I18n.available_locales.map(&:to_s)
+  filter :locale, as: :select, collection: I18n.available_locales.map(&:to_s)
   filter :name
 
   # Menu
-  menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call
+  menu parent: proc { I18n.t('ecm.cms.active_admin.menu') }.call
 
   form do |f|
     f.inputs do
-      f.input :locale, :as => :select, :collection => I18n.available_locales.map(&:to_s)
+      f.input :locale, as: :select, collection: I18n.available_locales.map(&:to_s)
       f.input :name
     end
 
@@ -30,13 +30,13 @@ ActiveAdmin.register Ecm::Cms::Navigation do
 
   show do
     panel Ecm::Cms::Navigation.human_attribute_name(:ecm_cms_navigation_items) do
-      table_for ecm_cms_navigation.ecm_cms_navigation_items, :i18n => Ecm::Cms::NavigationItem do
+      table_for ecm_cms_navigation.ecm_cms_navigation_items, i18n: Ecm::Cms::NavigationItem do
         sortable_tree_columns
         sortable_tree_indented_column :name
         column :url
         column :ecm_cms_page do |ni|
           if ni.ecm_cms_page.blank?
-            link_to(I18n.t('active_admin.create_model', :model => Ecm::Cms::Page.model_name.human), new_admin_ecm_cms_page_path({:ecm_cms_page => ni.params_for_new_page}))
+            link_to(I18n.t('active_admin.create_model', model: Ecm::Cms::Page.model_name.human), new_admin_ecm_cms_page_path(ecm_cms_page: ni.params_for_new_page))
           else
             link_to(ni.ecm_cms_page.title, [:admin, ni.ecm_cms_page])
           end
@@ -45,14 +45,14 @@ ActiveAdmin.register Ecm::Cms::Navigation do
         column :updated_at
 
         column do |ni|
-          link_to(I18n.t('active_admin.view'), [:admin, ni], :class => "member_link view_link") +
-          link_to(I18n.t('active_admin.edit'), [:edit, :admin, ni], :class => "member_link edit_link")
+          link_to(I18n.t('active_admin.view'), [:admin, ni], class: 'member_link view_link') +
+            link_to(I18n.t('active_admin.edit'), [:edit, :admin, ni], class: 'member_link edit_link')
         end
       end
     end
   end
 
-  sidebar Ecm::Cms::Navigation.human_attribute_name(:details), :only => :show do
+  sidebar Ecm::Cms::Navigation.human_attribute_name(:details), only: :show do
     attributes_table_for ecm_cms_navigation do
       row :locale
       row :name
@@ -61,5 +61,4 @@ ActiveAdmin.register Ecm::Cms::Navigation do
       row :updated_at
     end
   end # sidebar
-end if defined?(::ActiveAdmin)
-
+end if Gem::Specification.find_all_by_name('activeadmin').any?

data/{lib/ecm/cms/active_admin → app/admin}/ecm_cms_pages.rb

@@ -12,13 +12,12 @@ ActiveAdmin.register Ecm::Cms::Page do
                 :pathname,
                 :title) if Rails.version >= '4.0.0'
 
-
-  menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call
+  menu parent: proc { I18n.t('ecm.cms.active_admin.menu') }.call
 
   form do |f|
-#    f.inputs do
-#      f.object.errors.inspect
-#    end
+    #    f.inputs do
+    #      f.object.errors.inspect
+    #    end
 
     f.inputs do
       f.input :title
@@ -28,21 +27,21 @@ ActiveAdmin.register Ecm::Cms::Page do
 
     f.has_many :ecm_cms_page_content_blocks do |cb|
       # cb.inputs do
-        if cb.object.persisted?
-          cb.input :_destroy, :as => :boolean, :label => I18n.t('active_admin.delete')
-        end
+      if cb.object.persisted?
+        cb.input :_destroy, as: :boolean, label: I18n.t('active_admin.delete')
+      end
 
-        cb.input :ecm_cms_content_box
-        cb.input :body
+      cb.input :ecm_cms_content_box
+      cb.input :body
       # end
     end if Ecm::Cms::ContentBox.count > 0
 
     f.inputs do
       f.input :pathname
       f.input :basename
-      f.input :locale, :as => :select, :collection => I18n.available_locales.map(&:to_s)
-      f.input :format, :as => :select, :collection => Mime::SET.symbols.map(&:to_s)
-      f.input :handler, :as => :select, :collection => ActionView::Template::Handlers.extensions.map(&:to_s)
+      f.input :locale, as: :select, collection: I18n.available_locales.map(&:to_s)
+      f.input :format, as: :select, collection: Mime::SET.symbols.map(&:to_s)
+      f.input :handler, as: :select, collection: ActionView::Template::Handlers.extensions.map(&:to_s)
     end
 
     f.inputs do
@@ -50,12 +49,12 @@ ActiveAdmin.register Ecm::Cms::Page do
     end
 
     I18n.available_locales.each do |locale|
-      Ecm::Cms::Navigation.where(:locale => locale).all.each do |navigation|
+      Ecm::Cms::Navigation.where(locale: locale).all.each do |navigation|
         f.inputs navigation.to_s do
           f.input :ecm_cms_navigation_items,
-                  :as => :check_boxes,
-                  :collection => navigation.ecm_cms_navigation_items.joins(:ecm_cms_navigation).where(:ecm_cms_navigations => { :locale => locale }),
-                  :label_method => :key # .all.collect { |i| "#{'--' * i.depth} #{i.name}" }
+                  as: :check_boxes,
+                  collection: navigation.ecm_cms_navigation_items.joins(:ecm_cms_navigation).where(ecm_cms_navigations: { locale: locale }),
+                  label_method: :key # .all.collect { |i| "#{'--' * i.depth} #{i.name}" }
         end
       end
     end
@@ -66,12 +65,12 @@ ActiveAdmin.register Ecm::Cms::Page do
   index do
     selectable_column
     column :pathname
-    column :filename, :sortable => :basename
+    column :filename, sortable: :basename
     column :title
     column :home_page?
     column :layout
     column(:ecm_cms_navigation_items) do |page|
-      output = ""
+      output = ''
       page.ecm_cms_navigation_items.each do |navigation_item|
         output << link_to(navigation_item, [:admin, navigation_item])
       end
@@ -94,7 +93,7 @@ ActiveAdmin.register Ecm::Cms::Page do
     end
   end
 
-  sidebar Ecm::Cms::Page.human_attribute_name(:details), :only => :show do
+  sidebar Ecm::Cms::Page.human_attribute_name(:details), only: :show do
     attributes_table_for ecm_cms_page do
       # row :ecm_cms_navigation_item
       # row :folder
@@ -106,5 +105,4 @@ ActiveAdmin.register Ecm::Cms::Page do
       row :updated_at
     end
   end # sidebar
-end if defined?(::ActiveAdmin)
-
+end if Gem::Specification.find_all_by_name('activeadmin').any?

data/{lib/ecm/cms/active_admin → app/admin}/ecm_cms_partials.rb

@@ -8,7 +8,7 @@ ActiveAdmin.register Ecm::Cms::Partial do
                 :locale,
                 :pathname) if Rails.version >= '4.0.0'
   # Menu
-  menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call
+  menu parent: proc { I18n.t('ecm.cms.active_admin.menu') }.call
 
   form do |f|
     f.inputs do
@@ -18,9 +18,9 @@ ActiveAdmin.register Ecm::Cms::Partial do
     f.inputs do
       f.input :pathname
       f.input :basename
-      f.input :locale, :as => :select, :collection => I18n.available_locales.map(&:to_s)
-      f.input :format, :as => :select, :collection => Mime::SET.symbols.map(&:to_s)
-      f.input :handler, :as => :select, :collection => ActionView::Template::Handlers.extensions.map(&:to_s)
+      f.input :locale, as: :select, collection: I18n.available_locales.map(&:to_s)
+      f.input :format, as: :select, collection: Mime::SET.symbols.map(&:to_s)
+      f.input :handler, as: :select, collection: ActionView::Template::Handlers.extensions.map(&:to_s)
     end
 
     f.actions
@@ -41,7 +41,7 @@ ActiveAdmin.register Ecm::Cms::Partial do
     end
   end
 
-  sidebar Ecm::Cms::Partial.human_attribute_name(:details), :only => :show do
+  sidebar Ecm::Cms::Partial.human_attribute_name(:details), only: :show do
     attributes_table_for ecm_cms_partial do
       row :pathname
       row :filename
@@ -49,5 +49,4 @@ ActiveAdmin.register Ecm::Cms::Partial do
       row :updated_at
     end
   end # sidebar
-end
-
+end if Gem::Specification.find_all_by_name('activeadmin').any?

data/{lib/ecm/cms/active_admin → app/admin}/ecm_cms_templates.rb

@@ -7,9 +7,9 @@ ActiveAdmin.register Ecm::Cms::Template do
                 :layout,
                 :locale,
                 :pathname) if Rails.version >= '4.0.0'
-                  
+
   # Menu
-  menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call
+  menu parent: proc { I18n.t('ecm.cms.active_admin.menu') }.call
 
   form do |f|
     f.inputs do
@@ -19,9 +19,9 @@ ActiveAdmin.register Ecm::Cms::Template do
     f.inputs do
       f.input :pathname
       f.input :basename
-      f.input :locale, :as => :select, :collection => I18n.available_locales.map(&:to_s)
-      f.input :format, :as => :select, :collection => Mime::SET.symbols.map(&:to_s)
-      f.input :handler, :as => :select, :collection => ActionView::Template::Handlers.extensions.map(&:to_s)
+      f.input :locale, as: :select, collection: I18n.available_locales.map(&:to_s)
+      f.input :format, as: :select, collection: Mime::SET.symbols.map(&:to_s)
+      f.input :handler, as: :select, collection: ActionView::Template::Handlers.extensions.map(&:to_s)
     end
 
     f.actions
@@ -42,7 +42,7 @@ ActiveAdmin.register Ecm::Cms::Template do
     end
   end
 
-  sidebar Ecm::Cms::Template.human_attribute_name(:details), :only => :show do
+  sidebar Ecm::Cms::Template.human_attribute_name(:details), only: :show do
     attributes_table_for ecm_cms_template do
       # row :folder
       row :pathname
@@ -51,5 +51,4 @@ ActiveAdmin.register Ecm::Cms::Template do
       row :updated_at
     end
   end # sidebar
-end
-
+end if Gem::Specification.find_all_by_name('activeadmin').any?

data/app/controllers/ecm/cms/page_controller.rb

@@ -6,19 +6,24 @@ class Ecm::Cms::PageController < Ecm::Cms::Configuration.base_controller.constan
   # avoid error 500 on missing template
   rescue_from ActionView::MissingTemplate do
     respond_to do |format|
-      format.html {
-        render(:file => "#{Rails.root}/public/404", :formats => [:html],
-                                                    :layout => false,
-                                                    :status => 404
-        )
-      }
+      format.html do
+        render(file: "#{Rails.root}/public/404", formats: [:html],
+               layout: false,
+               status: 404
+              )
+      end
       format.xml  { head :not_found }
       format.any  { head :not_found }
     end
   end
 
   def respond
-    render :template => params[:page]
+    respond_to do |format|
+      format.html { render template: params[:page] }
+      format.pdf do
+        output = render_to_string template: params[:page], formats: [:html, :pdf], layout: false
+        self.response_body = WickedPdf.new.pdf_from_string(output)
+      end if Gem::Specification.find_all_by_name('wicked_pdf').any?
+    end
   end
 end
-

data/app/helpers/ecm/cms_helper.rb

@@ -9,14 +9,14 @@ module Ecm::CmsHelper
 
     level_as_array = (level).is_a?(Range) ? level.to_a : [level]
 
-    navigation = Ecm::Cms::Navigation.where(:name => name.to_s, :locale => I18n.locale.to_s).first
+    navigation = Ecm::Cms::Navigation.where(name: name.to_s, locale: I18n.locale.to_s).first
     unless navigation
-      return I18n.t('ecm.cms.navigation.messages.not_found', {:lang => I18n.locale.to_s, :name => name.to_s})
+      return I18n.t('ecm.cms.navigation.messages.not_found', lang: I18n.locale.to_s, name: name.to_s)
     end
 
     roots = navigation.ecm_cms_navigation_items.roots.all
     if roots.empty?
-      return I18n.t('ecm.cms.navigation.messages.empty', :lang => I18n.locale.to_s, :name => name)
+      return I18n.t('ecm.cms.navigation.messages.empty', lang: I18n.locale.to_s, name: name)
     end
 
     render_navigation(level: level, expand_all: expand_all, renderer: renderer) do |navigation|
@@ -30,7 +30,7 @@ module Ecm::CmsHelper
   def build_navigation_item(navigation, item, container_css_class)
     options = {}
     options[:highlights_on] = /#{item.highlights_on}/ if item.highlights_on.present?
-    options = item.li_attributes.marshal_dump.delete_if {|key, value| value.blank? }
+    options = item.li_attributes.marshal_dump.delete_if { |_key, value| value.blank? }
 
     navigation.dom_class = container_css_class
     if item.children.present?
@@ -47,4 +47,8 @@ module Ecm::CmsHelper
   def link_to_top
     render partial: '/ecm/cms/link_to_top'
   end
+
+  def cms_page?
+    params[:action] == 'respond' && params.has_key?(:page)
+  end
 end

data/app/models/concerns/model/ecm/cms/navigation_item/properties_concern.rb

@@ -0,0 +1,25 @@
+require 'active_support/concern'
+
+module Model::Ecm::Cms::NavigationItem
+  module PropertiesConcern
+    extend ActiveSupport::Concern
+
+    included do
+      serialize :properties, OpenStruct
+      delegate *Ecm::Cms::Configuration.navigation_item_properties, to: :li_attributes
+      delegate *Ecm::Cms::Configuration.navigation_item_properties.collect { |a| "#{a}=".to_sym }, to: :li_attributes
+    end
+
+    def highlights_on
+      properties.highlights_on ||= nil
+    end
+
+    delegate :highlights_on=, to: :properties
+
+    def li_attributes
+      properties.li_attributes ||= OpenStruct.new
+    end
+
+    delegate :li_attributes=, to: :properties
+  end
+end

data/app/models/ecm/cms/content_box.rb

@@ -1,16 +1,13 @@
 module Ecm::Cms
   class ContentBox < ActiveRecord::Base
     # associations
-    has_many :ecm_cms_page_content_blocks, :class_name => 'Page::ContentBlock',
-                                           :foreign_key => 'ecm_cms_content_box_id'
+    has_many :ecm_cms_page_content_blocks, class_name: 'Page::ContentBlock',
+                                           foreign_key: 'ecm_cms_content_box_id'
 
     # validations
-    validates :name, :presence => true,
-                     :uniqueness => true
+    validates :name, presence: true,
+                     uniqueness: true
 
-    def ecm_cms_page_content_blocks_count
-      ecm_cms_page_content_blocks.count
-    end
+    delegate :count, to: :ecm_cms_page_content_blocks, prefix: true
   end
 end
-

data/app/models/ecm/cms/folder.rb

@@ -1,20 +1,19 @@
 class Ecm::Cms::Folder < ActiveRecord::Base
   # associations
   has_many :ecm_cms_pages,
-           :class_name => 'Ecm::Cms::Page',
-           :dependent => :destroy,
-           :foreign_key => 'ecm_cms_folder_id'
+           class_name: 'Ecm::Cms::Page',
+           dependent: :destroy,
+           foreign_key: 'ecm_cms_folder_id'
   has_many :ecm_cms_partials,
-           :class_name => 'Ecm::Cms::Partial',
-           :dependent => :destroy,
-           :foreign_key => 'ecm_cms_folder_id'
+           class_name: 'Ecm::Cms::Partial',
+           dependent: :destroy,
+           foreign_key: 'ecm_cms_folder_id'
   has_many :ecm_cms_templates,
-           :class_name => 'Ecm::Cms::Template',
-           :dependent => :destroy,
-           :foreign_key => 'ecm_cms_folder_id'
+           class_name: 'Ecm::Cms::Template',
+           dependent: :destroy,
+           foreign_key: 'ecm_cms_folder_id'
 
   # validations
-  validates :basename, :presence => true
-  validates :pathname, :presence => true
+  validates :basename, presence: true
+  validates :pathname, presence: true
 end
-

data/app/models/ecm/cms/navigation.rb

@@ -1,18 +1,19 @@
 class Ecm::Cms::Navigation < ActiveRecord::Base
   # associations
   has_many :ecm_cms_navigation_items,
-           :class_name => 'Ecm::Cms::NavigationItem',
-           :dependent => :destroy,
-           :foreign_key => 'ecm_cms_navigation_id'
+           class_name: 'Ecm::Cms::NavigationItem',
+           dependent: :destroy,
+           foreign_key: 'ecm_cms_navigation_id'
 
   # validations
-  validates :locale, :inclusion => I18n.available_locales.map(&:to_s),
-                     :allow_nil => true
-  validates :name, :presence => true,
-                   :uniqueness => { :scope => [ :locale ] }
+  validates :locale, inclusion: I18n.available_locales.map(&:to_s),
+                     allow_nil: true
+  validates :name, presence: true,
+                   uniqueness: { scope: [:locale] }
+
+  delegate :count, to: :ecm_cms_navigation_items, prefix: true
 
   def to_s
-    "#{self.name} (#{self.locale})"
+    "#{name} (#{locale})"
   end
 end
-

data/app/models/ecm/cms/navigation_item.rb

@@ -1,47 +1,49 @@
+require_dependency 'model/ecm/cms/navigation_item/properties_concern'
+
 module Ecm::Cms
   class NavigationItem < ActiveRecord::Base
-    include Properties
+    include Model::Ecm::Cms::NavigationItem::PropertiesConcern
 
     # associations
     belongs_to :ecm_cms_navigation,
-               :class_name => 'Ecm::Cms::Navigation',
-               :foreign_key => 'ecm_cms_navigation_id'
+               class_name: 'Ecm::Cms::Navigation',
+               foreign_key: 'ecm_cms_navigation_id'
     belongs_to :ecm_cms_page,
-               :class_name => 'Ecm::Cms::Page',
-               :foreign_key => 'ecm_cms_page_id'
+               class_name: 'Ecm::Cms::Page',
+               foreign_key: 'ecm_cms_page_id'
 
     # awesome nested set
-    acts_as_nested_set :dependent => :destroy, :counter_cache => :children_count, :scope => :ecm_cms_navigation_id
+    acts_as_nested_set dependent: :destroy, counter_cache: :children_count, scope: :ecm_cms_navigation_id
 
     # callbacks
-    before_validation :update_navigation_from_parent, :if => Proc.new { |ni| ni.child? }
-    before_validation :update_url_form_page, :if => Proc.new { |ni| ni.ecm_cms_page.present? && ni.url.blank? }
+    before_validation :update_navigation_from_parent, if: proc { |ni| ni.child? }
+    before_validation :update_url_form_page, if: proc { |ni| ni.ecm_cms_page.present? && ni.url.blank? }
     after_save :update_children_navigations!
 
     # default_scope
     default_scope { order(:ecm_cms_navigation_id, :lft) }
 
     # validations
-    validates :key, :presence => true
-    validates :name, :presence => true
-    validates :url, :presence => true
-    validates :ecm_cms_navigation, :presence => true, :if => :root?
+    validates :key, presence: true
+    validates :name, presence: true
+    validates :url, presence: true
+    validates :ecm_cms_navigation, presence: true, if: :root?
 
     def params_for_new_page
       return {} if self.new_record?
-      match = self.url.scan(/(#{I18n.available_locales.join('|')})$/)
-      return { :locale => match[0][0], :pathname => '/', :basename => 'home', :title => self.name, :ecm_cms_navigation_item_ids => [ self.to_param ] } if match.size > 0
-      match = self.url.scan(/(#{I18n.available_locales.join('|')})(.*)\/(.*)/)
+      match = url.scan(/(#{I18n.available_locales.join('|')})$/)
+      return { locale: match[0][0], pathname: '/', basename: 'home', title: name, ecm_cms_navigation_item_ids: [to_param] } if match.size > 0
+      match = url.scan(/(#{I18n.available_locales.join('|')})(.*)\/(.*)/)
       return {} unless match.first.respond_to?(:size) # && match.first.size != 3
       params = match.first
       return {} if params.size != 3
       params[1] << '/' unless params[1].end_with?('/')
-      return { :locale => params[0], :pathname => params[1], :basename => params[2], :title => self.name, :ecm_cms_navigation_item_ids => [ self.to_param ] }
+      { locale: params[0], pathname: params[1], basename: params[2], title: name, ecm_cms_navigation_item_ids: [to_param] }
     end
 
     def to_label
       if depth > 0
-      "#{'&nbsp;' * depth} &#9654; #{name}".html_safe
+        "#{'&nbsp;' * depth} &#9654; #{name}".html_safe
       else
         name
       end
@@ -57,7 +59,7 @@ module Ecm::Cms
     end
 
     def update_children_navigations!
-      self.descendants.map(&:"update_navigation_from_parent!")
+      descendants.map(&:"update_navigation_from_parent!")
     end
 
     def update_url_form_page!
@@ -77,7 +79,7 @@ module Ecm::Cms
     end
 
     def update_navigation_from_parent
-      self.ecm_cms_navigation = self.parent.ecm_cms_navigation
+      self.ecm_cms_navigation = parent.ecm_cms_navigation
     end
 
     def update_url_form_page
@@ -85,4 +87,3 @@ module Ecm::Cms
     end
   end
 end
-