activeadmin-selleo-cms 0.0.14 → 0.0.16

data/app/models/activeadmin_selleo_cms/page.rb

@@ -1,5 +1,7 @@
 module ActiveadminSelleoCms
   class Page < ActiveRecord::Base
+    serialize :settings, Hash
+
     include ContentTranslation
 
     translates :title, :slug, :browser_title, :meta_keywords, :meta_description, fallbacks_for_empty_translations: true
@@ -13,21 +15,28 @@ module ActiveadminSelleoCms
     has_one :header_image, as: :assetable
     has_many :attachments, as: :assetable
     has_many :assets, as: :assetable
+    has_many :searches, as: :searchable
+    # ZUO
+    #has_many :translations, class_name: 'ActiveadminSelleoCms::Page::Translation', foreign_key: :activeadmin_selleo_cms_page_id, dependent: :destroy, before_add: :set_nest
 
     accepts_nested_attributes_for :translations, :sections, :children, :icon, :header_image, :attachments
 
     validates_format_of :link_url, with: /^http/i, allow_blank: false, if: ->(page) { page.is_link_url }
-    validates_presence_of :layout
-    validates_associated :translations, :sections
+    validates_presence_of :layout_name
+    # ZUO
+    #validates_associated :translations, :sections
 
     scope :show_in_menu, where(show_in_menu: true)
     scope :published, where(is_published: true)
     scope :not_published, where(is_published: false)
     scope :latest, ->(n) { published.reorder("published_at DESC").limit(n) }
     scope :most_read, ->(n) { published.reorder("views DESC").limit(n) }
+    scope :with_layout, ->(layout_name) { where(layout_name: layout_name) }
+    scope :with_setting_value, ->(key, value) { where("activeadmin_selleo_cms_pages.settings ~ '#{key}: #{value}'") }
 
     before_validation do
       self.slug = self.title.parameterize if title and slug.blank?
+      translations.each{ |translations| set_nest(translation)}
     end
 
     before_save do
@@ -37,7 +46,31 @@ module ActiveadminSelleoCms
     end
 
     after_initialize do
