ecm_cms 0.0.13.pre → 1.0.0.pre

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

@@ -8,8 +8,7 @@ class Ecm::Cms::PageController < ApplicationController
   # avoid error 500 on missing template
   rescue_from ActionView::MissingTemplate do
     respond_to do |format|
-      # format.html { render(:file => "#{Rails.root}/public/404.html", :layout => false, :status => 404) }
-      format.html { render(:file => "#{Rails.root}/public/404", :formats => [:html], :status => 404, :layout => false) }
+      format.html { render(:file => "#{Rails.root}/public/404", :formats => [:html], :layout => false, :status => 404) }
       format.xml  { head :not_found }
       format.any  { head :not_found }
     end

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

@@ -0,0 +1,21 @@
+module Ecm::Cms
+  class ContentBox < ActiveRecord::Base
+    self.table_name = 'ecm_cms_content_boxes'
+
+    # associations
+    has_many :ecm_cms_page_content_blocks, :class_name => 'Page::ContentBlock',
+                                           :foreign_key => 'ecm_cms_content_box_id'
+
+    # attributes
+    attr_accessible :name
+
+    # validations
+    validates :name, :presence => true,
+                     :uniqueness => true
+
+    def ecm_cms_page_content_blocks_count
+      ecm_cms_page_content_blocks.count
+    end
+  end
+end
+

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

@@ -22,3 +22,4 @@ class Ecm::Cms::Navigation < ActiveRecord::Base
     "#{self.name} (#{self.locale})"
   end
 end
+

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

@@ -0,0 +1,24 @@
+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'
+
+    # attributes
+    attr_accessible :body,
+                    :ecm_cms_content_box_id
+
+    # validations
+    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
+      ecm_cms_content_box.name
+    end
+  end
+end
+

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

@@ -1,40 +1,48 @@
-class Ecm::Cms::Page < ActiveRecord::Base
-  self.table_name = 'ecm_cms_pages'
-
-  # add shared behaviour for database backed templates
-  include Ecm::Cms::DatabaseTemplate
-
-  # associations
-  has_many :ecm_cms_navigation_items,
-           :class_name => 'Ecm::Cms::NavigationItem',
-           :dependent => :nullify,
-           :foreign_key => 'ecm_cms_page_id'
-
-  # attributes
-  attr_accessible :basename,
-                  :body,
-                  :ecm_cms_folder_id,
-                  :ecm_cms_navigation_item_ids,
-                  :format,
-                  :handler,
-                  :layout,
-                  :locale,
-                  :meta_description,
-                  :pathname,
-                  :title
-
-  # callbacks
-  after_save :touch_navigation_items # , :if => Proc.new { |page| page.locale_changed? || page.pathname_changed? || page.basename_changed? }
-
-  # validations
-  validates :title, :presence => true
-
-  def home_page? 
-    return self.pathname == '/' && self.basename == 'home'
-  end
-
-  def touch_navigation_items
-    self.ecm_cms_navigation_items.map(&:update_url_form_page!)
+module Ecm::Cms
+  class Page < ActiveRecord::Base
+    self.table_name = 'ecm_cms_pages'
+
+    # add shared behaviour for database backed templates
+    include DatabaseTemplate
+
+    # associations
+    has_many :ecm_cms_navigation_items,
+             :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          
+
+    # attributes
+    attr_accessible :basename,
+                    :body,
+                    :ecm_cms_folder_id,
+                    :ecm_cms_navigation_item_ids,
+                    :ecm_cms_page_content_blocks_attributes,
+                    :format,
+                    :handler,
+                    :layout,
+                    :locale,
+                    :meta_description,
+                    :pathname,
+                    :title
+    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
+
+    def home_page? 
+      return self.pathname == '/' && self.basename == 'home'
+    end
+
+    def touch_navigation_items
+      self.ecm_cms_navigation_items.map(&:update_url_form_page!)
+    end
   end
 end
-

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

