comfortable_mexican_sofa 2.0.17 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1de2082d0f04ab3482b9ca303ce5cb2a0742c931
-  data.tar.gz: 353bdb2b41ec035eb182d8fd96eaba92c2cf1e29
+SHA256:
+  metadata.gz: e514b33709fbc091e1fd7d85698df4aca91754f9534e846b0d3c9fd01b5ceec2
+  data.tar.gz: 9e3a60b2ac680e17bdc69e8f4d544dffcb433537b957e51e2bf155a10f2e3f17
 SHA512:
-  metadata.gz: d1a02dc6c122018580e2653b062ab52c2d1c3085652f60477a47ec0c8706ffe1a65bd9d698fd25a36cca4592fc581ec0460551250bca66b44c60b7b2c4171428
-  data.tar.gz: e668efc2fb6e753fe786bf73f33ee5a4ce7a5562a2ef70f93fec110328b3696dacde1652e39914f8cbf4a7599bb297e93058733e4c15fae2fb4cc92c0b0b492c
+  metadata.gz: af4880c26e4a7e7cac684928a01630727b0fb1cb038a1222352850e6c77efbc48aeee95887e7d447f16d8409fe0dec3ec51dc9ab49e4a1b4ab756a4a60be26ad
+  data.tar.gz: f2cc0e1ac9c9d1b1f4dc9542f9f1b5be37d17dbc2f1273eb43c69db0fbb1b8ad42c5f611f135e11e5412622a68d9aa20f79e47b49000644f096d4273734d000d

data/.gitignore

@@ -16,4 +16,5 @@ Gemfile.lock
 /.sass-cache
 coverage/
 /storage
-db/cms_fixtures/test-site/
+db/cms_fixtures/test-site/
+.idea

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.5
+  - 2.6.2
   - ruby-head
 gemfile:
   - test/gemfiles/5.2.gemfile

data/app/controllers/comfy/admin/base_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Comfy::Admin::BaseController < ComfortableMexicanSofa.config.base_controller.to_s.constantize
+class Comfy::Admin::BaseController < ComfortableMexicanSofa.config.admin_base_controller.to_s.constantize
 
   include Comfy::Paginate
 

data/app/controllers/comfy/admin/cms/categories_controller.rb

@@ -16,7 +16,7 @@ class Comfy::Admin::Cms::CategoriesController < Comfy::Admin::Cms::BaseControlle
   end
 
   def update
-    @category.update_attributes!(category_params)
+    @category.update!(category_params)
   rescue ActiveRecord::RecordInvalid
     head :ok
   end

data/app/controllers/comfy/admin/cms/layouts_controller.rb

@@ -32,7 +32,7 @@ class Comfy::Admin::Cms::LayoutsController < Comfy::Admin::Cms::BaseController
   end
 
   def update
-    @layout.update_attributes!(layout_params)
+    @layout.update!(layout_params)
     flash[:success] = I18n.t("comfy.admin.cms.layouts.updated")
     redirect_to action: :edit, id: @layout
   rescue ActiveRecord::RecordInvalid

data/app/controllers/comfy/admin/cms/sites_controller.rb

@@ -33,7 +33,7 @@ class Comfy::Admin::Cms::SitesController < Comfy::Admin::Cms::BaseController
   end
 
   def update
-    @site.update_attributes!(site_params)
+    @site.update!(site_params)
     flash[:success] = I18n.t("comfy.admin.cms.sites.updated")
     redirect_to action: :edit, id: @site
   rescue ActiveRecord::RecordInvalid

data/app/controllers/comfy/admin/cms/snippets_controller.rb

@@ -32,7 +32,7 @@ class Comfy::Admin::Cms::SnippetsController < Comfy::Admin::Cms::BaseController
   end
 
   def update
-    @snippet.update_attributes!(snippet_params)
+    @snippet.update!(snippet_params)
     flash[:success] = I18n.t("comfy.admin.cms.snippets.updated")
     redirect_to action: :edit, id: @snippet
   rescue ActiveRecord::RecordInvalid

