trusty-cms 6.0.4 → 6.1.1

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

@@ -3,11 +3,11 @@
 - body_classes << 'reversed'
 
 - content_for :toolbar do
-  = render 'search'
+  = render partial: 'search', locals: { term: @term, page: @page }
 
 .outset
   #assets_table.assets
-    = render :partial => 'asset_table', :locals => { assets: @assets, with_pagination: true }
+    = render partial: 'asset_table', locals: { assets: @assets, with_pagination: true }
   %p{style: 'clear: both; height: 2em'} &nbsp;
 
 - render_region :bottom do |bottom|

data/app/views/admin/layouts/_site_chooser.html.haml

@@ -1,4 +1,4 @@
-- if current_user.admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
+- if current_user.admin? && !current_user.scoped? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
   .site_chooser
     %ul.nav
       %li

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

@@ -24,7 +24,7 @@
       .popup_title= t('clipped_extension.find_assets')
 
       .toolbar
-        = render :partial => 'admin/assets/search'
+        = render :partial => 'admin/assets/search', locals: { term: @term, page: @page }
 
       #assets_table.assets.viewport
         - assets = Asset.all.paginate(:per_page => 20, page: params[:p])

data/config/initializers/ransack.rb

@@ -0,0 +1,5 @@
+Ransack.configure do |c|
+  # Change default search parameter key name.
+  # Default key name is :q
+  c.search_key = :search
+end

data/lib/trusty_cms/engine.rb

@@ -21,4 +21,5 @@ end
 
 require 'ckeditor'
 require 'devise'
+require 'ransack'
 

data/lib/trusty_cms.rb

@@ -2,7 +2,7 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '6.0.4'.freeze
+    VERSION = '6.1.1'.freeze
   end
 end
 

data/trusty_cms.gemspec

@@ -43,6 +43,7 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'radius', '~> 0.7'
   s.add_dependency 'rails'
   s.add_dependency 'rake', '< 14.0'
+  s.add_dependency 'ransack'
   s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
   s.add_dependency 'RedCloth', '4.3.2'
   s.add_dependency 'roadie-rails'

data/vendor/extensions/clipped-extension/clipped_extension.rb

@@ -5,10 +5,10 @@ class ClippedExtension < TrustyCms::Extension
   def activate
     if database_exists?
       if Asset.table_exists?
-        Page.send :include, PageAssetAssociations                                          # defines page-asset associations. likely to be generalised soon.
-        TrustyCms::AdminUI.send :include, ClippedAdminUI unless defined? admin.asset         # defines shards for extension of the asset-admin interface
-        Admin::PagesController.send :helper, Admin::AssetsHelper                           # currently only provides a description of asset sizes
-        Page.send :include, AssetTags                                                      # radius tags for selecting sets of assets and presenting each one
+        Page.send :include, PageAssetAssociations # defines page-asset associations. likely to be generalised soon.
+        TrustyCms::AdminUI.send :include, ClippedAdminUI unless defined? admin.asset # defines shards for extension of the asset-admin interface
+        Admin::PagesController.send :helper, Admin::AssetsHelper # currently only provides a description of asset sizes
+        Page.send :include, AssetTags # radius tags for selecting sets of assets and presenting each one
         AssetType.new :image, :icon => 'image', :default_radius_tag => 'image', :processors => [:thumbnail], :styles => :standard, :extensions => %w[jpg jpeg png gif], :mime_types => %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif]
         AssetType.new :video, :icon => 'video', :processors => [:frame_grab], :styles => :standard, :mime_types => %w[application/x-mp4 video/mpeg video/quicktime video/x-la-asf video/x-ms-asf video/x-msvideo video/x-sgi-movie video/x-flv flv-application/octet-stream video/3gpp video/3gpp2 video/3gpp-tt video/BMPEG video/BT656 video/CelB video/DV video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/JPEG video/MJ2 video/MP1S video/MP2P video/MP2T video/mp4 video/MP4V-ES video/MPV video/mpeg4 video/mpeg4-generic video/nv video/parityfec video/pointer video/raw video/rtx video/ogg video/webm]
         AssetType.new :audio, :icon => 'audio', :mime_types => %w[audio/mpeg audio/mpg audio/ogg application/ogg audio/x-ms-wma audio/vnd.rn-realaudio audio/x-wav]