@@ -0,0 +1,16 @@
+---
+de:
+  activerecord:
+    models:
+      ecm/cms/content_box:
+        one: Content Box
+        other: Content Boxen
+    attributes:
+      ecm/cms/content_box:
+        name: Name
+        body: Inhalt
+        created_at: Erstellt am
+        ecm_cms_page_content_blocks: Content Blöcke
+        ecm_cms_page_content_blocks_count: Content Blöcke
+        updated_at: Aktualisiert am
+

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

@@ -0,0 +1,16 @@
+---
+en:
+  activerecord:
+    models:
+      ecm/cms/content_box:
+        one: content box
+        other: content boxes
+    attributes:
+      ecm/cms/content_box:
+        name: name
+        body: body
+        created_at: created at
+        ecm_cms_page_content_blocks: content blocks
+        ecm_cms_page_content_blocks_count: content blocks
+        updated_at: updated at
+

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

@@ -0,0 +1,15 @@
+---
+de:
+  activerecord:
+    models:
+      ecm/cms/page/content_block:
+        one: Content Block
+        other: Content Blöcke
+    attributes:
+      ecm/cms/page/content_block:
+        body: Inhalt
+        created_at: Erstellt am
+        ecm_cms_page: Seite
+        ecm_cms_content_box: Content Box
+        updated_at: Aktualisiert am
+

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

@@ -0,0 +1,15 @@
+---
+en:
+  activerecord:
+    models:
+      ecm/cms/page/content_block:
+        one: content block
+        other: content blocks
+    attributes:
+      ecm/cms/page/content_block:
+        body: body
+        created_at: created at
+        ecm_cms_page: page
+        ecm_cms_content_box: content box
+        updated_at: udpated at
+

data/db/migrate/007_create_ecm_cms_content_boxes.rb

@@ -0,0 +1,9 @@
+class CreateEcmCmsContentBoxes < ActiveRecord::Migration
+  def change
+    create_table :ecm_cms_content_boxes do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/008_create_ecm_cms_page_content_blocks.rb

@@ -0,0 +1,15 @@
+class CreateEcmCmsPageContentBlocks < ActiveRecord::Migration
+  def change
+    create_table :ecm_cms_page_content_blocks do |t|
+      t.text :body
+
+      # associations
+      t.references :ecm_cms_page
+      t.references :ecm_cms_content_box
+
+      t.timestamps
+    end
+    add_index :ecm_cms_page_content_blocks, :ecm_cms_page_id
+    add_index :ecm_cms_page_content_blocks, :ecm_cms_content_box_id
+  end
+end

data/lib/ecm/cms/active_admin/ecm_cms_content_box.rb

@@ -0,0 +1,32 @@
+ActiveAdmin.register Ecm::Cms::ContentBox do
+  # Menu
+  menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call
+
+  index do
+    selectable_column
+    column :name
+    column :created_at
+    column :updated_at    
+    default_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|
+        column :ecm_cms_page
+        column :body
+        column :created_at
+        column :updated_at
+      end
+    end
+  end
+
+  sidebar Ecm::Cms::ContentBox.human_attribute_name(:details), :only => :show do
+    attributes_table_for ecm_cms_content_box do
+      row :name
+      row :created_at
+      row :updated_at
+      row :ecm_cms_page_content_blocks_count
+    end
+  end # sidebar
+end

data/lib/ecm/cms/active_admin/ecm_cms_navigation_items.rb

@@ -7,7 +7,7 @@ ActiveAdmin.register Ecm::Cms::NavigationItem do
 
   form do |f|
     f.inputs do
-      f.input :ecm_cms_navigation
+      f.input :ecm_cms_navigation, :collection => Ecm::Cms::Navigation.all.collect { |navigation| [navigation.to_s, navigation.id] }
       f.input :parent
       f.input :name      
     end
@@ -28,7 +28,7 @@ ActiveAdmin.register Ecm::Cms::NavigationItem do
   index :as => :nested_set do
     selectable_column
     sortable_tree_columns
-    column :ecm_cms_navigation
+    column(:ecm_cms_navigation) { |ni| link_to(ni.ecm_cms_navigation.to_s, [:admin, ni.ecm_cms_navigation]) } 
     column :name
     column :url
     column :ecm_cms_page do |ni|