data/app/controllers/comfy/admin/cms/translations_controller.rb

@@ -28,7 +28,7 @@ class Comfy::Admin::Cms::TranslationsController < Comfy::Admin::Cms::BaseControl
   end
 
   def update
-    @translation.update_attributes!(translation_params)
+    @translation.update!(translation_params)
     flash[:success] = I18n.t("comfy.admin.cms.translations.updated")
     redirect_to action: :edit, id: @translation
   rescue ActiveRecord::RecordInvalid

data/app/controllers/comfy/cms/assets_controller.rb

@@ -2,7 +2,7 @@
 
 class Comfy::Cms::AssetsController < Comfy::Cms::BaseController
 
-  skip_before_action :verify_authenticity_token
+  skip_before_action :verify_authenticity_token, raise: false
 
   before_action :load_cms_layout,
                 :use_null_session

data/app/controllers/comfy/cms/base_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Comfy::Cms::BaseController < ApplicationController
+class Comfy::Cms::BaseController < ComfortableMexicanSofa.config.public_base_controller.to_s.constantize
 
   before_action :load_cms_site
 

data/app/controllers/comfy/cms/content_controller.rb

@@ -21,11 +21,11 @@ class Comfy::Cms::ContentController < Comfy::Cms::BaseController
       respond_to do |format|
         format.html { render_page }
         format.json do
-          json_page = @cms_page.as_json(except: [:content_cache])
-          json_page[:content] = render_to_string(
+          @cms_page.content = render_to_string(
             inline: @cms_page.content_cache,
             layout: false
           )
+          json_page = @cms_page.as_json(ComfortableMexicanSofa.config.page_to_json_options)
           render json: json_page
         end
       end
@@ -44,7 +44,7 @@ protected
   # it's possible to control mimetype of a page by creating a `mime_type` field
   def mime_type
     mime_block = @cms_page.fragments.detect { |f| f.identifier == "mime_type" }
-    mime_block&.content || "text/html"
+    mime_block&.content&.strip || "text/html"
   end
 
   def app_layout
@@ -73,15 +73,10 @@ protected
   # Getting page and setting content_cache and fragments data if we need to
   # serve translation data
   def find_cms_page_by_full_path(full_path)
-    @cms_page   = @cms_site.pages.published.find_by!(full_path: full_path)
-    @cms_layout = @cms_page.layout
+    @cms_page = @cms_site.pages.published.find_by!(full_path: full_path)
 
-    # There are translations for this page and locale is not the default site
-    # locale, so we need to grab translation data.
-    if @cms_page.translations.any? && @cms_site.locale != I18n.locale.to_s
-      @cms_page.translate!(I18n.locale)
-      @cms_layout = @cms_page.layout
-    end
+    @cms_page.translate!
+    @cms_layout = @cms_page.layout
 
     @cms_page
 

data/app/models/comfy/cms/file.rb

@@ -21,10 +21,12 @@ class Comfy::Cms::File < ActiveRecord::Base
   belongs_to :site
 
   # -- Callbacks ---------------------------------------------------------------
+  before_validation :assign_label, on: :create
   before_create :assign_position
   after_save :process_attachment
 
   # -- Validations -------------------------------------------------------------
+  validates :label, presence: true
   validates :file, presence: true, on: :create
 
   # -- Scopes ------------------------------------------------------------------
@@ -34,13 +36,6 @@ class Comfy::Cms::File < ActiveRecord::Base
     where("active_storage_blobs.content_type LIKE 'image/%'").references(:blob)
   }
 
-  # -- Instance Methods --------------------------------------------------------
-  def label
-    l = read_attribute(:label)
-    return l if l.present?
-    attachment.attached? ? attachment.filename.to_s : nil
-  end
-
 protected
 
   def assign_position
@@ -48,6 +43,12 @@ protected
     self.position = max ? max + 1 : 0
   end
 
+  # TODO: Change db schema not to set blank string
+  def assign_label
+    return if label.present?
+    self.label = file&.original_filename
+  end
+
   def process_attachment
     return if @file.blank?
     attachment.attach(@file)

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

