occams 1.0.1 → 1.0.2

data/config/application.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "boot"
+require_relative 'boot'
 
-require "rails/all"
+require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -10,7 +10,7 @@ Bundler.require(*Rails.groups)
 
 module Occams
   class Application < Rails::Application
-    require_relative "../lib/occams"
+    require_relative '../lib/occams'
 
     config.load_defaults 5.2
 
@@ -30,7 +30,7 @@ module Occams
     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.paths['config/routes.rb'] << 'config/cms_routes.rb'
 
     config.i18n.enforce_available_locales = true
   end

data/config/boot.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-File.exist?(ENV["BUNDLE_GEMFILE"])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+File.exist? ENV.fetch('BUNDLE_GEMFILE')

data/config/environment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Load the rails application
-require File.expand_path("application", __dir__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
 Occams::Application.initialize!

data/config/environments/development.rb

@@ -16,12 +16,12 @@ defined?(Occams::Application) && Occams::Application.configure do
 
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join("tmp/caching-dev.txt").exist?
+  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}"
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false

data/config/environments/test.rb

@@ -17,7 +17,7 @@ defined?(Occams::Application) && Occams::Application.configure do
   # 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}"
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.

data/config/initializers/occams.rb

@@ -90,8 +90,8 @@ end
 
 # Default credentials for Occams::AccessControl::AdminAuthentication
 # YOU REALLY WANT TO CHANGE THIS BEFORE PUTTING YOUR SITE LIVE
-Occams::AccessControl::AdminAuthentication.username = "user"
-Occams::AccessControl::AdminAuthentication.password = "pass"
+Occams::AccessControl::AdminAuthentication.username = 'user'
+Occams::AccessControl::AdminAuthentication.password = 'pass'
 
 # Uncomment this module and `config.admin_auth` above to use custom admin authentication
 # module OccamsAdminAuthentication

data/config.ru

@@ -2,5 +2,5 @@
 
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path("config/environment", __dir__)
+require File.expand_path('config/environment', __dir__)
 run Occams::Application

data/lib/generators/occams/cms/assets_generator.rb

@@ -4,11 +4,11 @@ module Occams
   module Generators
     module Cms
       class AssetsGenerator < Rails::Generators::Base
-        source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/assets"))
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/assets'))
 
         def generate_assets
-          directory "javascripts/occams/admin/cms", "app/assets/javascripts/occams/admin/cms"
-          directory "stylesheets/occams/admin/cms", "app/assets/stylesheets/occams/admin/cms"
+          directory 'javascripts/occams/admin/cms', 'app/assets/javascripts/occams/admin/cms'
+          directory 'stylesheets/occams/admin/cms', 'app/assets/stylesheets/occams/admin/cms'
         end
       end
     end

data/lib/generators/occams/cms/cms_generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails/generators/active_record"
+require 'rails/generators/active_record'
 
 module Occams
   module Generators
@@ -8,23 +8,23 @@ module Occams
       include Rails::Generators::Migration
       include Thor::Actions
 
-      source_root File.expand_path("../../../..", __dir__)
+      source_root File.expand_path('../../../..', __dir__)
 
       def generate_migration
-        destination   = File.expand_path("db/migrate/01_create_cms.rb", destination_root)
+        destination   = File.expand_path('db/migrate/01_create_cms.rb', destination_root)
         migration_dir = File.dirname(destination)
-        destination   = self.class.migration_exists?(migration_dir, "create_cms")
+        destination   = self.class.migration_exists?(migration_dir, 'create_cms')
 
         if destination
           puts "\e[0m\e[31mFound existing cms_create.rb migration. Remove it if you want to regenerate.\e[0m"
         else
-          migration_template "db/migrate/01_create_cms.rb", "db/migrate/create_cms.rb"
+          migration_template 'db/migrate/01_create_cms.rb', 'db/migrate/create_cms.rb'
         end
       end
 
       def generate_initializer
-        copy_file "config/initializers/occams.rb",
-                  "config/initializers/occams.rb"
+        copy_file 'config/initializers/occams.rb',
+                  'config/initializers/occams.rb'
       end
 
       def generate_railties_order
@@ -45,18 +45,18 @@ module Occams
       end
 
       def generate_cms_seeds
-        directory "db/cms_seeds", "db/cms_seeds"
+        directory 'db/cms_seeds', 'db/cms_seeds'
       end
 
       def generate_assets
-        copy_file "app/assets/javascripts/occams/admin/cms/custom.js",
-                  "app/assets/javascripts/occams/admin/cms/custom.js"
-        copy_file "app/assets/stylesheets/occams/admin/cms/custom.sass",
-                  "app/assets/stylesheets/occams/admin/cms/custom.sass"
+        copy_file 'app/assets/javascripts/occams/admin/cms/custom.js',
+                  'app/assets/javascripts/occams/admin/cms/custom.js'
+        copy_file 'app/assets/stylesheets/occams/admin/cms/custom.sass',
+                  'app/assets/stylesheets/occams/admin/cms/custom.sass'
       end
 
       def show_readme
-        readme "lib/generators/occams/cms/README"
+        readme 'lib/generators/occams/cms/README'
       end
 
       def self.next_migration_number(dirname)

data/lib/generators/occams/cms/controllers_generator.rb

@@ -4,10 +4,10 @@ module Occams
   module Generators
     module Cms
       class ControllersGenerator < Rails::Generators::Base
-        source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/controllers"))
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/controllers'))
 
         def generate_controllers
-          directory "occams", "app/controllers/occams"
+          directory 'occams', 'app/controllers/occams'
         end
       end
     end

data/lib/generators/occams/cms/models_generator.rb

@@ -4,10 +4,10 @@ module Occams
   module Generators
     module Cms
       class ModelsGenerator < Rails::Generators::Base
-        source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/models"))
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/models'))
 
         def generate_models
-          directory "occams", "app/models/occams"
+          directory 'occams', 'app/models/occams'
         end
       end
     end

data/lib/generators/occams/cms/views_generator.rb

@@ -4,10 +4,10 @@ module Occams
   module Generators
     module Cms
       class ViewsGenerator < Rails::Generators::Base
-        source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/views"))
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/views'))
 
         def generate_views
-          directory "occams", "app/views/occams"
+          directory 'occams', 'app/views/occams'
         end
       end
     end

data/lib/generators/occams/scaffold/scaffold_generator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "rails/generators/generated_attribute"
-require "rails/generators/active_record"
+require 'rails/generators/generated_attribute'
+require 'rails/generators/active_record'
 
 module Occams
   module Generators
@@ -12,17 +12,17 @@ module Occams
         attr_accessor :model_attrs
       end
 
-      source_root File.expand_path(File.join(File.dirname(__FILE__), "templates"))
+      source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
 
-      argument :model_args, type: :array, default: [], banner: "attribute:type"
+      argument :model_args, type: :array, default: [], banner: 'attribute:type'
 
       def initialize(*args, &block)
         super
         @model_attrs = []
         model_args.each do |arg|
-          next unless arg.include?(":")
+          next unless arg.include?(':')
 
-          @model_attrs << Rails::Generators::GeneratedAttribute.new(*arg.split(":"))
+          @model_attrs << Rails::Generators::GeneratedAttribute.new(*arg.split(':'))
         end
       end
 
@@ -31,23 +31,23 @@ module Occams
       end
 
       def generate_model
-        migration_template "migration.rb", "db/migrate/create_#{file_name.pluralize}.rb"
-        template "model.rb", "app/models/#{file_name}.rb"
-        template "tests/model.rb", "test/models/#{file_name}_test.rb"
-        template "tests/fixture.yml", "test/fixtures/#{file_name.pluralize}.yml"
+        migration_template 'migration.rb', "db/migrate/create_#{file_name.pluralize}.rb"
+        template 'model.rb', "app/models/#{file_name}.rb"
+        template 'tests/model.rb', "test/models/#{file_name}_test.rb"
+        template 'tests/fixture.yml', "test/fixtures/#{file_name.pluralize}.yml"
       end
 
       def generate_controller
-        template "controller.rb", "app/controllers/admin/#{file_name.pluralize}_controller.rb"
-        template "tests/controller.rb", "test/controllers/admin/#{file_name.pluralize}_controller_test.rb"
+        template 'controller.rb', "app/controllers/admin/#{file_name.pluralize}_controller.rb"
+        template 'tests/controller.rb', "test/controllers/admin/#{file_name.pluralize}_controller_test.rb"
       end
 
       def generate_views
