trusty-cms 3.1.11 → 3.2.0

data/app/views/admin/removed/_assets_container.html.haml

@@ -0,0 +1,54 @@
+- @stylesheets << 'admin/assets'
+= javascript_include_tag 'admin/assets_admin'
+
+#assets-container
+  #asset-tabs
+    - render_region :asset_tabs do |asset_tabs|
+      - if @page && !@page.new_record? 
+        - asset_tabs.attachment_tab do
+          %a.asset-tab{ :href => "#page-attachments", :id => "tab_page-attachments" }
+            = t("clipped_extension.attached_assets")
+        - asset_tabs.upload_tab do
+          %a.asset-tab{ :href => "#upload_assets", :id => "tab_upload_assets" }
+            = t("clipped_extension.upload")
+        - asset_tabs.bucket_tab do
+          %a.asset-tab{ :href => "#bucket", :id => "tab_bucket" }
+            = t("clipped_extension.bucket")
+        - asset_tabs.search_tab do  
+          %a.asset-tab{ :href => "#search-assets" }
+            = t("clipped_extension.search")
+      - else
+        - asset_tabs.bucket_tab do
+          %a.asset-tab.here{ :href => "#" }
+            = t("clipped_extension.bucket")
+    - if @page && !@page.new_record? 
+      - render_region :asset_panes do |asset_panes|
+
+        - asset_panes.page_attachments do 
+          #page-attachments.pane
+            %p
+              %span.note 
+                != t("clipped_extension.asset_note")
+            %ul#attachments
+              = render :partial => "admin/assets/page_assets" 
+            .clear
+      
+        - asset_panes.upload do
+          #upload_assets.pane
+            %p
+              %span.note
+                != t("clipped_extension.asset_page_upload_note")
+            = render :partial => "admin/assets/upload_to_page"
+            .clear
+        - asset_panes.search do
+          #search-assets.pane
+            - form_tag do
+              %p
+                %label.note{ :for => 'search' }
+                  = t("clipped_extension.search_assets")
+                %input{ :type => "hidden", :name => "search", :value => @page.id }
+                %input{ :type => "search", :id => "search", :name => "search" }
+                = submit_tag t("clipped_extension.search")
+            #search-results
+            .clear
+            = observe_field 'search',  :frequency => 1, :update => 'search-results', :url =>  admin_assets_path(:asset_page => @page), :method => 'get', :with => "'search=' + escape(value)"

data/app/views/admin/removed/_bucket.html.haml

@@ -0,0 +1,11 @@
+%ul#bucket_list
+  - if session[:bucket]
+    - session[:bucket].each do |url, info| 
+      = render :partial => 'admin/assets/bucket_asset', :locals => { :asset_url => url, :asset_id => info[:id], :asset_type => info[:type], :asset_title => info[:title], :asset_thumbnail =>info[:thumbnail], :page => @page }
+  - else
+    %li
+      %p.note
+        = t("clipped_extension.empty_bucket")
+      
+ 
+

data/app/views/admin/removed/_bucket_asset.html.haml

@@ -0,0 +1,9 @@
+%li
+
+  %div{ :class => "#{asset_type} asset", :id =>  "bucket_#{asset_id}" }
+    = link_to image_tag(asset_thumbnail), asset_url, :title => asset_title, :class => "bucket_link"
+
+  .info{ :id => "#{asset_id}_info" }
+    = link_to image('assets/edit'), edit_admin_asset_url(asset_id), :class => "edit_asset", :title => t("clipped_extension.edit_asset", :asset => asset_title)
+    - if page && !page.new_record?
+      = link_to image('assets/add'), attach_page_asset_url(:asset => asset_id, :page => page.id), :class => "add_asset", :title => t("clipped_extension.attach_to_page")

data/app/views/admin/removed/_show_bucket_link.html.haml

@@ -0,0 +1,4 @@
+- unless @page.nil? || @page.new_record?
+  %span#show-bucket
+    = t('clipped_extension.bucket')
+    = link_to t("clipped_extension.show_assets_bucket"), "#"

data/app/views/admin/removed/_upload_to_page.html.haml

@@ -0,0 +1,12 @@
+#upload-form
+  - form_for :asset, :url => admin_assets_path(:page => @page, :format => 'js'), :html => { :id => 'asset-upload', :method => "post", :multipart => true, :target => 'ulframe' } do |form|
+    %div.file
+      %label.upload
+        = t("clipped_extension.choose_upload")
+      = form.file_field :asset, :class => "", :style => "width: 100%"
+
+    .upload-buttons
+      = form.submit t("clipped_extension.save_and_upload"), :class => "button"
+      %div.spinner
+        
+  %iframe{:id => 'ulframe', :name => "ulframe", :src => "about:blank"}