@@ -7,9 +7,11 @@ class Comfy::Cms::Page < ActiveRecord::Base
   include Comfy::Cms::WithFragments
   include Comfy::Cms::WithCategories
 
-  cms_acts_as_tree counter_cache: :children_count
+  cms_acts_as_tree counter_cache: :children_count, order: :position
   cms_has_revisions_for :fragments_attributes
 
+  attr_accessor :content
+
   # -- Relationships -----------------------------------------------------------
   belongs_to :site
   belongs_to :target_page,
@@ -88,8 +90,13 @@ class Comfy::Cms::Page < ActiveRecord::Base
 
   # This method will mutate page object by transfering attributes from translation
   # for a given locale.
-  def translate!(locale)
-    translation = translations.published.find_by!(locale: locale)
+  def translate!
+    # If site locale same as page's or there's no translastions, we do nothing
+    if site.locale == I18n.locale.to_s || translations.blank?
+      return
+    end
+
+    translation = translations.published.find_by!(locale: I18n.locale)
     self.layout        = translation.layout
     self.label         = translation.label
     self.content_cache = translation.content_cache

data/app/views/comfy/admin/cms/files/_file.html.haml

@@ -1,7 +1,7 @@
 %li{data: {id: file.id}}
   :ruby
     file_tag  = cms_file_link_tag(file)
-    thumb_url = url_for(file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.image?
+    thumb_url = url_for(file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.variable?
   .row
     .col-md-5.item
       .item-controls.d-none.d-lg-block

data/app/views/comfy/admin/cms/fragments/_form_fragment_attachments.html.haml

@@ -1,7 +1,7 @@
 .fragment-attachments
   - attachments.each do |attachment|
     :ruby
-      thumb_url = if attachment.image?
+      thumb_url = if attachment.variable?
         url_for(attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb]))
       end
       filename = attachment.filename.to_s

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

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

data/comfortable_mexican_sofa.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
   s.add_dependency "mini_magick",           ">= 4.8.0"
   s.add_dependency "rails",                 ">= 5.2.0"
   s.add_dependency "rails-i18n",            ">= 5.0.0"
-  s.add_dependency "sass-rails",            ">= 5.0.0"
+  s.add_dependency "sassc-rails",           ">= 2.0.0"
 end

data/config/environments/test.rb

@@ -48,4 +48,8 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   config.active_job.queue_adapter = :inline
 
   config.action_view.raise_on_missing_translations = true
+
+  # TODO: This is temporary fix so TravisCI runs until Rails 5.2.3 is out.
+  # See: https://github.com/rails/rails/pull/35607
+  config.secret_key_base = SecureRandom.hex(64)
 end

data/config/initializers/comfortable_mexican_sofa.rb

@@ -5,7 +5,10 @@ ComfortableMexicanSofa.configure do |config|
   #   config.cms_title = 'ComfortableMexicanSofa CMS Engine'
 
   # Controller that is inherited from CmsAdmin::BaseController
-  #   config.base_controller = 'ApplicationController'
+  #   config.admin_base_controller = 'ApplicationController'
+
+  # Controller that Comfy::Cms::BaseController will inherit from
+  #   config.public_base_controller = 'ApplicationController'
 
   # Module responsible for authentication. You can replace it with your own.
   # It simply needs to have #authenticate method. See http_auth.rb for reference.
@@ -77,6 +80,12 @@ ComfortableMexicanSofa.configure do |config|
   # Reveal partials that can be overwritten in the admin area.
   # Default is false.
   #   config.reveal_cms_partials = false
+  #
+  # Customize the returned content json data
+  # include fragments in content json
+  #   config.content_json_options = {
+  #     include: [:fragments]
+  #   }
 end
 
 # Default credentials for ComfortableMexicanSofa::AccessControl::AdminAuthentication

data/config/locales/pl.yml

@@ -6,7 +6,7 @@ pl:
       comfy/cms/page: Strona
       comfy/cms/snippet: Snippet
       comfy/cms/file: Plik