@@ -16,19 +16,19 @@ class ClippedExtension < TrustyCms::Extension
         AssetType.new :document, :icon => 'document', :mime_types => %w[application/msword application/rtf application/vnd.ms-excel application/vnd.ms-powerpoint application/vnd.ms-project application/vnd.ms-works text/plain text/html]
         AssetType.new :other, :icon => 'unknown'
 
-        admin.asset ||= TrustyCms::AdminUI.load_default_asset_regions                        # loads the shards defined in AssetsAdminUI
-        admin.page.edit.add :form, 'assets', :after => :edit_page_parts                    # adds the asset-attachment picker to the page edit view
-        admin.page.edit.add :main, 'asset_popups', :after => :edit_popups                  # adds the asset-attachment picker to the page edit view
+        admin.asset ||= TrustyCms::AdminUI.load_default_asset_regions # loads the shards defined in AssetsAdminUI
+        admin.page.edit.add :form, 'assets', :after => :edit_page_parts # adds the asset-attachment picker to the page edit view
+        admin.page.edit.add :main, 'asset_popups', :after => :edit_popups # adds the asset-attachment picker to the page edit view
         admin.page.edit.asset_popups.concat %w{upload_asset attach_asset}
         admin.configuration.show.add :trusty_config, 'admin/configuration/clipped_show', :after => 'defaults'
-        admin.configuration.edit.add :form,   'admin/configuration/clipped_edit', :after => 'edit_defaults'
+        admin.configuration.edit.add :form, 'admin/configuration/clipped_edit', :after => 'edit_defaults'
 
-        if TrustyCms::Config.table_exists? && TrustyCms::config["paperclip.command_path"]    # This is needed for testing if you are using mod_rails
+        if TrustyCms::Config.table_exists? && TrustyCms::config["paperclip.command_path"] # This is needed for testing if you are using mod_rails
           Paperclip.options[:command_path] = TrustyCms::config["paperclip.command_path"]
         end
 
         tab "Assets", :after => "Content" do
-          add_item "All", "/admin/assets/"
+          add_item "All", "/admin/assets"
         end
       end
     end

data/vendor/extensions/clipped-extension/lib/asset_tags.rb

@@ -2,34 +2,34 @@ module AssetTags
   include TrustyCms::Taggable
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::AssetTagHelper
-  
+
   class TagError < StandardError; end
-  
+
   %w{top_padding width height caption asset_file_name asset_content_type asset_file_size id filename image flash thumbnail url link extension if_content_type page:title page:url}.each do |name|
     deprecated_tag "assets:#{name}", :substitute => "asset:#{name}", :deadline => '2.0'
   end
-  
+
   desc %{
     The namespace for referencing images and assets.
     
     *Usage:* 
     <pre><code><r:asset [name="asset name"]>...</r:asset></code></pre>
-  }    
+  }
   tag 'asset' do |tag|
     tag.locals.asset = find_asset(tag, tag.attr) unless tag.attr.empty?
-      tag.expand
+    tag.expand
   end
 
   desc %{
     Cycles through all assets attached to the current page.  
-    This tag does not require the name atttribute, nor do any of its children.
+    This tag does not require the name attribute, nor do any of its children.
     Use the @limit@ and @offset@ attribute to render a specific number of assets.
     Use @by@ and @order@ attributes to control the order of assets.
     Use @extensions@ attribute to specify which assets to be rendered.
     
     *Usage:* 
     <pre><code><r:assets:each [limit=0] [offset=0] [order="asc|desc"] [by="position|title|..."] [extensions="png|pdf|doc"]>...</r:assets:each></code></pre>
-  }    
+  }
   tag 'assets' do |tag|
     tag.expand
   end
