trusty-cms 5.0.6 → 5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18961c722bc28e643661f536be22bf286898e3c1992cd70dfdaf389828e05991
-  data.tar.gz: 24fcd6e768d804658d6a5be29f3ac9b637caf54610c564021865d592507a6c23
+  metadata.gz: 2fc624969ff70829f656ee9b206b64c2748da39a5a5e4269e4c7487d4d83745e
+  data.tar.gz: b0a531ee97199d204b90c8b2ec819e51de205df2cbf5a9ad7d822db5d594395a
 SHA512:
-  metadata.gz: 359cb791d303fd26d99fc07591597ed7696f115a7f01fd9066407713083fd412e63feaebccfcd585dc668b0eabef16a41580c54663ae4e9007fa8eb27cf993a4
-  data.tar.gz: 2edfbce7ddd9b83b912110c2ca94ea985aff8562c2ce5dea59e8aaab2d1d2ef2bee66c91e11a064f5815464255eab0a16bd82127c200a6656b68552388fd781d
+  metadata.gz: 0d33321bc5f5e477b5dac327774f3806505df3f247dca235beb0d5cebdd56c72d592b8f52439b49fb7e65f0b5600bc719bff6476137b043b9448c3ea6a275f84
+  data.tar.gz: 5e7b09b40558f82de3d61df8ea41c4a77a4d2f45d47afaacf982226ee801c582c26d2ac9238d5713ded572c7580f4cb98677cf478e5364247c0450355f812afb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.0.6)
+    trusty-cms (5.0.7)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.1.0)
@@ -35,62 +35,62 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actioncable (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionmailbox (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      actionview (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionmailer (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      actionview (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.4)
-      actionview (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionpack (6.1.4.6)
+      actionview (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actiontext (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionview (6.1.4.6)
+      activesupport (= 6.1.4.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.4)
-      activesupport (= 6.1.4.4)
+    activejob (6.1.4.6)
+      activesupport (= 6.1.4.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activerecord (6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activestorage (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    activemodel (6.1.4.6)
+      activesupport (= 6.1.4.6)
+    activerecord (6.1.4.6)
+      activemodel (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
+    activestorage (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
     activestorage-validator (0.1.5)
       rails (>= 5.2.0)
-    activesupport (6.1.4.4)
+    activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -173,7 +173,7 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.9.1)
       concurrent-ruby (~> 1.0)
-    image_processing (1.12.1)
+    image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     json (2.6.1)
@@ -186,7 +186,8 @@ GEM
       addressable (~> 2.7)
     libv8-node (16.10.0.0-x86_64-darwin)
     libv8-node (16.10.0.0-x86_64-linux)
-    loofah (2.13.0)
+    libv8-node (16.10.0.0-x86_64-linux-musl)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -230,20 +231,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.1.4.4)
-      actioncable (= 6.1.4.4)
-      actionmailbox (= 6.1.4.4)
-      actionmailer (= 6.1.4.4)
-      actionpack (= 6.1.4.4)
-      actiontext (= 6.1.4.4)
-      actionview (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    rails (6.1.4.6)
+      actioncable (= 6.1.4.6)
+      actionmailbox (= 6.1.4.6)
+      actionmailer (= 6.1.4.6)
+      actionpack (= 6.1.4.6)
+      actiontext (= 6.1.4.6)
+      actionview (= 6.1.4.6)
+      activejob (= 6.1.4.6)
+      activemodel (= 6.1.4.6)
+      activerecord (= 6.1.4.6)
+      activestorage (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.4)
+      railties (= 6.1.4.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -252,9 +253,9 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    railties (6.1.4.6)
+      actionpack (= 6.1.4.6)
+      activesupport (= 6.1.4.6)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
@@ -265,12 +266,12 @@ GEM
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    roadie (4.0.0)
+    roadie (5.0.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
-    roadie-rails (2.3.0)
+    roadie-rails (3.0.0)
       railties (>= 5.1, < 7.1)
-      roadie (>= 3.1, < 5.0)
+      roadie (~> 5.0)
     rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.2)

data/app/models/asset.rb

@@ -45,16 +45,20 @@ class Asset < ActiveRecord::Base
   def asset_type
     AssetType.for(asset)
   end
+
   delegate :paperclip_processors, :paperclip_styles, :active_storage_styles, :style_dimensions, :style_format,
            to: :asset_type
 
   def thumbnail(style_name = 'original')
-    return asset.url if style_name.to_s == 'original' || asset.key.include?('culturaldistrict')
+    return asset.url if style_name.to_s == 'original' || render_original(style_name)
     return asset_variant(style_name.to_s).processed.url if asset.variable?
 
     asset_type.icon(style_name.to_s)
   end
 
+  def render_original(style_name)
+    style_name.to_s == 'original' && asset.key.include?('culturaldistrict')
+  end
 
   def asset_variant(style_name)
     case style_name
@@ -213,7 +217,9 @@ class Asset < ActiveRecord::Base
 
   # returns the return value of class << self block, which is self (as defined within that block)
   def self.eigenclass
-    class << self; self; end
+    class << self
+      self;
+    end
   end
 
   # for backwards compatibility

data/app/views/admin/assets/_asset_table.html.haml

@@ -25,6 +25,6 @@
             - else
               %li= link_to t('clipped_extension.edit'), admin_asset_path(asset), :class => 'edit'
               %li= link_to t("clipped_extension.remove"), remove_admin_asset_path(asset), :class => "delete"
-            
+
   - if with_pagination && assets.respond_to?(:total_pages) && assets.total_pages > 1
     = pagination_for(assets, pagination_parameters.merge(:depaginate => false, :param_name => 'p', :params => {:controller => 'admin/assets', :action => 'index', :id => nil, :format => 'js', :page_id => (page && page.id), :pp => assets.per_page }))

data/app/views/admin/assets/_search.html.haml

@@ -12,7 +12,7 @@
   .asset_search
     %i.fas.fa-search
     %input{:type=>"search", :id => 'filesearchforminput', :class=>"search", :name=>"search", :value=>h(params[:search]), :placeholder=>"Search", :results=>0, :size=>30}
-  
+
   #type_boxes{:style => "display: none"}
     - AssetType.all.each do |type|
       = check_box_tag 'filter[]',  type.name.to_s, false, :id => "#{type.name}-check", :class => 'selective'

data/app/views/admin/assets/_search_results.html.haml

@@ -1,6 +1,6 @@
 %ul#search_list
   - unless @assets.empty?
-    - @assets.each do |asset| 
+    - @assets.each do |asset|
       =# render :partial => 'asset', :locals => { :asset => asset, :page => @page }
       = render :partial => 'admin/assets/asset', :locals => { :asset_url => asset.asset.url, :asset_id => asset.id, :asset_type => 'image', :asset_title => asset.title, :asset_thumbnail => asset.thumbnail(:thumbnail), :page => @page }
 
@@ -8,7 +8,7 @@
     %li
       %p.note
         = t("clipped_extension.no_assets_found")
-      
+
 %script
   Asset.MakeDroppables();
   Asset.MakeDraggables();

data/app/views/admin/assets/edit.html.haml

@@ -1,16 +1,16 @@
 = stylesheet_link_tag 'admin/assets'
 = javascript_include_tag 'admin/custom_file_upload'
-= render_region :top 
+= render_region :top
 
 - render_region :main do |main|
   - main.edit_header do
     %h1= t("clipped_extension.asset_edit_title")
-  
+
   - main.edit_form do
     - form_for :asset, :url => admin_asset_path(@asset), :html => { :method => "put", :multipart => true } do |f|
       .form_area
         = render :partial => "form", :locals => { :f => f }
-        
+
         %div.content
           %fieldset
             %label.filename
@@ -25,13 +25,13 @@
             = image_tag @asset.thumbnail("normal"), :class => 'preview'
 
           = updated_stamp @asset
-        
+
         %fieldset.upload
           %label.custom-file-upload.upload
             = t("clipped_extension.replace_file")
             = f.file_field :asset, :style => "width: 100%"
           %span#file-chosen No file chosen
-        
+
         .buttons
           = save_model_button(@asset)
           = save_model_and_continue_editing_button(@asset)

data/app/views/admin/assets/index.html.haml

@@ -9,7 +9,7 @@
   #assets_table.assets
     = render :partial => 'asset_table', :locals => { assets: @assets, with_pagination: true }
   %p{style: 'clear: both; height: 2em'}  
-  
+
 - render_region :bottom do |bottom|
   #actions
     = link_to new_admin_asset_path, class: 'button' do

data/app/views/admin/configuration/_clipped_show.html.haml

@@ -1,4 +1,4 @@
-%h4 
+%h4
   = t('clipped_extension.assets')
 %p.ruled
   = show_config 'assets.max_asset_size'

data/app/views/admin/pages/_asset_popups.html.haml

@@ -2,7 +2,7 @@
   - popups.upload_asset do
     #upload_asset.popup{:style => 'display: none; width: 28em'}
       #upload_asset_busy.busy{:style => 'display: none'}= image('spinner.gif', :alt => '')
-      
+
       .popup_title= t('clipped_extension.upload_asset')
 
       = form_for([:admin, Asset.new], :html => {:method => 'post', :multipart => true, :class => 'upload_asset'}) do |f|
@@ -20,16 +20,16 @@
 
   - popups.attach_asset do
     #attach_asset.popup{:style=>'display: none;'}
-      
+
       .popup_title= t('clipped_extension.find_assets')
-      
+
       .toolbar
         = render :partial => 'admin/assets/search'
-      
+
       #assets_table.assets.viewport
         - assets = Asset.all.paginate(:per_page => 20, page: params[:p])
         = render :partial => 'admin/assets/asset_table', :locals => {:assets => assets, :with_pagination => true}
-    
+
       .busy{:style => 'display: none'}= image('spinner.gif', :alt => '')
       .buttons
         %a.cancel.close_popup{:href=>'#'}= t('close')

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

@@ -1,8 +1,8 @@
 #asset-bucket{ :style => 'display: none' }
   = render :partial => '/admin/assets/assets_container'
-  
+
   %p.note
     = automatic_size_descriptions
     = t('clipped_extension.images_automatically_created')
-  #close-link     
+  #close-link
     = link_to t('close'), '#'

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

@@ -4,7 +4,7 @@
 #assets-container
   #asset-tabs
     - render_region :asset_tabs do |asset_tabs|
-      - if @page && !@page.new_record? 
+      - 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')
@@ -14,25 +14,25 @@
         - asset_tabs.bucket_tab do
           %a.asset-tab{ :href => '#bucket', :id => 'tab_bucket' }
             = t('clipped_extension.bucket')
-        - asset_tabs.search_tab do  
+        - 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? 
+    - if @page && !@page.new_record?
       - render_region :asset_panes do |asset_panes|
 
-        - asset_panes.page_attachments do 
+        - asset_panes.page_attachments do
           #page-attachments.pane
             %p
-              %span.note 
+              %span.note
                 != t('clipped_extension.asset_note')
             %ul#attachments
               = render :partial => 'admin/assets/page_assets'
             .clear
-      
+
         - asset_panes.upload do
           #upload_assets.pane
             %p

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

@@ -1,6 +1,6 @@
 %ul#bucket_list
   - if session[:bucket]
-    - session[:bucket].each do |url, info| 
+    - 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

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

@@ -8,5 +8,5 @@
     .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/sites/_form.haml

@@ -39,10 +39,10 @@
       A new homepage will be created automatically if none is specified.
     - else
       If you change the site homepage ID, be sure it is to a page with no parents.
-  
+
   - render_region :form_bottom do |form_bottom|
     - form_bottom.edit_timestamp do
-      = updated_stamp @site  
+      = updated_stamp @site
       - form_bottom.edit_buttons do
         .buttons
           = save_model_button(@site)

data/app/views/admin/snippets/edit.html.haml

@@ -2,7 +2,7 @@
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1= t('edit_snippet')  
+    %h1= t('edit_snippet')
   - main.edit_form do
     = render :partial => 'form'
   - main.edit_popups do

data/app/views/admin/snippets/new.html.haml

@@ -1,6 +1,6 @@
 - render_region :main do |main|
   - main.edit_header do
-    %h1= t('new_snippet')  
+    %h1= t('new_snippet')
   - main.edit_form do
     = render :partial => 'form'
   - main.edit_popups do

data/config/database.yml

@@ -0,0 +1,4 @@
+test:
+  adapter: mysql2
+  database: trusty_cms_test
+  username: