ecm_cms2 1.1.1 → 2.0.2

data/app/models/ecm/cms/page/content_block.rb

@@ -1,19 +1,19 @@
 module Ecm::Cms
   class Page::ContentBlock < ActiveRecord::Base
     # associations
-    belongs_to :ecm_cms_content_box, :class_name => 'ContentBox',
-                                     :foreign_key => 'ecm_cms_content_box_id'
-    belongs_to :ecm_cms_page, :class_name => 'Ecm::Cms::Page',
-                              :foreign_key => 'ecm_cms_page_id'
+    belongs_to :ecm_cms_content_box, class_name: 'ContentBox',
+                                     foreign_key: 'ecm_cms_content_box_id'
+    belongs_to :ecm_cms_page, class_name: 'Ecm::Cms::Page',
+                              foreign_key: 'ecm_cms_page_id'
 
     # attributes
     attr_accessible(:body,
                     :ecm_cms_content_box_id) if Rails.version < '4.0.0'
 
     # validations
-    validates :body, :presence => true
-    validates :ecm_cms_content_box, :presence => true
-    validates :ecm_cms_page, :presence => true
+    validates :body, presence: true
+    validates :ecm_cms_content_box, presence: true
+    validates :ecm_cms_page, presence: true
     # validates :ecm_cms_page, :existence => true
 
     def content_box_name
@@ -21,4 +21,3 @@ module Ecm::Cms
     end
   end
 end
-

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

@@ -5,29 +5,29 @@ module Ecm::Cms
 
     # associations
     has_many :ecm_cms_navigation_items,
-             :class_name => 'NavigationItem',
-             :dependent => :nullify,
-             :foreign_key => 'ecm_cms_page_id'
+             class_name: 'NavigationItem',
+             dependent: :nullify,
+             foreign_key: 'ecm_cms_page_id'
     has_many :ecm_cms_page_content_blocks,
-             :class_name => 'Ecm::Cms::Page::ContentBlock',
-             :dependent => :destroy,
-             :foreign_key => 'ecm_cms_page_id',
-             :inverse_of => :ecm_cms_page
+             class_name: 'Ecm::Cms::Page::ContentBlock',
+             dependent: :destroy,
+             foreign_key: 'ecm_cms_page_id',
+             inverse_of: :ecm_cms_page
 
-    accepts_nested_attributes_for :ecm_cms_page_content_blocks, :allow_destroy => true
+    accepts_nested_attributes_for :ecm_cms_page_content_blocks, allow_destroy: true
 
     # callbacks
     after_save :touch_navigation_items # , :if => Proc.new { |page| page.locale_changed? || page.pathname_changed? || page.basename_changed? }
 
     # validations
-    validates :title, :presence => true
+    validates :title, presence: true
 
     def home_page?
-      return self.pathname == '/' && self.basename == 'home'
+      pathname == '/' && basename == 'home'
     end
 
     def touch_navigation_items
-      self.ecm_cms_navigation_items.map(&:update_url_form_page!)
+      ecm_cms_navigation_items.map(&:update_url_form_page!)
     end
   end
 end

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

@@ -5,12 +5,11 @@ class Ecm::Cms::Partial < ActiveRecord::Base
   include Ecm::Cms::DatabaseTemplate
 
   # callbacks
-  before_validation :ensure_basename_starts_with_underscore, :if => Proc.new { |t| t.basename.present? }
+  before_validation :ensure_basename_starts_with_underscore, if: proc { |t| t.basename.present? }
 
   private
 
   def ensure_basename_starts_with_underscore
-    self.basename.insert(0, '_') unless self.basename.start_with?('_')
+    basename.insert(0, '_') unless basename.start_with?('_')
   end
 end
-

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

@@ -4,16 +4,15 @@ class Ecm::Cms::Template < ActiveRecord::Base
 
   # associations
   belongs_to :ecm_cms_folder,
-             :class_name => 'Ecm::Cms::Folder',
-             :foreign_key => 'ecm_cms_folder_id'
+             class_name: 'Ecm::Cms::Folder',
+             foreign_key: 'ecm_cms_folder_id'
 
   # callbacks
-  before_validation :ensure_basename_starts_without_underscore, :if => Proc.new { |t| t.basename.present? }
+  before_validation :ensure_basename_starts_without_underscore, if: proc { |t| t.basename.present? }
 
   private
 
   def ensure_basename_starts_without_underscore
-    self.basename.slice!(0) if self.basename.start_with?('_')
+    basename.slice!(0) if basename.start_with?('_')
   end
 end
-

data/app/services/ecm/cms/add_homepages_service.rb

@@ -0,0 +1,61 @@
+module Ecm::Cms
+  class AddHomepagesService < Itsf::Services::V2::Service::Base
+    attr_accessor :locales
+
+    validates :locales, presence: true
+
+    def initialize(attributes = {})
+      attributes.reverse_merge!({ locales: I18n.available_locales })
+      attributes[:locales].try(:reject!, &:blank?)
+
+      super(attributes)
+
+      @all_pages              = []
+      @already_existent_pages = []
+      @failed_pages           = []
+      @created_pages          = []
+    end
+
+    def do_work
+      say "Environment: #{Rails.env}"
+      respond unless valid?
+      create_homepages
+      warn("Skipped #{@already_existent_pages.size} already existent pages for locales: #{@already_existent_pages.map(&:locale).join(', ')}", indent: 1) if @already_existent_pages.any?
+      info("Added #{@created_pages.size} new home pages for locales: #{@created_pages.map(&:locale).join(', ')}", indent: 1)
+      warn("Failed adding #{@failed_pages.size} new home pages for locales: #{@failed_pages.map(&:locale).join(', ')}", indent: 1) if @failed_pages.any?
+      respond
+    end
+
+    private
+
+    def create_homepages
+      @all_pages = @locales.collect do |locale|
+        say "Adding homepage for locale #{locale}", indent: 1
+        page = Ecm::Cms::Page.where(locale: locale, pathname: '/', basename: 'home', handler: 'textile').first_or_initialize
+        unless page.new_record?
+          @already_existent_pages << page
+          warn "already exists", indent: 2
+          next page
+        end 
+        page.tap do |page|
+          page.title            = "Homepage (#{locale})"
+          page.meta_description = 'home'
+          page.body             = "h1. Homepage (#{locale})"
+          page.pathname         = '/'
+          page.basename         = 'home'
+          page.locale           = locale
+          page.handler          = 'textile'
+        end
+        if page.save
+          @created_pages << page
+          info "done", indent: 1
+        else
+          @failed_pages << page
+          errors << page.errors
+          warn "could not save page. errors: #{page.errors.full_messages.to_sentence}"
+        end
+        page
+      end
+    end
+  end
+end

data/app/services/ecm/cms/import_partials_service.rb

@@ -1,6 +1,5 @@
 module Ecm::Cms
-  class ImportPartialsService
-
+  class ImportPartialsService < Itsf::Services::V2::Service::Base
     class PartialInFileSystem
       def initialize(filename, view_path)
         @filename = filename
@@ -8,7 +7,7 @@ module Ecm::Cms
       end
 
       def pathname
-        @pathname ||= File.dirname(relative_filename)
+        @pathname ||= "#{File.dirname(relative_filename)}/"
       end
 
       def basename
@@ -19,26 +18,18 @@ module Ecm::Cms
         locale = File.basename(relative_filename).split('.')[-3]
         if I18n.available_locales.map(&:to_s).include?(locale)
           @locale ||= locale
-        else
-          nil
         end
       end
 
       def format
         format = File.basename(relative_filename).split('.')[-2]