-      comfy/cms/translation: Translation
+      comfy/cms/translation: Tłumaczenie
 
     attributes:
       comfy/cms/site:
@@ -41,10 +41,10 @@ pl:
         label: Tytuł
         content: Zawartość
       comfy/cms/translation:
-        locale: Language
-        label: Label
-        layout_id: Layout
-        is_published: Published
+        locale: Język
+        label: Nazwa
+        layout_id: Szablon
+        is_published: Opublikowano
 
   comfy:
     cms:
@@ -144,7 +144,7 @@ pl:
             create: Utwórz stronę
             cancel: Anuluj
             update: Uaktualnij stronę
-            choose_link: Select page...
+            choose_link: Wybierz stronę...
 
         fragments:
           form_fragments:
@@ -153,25 +153,25 @@ pl:
               Dodaj do jego treści tag strony lub pola, np. <code>{{cms:wysiwyg content}}</code>
 
         translations:
-          created: Translation created
-          creation_failure: Failed to create translation
-          updated: Translation updated
-          update_failure: Failed to update translation
-          deleted: Translation deleted
-          not_found: Translation not found
+          created: Tłumaczenie zostało utworzone
+          creation_failure: Błąd przy tworzeniu tlumaczenia
+          updated: Tłumaczenie zostało uaktualnione
+          update_failure: Błąd przy uaktualnianiu tłumaczenia
+          deleted: Tłumaczenie zostało usunięte
+          not_found: Nie znaleziono tłumaczenia
 
           new:
-            title: New Translation
+            title: Nowe tłumaczenie
           edit:
-            title: Editing Translation
+            title: Edytuj tłumaczenie
           form:
-            preview: Preview
-            create: Create
-            update: Update
-            cancel: Return to Page
+            preview: Podgląd
+            create: Utwórz tłumaczenie
+            update: Uaktualnij tłumaczenie
+            cancel: Anuluj
           sidebar:
-            new: New Translation
-            confirm: Are you sure?
+            new: Nowe tłumaczenie
+            confirm: Jesteś pewien?
 
         snippets:
           created: Snippet został utworzony

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

@@ -22,3 +22,4 @@ true
 [files attachments]
 header.png
 footer.png
+cms logo.png

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -7,7 +7,11 @@ class ComfortableMexicanSofa::Configuration
 
   # Controller that is inherited from CmsAdmin::BaseController
   # 'ApplicationController' is the default
-  attr_accessor :base_controller
+  attr_accessor :admin_base_controller
+
+  # Controller that Comfy::Cms::BaseController will inherit from
+  # 'ApplicationController' is the default
+  attr_accessor :public_base_controller
 
   # Module that will handle authentication to access cms-admin area
   attr_accessor :admin_auth
@@ -76,21 +80,27 @@ class ComfortableMexicanSofa::Configuration
   # Auto-setting parameter derived from the routes
   attr_accessor :public_cms_path
 
+  # Customize returned content from `page.to_json`
+  # Default is set to `methods: [:content], except: [:content_cache]`
+  # For example: include fragments into json data with `config.page_to_json_options = { include: [:fragments] }`
+  attr_accessor :page_to_json_options
+
   # Configuration defaults
   def initialize
