comfortable_mexican_sofa 1.12.11 → 2.0.0

data/app/views/comfy/admin/cms/translations/edit.html.haml

@@ -0,0 +1,9 @@
+- content_for :right_column do
+  .box.revisions
+    = link_to t('.revision', count: @translation.revisions.count), comfy_admin_cms_site_page_translation_revisions_path(@site, @page, @translation), class: "btn btn-info d-block"
+
+.page-header
+  %h2= t('.title')
+
+= comfy_form_for @translation, as: :translation, url: {action: :update} do |form|
+  = render form

data/app/views/comfy/admin/cms/translations/form_fragments.js.erb

@@ -0,0 +1 @@
+$('#form-fragments').replaceWith('<%= escape_javascript(render("comfy/admin/cms/pages/form_fragments", record: @translation)) %>');

data/app/views/comfy/admin/cms/translations/new.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t('.title')
+
+= comfy_form_for @translation, as: :translation, url: {action: :create} do |form|
+  = render form

data/app/views/kaminari/comfy/_first_page.html.haml

@@ -1,2 +1,3 @@
-%li
-  = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote
+- unless current_page.first?
+  %li.page-item
+  = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, class: 'page-link', remote: remote

data/app/views/kaminari/comfy/_gap.html.haml

@@ -1,2 +1,2 @@
-%li.disabled
-  = link_to raw(t 'views.pagination.truncate'), '#'
+%li.page.item.disabled
+  = link_to raw(t 'views.pagination.truncate'), '#', class: 'page-link'

data/app/views/kaminari/comfy/_last_page.html.haml

@@ -1,2 +1,3 @@
-%li
-  = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}
+- unless current_page.last?
+  %li.page-item
+    = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, class: 'page-link', remote: remote

data/app/views/kaminari/comfy/_next_page.html.haml

@@ -1,2 +1,2 @@
-%li
-  = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote
+%li.page-item
+  = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link'

data/app/views/kaminari/comfy/_page.html.haml

@@ -1,2 +1,2 @@
-%li{class: "#{'active' if page.current?}"}
-  = link_to page, page.current? ? '#' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}
+%li{class: "page-item#{' active' if page.current?}"}
+  = link_to page, url, opts = {remote: remote, class: 'page-link', rel: page.next? ? 'next' : page.prev? ? 'prev' : nil}

data/app/views/kaminari/comfy/_prev_page.html.haml

@@ -1,2 +1,2 @@
 %li
-  = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote
+  = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote, class: 'page-link'

data/app/views/layouts/comfy/admin/cms/_body.html.haml

@@ -1,18 +1,16 @@
-%body#comfy{:class => "c-#{params[:controller].slugify} a-#{params[:action].slugify}"}
+%body#comfy{:class => "c-#{params[:controller].parameterize} a-#{params[:action].parameterize}"}
 
-  = render 'comfy/admin/cms/partials/body_before'
-
-  .body-wrapper
-    .left-column
-      .left-column-content
-        = render 'layouts/comfy/admin/cms/left'
-    .right-column
-      .right-column-content
-        = render 'layouts/comfy/admin/cms/right'
-    .center-column
-      = render 'layouts/comfy/admin/cms/flash'
-      .center-column-content
+  .container-fluid
+    .row
+      #cms-left.col-lg-2.bg-dark
+        = render "layouts/comfy/admin/cms/left"
+      #cms-main.col-lg-8.m-auto
+        = render "layouts/comfy/admin/cms/flash"
         = yield
-      = render 'layouts/comfy/admin/cms/footer'
+      #cms-right.col-lg-2
+        = render 'layouts/comfy/admin/cms/right'
+
+  = render "layouts/comfy/admin/cms/footer_js"
+
+  / = render 'comfy/admin/cms/partials/body_before'
 
-  = render 'layouts/comfy/admin/cms/footer_js'

data/app/views/layouts/comfy/admin/cms/_footer_js.html.haml

@@ -1,5 +1,12 @@
-= render 'comfy/admin/cms/partials/html_footer'
+= comfy_admin_partial "comfy/admin/cms/partials/html_footer"
 
-- if content_for(:javascript)
+= javascript_include_tag "comfy/admin/cms/application", "data-turbolinks-track": "reload"
+
+- if @site && @site.persisted?
   :javascript
