comfortable_mexican_sofa 1.12.11 → 2.0.0

data/db/cms_seeds/sample-site/layouts/default/nested/content.html

@@ -0,0 +1,14 @@
+[attributes]
+label: Nested Seed Layout
+position: 42
+
+[content]
+{{ cms:file thumbnail }}
+<div class="left">{{ cms:markdown left }}</div>
+<div class="right">{{ cms:markdown right }}</div>
+
+[js]
+// nested js
+
+[css]
+div{float:left}

data/db/cms_seeds/sample-site/pages/index/child_a/content.html

@@ -0,0 +1,7 @@
+[attributes]
+label: Child Seed Page
+layout: nested
+target_page: '/child_b'
+
+[textares content]
+Child A Page Seed Content

data/db/cms_seeds/sample-site/pages/index/child_b/content.html

@@ -0,0 +1,6 @@
+[attributes]
+label: Child Seed Page
+layout: nested
+
+[textares content]
+Child B Page Seed Content

data/db/cms_seeds/sample-site/pages/index/content.es.html

@@ -0,0 +1,6 @@
+[attributes]
+label: Bienvenido
+layout: default
+
+[wysiwyg content]
+Spanish Home Page Seed Content

data/db/cms_seeds/sample-site/pages/index/content.fr.html

@@ -0,0 +1,6 @@
+[attributes]
+label: Bienvenue
+layout: default
+
+[wysiwyg content]
+French Home Page Seed Content

data/db/cms_seeds/sample-site/pages/index/content.html

@@ -0,0 +1,24 @@
+[attributes]
+label: Home Seed Page
+layout: default
+position: 69
+categories:
+  - category_a
+  - category_b
+
+[file header]
+header.png
+
+[date published_on]
+2015-10-31
+
+[wysiwyg content]
+Home Page Seed Contént
+{{ cms:snippet default }}
+
+[checkbox published]
+true
+
+[files attachments]
+header.png
+footer.png

data/db/cms_seeds/sample-site/snippets/default.html

@@ -0,0 +1,8 @@
+[attributes]
+label: Default Seed Snippet
+categories:
+  - category_a
+  - category_b
+
+[content]
+Default Seed Snippet Content

data/db/migrate/00_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,26 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,        null: false
+      t.string   :filename,   null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.bigint   :byte_size,  null: false
+      t.string   :checksum,   null: false
+      t.datetime :created_at, null: false
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+
+      t.datetime :created_at, null: false
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true
+    end
+  end
+end

data/db/migrate/01_create_cms.rb

@@ -1,133 +1,142 @@
-class CreateCms < ActiveRecord::Migration
+class CreateCms < ActiveRecord::Migration[5.2]
 
-  def self.up
+  LIMIT = 16777215
 
-    # -- Sites --------------------------------------------------------------
-    create_table :comfy_cms_sites do |t|
-      t.string :label,        :null => false
-      t.string :identifier,   :null => false
-      t.string :hostname,     :null => false
+  def change
+
+    # -- Sites -----------------------------------------------------------------
+    create_table :comfy_cms_sites, force: true do |t|
+      t.string :label,        null: false
+      t.string :identifier,   null: false
+      t.string :hostname,     null: false
       t.string :path
-      t.string :locale,       :null => false, :default => 'en'
-      t.boolean :is_mirrored, :null => false, :default => false
+      t.string :locale,       null: false, default: "en"
+      t.timestamps
+
+      t.index :hostname
     end
-    add_index :comfy_cms_sites, :hostname
-    add_index :comfy_cms_sites, :is_mirrored
 
-    # -- Layouts ------------------------------------------------------------
-    create_table :comfy_cms_layouts do |t|
-      t.integer :site_id,     :null => false
+    # -- Layouts ---------------------------------------------------------------
+    create_table :comfy_cms_layouts, force: true do |t|
+      t.integer :site_id,     null: false
       t.integer :parent_id
       t.string  :app_layout