data/lib/ecm/cms/active_admin/ecm_cms_pages.rb

@@ -3,12 +3,27 @@ ActiveAdmin.register Ecm::Cms::Page do
   menu :parent => Proc.new { I18n.t('ecm.cms.active_admin.menu') }.call
 
   form do |f|
+#    f.inputs do
+#      f.object.errors.inspect
+#    end
+
     f.inputs do
       f.input :title
       f.input :meta_description
       f.input :body
     end
 
+    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
+
+        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
@@ -58,6 +73,12 @@ ActiveAdmin.register Ecm::Cms::Page do
     panel Ecm::Cms::Page.human_attribute_name(:body) do
       pre { ecm_cms_page.body }
     end
+
+    ecm_cms_page.ecm_cms_page_content_blocks.each do |content_block|
+      panel content_block.content_box_name do
+        pre { content_block.body }
+      end
+    end
   end
 
   sidebar Ecm::Cms::Page.human_attribute_name(:details), :only => :show do

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

@@ -10,14 +10,22 @@ module Ecm
       include Ecm::Cms::DatabaseResolver
 
       def build_source(record)
-        if record.body.nil?
-          source = '' 
-        else
-          source = record.body
+        output = ''
+        record.ecm_cms_page_content_blocks.each do |content_block|
+          # rendered_body = RedCloth.new(begin;content_block.body;end).to_html.html_safe
+          rendered_body = RedCloth.new(content_block.body).to_html
+          output << "<% content_for :#{content_block.content_box_name} do %>#{rendered_body}<% end %>"
         end
+
         content_for_title = "<% content_for :title do %>#{record.title}<% end %>"
         content_for_meta_description = "<% content_for :meta_description do %>#{record.meta_description}<% end %>"
-        source << content_for_title << content_for_meta_description
+        output << content_for_title << content_for_meta_description
+        
+        unless record.body.nil?
+          output << record.body
+        end
+
+        return output
       end
 
       def normalize_basename(basename)

data/lib/ecm/cms/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Cms
-    VERSION = "0.0.13.pre"
+    VERSION = "1.0.0.pre"
   end  
 end

data/lib/generators/ecm/cms/locales/locales_generator.rb

@@ -10,6 +10,9 @@ module Ecm
           copy_file "ecm.cms.en.yml", "config/locales/ecm.cms.en.yml"
           copy_file "ecm.cms.de.yml", "config/locales/ecm.cms.de.yml"
 
+          copy_file "ecm.cms.content_box.en.yml", "config/locales/ecm.cms.content_box.en.yml"
+          copy_file "ecm.cms.content_box.de.yml", "config/locales/ecm.cms.content_box.de.yml"
+
           copy_file "ecm.cms.navigation.en.yml", "config/locales/ecm.cms.navigation.en.yml"
           copy_file "ecm.cms.navigation.de.yml", "config/locales/ecm.cms.navigation.de.yml"
 
@@ -19,6 +22,9 @@ module Ecm
           copy_file "ecm.cms.page.en.yml", "config/locales/ecm.cms.page.en.yml"
           copy_file "ecm.cms.page.de.yml", "config/locales/ecm.cms.page.de.yml"
 
+          copy_file "ecm.cms.page.content_block.en.yml", "config/locales/ecm.cms.page.content_block.en.yml"
+          copy_file "ecm.cms.page.content_block.de.yml", "config/locales/ecm.cms.page.content_block.de.yml"
+
           copy_file "ecm.cms.partial.en.yml", "config/locales/ecm.cms.partial.en.yml"
           copy_file "ecm.cms.partial.de.yml", "config/locales/ecm.cms.partial.de.yml"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ecm_cms
 version: !ruby/object:Gem::Version 
-  hash: 961916016
-  prerelease: 7
+  hash: 961915988
+  prerelease: 6
   segments: 
+  - 1
   - 0
   - 0
-  - 13
   - pre