-    #{yield :javascript}
+    CMS.file_upload_path  = '#{comfy_admin_cms_site_files_path(@site)}';
+    CMS.pages_path        = '#{comfy_admin_cms_site_pages_path(@site)}';
+    CMS.locale            = '#{I18n.locale}';
+
+- if content_for(:javascript)
+  = yield :javascript

data/app/views/layouts/comfy/admin/cms/_head.html.haml

@@ -1,17 +1,14 @@
 %head
-  %meta{'http-equiv' => 'Content-type', :content => 'text/html; charset=utf-8'}
   %title= ComfortableMexicanSofa.config.cms_title
-  = csrf_meta_tag
 
-  = stylesheet_link_tag     'comfy/admin/cms/application', 'data-turbolinks-track' => true
-  = javascript_include_tag  'comfy/admin/cms/application', 'data-turbolinks-track' => true
+  %meta{"http-equiv" => "Content-type", content: "text/html; charset=utf-8"}
+  %meta{charset: "utf-8"}
+  %meta{name: "viewport", content: "width=device-width, initial-scale=1, shrink-to-fit=no"}
+
+  = csrf_meta_tag
 
-  - if @site && @site.persisted?
-    :javascript
-      CMS.file_upload_path  = '#{comfy_admin_cms_site_files_path(@site)}';
-      CMS.pages_path        = '#{comfy_admin_cms_site_pages_path(@site)}';
-      CMS.locale            = '#{I18n.locale}';
+  = stylesheet_link_tag "comfy/admin/cms/application", media: "all", "data-turbolinks-track": "reload"
 
   = yield :head
 
-  = render 'comfy/admin/cms/partials/html_head'
+  = comfy_admin_partial "comfy/admin/cms/partials/html_head"

data/app/views/layouts/comfy/admin/cms/_left.html.haml

@@ -1,21 +1,39 @@
-= render 'comfy/admin/cms/partials/navigation_before'
+= comfy_admin_partial "comfy/admin/cms/partials/navigation_before"
 
-%ul.navigation
-  %li= active_link_to t('comfy.admin.cms.base.sites'), comfy_admin_cms_sites_path, :active => ['comfy/admin/cms/sites']
+%nav.navbar.navbar-expand-lg
+  %button.navbar-toggler{type: "button", data: {toggle:"collapse", target: "#leftnav"}, aria: {controls: "navbarSupportedContent", expanded: "false", label: "Toggle navigation"}}
+    = fa_icon "bars"
 
-  - if @site && !@site.new_record?
-    %li= active_link_to t('comfy.admin.cms.base.layouts'), comfy_admin_cms_site_layouts_path(@site)
-    %li= active_link_to t('comfy.admin.cms.base.pages'), comfy_admin_cms_site_pages_path(@site)
-    %li= active_link_to t('comfy.admin.cms.base.snippets'), comfy_admin_cms_site_snippets_path(@site)
-    %li
-      - unless is_active_link?(comfy_admin_cms_site_files_path(@site))
-        %a.cms-files-open-modal{:href => '#', :title => 'Open library'}
-          %span.glyphicon.glyphicon-th-list
-      = active_link_to t('comfy.admin.cms.base.files'), comfy_admin_cms_site_files_path(@site)
+  #leftnav.navbar-collapse.collapse
 
+    %ul.nav.nav-pills
+      %li.nav-item
+        = active_link_to comfy_admin_cms_sites_path, class: "nav-link", active: ['comfy/admin/cms/sites'] do
+          = t('comfy.admin.cms.base.sites')
 
-  = cms_hook :navigation
+      - if @site && !@site.new_record?
+        %li.nav-item
+          = active_link_to comfy_admin_cms_site_layouts_path(@site), class: "nav-link" do
+            = t('comfy.admin.cms.base.layouts')
+        %li.nav-item
+          = active_link_to comfy_admin_cms_site_pages_path(@site), class: "nav-link" do
+            = t('comfy.admin.cms.base.pages')
+        %li.nav-item
+          = active_link_to comfy_admin_cms_site_snippets_path(@site), class: "nav-link" do
+            = t('comfy.admin.cms.base.snippets')
+        %li.nav-item
+          - unless is_active_link?(comfy_admin_cms_site_files_path(@site))
+            %a.cms-files-open-modal{href: '#', title: "Open library"}
+              = fa_icon "bars"
+          = active_link_to comfy_admin_cms_site_files_path(@site), class: "nav-link" do
+            = t('comfy.admin.cms.base.files')
 