@@ -58,7 +58,7 @@ module AssetTags
     end
     result
   end
-  
+
   desc %{
     References the first asset attached to the current page.  
     
@@ -84,7 +84,7 @@ module AssetTags
     assets = tag.locals.page.assets.count(:conditions => assets_find_options(tag)[:conditions])
     tag.expand if assets >= count
   end
-  
+
   desc %{
     The opposite of @<r:if_assets/>@.
   }
@@ -93,7 +93,7 @@ module AssetTags
     assets = tag.locals.page.assets.count(:conditions => assets_find_options(tag)[:conditions])
     tag.expand unless assets >= count
   end
-  
+
   # Resets the page Url and title within the asset tag
   [:title, :url].each do |method|
     tag "asset:page:#{method.to_s}" do |tag|
@@ -127,10 +127,10 @@ module AssetTags
     size = options['size'] ? options.delete('size') : 'icon'
     raise TagError, "asset #{tag.locals.asset.title} has no '#{size}' thumbnail" unless tag.locals.asset.style?(size)
     container = options.delete('container')
-    ((container.to_i - asset.height(size).to_i)/2).to_s
+    ((container.to_i - asset.height(size).to_i) / 2).to_s
   end
-    
-  ['height','width'].each do |dimension|
+
+  ['height', 'width'].each do |dimension|
     desc %{
       Renders the #{dimension} of the asset.
     }
@@ -180,11 +180,11 @@ module AssetTags
   tag 'asset:if_content_type' do |tag|
     options = tag.attr.dup
     # XXX build_regexp_for comes from StandardTags
-    regexp = build_regexp_for(tag,options)
+    regexp = build_regexp_for(tag, options)
     asset_content_type = tag.locals.asset.asset_content_type
     tag.expand unless asset_content_type.match(regexp).nil?
   end
-    
+
   [:title, :caption, :asset_file_name, :extension, :asset_content_type, :asset_file_size, :id].each do |method|
     desc %{
       Renders the @#{method.to_s}@ attribute of the asset
@@ -194,16 +194,16 @@ module AssetTags
       asset.send(method) rescue nil
     end
   end
-  
+
   tag 'asset:name' do |tag|
     tag.render('asset:title', tag.attr.dup)
-  end  
-  
+  end
+
   tag 'asset:filename' do |tag|
     asset, options = asset_and_options(tag)
     asset.asset_file_name rescue nil
   end
-  
+
   desc %{
     Renders an image tag for the asset.
     
@@ -213,7 +213,7 @@ module AssetTags
     
     *Usage:* 
     <pre><code><r:asset:image [name="asset name" or id="asset id"] [size="icon|thumbnail|whatever"]></code></pre>
-  }    
+  }
   tag 'asset:image' do |tag|
     tag.locals.asset, options = image_asset_and_options(tag)
     return "Error: This image cannot be found" if tag.locals.asset == nil
@@ -223,20 +223,20 @@ module AssetTags
     url = tag.locals.asset.thumbnail(size)
     ActionController::Base.helpers.image_tag(url, options)
   end
-    
+
   desc %{
     Renders the url for the asset. If the asset is an image, the <code>size</code> attribute can be used to 
     generate the url for that size. 
     
     *Usage:* 
     <pre><code><r:url [name="asset name" or id="asset id"] [size="icon|thumbnail"]></code></pre>
-  }    
+  }
   tag 'asset:url' do |tag|
     asset, options = asset_and_options(tag)
     size = options['size'] ? options.delete('size') : 'original'
     asset.thumbnail(size) rescue nil
   end