-        if Mime::SET.symbols.map(&:to_s).include?(format)
-          @format ||= format
-        else
-          nil
-        end
+        @format ||= format if Mime::SET.symbols.map(&:to_s).include?(format)
       end
 
       def handler
         handler = File.basename(relative_filename).split('.').last
         if ActionView::Template::Handlers.extensions.map(&:to_s).include?(handler)
           @handler ||= handler
-        else
-          nil
         end
       end
 
@@ -67,38 +58,56 @@ module Ecm::Cms
         @relative_filename ||= @filename.gsub(view_path.to_s, '')
       end
 
-      def view_path
-        @view_path
-      end
+      attr_reader :view_path
     end
 
-    def self.call(*args)
-      new(*args).do_work
-    end
+    attr_accessor :view_path, :force
 
-    def initialize(options = {})
-      options.reverse_merge!({ view_path: Rails.root.join(*%w(app views)) })
-      @view_path = options[:view_path]
+    validates :view_path, presence: true
+
+    def initialize(attributes = {})
+      attributes.reverse_merge!(view_path: Rails.root.join(*%w(app views)), force: false)
+      super(attributes)
     end
 
-    def do_work
-      puts "Environment: #{Rails.env}"
+    def do_work    
+      info "Environment: #{Rails.env}"
+      respond unless valid?
       @partials = load_partials
       partials_count = @partials.size
-      puts "Processing #{partials_count} partials in #{view_path}:"
+      info "Processing #{partials_count} partials in #{view_path}:"
       @partials.each_with_index do |partial, index|
-        puts "  (#{index + 1}/#{partials_count}) #{partial.human}"
-        partial = Partial.new(partial.to_partial_attributes_hash)
+        info "  (#{index + 1}/#{partials_count}) #{partial.human}"
+        attributes_hash = partial.to_partial_attributes_hash
+        partial = force ? find_or_initialize_partial(attributes_hash) : initialize_partial(attributes_hash)
+        new_record = partial.new_record?
+        partial.attributes = attributes_hash
         if partial.save
-          puts "    Created #{partial.human}"
+          info "    #{new_record ? 'Created' : 'Updated'} #{partial.human}"
         else
-          puts "    Could not create #{partial.human}. Errors: #{partial.errors.full_messages}"
+          info "    Could not #{new_record ? 'create' : 'update'} #{partial.human}. Errors: #{partial.errors.full_messages.to_sentence}"
         end
       end
+
+      respond
+    end
+
+    def force=(value)
+      @force =  ActiveRecord::Type::Boolean.new.type_cast_from_database(value)
     end
 
     private
 
+    def find_or_initialize_partial(attributes)
+      attributes = attributes.dup
+      attributes.compact!.delete(:body)
+      Partial.where(attributes).first_or_initialize
+    end
+
+    def initialize_partial(attributes)
+      Partial.new(attributes)
+    end
+
     def load_partials
       load_partials_absolute.collect { |file| PartialInFileSystem.new(file, view_path) }
     end
@@ -106,9 +115,5 @@ module Ecm::Cms
     def load_partials_absolute
       Dir.glob("#{view_path}/**/_*.*")
     end
-
-    def view_path
-      @view_path
-    end
   end
 end

data/config/locales/ecm.cms.de.yml

@@ -1,4 +1,7 @@
 de:
+  classes:
+    ecm/cms/add_homepages_service: 'Dienst zum hinzufügen von Homepages'
+    ecm/cms/import_partials_service: 'Dienst zum importieren von Fragmenten'
   ecm:
     cms:
       active_admin:

data/config/locales/ecm.cms.navigation.de.yml

@@ -8,6 +8,7 @@ de:
       ecm/cms/navigation:
         created_at: Erstellt am
         ecm_cms_navigation_items: Navigationseinträge
+        ecm_cms_navigation_items_count: Navigationseinträge
         locale: Sprache
         name: Name
         slug: Freundliche ID

data/config/locales/ecm.cms.navigation.en.yml