data/app/views/admin/removed/bucket/_iframe.html.haml

@@ -0,0 +1 @@
+= render :partial => 'admin/assets/asset', :object => asset, :locals => {:dom_id => "attachment_#{asset.id}" }

data/config/application.rb

@@ -12,10 +12,7 @@ require 'trustygems'
 
 
 if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
   Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
 end
 
 module TrustyCms
@@ -47,40 +44,6 @@ module TrustyCms
 
     config.encoding = 'utf-8'
 
-    # Skip frameworks you're not going to use (only works if using vendor/rails).
-    # To use Rails without a database, you must remove the Active Record framework
-    # config.frameworks -= [ :action_mailer ]
-
-    # Only load the extensions named here, in the order given. By default all
-    # extensions in vendor/extensions are loaded, in alphabetical order. :all
-    # can be used as a placeholder for all extensions not explicitly named.
-    # config.extensions = [ :all ]
-
-    # By default, only English translations are loaded. Remove any of these from
-    # the list below if you'd like to provide any of the additional options
-    # config.ignore_extensions []
-
-    # Comment out this line if you want to turn off all caching, or
-    # add options to modify the behavior. In the majority of deployment
-    # scenarios it is desirable to leave TrustyCms's cache enabled and in
-    # the default configuration.
-    #
-    # Additional options:
-    #  :use_x_sendfile => true
-    #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd.
-    #  :use_x_accel_redirect => '/some/virtual/path'
-    #    Turns on X-Accel-Redirect support for nginx. You have to provide
-    #    a path that corresponds to a virtual location in your webserver
-    #    configuration.
-    #  :entitystore => "radiant:tmp/cache/entity"
-    #    Sets the entity store type (preceding the colon) and storage
-    #   location (following the colon, relative to Rails.root).
-    #    We recommend you use radiant: since this will enable manual expiration.
-    #  :metastore => "radiant:tmp/cache/meta"
-    #    Sets the meta store type and storage location.  We recommend you use
-    #    radiant: since this will enable manual expiration and acceleration headers.
-
-
     config.middleware.use Rack::Cache,
                           :private_headers => ['Authorization'],
                           :entitystore => "radiant:tmp/cache/entity",

data/config/initializers/assets.rb

@@ -1,3 +1,4 @@
 Rails.application.config.assets.paths << Rails.root.join('node_modules')
 Rails.application.config.assets.precompile += ['*.png',
                                                '*.gif']
+Rails.application.config.assets.precompile += %w(admin/assets.css admin/assets_admin.js)

data/config/initializers/interpolation.rb

@@ -0,0 +1,6 @@
+require 'paperclip'
+
+Paperclip.interpolates :no_original_style do |attachment, style|
+  style ||= :original
+  style == attachment.default_style ? nil : "_#{style}"
+end

data/config/initializers/kraken.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'kraken-io'
+
+$kraken = Kraken::API.new(
+    :api_key => ENV['KRAKEN_KEY'],
+    :api_secret => ENV['KRAKEN_SECRET']
+)

data/config/initializers/trusty_cms_config.rb

@@ -1,4 +1,5 @@
 require 'multi_site/engine'
+require 'clipped/engine'
 
 TrustyCms.config do |config|
   config.define 'admin.title', :default => "TrustyCms CMS"
@@ -19,6 +20,72 @@ TrustyCms.config do |config|
   require 'multi_site/scoped_validation'
 end
 