-        template "views/index.haml", "app/views/admin/#{file_name.pluralize}/index.html.haml"
-        template "views/show.haml", "app/views/admin/#{file_name.pluralize}/show.html.haml"
-        template "views/new.haml", "app/views/admin/#{file_name.pluralize}/new.html.haml"
-        template "views/edit.haml", "app/views/admin/#{file_name.pluralize}/edit.html.haml"
-        template "views/_form.haml", "app/views/admin/#{file_name.pluralize}/_form.html.haml"
+        template 'views/index.haml', "app/views/admin/#{file_name.pluralize}/index.html.haml"
+        template 'views/show.haml', "app/views/admin/#{file_name.pluralize}/show.html.haml"
+        template 'views/new.haml', "app/views/admin/#{file_name.pluralize}/new.html.haml"
+        template 'views/edit.haml', "app/views/admin/#{file_name.pluralize}/edit.html.haml"
+        template 'views/_form.haml', "app/views/admin/#{file_name.pluralize}/_form.html.haml"
       end
 
       def generate_route
@@ -61,7 +61,7 @@ module Occams
       end
 
       def generate_navigation_link
-        partial_path = "app/views/occams/admin/cms/partials/_navigation_inner.html.haml"
+        partial_path = 'app/views/occams/admin/cms/partials/_navigation_inner.html.haml'
 
         unless File.exist?(File.join(destination_root, partial_path))
           create_file partial_path

data/lib/occams/configuration.rb

@@ -86,44 +86,44 @@ class Occams::Configuration
 
   # Configuration defaults
   def initialize
-    @cms_title              = "Occams CMS Engine"
-    @admin_base_controller  = "ApplicationController"
-    @public_base_controller = "ApplicationController"
-    @admin_auth             = "Occams::AccessControl::AdminAuthentication"
-    @admin_authorization    = "Occams::AccessControl::AdminAuthorization"
-    @public_auth            = "Occams::AccessControl::PublicAuthentication"
-    @public_authorization   = "Occams::AccessControl::PublicAuthorization"
+    @cms_title              = 'Occams CMS Engine'
+    @admin_base_controller  = 'ApplicationController'
+    @public_base_controller = 'ApplicationController'
+    @admin_auth             = 'Occams::AccessControl::AdminAuthentication'
+    @admin_authorization    = 'Occams::AccessControl::AdminAuthorization'
+    @public_auth            = 'Occams::AccessControl::PublicAuthentication'
+    @public_authorization   = 'Occams::AccessControl::PublicAuthorization'
     @seed_data_path         = nil
-    @admin_route_redirect   = ""
+    @admin_route_redirect   = ''
     @enable_sitemap         = true
     @enable_seeds           = false
-    @seeds_path             = File.expand_path("db/cms_seeds", Rails.root)
+    @seeds_path             = File.expand_path('db/cms_seeds', Rails.root)
     @revisions_limit        = 25
     @locales                = {
-      "ar" => "عربي",
-      "ca" => "Català",
-      "cs" => "Česky",
-      "da" => "Dansk",
-      "de" => "Deutsch",
-      "en" => "English",
-      "es" => "Español",
-      "fi" => "Suomi",
-      "fr" => "Français",
-      "gr" => "Ελληνικά",
-      "hr" => "Hrvatski",
-      "it" => "Italiano",
-      "ja" => "日本語",
-      "nb" => "Norsk",
-      "nl" => "Nederlands",
-      "pl" => "Polski",
-      "pt-BR" => "Português Brasileiro",
-      "ru" => "Русский",
-      "sk" => "Slovensky",
-      "sv" => "Svenska",
-      "tr" => "Türkçe",
-      "uk" => "Українська",
-      "zh-CN" => "简体中文",
-      "zh-TW" => "正體中文"
+      'ar' => 'عربي',
+      'ca' => 'Català',
+      'cs' => 'Česky',
+      'da' => 'Dansk',
+      'de' => 'Deutsch',
+      'en' => 'English',
+      'es' => 'Español',
+      'fi' => 'Suomi',
+      'fr' => 'Français',
+      'gr' => 'Ελληνικά',
+      'hr' => 'Hrvatski',
+      'it' => 'Italiano',
+      'ja' => '日本語',
+      'nb' => 'Norsk',
+      'nl' => 'Nederlands',
+      'pl' => 'Polski',
+      'pt-BR' => 'Português Brasileiro',
+      'ru' => 'Русский',
+      'sk' => 'Slovensky',
+      'sv' => 'Svenska',
+      'tr' => 'Türkçe',
+      'uk' => 'Українська',
+      'zh-CN' => '简体中文',
+      'zh-TW' => '正體中文'
     }
     @admin_locale         = nil
     @admin_cache_sweeper  = nil

