cardboard_cms 0.2.2 → 0.3.1

data/app/models/cardboard/field/rich_text.rb

@@ -1,7 +1,7 @@
 module Cardboard
   class Field::RichText < Field
     validate :is_required
-    before_save :sanitize_value
+    # before_save :sanitize_value
 
     def value
       self.value_uid.try(:html_safe)
@@ -13,10 +13,10 @@ module Cardboard
 
     private
     
-    def sanitize_value
-      return nil unless value_changed?
-      self.value = ActionController::Base.helpers.sanitize(self.value, :tags => %w(strong b i u em br p div span ul ol li a pre code blockquote h1 h2 h3), :attributes => %w(class style href src width height alt))
-    end
+    # def sanitize_value
+    #   return nil unless value_changed?
+    #   self.value = ActionController::Base.helpers.sanitize(self.value, :tags => %w(strong b i u em br p div span ul ol li a pre code blockquote h1 h2 h3 table), :attributes => %w(class style href src width height alt))
+    # end
 
     def is_required
       errors.add(:value, "is required") if required_field? && ActionController::Base.helpers.strip_tags(value_uid).blank?

data/app/models/cardboard/page.rb

@@ -1,38 +1,32 @@
 module Cardboard
   class Page < ActiveRecord::Base
-
     has_many :parts, class_name: "Cardboard::PagePart", :dependent => :destroy, :validate => true
 
     belongs_to :template, class_name: "Cardboard::Template"
       
-    attr_accessor :parent_url, :is_root
+    attr_accessor :parent_url
 
     accepts_nested_attributes_for :parts, allow_destroy: true, :reject_if => :all_blank
     # TODO: allow destroy and allow all blank only if repeatable
 
-    serialize :meta_seo, Hash
-    serialize :slugs_backup, Array
-
-    before_validation :default_values
-    before_save :update_slugs_backup
-
-    #gems
-    acts_as_url :title, :url_attribute => :slug, :scope =>  :path, only_when_blank: true
-
+    include UrlConcern
     include RankedModel
-    ranks :position, :with_same => :path
+    ranks :position
 
     #validations
-    # validates_associated :parts
-    validates :title, :path, :template, presence:true
-    validates :slug, uniqueness: { :case_sensitive => false, :scope => :path }, presence: true
+    validates :title, :template, presence:true
     validates :identifier, uniqueness: {:case_sensitive => false}, :format => { :with => /\A[a-z\_0-9]+\z/,
                            :message => "Only downcase letters, numbers and underscores are allowed" }, presence: true
-    #validate all seo keys are valid meta keys + title
 
     #scopes
-    scope :preordered, -> {order("path ASC, position ASC, slug ASC")} 
+    scope :preordered, -> {joins(:url_object).order("cardboard_urls.path ASC, position ASC, cardboard_urls.slug ASC")} 
+    scope :with_path,  -> (p) {joins(:url_object).where("cardboard_urls.path = ?",p) }
+
+
+    # Hooks
+    before_validation :default_values
 
+    #delegates
 
     #class variables
     after_commit do
@@ -40,51 +34,34 @@ module Cardboard
     end
 
     #overwritten setters/getters
-    def slug=(value)
-      # the user can overwrite the auto generated slug
-      self[:slug] = value.present? ? value.to_url : nil
-    end
 
-    def is_root=(val)
-      self.position_position = :first if val
+    def self.root
+      #TODO: check that join work correctly
+      with_path('/').rank(:position).first
     end
+    def self.homepage; self.root; end
 
-    def using_slug_backup?
-      @using_slug_backup || false
+    def root?
+      return @root unless @root.nil?
+      @root = self.id == Page.root.id
     end
 
-    def using_slug_backup=(value)
-      @using_slug_backup = value
+    def meta_seo=(hash)
+      self.meta_tags = meta_tags.merge(hash)
+    end
+    def meta_seo
+      meta_tags.slice("description", "title")
     end
 
     #class methods
     def self.find_by_url(full_url)