-  version: 0.0.13.pre
+  version: 1.0.0.pre
 platform: ruby
 authors: 
 - Roberto Vasquez Angel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-07 00:00:00 Z
+date: 2013-03-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
         - 3
         - 2
-        - 11
-        version: 3.2.11
+        - 12
+        version: 3.2.12
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -175,7 +175,7 @@ dependencies:
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: activeadmin
+  name: coffee-rails
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -217,7 +217,7 @@ dependencies:
   type: :development
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: coffee-rails
+  name: therubyracer
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
@@ -231,7 +231,7 @@ dependencies:
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: therubyracer
+  name: twitter-bootstrap-rails
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -245,7 +245,7 @@ dependencies:
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: twitter-bootstrap-rails
+  name: capybara
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
@@ -259,7 +259,7 @@ dependencies:
   type: :development
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: rspec-rails
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
@@ -273,7 +273,7 @@ dependencies:
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: shoulda-matchers
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
@@ -286,24 +286,10 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id019
-- !ruby/object:Gem::Dependency 
-  name: shoulda-matchers
-  prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: factory_girl_rails
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -314,27 +300,26 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
-  version_requirements: *id021
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rb-inotify
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 25
         segments: 
         - 0
-        - 8
-        - 8
-        version: 0.8.8
+        - 9
+        version: "0.9"
   type: :development
-  version_requirements: *id022
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -344,11 +329,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id023
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: guard-bundler
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -358,7 +343,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id024
+  version_requirements: *id023
 description: CMS Module for active admin.
 email: 
 - roberto@vasquez-angel.de
@@ -374,12 +359,15 @@ files:
 - app/models/ecm/cms.rb
 - app/models/ecm/cms/navigation_item.rb
 - app/models/ecm/cms/partial.rb
+- app/models/ecm/cms/page/content_block.rb
 - app/models/ecm/cms/navigation.rb
 - app/models/ecm/cms/page.rb
+- app/models/ecm/cms/content_box.rb
 - app/models/ecm/cms/folder.rb
 - app/models/ecm/cms/template.rb
 - app/assets/stylesheets/ecm_cms.css.less
 - config/locales/ecm.cms.page.en.yml
+- config/locales/ecm.cms.content_box.de.yml
 - config/locales/ecm.cms.partial.en.yml
 - config/locales/ecm.cms.template.de.yml
 - config/locales/ecm.cms.navigation_item.de.yml
@@ -390,11 +378,16 @@ files:
 - config/locales/ecm.cms.navigation.de.yml
 - config/locales/ecm.cms.navigation.en.yml
 - config/locales/ecm.cms.navigation_item.en.yml
+- config/locales/ecm.cms.content_box.en.yml
 - config/locales/ecm.cms.partial.de.yml
+- config/locales/ecm.cms.page.content_block.en.yml
+- config/locales/ecm.cms.page.content_block.de.yml
 - db/migrate/005_create_ecm_cms_navigations.rb
 - db/migrate/003_create_ecm_cms_templates.rb
 - db/migrate/001_create_ecm_cms_folders.rb
 - db/migrate/002_create_ecm_cms_pages.rb
+- db/migrate/008_create_ecm_cms_page_content_blocks.rb
+- db/migrate/007_create_ecm_cms_content_boxes.rb
 - db/migrate/004_create_ecm_cms_partials.rb
 - db/migrate/006_create_ecm_cms_navigation_items.rb
 - lib/rails_tools/i18n_controller.rb
@@ -412,6 +405,7 @@ files:
 - lib/ecm/cms/active_admin/ecm_cms_navigation_items.rb
 - lib/ecm/cms/active_admin/ecm_cms_pages.rb
 - lib/ecm/cms/active_admin/ecm_cms_navigations.rb
+- lib/ecm/cms/active_admin/ecm_cms_content_box.rb
 - lib/ecm/cms/active_admin/ecm_cms_templates.rb
 - lib/ecm/cms/resolvers/ecm/cms/page_resolver.rb
 - lib/ecm/cms/resolvers/ecm/cms/template_resolver.rb