+TrustyCms.config do |config|
+  config.namespace 'paperclip' do |pc|
+    pc.define 'url',                      :default => '/system/:attachment/:id/:style/:basename:no_original_style.:extension', :allow_change => true
+    pc.define 'path',                     :default => ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', :allow_change => true
+    pc.define 'skip_filetype_validation', :default => true, :type => :boolean
+    pc.define 'storage', :default       => 'filesystem',
+                         :select_from   => {
+                           'File System'            => 'filesystem',
+                           'Amazon S3'              => 'fog',
+                           'Google Storage'         => 'fog',
+                           'Rackspace Cloud Files'  => 'fog'
+                         },
+                         :allow_blank   => false,
+                         :allow_display => false
+
+    pc.namespace 'fog' do |fog|
+      fog.define 'provider', :select_from => {
+                               'Amazon S3'              => 'AWS',
+                               'Google Storage'         => 'Google',
+                               'Rackspace Cloud Files'  => 'Rackspace'
+                             }
+      fog.define 'directory'
+      fog.define 'public?', :default => true
+      fog.define 'host'
+    end
+
+    pc.namespace 'google_storage' do |gs|
+      gs.define 'access_key_id'
+      gs.define 'secret_access_key'
+    end
+
+    pc.namespace 'rackspace' do |rs|
+      rs.define 'username'
+      rs.define 'api_key'
+    end
+
+    pc.namespace 's3' do |s3|
+      s3.define 'key'
+      s3.define 'secret'
+      s3.define 'region', :select_from => {
+                            'Asia North East' => 'ap-northeast-1',
+                            'Asia South East' => 'ap-southeast-1',
+                            'EU West' => 'eu-west-1',
+                            'US East' => 'us-east-1',
+                            'US West' => 'us-west-1'
+                          }
+    end
+  end
+
+  config.namespace 'assets', :allow_display => false do |assets|
+    assets.define 'create_image_thumbnails?', :default => 'true'
+    assets.define 'create_video_thumbnails?', :default => 'true'
+    assets.define 'create_pdf_thumbnails?', :default => 'true'
+
+    assets.namespace 'thumbnails' do |thumbs| # NB :icon and :thumbnail are already defined as fixed formats for use in the admin interface and can't be changed
+      thumbs.define 'image', :default => 'normal:size=640x640>|small:size=320x320>'
+      thumbs.define 'video', :default => 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
+      thumbs.define 'pdf', :default => 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
+    end
+
+    assets.define 'max_asset_size', :default => 5, :type => :integer, :units => 'MB'
+    assets.define 'display_size', :default => 'normal', :allow_blank => true
+    assets.define 'insertion_size', :default => 'normal', :allow_blank => true
+  end
+end
+
 if TrustyCms.config_definitions['defaults.snippet.filter'].nil?
   TrustyCms.config.define 'defaults.snippet.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
 end

data/config/locales/en.yml

@@ -13,6 +13,10 @@ en:
         too_long: 'this must not be longer than %{count} characters' # character_limit
         too_short: 'this must be at least %{count} characters long' # character_minimum
       models:
+        asset:
+          attributes:
+            asset:
+              blank: 'You must choose a file to upload!'
         page:
           attributes:
             slug:
@@ -30,6 +34,19 @@ en:
   add_part: 'Add Part'
   add_tab: 'Add Tab'
   admin: 'Administrator'
+  assets: 'Assets'
+  asset_types:
+    all: 'All'
+    documents: 'Documents'
+    fonts: 'Fonts'
+    images: 'Images'
+    others: 'Others'
+    audios: 'Audio'
+    flashes: 'Flash'
+    fonts: 'Fonts'
+    videos: 'Video'
+    pdfs: 'PDFs'
+    swfs: 'Flash'
   available_tags: 'Available Tags'
   available_tags_for: 'Available Tags for %{name}'
   body: 'Body'
@@ -40,10 +57,94 @@ en:
     save_changes: 'Save Changes'
   cancel: 'Cancel'
   change: 'Change'