-      t.string  :label,       :null => false
-      t.string  :identifier,  :null => false
-      t.text    :content,     :limit => 16777215
-      t.text    :css,         :limit => 16777215
-      t.text    :js,          :limit => 16777215
-      t.integer :position,    :null => false, :default => 0
-      t.boolean :is_shared,   :null => false, :default => false
+      t.string  :label,       null: false
+      t.string  :identifier,  null: false
+      t.text    :content,     limit: LIMIT
+      t.text    :css,         limit: LIMIT
+      t.text    :js,          limit: LIMIT
+      t.integer :position,    null: false, default: 0
       t.timestamps
+
+      t.index [:parent_id, :position]
+      t.index [:site_id, :identifier], unique: true
     end
-    add_index :comfy_cms_layouts, [:parent_id, :position]
-    add_index :comfy_cms_layouts, [:site_id, :identifier], :unique => true
 
-    # -- Pages --------------------------------------------------------------
-    create_table :comfy_cms_pages do |t|
-      t.integer :site_id,         :null => false
+    # -- Pages -----------------------------------------------------------------
+    create_table :comfy_cms_pages, force: true do |t|
+      t.integer :site_id,         null: false
       t.integer :layout_id
       t.integer :parent_id
       t.integer :target_page_id
-      t.string  :label,           :null => false
+      t.string  :label,           null: false
       t.string  :slug
-      t.string  :full_path,       :null => false
-      t.text    :content_cache,   :limit => 16777215
-      t.integer :position,        :null => false, :default => 0
-      t.integer :children_count,  :null => false, :default => 0
-      t.boolean :is_published,    :null => false, :default => true
-      t.boolean :is_shared,       :null => false, :default => false
+      t.string  :full_path,       null: false
+      t.text    :content_cache,   limit: LIMIT
+      t.integer :position,        null: false, default: 0
+      t.integer :children_count,  null: false, default: 0
+      t.boolean :is_published,    null: false, default: true
+      t.timestamps
+
+      t.index [:site_id, :full_path]
+      t.index [:parent_id, :position]
+      t.index [:is_published]
+    end
+
+    # -- Translations ----------------------------------------------------------
+    create_table :comfy_cms_translations, force: true do |t|
+      t.string  :locale,    null: false
+      t.integer :page_id,   null: false
+      t.integer :layout_id
+      t.string  :label,           null: false
+      t.text    :content_cache,   limit: LIMIT
+      t.boolean :is_published,    null: false, default: true
       t.timestamps
+
+      t.index [:page_id]
+      t.index [:locale]
+      t.index [:is_published]
     end
-    add_index :comfy_cms_pages, [:site_id, :full_path]
-    add_index :comfy_cms_pages, [:parent_id, :position]
-
-    # -- Page Blocks --------------------------------------------------------
-    create_table :comfy_cms_blocks do |t|
-      t.string     :identifier,  :null => false
-      t.text       :content,     :limit => 16777215
-      t.references :blockable, :polymorphic => true
+
+    # -- Fragments -------------------------------------------------------------
+    create_table :comfy_cms_fragments, force: true do |t|
+      t.references  :record,      polymorphic: true
+      t.string      :identifier,  null: false
+      t.string      :tag,         null: false, default: "text"
+      t.text        :content,     limit: LIMIT
+      t.boolean     :boolean,     null: false, default: false
+      t.datetime    :datetime
       t.timestamps
+
+      t.index [:identifier]
+      t.index [:datetime]
+      t.index [:boolean]
     end
-    add_index :comfy_cms_blocks, [:identifier]
-    add_index :comfy_cms_blocks, [:blockable_id, :blockable_type]
-
-    # -- Snippets -----------------------------------------------------------
-    create_table :comfy_cms_snippets do |t|
-      t.integer :site_id,     :null => false
-      t.string  :label,       :null => false
-      t.string  :identifier,  :null => false
-      t.text    :content,     :limit => 16777215
-      t.integer :position,    :null => false, :default => 0
-      t.boolean :is_shared,   :null => false, :default => false
+
+    # -- Snippets --------------------------------------------------------------
+    create_table :comfy_cms_snippets, force: true do |t|
+      t.integer :site_id,     null: false
+      t.string  :label,       null: false
+      t.string  :identifier,  null: false
+      t.text    :content,     limit: LIMIT
+      t.integer :position,    null: false, default: 0
       t.timestamps
+
+      t.index [:site_id, :identifier], unique: true
+      t.index [:site_id, :position]
     end