@@ -8,6 +8,7 @@ en:
       ecm/cms/navigation:
         created_at: created at
         ecm_cms_navigation_items: navigation items
+        ecm_cms_navigation_items_count: navigation items
         locale: language
         name: name
         slug: friendly id

data/config/locales/ecm.cms.page.de.yml

@@ -19,6 +19,7 @@ de:
         layout: Layout
         locale: Sprache
         meta_description: Meta Beschreibung
+        path_and_filename: Dateipfad
         pathname: Pfad
         title: Titel
         updated_at: Aktualisiert am

data/config/locales/ecm.cms.page.en.yml

@@ -19,6 +19,7 @@ en:
         layout: layout
         locale: language
         meta_description: meta description
+        path_and_filename: filepath
         pathname: path
         title: title
         updated_at: updated at

data/db/migrate/001_create_ecm_cms_folders.rb

@@ -5,8 +5,8 @@ class CreateEcmCmsFolders < ActiveRecord::Migration
       t.string :pathname
 
       # associations
-      t.integer :children_count, :default => 0, :null => false
-      t.integer :ecm_cms_templates_count, :default => 0, :null => false
+      t.integer :children_count, default: 0, null: false
+      t.integer :ecm_cms_templates_count, default: 0, null: false
 
       # awesome nested set
       t.references :parent

data/db/migrate/004_create_ecm_cms_partials.rb

@@ -9,7 +9,7 @@ class CreateEcmCmsPartials < ActiveRecord::Migration
       t.string :format
       t.string :handler
 
-      # associations      
+      # associations
       t.references :ecm_cms_folder
 
       t.timestamps

data/db/migrate/006_create_ecm_cms_navigation_items.rb

@@ -5,7 +5,7 @@ class CreateEcmCmsNavigationItems < ActiveRecord::Migration
       t.string :url
       t.string :key
       t.string :options
-      t.text   :properties, null: true
+      t.text :properties, null: true
 
       # associations
       t.references :ecm_cms_navigation

data/lib/ecm/cms/action_view/template/handlers/textile.rb

@@ -1,6 +1,5 @@
 module ActionView::Template::Handlers
   class Textile
-
     class_attribute :default_format
     self.default_format = Mime::HTML
 
@@ -12,7 +11,5 @@ module ActionView::Template::Handlers
       compiled_source = erb_handler.call(template)
       "RedCloth.new(begin;#{compiled_source};end).to_html.html_safe"
     end
-
   end
 end
-

data/lib/ecm/cms/action_view/template_patch.rb

@@ -1,13 +1,13 @@
 module ActionView
   module TemplatePatch
-    def self.included base
+    def self.included(base)
       base.class_eval do
         attr_accessor :layout
 
         alias_method :original_initialize, :initialize
 
         def initialize(source, identifier, handler, details)
-          @layout = details[:layout] if details.has_key?(:layout)
+          @layout = details[:layout] if details.key?(:layout)
           original_initialize(source, identifier, handler, details)
         end
       end
@@ -16,4 +16,3 @@ module ActionView
 end
 
 ActionView::Template.send(:include, ActionView::TemplatePatch)
-

data/lib/ecm/cms/action_view/template_renderer_patch.rb

@@ -1,6 +1,6 @@
 module ActionView
   module TemplateRendererPatch
-    def self.included base
+    def self.included(base)
       base.class_eval do
         alias_method :original_render, :render
         if Rails::VERSION::MAJOR < 4
@@ -26,14 +26,14 @@ module ActionView
             @view = context
             @details = extract_details(options)
             template = determine_template(options)
-            
+
             prepend_formats(template.formats)
-            
+
             @lookup_context.rendered_format ||= (template.formats.first || formats.first)
 
             layout = template.layout if template.respond_to?(:layout)
             layout ||= options[:layout]
-            
+
             render_template(template, layout, options[:locals])
           end
         end
@@ -42,6 +42,4 @@ module ActionView
   end
 end
 