-    @cms_title            = "ComfortableMexicanSofa CMS Engine"
-    @base_controller      = "ApplicationController"
-    @admin_auth           = "ComfortableMexicanSofa::AccessControl::AdminAuthentication"
-    @admin_authorization  = "ComfortableMexicanSofa::AccessControl::AdminAuthorization"
-    @public_auth          = "ComfortableMexicanSofa::AccessControl::PublicAuthentication"
-    @public_authorization = "ComfortableMexicanSofa::AccessControl::PublicAuthorization"
-    @seed_data_path       = nil
-    @admin_route_redirect = ""
-    @enable_sitemap       = true
-    @enable_seeds         = false
-    @seeds_path           = File.expand_path("db/cms_seeds", Rails.root)
-    @revisions_limit      = 25
-    @locales              = {
+    @cms_title              = "ComfortableMexicanSofa CMS Engine"
+    @admin_base_controller  = "ApplicationController"
+    @public_base_controller = "ApplicationController"
+    @admin_auth             = "ComfortableMexicanSofa::AccessControl::AdminAuthentication"
+    @admin_authorization    = "ComfortableMexicanSofa::AccessControl::AdminAuthorization"
+    @public_auth            = "ComfortableMexicanSofa::AccessControl::PublicAuthentication"
+    @public_authorization   = "ComfortableMexicanSofa::AccessControl::PublicAuthorization"
+    @seed_data_path         = nil
+    @admin_route_redirect   = ""
+    @enable_sitemap         = true
+    @enable_seeds           = false
+    @seeds_path             = File.expand_path("db/cms_seeds", Rails.root)
+    @revisions_limit        = 25
+    @locales                = {
       "ca"    => "Català",
       "cs"    => "Česky",
       "da"    => "Dansk",
@@ -122,6 +132,7 @@ class ComfortableMexicanSofa::Configuration
     @hostname_aliases     = nil
     @reveal_cms_partials  = false
     @public_cms_path      = nil
+    @page_to_json_options = { methods: [:content], except: [:content_cache] }
   end
 
 end

data/lib/comfortable_mexican_sofa/content/tags/file.rb

@@ -11,6 +11,7 @@ require_relative "./mixins/file_content"
 # `resize`  - imagemagic option. For example: "100x50>"
 # `gravity` - imagemagic option. For example: "center"
 # `crop`    - imagemagic option. For example: "100x50+0+0"
+# `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
 class ComfortableMexicanSofa::Content::Tag::File < ComfortableMexicanSofa::Content::Tag::Fragment
 
@@ -27,6 +28,7 @@ class ComfortableMexicanSofa::Content::Tag::File < ComfortableMexicanSofa::Conte
     super
     @as             = options["as"] || "url"
     @label          = options["label"]
+    @class          = options["class"]
     @variant_attrs  = options.slice("resize", "gravity", "crop")
   end
 

data/lib/comfortable_mexican_sofa/content/tags/file_link.rb

@@ -11,6 +11,7 @@ require_relative "./mixins/file_content"
 # `resize`  - imagemagic option. For example: "100x50>"
 # `gravity` - imagemagic option. For example: "center"
 # `crop`    - imagemagic option. For example: "100x50+0+0"
+# `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
 class ComfortableMexicanSofa::Content::Tag::FileLink < ComfortableMexicanSofa::Content::Tag
 
@@ -31,6 +32,7 @@ class ComfortableMexicanSofa::Content::Tag::FileLink < ComfortableMexicanSofa::C
     options = params.extract_options!
     @identifier     = params[0]
     @as             = options["as"] || "url"
+    @class          = options["class"]
     @variant_attrs  = options.slice("resize", "gravity", "crop")
 
     unless @identifier.present?

data/lib/comfortable_mexican_sofa/content/tags/mixins/file_content.rb

@@ -12,26 +12,31 @@ module ComfortableMexicanSofa::Content::Tag::Mixins
     def content(file: self.file, as: self.as, variant_attrs: self.variant_attrs, label: self.label)
       return "" unless file
 
-      if variant_attrs.present? && attachment.image?
-        file = file.variant(combine_options: variant_attrs)
-      end
+      url_helpers = Rails.application.routes.url_helpers
 
-      url = rails_blob_path(file)
+      attachment_url =
+        if variant_attrs.present? && file.image?
+          variant = file.variant(combine_options: variant_attrs)
+          url_helpers.rails_representation_path(variant, only_path: true)
+        else
+          url_helpers.rails_blob_path(file, only_path: true)
+        end
 
       case as
       when "link"
-        "<a href='#{url}' target='_blank'>#{label}</a>"
+        "<a href='#{attachment_url}'#{html_class_attribute} target='_blank'>#{label}</a>"
       when "image"
-        "<img src='#{url}' alt='#{label}'/>"
+        "<img src='#{attachment_url}'#{html_class_attribute} alt='#{label}'/>"
       else
-        url
+        attachment_url
       end
     end
 
-    # @param [ActiveStorage::Blob]
-    # @return [String]
-    def rails_blob_path(blob)
-      Rails.application.routes.url_helpers.rails_blob_path(blob, only_path: true)
+  private
+
+    def html_class_attribute
+      return if @class.blank?
+      " class='#{@class}'"
     end
 
   end

data/lib/comfortable_mexican_sofa/content/tags/page_file_link.rb

@@ -20,6 +20,7 @@ require_relative "./mixins/file_content"
 # `resize`  - imagemagick option. For example: "100x50>"
 # `gravity` - imagemagick option. For example: "center"
 # `crop`    - imagemagick option. For example: "100x50+0+0"
+# `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
 class ComfortableMexicanSofa::Content::Tag::PageFileLink < ComfortableMexicanSofa::Content::Tag
 
@@ -44,6 +45,7 @@ class ComfortableMexicanSofa::Content::Tag::PageFileLink < ComfortableMexicanSof
     options = params.extract_options!
     @identifier     = params[0]
     @as             = options["as"] || "url"
+    @class          = options["class"]
     @variant_attrs  = options.slice("resize", "gravity", "crop")
     @filename       = options["filename"]
 

data/lib/comfortable_mexican_sofa/engine.rb

@@ -8,11 +8,19 @@ require "active_link_to"
 require "kramdown"
 require "jquery-rails"
 require "haml-rails"
-require "sass-rails"
+require "sassc-rails"
 
 module ComfortableMexicanSofa
   class Engine < ::Rails::Engine
 
+    initializer "comfortable_mexican_sofa.setup_assets" do
+      ::ComfortableMexicanSofa::Engine.config.assets.precompile += %w[
+        comfy/admin/cms/application.js
+        comfy/admin/cms/application.css
+        comfy/admin/cms/lib/redactor-font.eot
+      ]
+    end
+
     config.to_prepare do
       Dir.glob(Rails.root + "app/decorators/comfortable_mexican_sofa/*_decorator*.rb").each do |c|
         require_dependency(c)

data/lib/comfortable_mexican_sofa/extensions/has_revisions.rb

@@ -60,7 +60,7 @@ module ComfortableMexicanSofa::HasRevisions
     # Assigning whatever is found in revision data and attempting to save the object
     def restore_from_revision(revision)
       return unless revision.record == self
-      update_attributes!(revision.data)
+      update!(revision.data)
     end
 
   end

data/lib/comfortable_mexican_sofa/render_methods.rb

@@ -67,6 +67,8 @@ module ComfortableMexicanSofa::RenderMethods
       raise ComfortableMexicanSofa::MissingPage, path
     end
 
+    @cms_page.translate!
+
     @cms_layout = @cms_page.layout
     if (cms_fragments = options.delete(:cms_fragments)).present?
       cms_fragments.each do |identifier, value|

data/lib/comfortable_mexican_sofa/seeds.rb

@@ -2,6 +2,8 @@
 
 module ComfortableMexicanSofa::Seeds
 
+  SEED_CLASSES = %w[Layout Page Snippet File].freeze
+
   class Error < StandardError; end
 
   require "mimemagic"
@@ -26,8 +28,8 @@ module ComfortableMexicanSofa::Seeds
       end
     end
 
-    def import!
-      %w[Layout Page Snippet File].each do |klass|
+    def import!(classes = SEED_CLASSES)
+      classes.each do |klass|
         klass = "ComfortableMexicanSofa::Seeds::#{klass}::Importer"
         klass.constantize.new(from, to).import!
       end
@@ -78,8 +80,8 @@ module ComfortableMexicanSofa::Seeds
       self.site = Comfy::Cms::Site.where(identifier: from).first!
     end
 
-    def export!
-      %w[Layout Page Snippet File].each do |klass|
+    def export!(classes = SEED_CLASSES)
+      classes.each do |klass|
         klass = "ComfortableMexicanSofa::Seeds::#{klass}::Exporter"
         klass.constantize.new(from, to).export!
       end

data/lib/comfortable_mexican_sofa/seeds/page/importer.rb

@@ -187,7 +187,7 @@ module ComfortableMexicanSofa::Seeds::Page
     # ActiveStorage and a list of ids of old attachements to destroy
     def files_content(record, identifier, path, frag_content)
       # preparing attachments
-      files = frag_content.split.collect do |filename|
+      files = frag_content.split("\n").collect do |filename|
         file_handler = File.open(File.join(path, filename))
         {
           io:           file_handler,

data/lib/comfortable_mexican_sofa/version.rb

@@ -2,6 +2,6 @@
 
 module ComfortableMexicanSofa
 
-  VERSION = "2.0.17"
+  VERSION = "2.0.18"
 
 end

data/lib/generators/comfy/scaffold/templates/controller.rb.tt

@@ -29,7 +29,7 @@ class Admin::<%= class_name.pluralize %>Controller < Comfy::Admin::BaseControlle
   end
 
   def update
-    @<%= file_name %>.update_attributes!(<%= file_name %>_params)
+    @<%= file_name %>.update!(<%= file_name %>_params)
     flash[:success] = '<%= class_name.titleize %> updated'
     redirect_to action: :show, id: @<%= file_name %>
   rescue ActiveRecord::RecordInvalid

data/lib/tasks/cms_seeds.rake

@@ -2,11 +2,12 @@
 
 namespace :comfy do
   namespace :cms_seeds do
-    desc "Import CMS Seed data into database (from: folder name, to: site identifier)"
+    desc "Import CMS Seed data into database (from: folder name, to: site identifier, klasses: class name[s])"
 
-    task :import, %i[from to] => [:environment] do |_t, args|
+    task :import, %i[from to klasses] => [:environment] do |_t, args|
       from  = args[:from]
       to    = args[:to] || from
+      klasses = args[:klasses].nil? ? nil : args[:klasses].split
 
       puts "Importing CMS Seed data from Folder [#{from}] to Site [#{to}] ..."
 
@@ -14,15 +15,16 @@ namespace :comfy do
       logger = ComfortableMexicanSofa.logger
       ComfortableMexicanSofa.logger = Logger.new(STDOUT)
 
-      ComfortableMexicanSofa::Seeds::Importer.new(from, to).import!
+      ComfortableMexicanSofa::Seeds::Importer.new(from, to).import!(klasses)
 
       ComfortableMexicanSofa.logger = logger
     end
 
-    desc "Export database data into CMS Seed files (from: site identifier, to: folder name)"
-    task :export, %i[from to] => [:environment] do |_t, args|
+    desc "Export database data into CMS Seed files (from: site identifier, to: folder name, klasses: class name[s])"
+    task :export, %i[from to klasses] => [:environment] do |_t, args|
       from  = args[:from]
       to    = args[:to] || from
+      classes = args[:classes]&.split
 
       puts "Exporting CMS data from Site [#{from}] to Folder [#{to}] ..."
 
@@ -30,7 +32,7 @@ namespace :comfy do
       logger = ComfortableMexicanSofa.logger
       ComfortableMexicanSofa.logger = Logger.new(STDOUT)
 
-      ComfortableMexicanSofa::Seeds::Exporter.new(from, to).export!
+      ComfortableMexicanSofa::Seeds::Exporter.new(from, to).export!(classes)
 
       ComfortableMexicanSofa.logger = logger
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -137,19 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 2.0.0
 description: ComfortableMexicanSofa is a powerful Rails 5.2+ CMS Engine
 email:
 - oleg@khabarov.ca
@@ -536,6 +536,7 @@ files:
 - db/cms_seeds/sample-site/layouts/default/nested/content.html
 - db/cms_seeds/sample-site/pages/index/child_a/content.html
 - db/cms_seeds/sample-site/pages/index/child_b/content.html
+- db/cms_seeds/sample-site/pages/index/cms logo.png
 - db/cms_seeds/sample-site/pages/index/content.es.html
 - db/cms_seeds/sample-site/pages/index/content.fr.html
 - db/cms_seeds/sample-site/pages/index/content.html
@@ -633,8 +634,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rails 5.2+ CMS Engine