-    add_index :comfy_cms_snippets, [:site_id, :identifier], :unique => true
-    add_index :comfy_cms_snippets, [:site_id, :position]
-
-    # -- Files --------------------------------------------------------------
-    create_table :comfy_cms_files do |t|
-      t.integer :site_id,           :null => false
-      t.integer :block_id
-      t.string  :label,             :null => false
-      t.string  :file_file_name,    :null => false
-      t.string  :file_content_type, :null => false
-      t.integer :file_file_size,    :null => false
-      t.string  :description,       :limit => 2048
-      t.integer :position,          :null => false, :default => 0
+
+    # -- Files -----------------------------------------------------------------
+    create_table :comfy_cms_files, force: true do |t|
+      t.integer :site_id,     null: false
+      t.string  :label,       null: false, default: ""
+      t.text    :description, limit: 2048
+      t.integer :position,    null: false, default: 0
       t.timestamps
+
+      t.index [:site_id, :position]
     end
-    add_index :comfy_cms_files, [:site_id, :label]
-    add_index :comfy_cms_files, [:site_id, :file_file_name]
-    add_index :comfy_cms_files, [:site_id, :position]
-    add_index :comfy_cms_files, [:site_id, :block_id]
-
-    # -- Revisions -----------------------------------------------------------
-    create_table :comfy_cms_revisions, :force => true do |t|
-      t.string    :record_type, :null => false
-      t.integer   :record_id,   :null => false
-      t.text      :data,        :limit => 16777215
+
+    # -- Revisions -------------------------------------------------------------
+    create_table :comfy_cms_revisions, force: true do |t|
+      t.string    :record_type, null: false
+      t.integer   :record_id,   null: false
+      t.text      :data,        limit: LIMIT
       t.datetime  :created_at
+
+      t.index [:record_type, :record_id, :created_at],
+      name: "index_cms_revisions_on_rtype_and_rid_and_created_at"
     end
-    add_index :comfy_cms_revisions, [:record_type, :record_id, :created_at],
-      :name => 'index_cms_revisions_on_rtype_and_rid_and_created_at'
-
-    # -- Categories ---------------------------------------------------------
-    create_table :comfy_cms_categories, :force => true do |t|
-      t.integer :site_id,          :null => false
-      t.string  :label,            :null => false
-      t.string  :categorized_type, :null => false
-    end
-    add_index :comfy_cms_categories, [:site_id, :categorized_type, :label], :unique => true,
-      :name => 'index_cms_categories_on_site_id_and_cat_type_and_label'
 
-    create_table :comfy_cms_categorizations, :force => true do |t|
-      t.integer :category_id,       :null => false
-      t.string  :categorized_type,  :null => false
-      t.integer :categorized_id,    :null => false
+    # -- Categories ------------------------------------------------------------
+    create_table :comfy_cms_categories, force: true do |t|
+      t.integer :site_id,          null: false
+      t.string  :label,            null: false
+      t.string  :categorized_type, null: false
+
+      t.index [:site_id, :categorized_type, :label],
+      unique: true,
+      name:   "index_cms_categories_on_site_id_and_cat_type_and_label"
     end
-    add_index :comfy_cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
-      :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
-  end
 
-  def self.down
-    drop_table :comfy_cms_sites
-    drop_table :comfy_cms_layouts
-    drop_table :comfy_cms_pages
-    drop_table :comfy_cms_snippets
-    drop_table :comfy_cms_blocks
-    drop_table :comfy_cms_files
-    drop_table :comfy_cms_revisions
-    drop_table :comfy_cms_categories
-    drop_table :comfy_cms_categorizations
+    create_table :comfy_cms_categorizations, force: true do |t|
+      t.integer :category_id,       null: false
+      t.string  :categorized_type,  null: false
+      t.integer :categorized_id,    null: false
+
+      t.index [:category_id, :categorized_type, :categorized_id],
+      unique: true,
+      name:   "index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id"
+    end
   end
 end
-

data/lib/comfortable_mexican_sofa.rb

@@ -14,23 +14,19 @@ require_relative 'comfortable_mexican_sofa/access_control/public_authorization'
 require_relative 'comfortable_mexican_sofa/render_methods'
 require_relative 'comfortable_mexican_sofa/view_hooks'
 require_relative 'comfortable_mexican_sofa/form_builder'