+  clipped_extension:
+    actions: Actions
+    all: 'All'
+    all_thumbnails_refreshed: 'All asset thumbnails refreshed.'
+    alt_text_or_title: 'Set Asset Title <span class="hint">(optional)</span>'
+    asset: 'Asset'
+    asset_edit_title: 'Edit Asset'
+    asset_errors: 'Sorry. {{errors}}'
+    asset_page_attachment_note: 'Attached assets. These can be inserted with drag and drop or shown with the <code>&lt;r:assets:each /&gt;</code> tag.'
+    asset_note: 'Attached assets. '
+    assets: 'Assets'
+    assets_explanation: 'Assets and images can be uploaded and then attached or inserted into pages, snippets and layouts. Click on a asset name above to edit it or click <code>Remove</code> to delete it.'
+    assets_title: 'Assets'
+    asset_page_upload_note: 'Assets uploaded here will be automatically associated with this page.'
+    asset_upload_note: 'Choose an asset to upload here. If the <code>Title</code> field is left blank, the filename (without the file type) will be automatically added. By clicking on <code>More</code>, you can add a caption as well.'
+    attached_assets: 'Attached Assets'
+    attach: 'Attach'
+    attach_asset: 'attach asset'
+    attach_assets: 'Attach assets'
+    attach_existing: 'Attach Existing Assets'
+    attach_to_page: 'Attach to page'
+    audio: 'Audio'
+    cancel_attachment: 'Unattach'
+    copy: 'Copy'
+    copy_alt: 'copy radius tag to clipboard'
+    choose_file: 'Choose File'
+    documents: 'Documents'
+    caption: 'Caption'
+    confirm_refresh_assets: 'Are you sure you want to regenerate every asset thumbnail? This is likely to take a long time and use a lot of server resources: <strong class="warning">the performance of your site is very likely to be affected</strong> and your browser may time out before the operation is complete. This is only recommended if your asset collection is small!'
+    confirm_remove_asset: 'Are you sure you want to permanently remove the following asset?'
+    confirm_remove_from_page: 'Are you sure you want to remove this assets from the page?'
+    delete_asset: 'Delete Asset'
+    detach: 'Detach'
+    edit: 'Edit'
+    edit_asset: 'Edit {{asset}}'
+    filename: 'Filename'
+    find_assets: 'Find Assets'
+    images: 'Images'
+    images_automatically_created: 'images are automatically created'
+    insert: 'Insert'
+    modify: 'Modify'
+    movies: 'Movies'
+    need_to_upload: 'Need to upload?'
+    new_asset: 'New Asset'
+    no_assets_found: 'There were no assets found'
+    no_assets: 'No Assets'
+    no_attached_assets: 'No assets attached.'
+    others: 'Others'
+    refresh_assets: 'Regenerate all thumbnails'
+    regenerate: 'Regenerate'
+    regenerate_thumbnails: 'Regenerate Thumbnails'
+    remove_asset: 'Remove Asset'
+    remove_from_page: 'Remove from page'
+    reorder: 'Reorder'
+    remove: 'Remove'
+    refresh_assets_rake_task: 'For better results please log into your server and run <code>rake paperclip:refresh class=Asset</code>.'
+    replace_file: 'Replace File'
+    save_and_upload: 'Save and Upload'
+    search_assets: 'Search for assets'
+    search: 'Search'
+    select: 'Select'
+    thumbnails_refreshed: "Thumbnails refreshed."
+    title: 'Title'
+    type: 'Type'
+    types_to_find: 'Types to find'
+    upload: 'Upload'
+    upload_asset: 'Upload Asset'
   close: 'Close'
   trusty_config:
     admin:
       title: 'admin header title'
+    assets:
+      additional_thumbnails: 'Additional Thumbnails'
+      content_types: 'Content Types'
+      create_image_thumbnails?: 'Image thumbnails'
+      create_pdf_thumbnails?: 'PDF thumbnails'
+      create_video_thumbnails?: 'Video thumbnails'
+      display_size: 'Display Size'
+      insertion_size: 'Insertion Size'
+      max_asset_size: 'Max Asset Size'
+      path: 'Path'
+      s3:
+        bucket: 'Bucket'
+        key: 'Key'
+        secret: 'Secret'
+      skip_filetype_validation: 'Skip Filetype Validation'
+      storage: 'Storage'
+      url: 'Url'  
     defaults:
       locale: 'default language'
       page:

data/config/routes.rb

@@ -4,12 +4,10 @@ TrustyCms::Application.routes.draw do
   get '/rad_social/mail' => 'social_mailer#social_mail_form', as: :rad_social_mail_form
   post '/rad_social/mail' => 'social_mailer#create_social_mail', as: :rad_create_social_mail
   TrustyCms::Application.config.enabled_extensions.each { |ext|
-    #load File.join(TrustyCms::ExtensionPath.find(ext).to_s, "config", "routes.rb")
   }
   namespace :admin do
     resources :pages do
       resources :children, :controller => 'pages'
-      #TODO: put back the remove on children possibly
       get 'remove', on: :member
     end
     resources :layouts do
@@ -23,6 +21,20 @@ TrustyCms::Application.routes.draw do
     end
     resources :password_resets
     post 'save-table-position' => "pages#save_table_position", as: "save_tables_position"
+
+    resources :assets do
+      get :remove, on: :member
+      get :refresh, on: :collection
+      post :regenerate, on: :collection
+      put :refresh, on: :member
+    end
+    resources :page_attachments, :only => [:new] do
+      get :remove, on: :member
+    end
+    resources :pages do
+      get :remove, on: :member
+      resources :page_attachments
+    end
   end
 
   match 'admin/preview' => 'admin/pages#preview', :as => :preview, :via => [:post, :put]