-  = render 'comfy/admin/cms/partials/navigation_inner'
+      = cms_hook :navigation
 
-= render 'comfy/admin/cms/partials/navigation_after'
+      = comfy_admin_partial "comfy/admin/cms/partials/navigation_inner"
+
+= comfy_admin_partial "comfy/admin/cms/partials/navigation_after"
+
+.left-footer
+  = link_to 'ComfortableMexicanSofa', 'https://github.com/comfy', target: '_blank'
+  %span.version= ComfortableMexicanSofa::VERSION

data/app/views/layouts/comfy/admin/cms/_right.html.haml

@@ -1,5 +1,5 @@
-= render 'comfy/admin/cms/partials/right_column_before'
+= comfy_admin_partial "comfy/admin/cms/partials/right_column_before"
 
 = yield :right_column
 
-= render 'comfy/admin/cms/partials/right_column_after'
+= comfy_admin_partial "comfy/admin/cms/partials/right_column_after"

data/comfortable_mexican_sofa.gemspec

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 $:.unshift File.expand_path('../lib', __FILE__)
 require 'comfortable_mexican_sofa/version'
 
@@ -9,28 +7,30 @@ Gem::Specification.new do |s|
   s.authors       = ["Oleg Khabarov"]
   s.email         = ["oleg@khabarov.ca"]
   s.homepage      = "http://github.com/comfy/comfortable-mexican-sofa"
-  s.summary       = "Rails 4/5 CMS Engine"
-  s.description   = "ComfortableMexicanSofa is a powerful Rails 4/5 CMS Engine"
+  s.summary       = "Rails 5.2+ CMS Engine"
+  s.description   = "ComfortableMexicanSofa is a powerful Rails 5.2+ CMS Engine"
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.2.2'
+  s.required_ruby_version = ">= 2.2.2"
 
-  s.add_dependency 'rails',             '>= 4.0.0', '< 5.1'
-  s.add_dependency 'rails-i18n',        '>= 4.0.0'
-  s.add_dependency 'bootstrap_form',    '>= 2.2.0'
-  s.add_dependency 'active_link_to',    '>= 1.0.0'
-  s.add_dependency 'paperclip',         '>= 4.0.0'
-  s.add_dependency 'kramdown',          '>= 1.0.0'
-  s.add_dependency 'jquery-rails',      '>= 3.0.0'
-  s.add_dependency 'jquery-ui-rails',   '>= 5.0.0'
-  s.add_dependency 'haml-rails',        '>= 0.3.0'
-  s.add_dependency 'sass-rails',        '>= 4.0.3'
-  s.add_dependency 'coffee-rails',      '>= 3.1.0'
-  s.add_dependency 'codemirror-rails',  '>= 3.0.0'
-  s.add_dependency 'bootstrap-sass',    '>= 3.2.0'
-  s.add_dependency 'plupload-rails',    '>= 1.2.1'
+  s.add_dependency "rails",                 ">= 5.2.0.beta1"
+  s.add_dependency "bootstrap",             ">= 4.0.0.beta2.1"
+  s.add_dependency "comfy_bootstrap_form",  ">= 4.0.0.beta1"
+  s.add_dependency "mini_magick",           ">= 4.8.0"
+  s.add_dependency "mimemagic",             ">= 0.3.2"
+  s.add_dependency "jquery-rails",          ">= 4.3.1"
+  s.add_dependency "jquery-ui-rails",       ">= 6.0.1"
+  s.add_dependency "codemirror-rails",      ">= 5.16.0"
+  s.add_dependency "font-awesome-rails",    ">= 4.7.0"
+  s.add_dependency "rails-i18n",            ">= 5.0.0"
+  s.add_dependency "active_link_to",        ">= 1.0.0"
+  s.add_dependency "haml-rails",            ">= 1.0.0"
+  s.add_dependency "kramdown",              ">= 1.0.0"
+  s.add_dependency "sass-rails",            ">= 5.0.0"
+  s.add_dependency "coffee-rails",          ">= 4.2.0"
+  s.add_dependency "plupload-rails",        ">= 1.2.1"
 end