-  
+
   desc %{
     Renders a link to the asset. If the asset is an image, the <code>size</code> attribute can be used to 
     generate a link to that size. 
@@ -255,8 +255,9 @@ module AssetTags
     url = asset.thumbnail(size)
     %{<a href="#{url  }#{anchor}"#{attributes}>#{text}</a>} rescue nil
   end
-    
-private
+
+  private
+
   def asset_and_options(tag)
     options = tag.attr.dup
     [find_asset(tag, options), options]
@@ -269,19 +270,19 @@ private
 
   def find_asset(tag, options)
     tag.locals.asset ||= if title = (options.delete('name') || options.delete('title'))
-      Asset.find_by_title(title)
-    elsif id = options.delete('id')
-      Asset.find_by_id(id)
-    end
+                           Asset.find_by_title(title)
+                         elsif id = options.delete('id')
+                           Asset.find_by_id(id)
+                         end
     tag.locals.asset || raise(TagError, "Asset not found.")
   end
 
   def find_image_asset(tag, options)
     tag.locals.asset ||= if title = (options.delete('name') || options.delete('title'))
-      Asset.find_by_title(title)
-    elsif id = options.delete('id')
-      Asset.find_by_id(id)
-    end
+                           Asset.find_by_title(title)
+                         elsif id = options.delete('id')
+                           Asset.find_by_id(id)
+                         end
     tag.locals.asset || nil
   end
 
@@ -289,16 +290,16 @@ private
     attr = tag.attr.symbolize_keys
     extensions = attr[:extensions] && attr[:extensions].split('|') || []
     conditions = unless extensions.blank?
-      # this is soon to be removed in favour of asset types
-      [ extensions.map { |ext| "assets.asset_file_name LIKE ?"}.join(' OR '), 
-        *extensions.map { |ext| "%.#{ext}" } ]
-    else
-      nil
-    end
-    
+                   # this is soon to be removed in favour of asset types
+                   [extensions.map { |ext| "assets.asset_file_name LIKE ?" }.join(' OR '),
+                    *extensions.map { |ext| "%.#{ext}" }]
+                 else
+                   nil
+                 end
+
     by = attr[:by] || 'page_attachments.position'
     order = attr[:order] || 'asc'
-    
+
     options = {
       :order => "#{by} #{order}",
       :limit => attr[:limit] || nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.1.1
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -312,6 +312,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '14.0'
+- !ruby/object:Gem::Dependency
+  name: ransack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -781,6 +795,7 @@ files:
 - config/initializers/assets.rb
 - config/initializers/devise.rb
 - config/initializers/kraken.rb
+- config/initializers/ransack.rb
 - config/initializers/response_cache_timeout.rb
 - config/initializers/secret_token.rb
 - config/initializers/tmp.rb
@@ -1133,51 +1148,51 @@ specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
 - spec/models/layout_spec.rb
-- spec/features/layouts_spec.rb
-- spec/features/config_spec.rb
-- spec/features/pages_spec.rb
-- spec/support/custom_actions.rb
-- spec/ci/database.mysql.yml
-- spec/controllers/users_controller_spec.rb
-- spec/controllers/application_controller_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/application_controller_spec.rb
+- spec/support/custom_actions.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/yarn.lock
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/package.json
 - spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/application.rb
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/yarn.lock
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/README.rdoc
-- spec/dummy/bin/bundle
 - spec/dummy/bin/rails
+- spec/dummy/bin/bundle
 - spec/dummy/bin/setup
 - spec/dummy/bin/rake
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/package.json
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/Rakefile
+- spec/fixtures/users.yml
 - spec/factories/page.rb
-- spec/factories/user.rb
-- spec/factories/layout.rb
 - spec/factories/page_part.rb
-- spec/fixtures/users.yml
+- spec/factories/layout.rb
+- spec/factories/user.rb
+- spec/features/pages_spec.rb
+- spec/features/config_spec.rb
+- spec/features/layouts_spec.rb
+- spec/ci/database.mysql.yml