-      return nil unless full_url
-      path, slug = self.path_and_slug(full_url)
-      page = self.where(path: path, slug: slug).first
-
-      if slug && page.nil?
-        #use arel instead of LIKE/ILIKE
-        page = self.where(path: path).where(self.arel_table[:slugs_backup].matches("% #{slug}\n%")).first
-        page.using_slug_backup = true if page
-      end
-
-      page
+      Cardboard::Url.urlable_for(full_url, type: self.name)
     end
 
-    def self.root
-      # Homepage is the highest position in the root path
-      where(path: "/").rank(:position).first
-    end
-    def self.homepage; self.root; end
-
-    def root?
-      @root_id ||= Page.root.id
-      @root_id == self.id
-    end
 
     #instance methods
 
+
     def template_hash
       @template_hash ||= self.template.fields
     end
@@ -128,14 +105,8 @@ module Cardboard
       self.meta_seo = hash.to_hash
       @_seo = nil
     end
-    
-    def url
-      return "/" if slug.blank? #|| self.root?
-      "#{path}#{slug}/"
-    end
 
     def split_path
-      # path.sub(/^\//,'').split("/") # "/path/" => ["path"]
       path[1..-1].split("/")
     end
 
@@ -172,11 +143,11 @@ module Cardboard
     end
 
     def children
-      Cardboard::Page.where(path: url)
+      Cardboard::Page.with_path(url)
     end
 
     def siblings
-      Cardboard::Page.where("path = ? AND id != ?", path, id)
+      Cardboard::Page.with_path(path).where("cardboard_pages.id != ?", id)
     end
 
     def depth
@@ -218,25 +189,12 @@ module Cardboard
       Rails.cache.delete("arranged_pages")
     end
 
-  # def to_param
-  #   "#{id}-#{slug}"
-  # end  
-
   private