-require_relative 'comfortable_mexican_sofa/tag'
-require_relative 'comfortable_mexican_sofa/fixture'
-require_relative 'comfortable_mexican_sofa/fixture/category'
-require_relative 'comfortable_mexican_sofa/fixture/layout'
-require_relative 'comfortable_mexican_sofa/fixture/page'
-require_relative 'comfortable_mexican_sofa/fixture/snippet'
-require_relative 'comfortable_mexican_sofa/fixture/file'
-require_relative 'comfortable_mexican_sofa/extensions/rails'
+require_relative 'comfortable_mexican_sofa/seeds'
+require_relative 'comfortable_mexican_sofa/seeds/layout/importer'
+require_relative 'comfortable_mexican_sofa/seeds/layout/exporter'
+require_relative 'comfortable_mexican_sofa/seeds/page/importer'
+require_relative 'comfortable_mexican_sofa/seeds/page/exporter'
+require_relative 'comfortable_mexican_sofa/seeds/snippet/importer'
+require_relative 'comfortable_mexican_sofa/seeds/snippet/exporter'
+require_relative 'comfortable_mexican_sofa/seeds/file/importer'
+require_relative 'comfortable_mexican_sofa/seeds/file/exporter'
 require_relative 'comfortable_mexican_sofa/extensions/acts_as_tree'
-require_relative 'comfortable_mexican_sofa/extensions/cms_manageable'
 require_relative 'comfortable_mexican_sofa/extensions/has_revisions'
-require_relative 'comfortable_mexican_sofa/extensions/is_mirrored'
-require_relative 'comfortable_mexican_sofa/extensions/is_categorized'
 
-Dir.glob(File.expand_path('comfortable_mexican_sofa/tags/*.rb', File.dirname(__FILE__))).each do |path|
-  require_relative path
-end
+require_relative  'comfortable_mexican_sofa/content'
 
 module ComfortableMexicanSofa
   class << self

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -25,15 +25,12 @@ class ComfortableMexicanSofa::Configuration
   # for example '/cms-admin/users'
   attr_accessor :admin_route_redirect
 
-  # Upload settings
-  attr_accessor :upload_file_options
-
   # With each page load, files will be synched with the database. Database entries are
-  # destroyed if there's no corresponding file. Fixtures are disabled by default.
-  attr_accessor :enable_fixtures
+  # destroyed if there's no corresponding file. Seeds are disabled by default.
+  attr_accessor :enable_seeds
 
-  # Path where fixtures can be located.
-  attr_accessor :fixtures_path
+  # Path where seeds can be located.
+  attr_accessor :seeds_path
 
   # Number of revisions kept. Default is 25. If you wish to disable: set this to 0.
   attr_accessor :revisions_limit
@@ -49,8 +46,8 @@ class ComfortableMexicanSofa::Configuration
   # A class that is included as a sweeper to admin base controller if it's set
   attr_accessor :admin_cache_sweeper
 
-  # Not allowing irb code to be run inside page content. False by default.
-  attr_accessor :allow_irb
+  # Not allowing erb code to be run inside page content. False by default.
+  attr_accessor :allow_erb
 
   # Whitelist of all helper methods that can be used via {{cms:helper}} tag. By default
   # all helpers are allowed except `eval`, `send`, `call` and few others. Empty array
@@ -89,9 +86,8 @@ class ComfortableMexicanSofa::Configuration
     @seed_data_path       = nil
     @admin_route_redirect = ''
     @enable_sitemap       = true
-    @upload_file_options  = { }
-    @enable_fixtures      = false
-    @fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
+    @enable_seeds         = false
+    @seeds_path           = File.expand_path('db/cms_seeds', Rails.root)
     @revisions_limit      = 25
     @locales              = {
       'cs'    => 'Česky',
@@ -116,7 +112,7 @@ class ComfortableMexicanSofa::Configuration
     }
     @admin_locale         = nil
     @admin_cache_sweeper  = nil
-    @allow_irb            = false
+    @allow_erb            = false
     @allowed_helpers      = nil
     @allowed_partials     = nil
     @hostname_aliases     = nil