data/lib/occams/content/params_parser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "strscan"
+require 'strscan'
 
 class Occams::Content::ParamsParser
   class Error < StandardError; end
@@ -16,7 +16,7 @@ class Occams::Content::ParamsParser
   INTEGER         = %r{\b[0-9]+\b}i.freeze
 
   # @param <String> string
-  def initialize(string = "")
+  def initialize(string = '')
     @string = string
   end
 
@@ -120,7 +120,7 @@ private
   # @param [String] args_string
   # @return [Array<String>] tokens
   def tokenize(args_string)
-    args_string = args_string.tr("“”‘’", %q(""''))
+    args_string = args_string.tr('“”‘’', %q(""''))
     ss = StringScanner.new(args_string)
     tokens = []
     loop do

data/lib/occams/content/renderer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "strscan"
+require 'strscan'
 
 # Processing content follows these stages:
 #
@@ -48,7 +48,7 @@ class Occams::Content::Renderer
   # @param [Boolean] allow_erb
   def render(nodes, allow_erb = Occams.config.allow_erb)
     if (@depth += 1) > MAX_DEPTH
-      raise Error, "Deep tag nesting or recursive nesting detected"
+      raise Error, 'Deep tag nesting or recursive nesting detected'
     end
 
     nodes.map do |node|
@@ -67,7 +67,7 @@ class Occams::Content::Renderer
     if allow_erb
       string.to_s
     else
-      string.to_s.gsub("<%", "&lt;%").gsub("%>", "%&gt;")
+      string.to_s.gsub('<%', '&lt;%').gsub('%>', '%&gt;')
     end
   end
 
@@ -77,7 +77,7 @@ class Occams::Content::Renderer
     tokens = []
     ss = StringScanner.new(string.to_s)
     while (string = ss.scan_until(TAG_REGEX))