@@ -47,7 +59,6 @@ TrustyCms::Application.routes.draw do
   get 'admin/welcome' => 'admin/welcome#index', :as => :welcome
   match 'admin/login' => 'admin/welcome#login', :as => :login, :via => [:get, :post]
   get 'admin/logout' => 'admin/welcome#logout', :as => :logout
-  # match '/' => 'site#show_page', :url => '/' # set root to this so root_path works
   get 'error/404' => 'site#not_found', :as => :not_found
   get 'error/500' => 'site#error', :as => :error
   get '*url' => 'site#show_page'

data/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.10.2/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2018-02-07T11:30:37-05:00">2018-02-07T11:30:37-05:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2018-03-30T11:37:29-04:00">2018-03-30T11:37:29-04:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
@@ -287,7 +287,7 @@
         <td>14</td>
         <td>14</td>
         <td>0</td>
-        <td>21.7</td>
+        <td>21.9</td>
       </tr>
       
       <tr>
@@ -6414,8 +6414,8 @@
           <code class="ruby">  # Default Order</code>
         </li>
       
-        <li class="covered" data-hits="26" data-linenumber="7">
-          <span class="hits">26</span>
+        <li class="covered" data-hits="27" data-linenumber="7">
+          <span class="hits">27</span>
           
           <code class="ruby">  default_scope {order(&quot;name&quot;)}</code>
         </li>
@@ -6888,14 +6888,14 @@
           <code class="ruby">  def encrypt_password_unless_empty_or_unchanged</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="86">
-          <span class="hits">1</span>
+        <li class="covered" data-hits="2" data-linenumber="86">
+          <span class="hits">2</span>
           
           <code class="ruby">    user = self.class.find(self.id)</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="87">
-          <span class="hits">1</span>
+        <li class="covered" data-hits="2" data-linenumber="87">
+          <span class="hits">2</span>
           
           <code class="ruby">    case password</code>
         </li>
@@ -7039,8 +7039,8 @@
           <code class="ruby">  def current_user</code>
         </li>
       
-        <li class="covered" data-hits="8" data-linenumber="12">
-          <span class="hits">8</span>
+        <li class="covered" data-hits="9" data-linenumber="12">
+          <span class="hits">9</span>
           
           <code class="ruby">    self.class.current_user</code>
         </li>
@@ -7057,8 +7057,8 @@
           <code class="ruby">  def self.current_user</code>
         </li>
       
-        <li class="covered" data-hits="8" data-linenumber="15">
-          <span class="hits">8</span>
+        <li class="covered" data-hits="9" data-linenumber="15">
+          <span class="hits">9</span>
           
           <code class="ruby">    Thread.current[:current_user]</code>
         </li>
@@ -7105,8 +7105,8 @@
           <code class="ruby">  def before_update(model)</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="23">
-          <span class="hits">1</span>
+        <li class="covered" data-hits="2" data-linenumber="23">
+          <span class="hits">2</span>
           
           <code class="ruby">    model.updated_by = self.current_user</code>
         </li>
@@ -8189,7 +8189,7 @@
         <li class="covered" data-hits="1" data-linenumber="1">
           <span class="hits">1</span>
           
-          <code class="ruby">FactoryGirl.define do</code>
+          <code class="ruby">FactoryBot.define do</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="2">
@@ -8310,7 +8310,7 @@
         <li class="covered" data-hits="1" data-linenumber="1">
           <span class="hits">1</span>
           
-          <code class="ruby">FactoryGirl.define do</code>
+          <code class="ruby">FactoryBot.define do</code>
         </li>
       
         <li class="covered" data-hits="1" data-linenumber="2">
@@ -8352,7 +8352,7 @@
         <li class="covered" data-hits="1" data-linenumber="8">
           <span class="hits">1</span>
           