-    def self.path_and_slug(full_url)
-      *path, slug = full_url.sub(/^\//, '').split('/')
-      [path.blank? ? '/' : "/#{path.join('/')}/", slug]
-    end
-
-
-    def update_slugs_backup
-      return nil if !self.slug_changed? || self.slug_was.nil?
-      self.slugs_backup |= [self.slug_was] #Yes, that's a single pipe...
-    end
 
     def default_values
-      self.path  ||= '/'
-      self.title ||= self.identifier.parameterize("_")
+      self.title ||= self.identifier.try(:parameterize, "_")
+      self.path ||=  "/"
+      self.slug = self.title.try(:to_url) if self.slug.blank?
     end
   end
 end

data/app/models/cardboard/setting.rb

@@ -1,7 +1,5 @@
 module Cardboard
   class Setting < ActiveRecord::Base
-    # self.table_name = "cardboard_settings"
-    # attr_accessible :name, :fields_attributes
 
     has_many :fields, :as => :object_with_field
     accepts_nested_attributes_for :fields, :allow_destroy => true

data/app/models/cardboard/template.rb

@@ -7,6 +7,11 @@ module Cardboard
 
     validates :identifier, uniqueness: {:case_sensitive => false}, :format => { :with => /\A[a-z\_0-9]+\z/,
                            :message => "Only downcase letters, numbers and underscores are allowed" }
+    
+    after_save :reload_routes
+    def reload_routes
+      DynamicRouter.reload
+    end
 
     def name
       self[:name] || self.identifier

data/app/models/cardboard/url.rb

@@ -0,0 +1,91 @@
+module Cardboard
+  class Url < ActiveRecord::Base
+    belongs_to :urlable, polymorphic: true
+
+    serialize :slugs_backup, Array
+    serialize :meta_tags, Hash
+
+    before_save :update_slugs_backup
+
+    validates :path, presence: true
+    validates :slug, uniqueness: { :case_sensitive => false, :scope => :path }, presence: true
+
+    after_save :reload_routes
+
+    # TODO: Should we use the homepage boolean?
+    # before_save :update_homepage
+    # def update_homepage
+    #   return unless homepage_changed?
+    #   self.class.where('id != ? AND homepage', self.id).update_all(homepage: false)
+    # end
+
+    def self.urlable_for(full_url, options = {})
+      #TODO: refactor
+      return nil unless full_url
+      path, slug = self.path_and_slug(full_url)
+      url_hash = {path: path, slug: slug}
+      url_hash.merge!(urlable_type: options[:type]) if options[:type]
+
+      page = self.where(url_hash).first
+
+      if slug && page.nil?
+        #use arel instead of LIKE/ILIKE
+        page = self.where(path: path).where(self.arel_table[:slugs_backup].matches("% #{slug}\n%")).where(urlable_type: options[:type]).first
+        page.using_slug_backup = true if page
+      end
+
+      page.try(:urlable)
+    end
+
+    def slug=(value)
+      # the user can overwrite the auto generated slug
+      self[:slug] = value.present? ? value.to_url : nil
+    end
+
+    def path=(value)
+      return if value.nil?
+      value = value.gsub(/\//, '')
+      self[:path] = value.blank?? "/" : "/#{value}/"
+    end
+
+    def using_slug_backup?
+      @using_slug_backup || false
+    end
+
+    def using_slug_backup=(value)
+      @using_slug_backup = value
+    end
+
+    def slugs_backup=(value)
+      if value.is_a?(String)
+        self[:slugs_backup] = value.split(",").map(&:strip)
+      else
+        self[:slugs_backup] = value
+      end
+    end
+
+    def to_s
+      return "/" if slug.blank?
+      "#{path}#{slug}/"
+    end
+
+  private
+
+    def reload_routes
+      DynamicRouter.reload
+    end
+
+    def self.path_and_slug(full_url)
+      *path, slug = full_url.sub(/^\//, '').split('/')
+      [path.blank? ? '/' : "/#{path.join('/')}/", slug]
+    end
+
+
+    def update_slugs_backup
+      return nil if !self.slug_changed? || self.slug_was.nil?
+      self.slugs_backup |= [self.slug_was] #Yes, that's a single pipe...
+      self.slugs_backup = slugs_backup - [self.slug] #in case we are going back to a link that was in the backup
+    end
+
+  end
+end

data/app/views/cardboard/pages/_sidebar.html.slim

@@ -1,6 +1,6 @@
 form class="form-inline"
   - if Cardboard.used_with_templates?
-    => link_to pages_new_path, class:"btn btn-primary" do
+    => link_to new_page_path, class:"btn btn-primary" do
       i.icon-plus
 
   .input-append style=(Cardboard.used_with_templates?? "width: 160px" : nil)

data/app/views/layouts/cardboard/_main_topbar.html.slim

@@ -3,7 +3,7 @@
   #cardboard_logo CB
   
   = link_to main_app.root_path, id: "brand" do
-    = Cardboard::Setting.company_name || Cardboard.application.site_title
+    = Cardboard::Setting.company_name rescue Cardboard.application.site_title
 
   ul.nav.pull-right
 

data/cardboard.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
   s.summary     = "Rails CMS made simple"
   s.description = "Rails CMS made simple"
 
+  s.required_ruby_version = ">= 1.9.3"
+
   # s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.files         = `git ls-files`.split("\n").sort - %w(.rvmrc .gitignore)
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -28,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-rails"
   s.add_dependency 'bootstrap-sass', '~> 2.2'
   s.add_dependency 'bootstrap-datepicker-rails'
-  s.add_dependency 'bootstrap-wysihtml5-rails'
+  s.add_dependency 'bootstrap-wysihtml5-rails', '~> 0.3.1.24'
   s.add_dependency 'kaminari-bootstrap', '~> 0.1.3'
   s.add_dependency 'font-awesome-sass-rails',  '>= 3.0.0.1'
   s.add_dependency 'simple_form', '>= 3.0.0'
@@ -43,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'ransack', '>= 1.0.0'
   s.add_dependency 'turbolinks'
   s.add_dependency 'decorators'
-  s.add_dependency 'jquery-ui-rails'
+  s.add_dependency 'jquery-ui-rails', '~> 5.0.0'
   s.add_dependency 'select2-rails'
 
   s.add_development_dependency "guard-minitest"

data/config/routes.rb

@@ -4,10 +4,7 @@ Cardboard::Engine.routes.draw do
   get "my_account", to: "my_account#edit"
   patch "my_account", to: "my_account#update"
 
-  get "pages/new", to: "pages#new"
   post "pages/sort", to: "pages#sort"
-  get "pages/:id", to: "pages#edit"
-  
   resources :pages
 
   get "/yoda", to: "super_user#index"
@@ -15,10 +12,8 @@ Cardboard::Engine.routes.draw do
   get "/settings", to: "settings#index"
   patch "/settings/update", to: "settings#update", as: "setting"
 
-  get "/", to: "dashboard#index", as: "dashboard"
-  #Don't put a root path here, use "/" instead... (to be able to use root_path in the pages)
+  get "/", to: "dashboard#index", as: "dashboard" #Don't put a root path here
 
-  
   scope as: 'cardboard' do
     #generate routes for custom cardboard resources controllers
     Cardboard.resource_controllers.each do |controller|
@@ -36,15 +31,9 @@ Cardboard::Engine.routes.draw do
 end
 
 # Routes for public pages
-Rails.application.routes.draw do
-  scope  :constraints => { :format => 'html' } do #:format => true,
-    get "*id", to: "pages#show"
-  end
-
-  root :to => "pages#show" unless @set.named_routes.routes[:root] #has_named_route?
-end
-
+Cardboard::DynamicRouter.load
 
+#legacy support
 Rails.application.routes.named_routes.module.module_eval do
   def page_path(identifier, options = {})
     url = Cardboard::Page.where(identifier: identifier.to_s).first.try(:url)

data/db/migrate/1_create_cardboard.rb

@@ -27,9 +27,6 @@ class CreateCardboard < ActiveRecord::Migration
     #Pages
     create_table :cardboard_pages do |t|
       t.string :title
-      t.string :path
-      t.string :slug
-      t.text :slugs_backup
       t.integer :position
       t.text :meta_seo
       t.boolean :in_menu, default: true
@@ -38,7 +35,6 @@ class CreateCardboard < ActiveRecord::Migration
 
       t.timestamps
     end
-    add_index :cardboard_pages, [:path, :slug], :unique => true
     add_index :cardboard_pages, :identifier, :unique => true
 
     #Settings
@@ -57,7 +53,20 @@ class CreateCardboard < ActiveRecord::Migration
       t.text :fields
       t.string :identifier
       t.boolean :is_page
+      t.string :controller_action
+      t.timestamps
+    end
+    add_index :cardboard_templates, :identifier, :unique => true
+
+    create_table :cardboard_urls do |t|
+      t.string :slug, index: true
+      t.string :path, index: true
+      t.text :slugs_backup
+      t.text :meta_tags
+      t.references :urlable,  polymorphic: true
+
       t.timestamps
     end
+    add_index :cardboard_urls, [:path, :slug], :unique => true
   end
 end

data/lib/cardboard/concerns/url_concern.rb

@@ -0,0 +1,29 @@
+require 'active_support/concern'
+
+module Cardboard
+  module UrlConcern
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :url_object, class_name: "Cardboard::Url", :as => :urlable, :autosave => true, :dependent => :destroy
+   
+      def url_object_with_auto_build
+        build_url_object unless url_object_without_auto_build
+        url_object_without_auto_build #to continue the association chain
+      end
+      alias_method_chain :url_object, :auto_build
+
+      accepts_nested_attributes_for :url_object
+
+      delegate :slug, :slug=,
+               :path, :path=, 
+               :meta_tags, :meta_tags=,
+               :using_slug_backup?,  
+               to: :url_object, allow_nil: true
+    end
+
+    def url
+      url_object.to_s
+    end
+  end
+end