-      self.layout = Layout.all.first if new_record? and layout.blank?
+      self.layout_name = Layout.all.first if new_record? and layout_name.blank?
+    end
+
+    def set_nest(translation)
+      translation.activeadmin_selleo_cms_page ||= self
+    end
+
+    def method_missing(method, *args, &block)
+      _method = (method.to_s[/(.*)\=$/,1] || method).to_sym
+      unless (self.settings || {})[_method].nil?
+        eval "
+          def #{_method}
+            (self.settings || {})[:#{_method}]
+          end
+          def #{_method}=(val)
+            self.settings ||= {}
+            val = true if val == '1'
+            val = false if val == '0'
+            self.settings[:#{_method}] = val
+          end
+          "
+        send(method, *args)
+      else
+        super
+      end
     end
 
     def initialize_missing_sections
@@ -51,15 +84,15 @@ module ActiveadminSelleoCms
     end
 
     def section_names
-      begin
-        File.open(Dir.glob(File.join(Rails.root, "app/views/layouts/#{layout}.html*")).first).read.scan(/yield\s*\:(\w+)/).flatten
-      rescue
-        []
-      end
+      @section_names ||= layout.section_names
+    end
+
+    def layout
+      @layout ||= Layout.find(layout_name)
     end
 
     def to_param
-      slug
+      parent ? "#{parent.to_param}/#{slug}" : slug
     end
 
     def icon_url
@@ -78,11 +111,31 @@ module ActiveadminSelleoCms
       self_and_ancestors.map(&:title).join(' &raquo; ').html_safe
     end
 
+    def url(options={locale: true})
+      _url = if is_link_url
+        link_url
+      elsif redirect_to_first_sub_page and children.published.any?
+        "/:locale/#{children.published.first.to_param}"
+      else
+        "/:locale/#{to_param}"
+      end
+      _url = _url.gsub(':locale', I18n.locale.to_s) if _url.match(/:locale/) and options[:locale]
+      _url
+    end
+
     class Translation
       attr_protected :id
 
+      belongs_to :activeadmin_selleo_cms_page, class_name: 'ActiveadminSelleoCms::Page'
+
       validates :title, presence: true, if: ->(translation){ translation.locale.eql? I18n.locale }
-      validates :slug, presence: true, uniqueness: { scope: :locale}, format: { with: /^[a-z0-9\-_]+$/i }, if: ->(translation) { translation.locale.eql? I18n.locale }
+      validates :slug, presence: true, format: { with: /^[a-z0-9\-_]+$/i }, if: ->(translation) { translation.locale.eql? I18n.locale }
+      validate do |translation|
+        if slug.present? and translation.class.joins(:activeadmin_selleo_cms_page).
+            where(locale: locale, slug: slug, activeadmin_selleo_cms_pages: { parent_id: activeadmin_selleo_cms_page.parent_id }).all.reject{|p| p == self}.any?
+          errors.add(:slug, :taken)
+        end
+      end
     end
   end
 end

data/app/models/activeadmin_selleo_cms/section.rb

@@ -14,8 +14,24 @@ module ActiveadminSelleoCms
     validates_uniqueness_of :name, scope: [:sectionable_type, :sectionable_id]
     validates_associated :translations
 
+    scope :with_name, ->(section_name) { where(name: section_name) }
+    scope :blurbs, where("name ILIKE 'blurb.%'")
+    scope :help, where("name ILIKE 'help.%'")
+
+    def toolbar
+      case name
+        when /blurb\./ then "Easy"
+        when /help\./ then "Lite"
+        else "Easy"
+      end
+    end
+
     class Translation
       attr_protected :id
+
+      has_many :attachments, as: :assetable
+
+      accepts_nested_attributes_for :attachments
     end
   end
 end

data/app/views/admin/assets/destroy.js.erb

@@ -0,0 +1 @@
+$('li[data-asset-id="<%= @asset.id %>"]').remove();

data/app/views/admin/pages/_form.html.haml

@@ -7,11 +7,15 @@
   - @section_forms = []
 
   = form.inputs "General options" do
-    = form.input :layout, collection: ActiveadminSelleoCms::Layout.all, include_blank: false, hint: "The form will reload on change"
+    = form.input :layout_name, collection: ActiveadminSelleoCms::Layout.all.sort, include_blank: false, hint: "The form will reload on change"
     = form.input :parent_id, as: :select, collection: nested_set_options(ActiveadminSelleoCms::Page, @page) {|i| "#{'-' * i.level} #{i.title}" }
     = form.input :is_published, as: :boolean, input_html: { checked: @page.published_at.present? }
+    = form.input :redirect_to_first_sub_page, as: :boolean
     = form.input :is_link_url, as: :boolean, input_html: { checked: @page.link_url.present? }
     = form.input :link_url, hint: "Enter remote URL including the http part at the beginning"
+    - form.object.settings.keys.each do |key|
+      = form.input key.to_sym, as: determine_field_type(form.object.send(key))
+
 
   = form.semantic_fields_for :sections do |section_form|
     - if @page.section_names.include? section_form.object.name
@@ -37,20 +41,12 @@
       - else
         = ""
 
-  = form.inputs "Page icon", for: [:icon, form.object.icon || ActiveadminSelleoCms::Icon.new] do |icon_form|
-    = icon_form.input :data, label: "Icon", hint: (form.object.icon ? icon_form.template.image_tag(form.object.icon_url) : "No icon uploaded yet" )
-
-  = form.inputs "Header image", for: [:header_image, form.object.header_image || ActiveadminSelleoCms::HeaderImage.new] do |header_image_form|
-    = header_image_form.input :data, label: "Header image", hint: (form.object.header_image ? header_image_form.template.image_tag(form.object.header_image_url) : "No header image uploaded yet" )
-
-  = form.inputs "Attachments", for: [:attachments, ActiveadminSelleoCms::Attachment.new] do |attachment_form|
-    = attachment_form.input :data, label: "Attachment", input_html: { multiple: true, name: "page[attachments_attributes][][data]" }
-    - form.object.attachments.each do |attachment|
-      %li{"data-attachment-id" => attachment.id}
-        %label File
-        = attachment.data_file_name
-        = link_to_function "Delete", "delete_asset(#{@page.id}, #{attachment.id})"
+  - unless @page.new_record?
+    = form.inputs "Page icon", for: [:icon, form.object.icon || ActiveadminSelleoCms::Icon.new] do |icon_form|
+      = icon_form.input :data, label: "Icon", hint: (form.object.icon ? icon_form.template.image_tag(form.object.icon_url) : "No icon uploaded yet" )
 
+    = form.inputs "Header image", for: [:header_image, form.object.header_image || ActiveadminSelleoCms::HeaderImage.new] do |header_image_form|
+      = header_image_form.input :data, label: "Header image", hint: (form.object.header_image ? header_image_form.template.image_tag(form.object.header_image_url) : "No header image uploaded yet" )
 
   = form.actions do
     = form.action :submit
@@ -89,7 +85,7 @@
           is_link_url();
         });
 