-          <code class="ruby">      page_parts { [FactoryGirl.create(:page_part, name: &#39;body&#39;)] }</code>
+          <code class="ruby">      page_parts { [FactoryBot.create(:page_part, name: &#39;body&#39;)] }</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="9">
@@ -8376,7 +8376,7 @@
         <li class="covered" data-hits="1" data-linenumber="12">
           <span class="hits">1</span>
           
-          <code class="ruby">      children { [FactoryGirl.create(:page, :with_parts)] }</code>
+          <code class="ruby">      children { [FactoryBot.create(:page, :with_parts)] }</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="13">
@@ -8707,7 +8707,7 @@
         <li class="covered" data-hits="1" data-linenumber="1">
           <span class="hits">1</span>
           
-          <code class="ruby">FactoryGirl.define do</code>
+          <code class="ruby">FactoryBot.define do</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="2">
@@ -8774,7 +8774,7 @@
         <li class="covered" data-hits="1" data-linenumber="1">
           <span class="hits">1</span>
           
-          <code class="ruby">FactoryGirl.define do</code>
+          <code class="ruby">FactoryBot.define do</code>
         </li>
       
         <li class="covered" data-hits="1" data-linenumber="2">
@@ -10483,7 +10483,7 @@
         <li class="covered" data-hits="1" data-linenumber="5">
           <span class="hits">1</span>
           
-          <code class="ruby">  let(:layout){ FactoryGirl.build(:layout) }</code>
+          <code class="ruby">  let(:layout){ FactoryBot.build(:layout) }</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="6">
@@ -10507,7 +10507,7 @@
         <li class="covered" data-hits="1" data-linenumber="9">
           <span class="hits">1</span>
           
-          <code class="ruby">      layout = FactoryGirl.build(:layout, name: &#39;&#39;)</code>
+          <code class="ruby">      layout = FactoryBot.build(:layout, name: &#39;&#39;)</code>
         </li>
       
         <li class="covered" data-hits="1" data-linenumber="10">
@@ -10543,7 +10543,7 @@
         <li class="covered" data-hits="1" data-linenumber="15">
           <span class="hits">1</span>
           
-          <code class="ruby">      layout = FactoryGirl.build(:layout, name: &#39;Normal&#39;, content: &quot;Content!&quot;)</code>
+          <code class="ruby">      layout = FactoryBot.build(:layout, name: &#39;Normal&#39;, content: &quot;Content!&quot;)</code>
         </li>
       
         <li class="covered" data-hits="1" data-linenumber="16">
@@ -10555,7 +10555,7 @@
         <li class="covered" data-hits="1" data-linenumber="17">
           <span class="hits">1</span>
           
-          <code class="ruby">      other = FactoryGirl.build(:layout, name: &#39;Normal&#39;, content: &quot;Content!&quot;)</code>
+          <code class="ruby">      other = FactoryBot.build(:layout, name: &#39;Normal&#39;, content: &quot;Content!&quot;)</code>
         </li>
       
         <li class="covered" data-hits="2" data-linenumber="18">
@@ -10585,7 +10585,7 @@
         <li class="covered" data-hits="1" data-linenumber="22">
           <span class="hits">1</span>
           
-          <code class="ruby">      layout = FactoryGirl.build(:layout, name: &#39;x&#39; * 100)</code>
+          <code class="ruby">      layout = FactoryBot.build(:layout, name: &#39;x&#39; * 100)</code>
         </li>
       
         <li class="covered" data-hits="1" data-linenumber="23">
@@ -10597,7 +10597,7 @@
         <li class="covered" data-hits="1" data-linenumber="24">
           <span class="hits">1</span>
           
-          <code class="ruby">      layout = FactoryGirl.build(:layout, name: &#39;x&#39; * 101)</code>
+          <code class="ruby">      layout = FactoryBot.build(:layout, name: &#39;x&#39; * 101)</code>
         </li>
       
         <li class="covered" data-hits="2" data-linenumber="25">

data/db/migrate/028_create_assets.rb

@@ -0,0 +1,12 @@
+class CreateAssets < ActiveRecord::Migration[5.1]
+  def self.up
+    create_table :assets do |t|
+      t.string :caption, :title
+    end
+    
+  end
+  
+  def self.down
+    drop_table :assets
+  end
+end

data/db/migrate/029_create_paperclip_attributes.rb

@@ -0,0 +1,13 @@
+class CreatePaperclipAttributes < ActiveRecord::Migration[5.1]
+  def self.up
+    add_column :assets, :asset_file_name, :string
+    add_column :assets, :asset_content_type, :string
+    add_column :assets, :asset_file_size, :integer
+  end
+  
+  def self.down
+    remove_column :assets, :asset_file_name
+    remove_column :assets, :asset_content_type
+    remove_column :assets, :asset_file_size
+  end
+end

data/db/migrate/030_create_user_observer.rb

@@ -0,0 +1,13 @@
+class CreateUserObserver < ActiveRecord::Migration[5.1]
+  def self.up
+    add_column :assets, :created_by, :integer
+    add_column :assets, :updated_by, :integer
+    add_column :assets, :created_at, :datetime
+    add_column :assets, :updated_at, :datetime
+  end
+  
+  def self.down
+    remove_column :assets, :created_by
+    remove_column :assets, :updated_by
+  end
+end