data/config/application.rb

@@ -1,15 +1,18 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
 
-# Assets should be precompiled for production (so we don't need the gems loaded then)
-Bundler.require(*Rails.groups(assets: %w(development test)))
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
 module ComfortableMexicanSofa
   class Application < Rails::Application
-    
-    require_relative '../lib/comfortable_mexican_sofa'
-    
+
+    require_relative "../lib/comfortable_mexican_sofa"
+
+    config.load_defaults 5.2
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -21,10 +24,13 @@ module ComfortableMexicanSofa
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    
+
+    # Ensuring that all ActiveStorage routes are loaded before out globbing route.
+    config.railties_order = [ActiveStorage::Engine, :main_app, :all]
+
     # Making sure we don't load our dev routes as part of the engine
     config.paths['config/routes.rb'] << 'config/cms_routes.rb'
-    
+
     config.i18n.enforce_available_locales = true
   end
 end

data/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+File.exist?(ENV['BUNDLE_GEMFILE'])

data/config/cms_routes.rb

@@ -1,6 +1,6 @@
+# We can't have this in config/routes.rb as they will get pulled in into parent
+# application automatically. We want user to manually place them.
 ComfortableMexicanSofa::Application.routes.draw do
-
   comfy_route :cms_admin
-  comfy_route :cms, :sitemap => true
-
+  comfy_route :cms
 end

data/config/environments/development.rb

@@ -9,19 +9,52 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp/caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  config.action_mailer.perform_caching = false
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise an error on page load if there are pending migrations
+  # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
   config.assets.debug = true
+
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  config.active_job.queue_adapter = :inline
 end

data/config/environments/test.rb

@@ -12,14 +12,11 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  if config.respond_to?(:public_file_server)
-    config.public_file_server.enabled = true
-    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
-  else
-    config.serve_static_files = true
-    config.static_cache_control = "public, max-age=3600"
-  end
+  # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+  }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -31,6 +28,10 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+  config.action_mailer.perform_caching = false
+
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
@@ -39,11 +40,8 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  config.active_support.test_order = :random
-
-  if Rails.version >= '4.2' && Rails.version < '5'
-    config.active_record.raise_in_transactional_callbacks = true
-  end
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 
-  config.action_view.raise_on_missing_translations = true
+  config.active_job.queue_adapter = :inline
 end

data/config/initializers/comfortable_mexican_sofa.rb

@@ -30,20 +30,13 @@ ComfortableMexicanSofa.configure do |config|
   # for example '/cms-admin/users'
   #   config.admin_route_redirect = ''
 
-  # File uploads use Paperclip and can support filesystem or s3 uploads.  Override
-  # the upload method and appropriate settings based on Paperclip.  For S3 see:
-  # http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/S3, and for
-  # filesystem see: http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/Filesystem
-  # If you are using S3 and HTTPS, pass :s3_protocol => '' to have URLs that use the protocol of the page
-  #   config.upload_file_options = {:url => '/system/:class/:id/:attachment/:style/:filename'}
-
   # Sofa allows you to setup entire site from files. Database is updated with each
   # request (if necessary). Please note that database entries are destroyed if there's
-  # no corresponding file. Fixtures are disabled by default.
-  #   config.enable_fixtures = false
+  # no corresponding file. Seeds are disabled by default.
+  #   config.enable_seeds = false
 
-  # Path where fixtures can be located.
-  #   config.fixtures_path = File.expand_path('db/cms_fixtures', Rails.root)
+  # Path where seeds can be located.
+  #   config.seeds_path = File.expand_path('db/cms_seeds', Rails.root)
 
   # Importing fixtures into Database
   # To load fixtures into the database just run this rake task:
@@ -76,7 +69,7 @@ ComfortableMexicanSofa.configure do |config|
   # By default you cannot have irb code inside your layouts/pages/snippets.
   # Generally this is to prevent putting something like this:
   # <% User.delete_all %> but if you really want to allow it...
-  #   config.allow_irb = false
+  #   config.allow_erb = false
 
   # 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