-
 ActionView::TemplateRenderer.send(:include, ActionView::TemplateRendererPatch)
-

data/lib/ecm/cms/configuration.rb

@@ -14,7 +14,7 @@ module Ecm
       end
 
       mattr_accessor :default_handlers do
-        HashWithIndifferentAccess.new()
+        HashWithIndifferentAccess.new
       end
 
       mattr_accessor :site_title do

data/lib/ecm/cms/controller_extensions/page_resolver.rb

@@ -10,4 +10,3 @@ module Ecm
     end
   end
 end
-

data/lib/ecm/cms/controller_extensions/partial_resolver.rb

@@ -10,4 +10,3 @@ module Ecm
     end
   end
 end
-

data/lib/ecm/cms/controller_extensions/template_resolver.rb

@@ -10,4 +10,3 @@ module Ecm
     end
   end
 end
-

data/lib/ecm/cms/database_resolver.rb

@@ -15,29 +15,29 @@ module Ecm
         return [] unless resolve(partial)
 
         conditions = {
-          :pathname    => assert_slashs(prefix.to_s),
-          :basename    => normalize_basename(name),
-          :locale      => normalize_array(details[:locale]).first,
-          :format      => normalize_array(details[:formats]).first,
-          :handler     => normalize_array(details[:handlers])
+          pathname: assert_slashs(prefix.to_s),
+          basename: normalize_basename(name),
+          locale: normalize_array(details[:locale]).first,
+          format: normalize_array(details[:formats]).first,
+          handler: normalize_array(details[:handlers])
         }
 
         format = conditions.delete(:format)
         locale = conditions.delete(:locale)
-        
-        query  = self.template_class.constantize.where(conditions)
+
+        query  = template_class.constantize.where(conditions)
 
         # 2) Check for templates with the given format or format is nil
-        query = query.where(["format = ? OR format = ''", format])
+        query = query.where(["format = ? OR format = '' OR format IS NULL", format])
 
         # 3) Ensure templates with format come first
-        query = query.order("format DESC")
+        query = query.order('format DESC')
 
         # 4) Check for templates with the given locale or locale is nil
-        query = query.where(["locale = ? OR locale = ''", locale])
+        query = query.where(["locale = ? OR locale = '' OR locale IS NULL", locale])
 
         # 5) Ensure templates with locale come first
-        query = query.order("locale DESC")
+        query = query.order('locale DESC')
 
         # 6) Now trigger the query passing on conditions to initialization
         query.map do |record|
@@ -58,9 +58,9 @@ module Ecm
         format ||= details[:formats]
 
         details = {
-          :format => format,
-          :updated_at => record.updated_at,
-          :virtual_path => "#{record.pathname}#{record.basename}"
+          format: format,
+          updated_at: record.updated_at,
+          virtual_path: "#{record.pathname}#{record.basename}"
         }
 
         details[:layout] = record.layout if record.respond_to?(:layout) && record.layout.present?
@@ -72,7 +72,7 @@ module Ecm
         output = prefix.dup
         output << '/' unless output.end_with?('/')
         output = '/' << output unless output.start_with?('/')
-        return output
+        output
       end
 
       # Normalize arrays by converting all symbols to strings.
@@ -81,21 +81,20 @@ module Ecm
       end
 
       def build_source
-        raise "call to abstract method #build_source"
+        fail 'call to abstract method #build_source'
       end
 
-      def normalize_basename(basename)
-        raise "call to abstract method #normalize_basename"
+      def normalize_basename(_basename)
+        fail 'call to abstract method #normalize_basename'
       end
 
-      def resolve(partial_flag)
-        raise "call to abstract method #resolve"
+      def resolve(_partial_flag)
+        fail 'call to abstract method #resolve'
       end
 
       def template_class
-        raise "call to abstract method #template_class"
+        fail 'call to abstract method #template_class'
       end
     end
   end
 end
-