-      text = string.sub(ss[0], "")
+      text = string.sub(ss[0], '')
       tokens << text unless text.empty?
       tokens << {
         tag_class: ss[:class],
@@ -105,9 +105,9 @@ class Occams::Content::Renderer
         case tag_class = token[:tag_class]
 
         # This handles {{cms:end}} tag. Stopping collecting block nodes.
-        when "end"
+        when 'end'
           if nodes.count == 1
-            raise SyntaxError, "closing unopened block"
+            raise SyntaxError, 'closing unopened block'
           end
 
           nodes.pop
@@ -115,7 +115,7 @@ class Occams::Content::Renderer
         else
           # @type [Class<Occams::Content::Tag>]
           klass = self.class.tags[tag_class] ||
-            raise(SyntaxError, "Unrecognized tag: #{token[:source]}")
+                  raise(SyntaxError, "Unrecognized tag: #{token[:source]}")
 
           # @type [Occams::Content::Tag]
           tag = klass.new(
@@ -138,7 +138,7 @@ class Occams::Content::Renderer
     end
 
     if nodes.count > 1
-      raise SyntaxError, "unclosed block detected"
+      raise SyntaxError, 'unclosed block detected'
     end
 
     nodes.flatten

data/lib/occams/content/tag.rb

@@ -38,7 +38,7 @@ class Occams::Content::Tag
 
   # @return [String]
   def content
-    raise Error, "This is a base class. It holds no content"
+    raise Error, 'This is a base class. It holds no content'
   end
 
   # @return [String]

data/lib/occams/content/tags/asset.rb

@@ -15,12 +15,12 @@ class Occams::Content::Tag::Asset < Occams::Content::Tag
 
     options = params.extract_options!
     @identifier = params[0]
-    @type       = options["type"]
-    @as         = options["as"] || "url"
+    @type       = options['type']
+    @as         = options['as'] || 'url'
 
-    unless @identifier.present?
-      raise Error, "Missing layout identifier for asset tag"
-    end
+    return if @identifier.present?
+
+    raise Error, 'Missing layout identifier for asset tag'
   end
 
   def layout
@@ -28,23 +28,23 @@ class Occams::Content::Tag::Asset < Occams::Content::Tag
   end
 
   def content
-    return "" unless layout
+    return '' unless layout
 
-    base = Occams.config.public_cms_path || ""
-    unless base.ends_with?("/")
-      base += "/"
+    base = Occams.config.public_cms_path || ''
+    unless base.ends_with?('/')
+      base += '/'
     end
 
     case @type
-    when "css"
+    when 'css'
       out = "#{base}cms-css/#{context.site.id}/#{@identifier}/#{layout.cache_buster}.css"
-      if @as == "tag"
+      if @as == 'tag'
         out = "<link href='#{out}' media='screen' rel='stylesheet' type='text/css' />"
       end
       out
-    when "js"
+    when 'js'
       out = "#{base}cms-js/#{context.site.id}/#{@identifier}/#{layout.cache_buster}.js"
-      if @as == "tag"
+      if @as == 'tag'
         out = "<script src='#{out}' type='text/javascript'></script>"
       end
       out

data/lib/occams/content/tags/checkbox.rb

@@ -11,11 +11,11 @@ class Occams::Content::Tag::Checkbox < Occams::Content::Tag::Fragment
   def form_field(object_name, view, index)
     name = "#{object_name}[fragments_attributes][#{index}][boolean]"
 
-    input = view.content_tag(:div, class: "form-check mt-2") do
-      view.concat view.hidden_field_tag(name, "0", id: nil)
+    input = view.content_tag(:div, class: 'form-check mt-2') do
+      view.concat view.hidden_field_tag(name, '0', id: nil)
 
-      options = { id: form_field_id, class: "form-check-input position-static" }
-      view.concat view.check_box_tag(name, "1", content.present?, options)
+      options = { id: form_field_id, class: 'form-check-input position-static' }
+      view.concat view.check_box_tag(name, '1', content.present?, options)
     end
 
     yield input

data/lib/occams/content/tags/date.rb

@@ -6,8 +6,8 @@
 class Occams::Content::Tag::Date < Occams::Content::Tag::Datetime
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"
-    options = { id: form_field_id, class: "form-control", data: { "cms-date" => true } }
-    value   = content.present? ? content.to_s(:db) : ""
+    options = { id: form_field_id, class: 'form-control', data: { 'cms-date' => true } }
+    value   = content.present? ? content.to_s(:db) : ''
     input   = view.send(:text_field_tag, name, value, options)
 
     yield input

data/lib/occams/content/tags/datetime.rb

@@ -10,7 +10,7 @@ class Occams::Content::Tag::Datetime < Occams::Content::Tag::Fragment
 
   def initialize(context:, params: [], source: nil)
     super
-    @strftime = options["strftime"]
+    @strftime = options['strftime']
   end
 
   def content
@@ -18,7 +18,7 @@ class Occams::Content::Tag::Datetime < Occams::Content::Tag::Fragment
   end
 
   def render
-    return "" unless renderable
+    return '' unless renderable
 
     if strftime.present?
       content.strftime(strftime)
@@ -29,8 +29,8 @@ class Occams::Content::Tag::Datetime < Occams::Content::Tag::Fragment
 
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"
-    options = { id: form_field_id, class: "form-control", data: { "cms-datetime" => true } }
-    value   = content.present? ? content.to_s(:db) : ""
+    options = { id: form_field_id, class: 'form-control', data: { 'cms-datetime' => true } }
+    value   = content.present? ? content.to_s(:db) : ''
     input   = view.send(:text_field_tag, name, value, options)
 
     yield input

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./mixins/file_content"
+require_relative 'mixins/file_content'
 
 # File tag allows attaching of file to the page. This controls how files are
 # uploaded and then displayed on the page. Example tag:
@@ -25,20 +25,20 @@ class Occams::Content::Tag::File < Occams::Content::Tag::Fragment
   # @param (see Occams::Content::Tag#initialize)
   def initialize(context:, params: [], source: nil)
     super
-    @as             = options["as"] || "url"
-    @label          = options["label"]
-    @class          = options["class"]
-    @variant_attrs  = options.slice("resize", "gravity", "crop")
+    @as             = options['as'] || 'url'
+    @label          = options['label']
+    @class          = options['class']
+    @variant_attrs  = options.slice('resize', 'gravity', 'crop')
   end
 
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][files]"
-    input   = view.send(:file_field_tag, name, id: form_field_id, class: "form-control")
+    input   = view.send(:file_field_tag, name, id: form_field_id, class: 'form-control')
 
     attachments_partial =
       if fragment.attachments
         view.render(
-          partial: "occams/admin/cms/fragments/form_fragment_attachments",
+          partial: 'occams/admin/cms/fragments/form_fragment_attachments',
           locals: {
             object_name: object_name,
             index: index,
@@ -49,7 +49,7 @@ class Occams::Content::Tag::File < Occams::Content::Tag::Fragment
         )
       end
 
-    yield view.safe_join([input, attachments_partial], "")
+    yield view.safe_join([input, attachments_partial], '')
   end
 
 protected