-        $('select#page_layout').change(function(){
+        $('select#page_layout_name').change(function(){
           $(this).closest('form').find('input[name="_change_layout"]').attr('value','1');
           $(this).closest('form').submit();
         });

data/app/views/admin/pages/_translated_fields.html.haml

@@ -11,7 +11,17 @@
     - @section_forms.each do |section_form|
       = section_form.semantic_fields_for :translations do |section_form_translated|
         - if section_form_translated.object.locale.to_sym == locale.code
-          = section_form_translated.input :body, as: :ckeditor, label: "#{section_form.object.name.titleize} part", input_html: { toolbar: "Easy" }
+          - section = @page.layout.find_section(section_form.object.name)
+          = section_form_translated.input :body, as: section.type, label: "#{section_form.object.name.titleize} part", input_html: { toolbar: section.toolbar }
           = section_form_translated.input :locale, :as => :hidden, :label => false
+          - if !@page.new_record? and section.attachments
+            = section_form_translated.inputs "Attachments", for: [:attachments, ActiveadminSelleoCms::Attachment.new] do |attachment_form|
+              = attachment_form.input :data, label: "Attachment", input_html: { multiple: false }
+              - section_form_translated.object.attachments.each do |attachment|
+                %li{"data-asset-id" => attachment.id}
+                  %label File
+                  = attachment.data_file_name
+                  = link_to_function "Delete", "delete_asset(#{@page.id}, #{attachment.id})"
         - else
           = ""
+

data/app/views/admin/sections/_form.html.haml

@@ -0,0 +1,36 @@
+= semantic_form_for [:admin, @section], url: (@section.new_record? ? admin_sections_path : admin_section_path(@section.id)), html: { multipart: true } do |form|
+
+  = form.input :name, as: :hidden, label: false
+  - @section.initialize_missing_translations
+  - current_locale = ActiveadminSelleoCms::Locale.find_by_code(I18n.locale)
+
+  .language-tabs
+    %ul.language-selection
+      %li= link_to current_locale.name, "#lang-#{current_locale.code}"
+      - @section.translations.each do |translation|
+        - unless translation.locale == current_locale.code
+          - if additional_locale = ActiveadminSelleoCms::Locale.enabled.find_by_code(translation.locale)
+            %li= link_to additional_locale.name, "#lang-#{additional_locale.code}"
+          - else
+            = ""
+
+    = form.semantic_fields_for :translations do |translated_form|
+      - if additional_locale = ActiveadminSelleoCms::Locale.enabled.find_by_code(translated_form.object.locale)
+        %div{id: "lang-#{additional_locale.code}", style: "#{'display:none;' if additional_locale.code == current_locale.code}"}
+          = translated_form.inputs "#{additional_locale.name} translation" do
+            %ol
+              = translated_form.input :body, as: :ckeditor, input_html: { toolbar: @section.toolbar }
+              = translated_form.input :locale, as: :hidden, label: false
+      - else
+        = ""
+
+  = form.actions do
+    = form.action :submit
+    %li.cancel
+      = link_to I18n.t('active_admin.cancel'), admin_pages_path
+
+
+:javascript
+  $(function() {
+        $(".language-tabs").tabs();
+    });

data/app/views/pages/show.html.haml

@@ -0,0 +1,5 @@
+- @page.sections.each do |section|
+  - content_for section.name.to_sym do
+    = section.body.html_safe if section.body
+    - if current_user and current_user.respond_to? :admin? and current_user.admin?
+      %p= link_to t("active_admin.cms.edit"), edit_admin_page_path(@page.id)

data/config/initializers/active_admin.rb

@@ -10,3 +10,9 @@ ActiveAdmin.setup do |config|
 
   config.before_filter :set_admin_locale
 end
+
+module ActiveAdmin
+  class BaseController
+    with_role :admin
+  end
+end

data/config/initializers/i18n.rb

@@ -1,3 +1,5 @@
+I18n.default_locale = :en
+
 require "i18n/backend/fallbacks"
 I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
 

data/config/locales/cms.en.yml

@@ -2,4 +2,5 @@ en:
   active_admin:
     cms:
       view_on_site: "View on site"
-      sub_pages: "Sub pages"
+      sub_pages: "Sub pages"
+      edit: "Edit"

data/config/routes.rb

@@ -1,14 +1,23 @@
-ActiveadminSelleoCms::Engine.routes.draw do
+Rails.application.routes.draw do
   mount Ckeditor::Engine => '/ckeditor'
 
   scope ":locale", :locale => /\w{2}/ do
     scope "search" do
       resources :searches, path: '', only: [:show]
     end
-    resources :pages, path: '', only: [:show]
+    # TODO refactor
+    resources :pages, path: '', only: [:show, :index] do
+      resources :pages, path: '', only: [:show] do
+        resources :pages, path: '', only: [:show] do
+          resources :pages, path: '', only: [:show]
+        end
+      end
+    end
   end
 
   match ':locale' => 'pages#show'
 
   root to: 'pages#show'
-end
+
+  resources :locales, only: :show
+end

data/db/migrate/20121129142932_create_activeadmin_selleo_cms_pages.rb

@@ -5,7 +5,7 @@ class CreateActiveadminSelleoCmsPages < ActiveRecord::Migration
       t.integer :lft
       t.integer :rgt
       t.integer :depth
-      t.string :layout
+      t.string :layout_name
       t.boolean :show_in_menu, default: true
       t.boolean :is_published
       t.datetime :published_at

data/db/migrate/20130108153415_add_redirect_to_first_sub_page.rb

@@ -0,0 +1,10 @@
+class AddRedirectToFirstSubPage < ActiveRecord::Migration
+  def self.up
+    add_column :activeadmin_selleo_cms_pages, :redirect_to_first_sub_page, :boolean, default: false
+    execute "UPDATE activeadmin_selleo_cms_pages SET redirect_to_first_sub_page = false"
+  end
+
+  def self.down
+    remove_column :activeadmin_selleo_cms_pages, :redirect_to_first_sub_page
+  end
+end

data/db/migrate/20130109132745_add_fields_to_page.rb

@@ -0,0 +1,9 @@
+class AddFieldsToPage < ActiveRecord::Migration
+  def self.up
+    add_column :activeadmin_selleo_cms_pages, :settings, :text
+  end
+
+  def self.down
+    remove_column :activeadmin_selleo_cms_pages, :settings
+  end
+end

data/lib/activeadmin-selleo-cms/engine.rb

@@ -1,5 +1,9 @@
 module ActiveadminSelleoCms
   class Engine < ::Rails::Engine
     isolate_namespace ActiveadminSelleoCms
+    config.to_prepare do
+      ApplicationController.helper(PagesHelper)
+      DeviseController.helper(PagesHelper)
+    end
   end
 end

data/lib/activeadmin-selleo-cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.14"
+  VERSION = "0.0.16"
 end

data/lib/tasks/rebuild.rake

@@ -0,0 +1,20 @@
+namespace :db do
+  desc "Drops, creates and migrates db"
+
+  task(:rebuild => :environment) do
+    puts "Dropping db"
+    Rake::Task['db:drop'].invoke
+    puts "Creating db"
+    Rake::Task['db:create'].invoke
+    puts "Migrating db"
+    Rake::Task['db:migrate'].invoke
+    puts "Loading seeds"
+    Rake::Task['db:seed'].invoke
+    if Rails.env.test?
+      puts "Creating db snapshot"
+      excluded_tables = ["schema_migrations"].collect { |t| "-T #{t}" }.join(" ")
+      db_config = ActiveRecord::Base.configurations[ENV["RAILS_ENV"]]
+      `pg_dump -i -a -x #{excluded_tables} -O #{db_config["database"]} -p #{db_config["port"]} -f db/snapshots/test_database.sql`
+    end
+  end
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -8,11 +8,7 @@
 </head>
 <body>
 
-<%= yield :header %>
-
-<%= yield :content %>
-
-<%= yield :footer %>
+<%= yield %>
 
 </body>
 </html>

data/spec/dummy/app/views/layouts/cms.html.erb

@@ -14,13 +14,21 @@
   <% end %>
 </ul>
 
-<h1><%= yield :header %></h1>
+<h1>
+  <section name='header'>
+    <%= yield :header %>
+  </section>
+</h1>
 
-<%= yield :content %>
+<section name='content' data-type='ckeditor'>
+  <%= yield :content %>
+</section>
 
 <hr/>
 
-<%= yield :footer %>
+<section name='footer'>
+  <%= yield :footer %>
+</section>
 
 </body>
 </html>

data/spec/dummy/app/views/layouts/haml.html.haml

@@ -0,0 +1 @@
+!!!

data/spec/dummy/db/migrate/{20130103215140_create_activeadmin_selleo_cms_pages.activeadmin_selleo_cms.rb → 20130117150800_create_activeadmin_selleo_cms_pages.activeadmin_selleo_cms.rb}

@@ -6,7 +6,7 @@ class CreateActiveadminSelleoCmsPages < ActiveRecord::Migration
       t.integer :lft
       t.integer :rgt
       t.integer :depth
-      t.string :layout
+      t.string :layout_name
       t.boolean :show_in_menu, default: true
       t.boolean :is_published
       t.datetime :published_at