data/lib/ecm/cms/database_template.rb

@@ -6,8 +6,8 @@ module Ecm
 
         # associations
         base.belongs_to :ecm_cms_folder,
-                        :class_name => 'Ecm::Cms::Folder',
-                        :foreign_key => 'ecm_cms_folder_id'
+                        class_name: 'Ecm::Cms::Folder',
+                        foreign_key: 'ecm_cms_folder_id'
 
         # callbacks
         base.after_initialize :set_defaults
@@ -15,16 +15,16 @@ module Ecm
         base.after_save :clear_resolver_cache
 
         # validations
-        base.validates :basename, :presence => true,
-                                  :uniqueness =>  { :scope => [ :pathname, :locale, :format, :handler ] }
-        base.validates :handler, :inclusion => ActionView::Template::Handlers.extensions.map(&:to_s)
-        base.validates :locale, :inclusion => I18n.available_locales.map(&:to_s),
-                                :allow_nil => true,
-                                :allow_blank => true
-        base.validates :format, :inclusion => Mime::SET.symbols.map(&:to_s),
-                                :allow_nil => true,
-                                :allow_blank => true
-        base.validates :pathname, :presence => true
+        base.validates :basename, presence: true,
+                                  uniqueness: { scope: [:pathname, :locale, :format, :handler] }
+        base.validates :handler, inclusion: ActionView::Template::Handlers.extensions.map(&:to_s)
+        base.validates :locale, inclusion: I18n.available_locales.map(&:to_s),
+                                allow_nil: true,
+                                allow_blank: true
+        base.validates :format, inclusion: Mime::SET.symbols.map(&:to_s),
+                                allow_nil: true,
+                                allow_blank: true
+        base.validates :pathname, presence: true
       end
 
       module ClassMethods
@@ -49,8 +49,8 @@ module Ecm
       private
 
       def assert_trailing_slash_on_pathname
-        self.pathname = '/' and return if self.pathname.blank?
-        self.pathname << '/' unless self.pathname.end_with?('/')
+        self.pathname = '/' and return if pathname.blank?
+        pathname << '/' unless pathname.end_with?('/')
       end
 
       def clear_resolver_cache
@@ -59,12 +59,11 @@ module Ecm
       end
 
       def set_defaults
-        if self.new_record?
-          self.locale  ||= I18n.default_locale.to_s
-          self.handler ||= Ecm::Cms::Configuration.default_handlers[:page].to_s
+        if new_record?
+          self.locale ||= I18n.default_locale.to_s
+          self.handler ||= Ecm::Cms::Configuration.default_handlers[self.class.name.demodulize.underscore.to_sym].to_s
         end
       end
     end
   end
 end
-

data/lib/ecm/cms/engine.rb

@@ -2,27 +2,25 @@ module Ecm
   module Cms
     class Engine < ::Rails::Engine
       config.app_generators do |c|
-        c.test_framework :rspec, :fixture => true,
-                                 :fixture_replacement => nil
+        c.test_framework :rspec, fixture: true,
+                                 fixture_replacement: nil
 
         c.integration_tool :rspec
         c.performance_tool :rspec
       end
 
-      # active admin
       initializer :ecm_cms_engine do
         ::ActiveAdmin.setup do |config|
-          config.load_paths += Dir[File.dirname(__FILE__) + '/active_admin']
+          config.load_paths += Dir[root.join('app', 'admin')]
           config.register_stylesheet 'ecm_cms.css'
           config.register_javascript 'ecm_cms.js'
         end
-      end if defined?(::ActiveAdmin)
+      end if Gem::Specification.find_all_by_name('activeadmin').any?
 
-      initializer "ecm_cms.asset_pipeline" do |app|
+      initializer 'ecm_cms.asset_pipeline' do |app|
         app.config.assets.precompile << 'ecm_cms.js'
         app.config.assets.precompile << 'ecm_cms.css'
       end
     end
   end
 end
-